From f55b2062f20f35da40aee4febc19dfef0ad0d59c Mon Sep 17 00:00:00 2001 From: Samantha Date: Fri, 11 Aug 2023 10:27:14 -0400 Subject: [PATCH] Update serverless templates to use an empty string for aws profile. (#118) --- main/config/settings/.defaults.yml | 2 ++ main/solution/backend/config/settings/.defaults.yml | 2 -- main/solution/backend/serverless.yml | 2 +- main/solution/post-deployment/config/settings/.defaults.yml | 2 -- main/solution/post-deployment/serverless.yml | 2 +- main/solution/pre-deployment/config/settings/.defaults.yml | 2 -- main/solution/pre-deployment/serverless.yml | 2 +- 7 files changed, 5 insertions(+), 9 deletions(-) diff --git a/main/config/settings/.defaults.yml b/main/config/settings/.defaults.yml index cf8aa52b00..b751d13b35 100644 --- a/main/config/settings/.defaults.yml +++ b/main/config/settings/.defaults.yml @@ -232,3 +232,5 @@ dbEnvironmentsSc: ${self:custom.settings.dbPrefix}-EnvironmentsSc # Use Custom AMIs that are already managed by other process like golden image pipeline useCustomAmi: false + +useAwsProfile: false \ No newline at end of file diff --git a/main/solution/backend/config/settings/.defaults.yml b/main/solution/backend/config/settings/.defaults.yml index 8ffe7d0013..b37737eb5d 100644 --- a/main/solution/backend/config/settings/.defaults.yml +++ b/main/solution/backend/config/settings/.defaults.yml @@ -315,5 +315,3 @@ dataSourceReachabilityHandlerRoleArn: 'arn:aws:iam::${self:custom.settings.awsAc backendStackName: ${self:custom.settings.namespace}-backend envMgmtRoleArn: ${self:custom.settings.backendStackName}.EnvMgmtRoleArn} - -useAwsProfile: true \ No newline at end of file diff --git a/main/solution/backend/serverless.yml b/main/solution/backend/serverless.yml index 2f122edfb9..b8177a31c0 100644 --- a/main/solution/backend/serverless.yml +++ b/main/solution/backend/serverless.yml @@ -50,7 +50,7 @@ custom: environmentOverrides: # when running locally provider: APP_AWS_REGION: ${self:custom.settings.awsRegion} # this is needed for local development - APP_AWS_PROFILE: ${self:custom.settings.awsProfile} # this is needed for local development + APP_AWS_PROFILE: ${self:custom.settings.awsProfile, ""} # this is needed for local development APP_USE_AWS_PROFILE: ${self:custom.settings.useAwsProfile, ""} IS_OFFLINE: true APP_LOCAL_ROLE_AUTO_ADJUST_TRUST: ${self:custom.settings.localRoleAutoAdjustTrust} # Auto adjust trust policy of the lambda execution role to allow assumeRole from local machine diff --git a/main/solution/post-deployment/config/settings/.defaults.yml b/main/solution/post-deployment/config/settings/.defaults.yml index 677e3464cb..18e918a3dc 100644 --- a/main/solution/post-deployment/config/settings/.defaults.yml +++ b/main/solution/post-deployment/config/settings/.defaults.yml @@ -317,8 +317,6 @@ postDeploymentHandlerRoleName: ${self:custom.settings.namespace}-postDeployment- # The IAM role arn for the Lambda Post Deployment handler, we need to define it in the settings because it is being passed to lambdas as an env var postDeploymentHandlerRoleArn: 'arn:aws:iam::${self:custom.settings.awsAccountInfo.awsAccountId}:role/${self:custom.settings.postDeploymentHandlerRoleName}' -useAwsProfile: true - #===============================WAF=IP=Rate=Limit=========================================================== # Per ip, per 5 minutes wafIpRateLimit: 1000 diff --git a/main/solution/post-deployment/serverless.yml b/main/solution/post-deployment/serverless.yml index 3f1960ae73..a5560b473e 100644 --- a/main/solution/post-deployment/serverless.yml +++ b/main/solution/post-deployment/serverless.yml @@ -40,7 +40,7 @@ custom: environmentOverrides: # when running locally provider: APP_AWS_REGION: ${self:custom.settings.awsRegion} # this is needed for local development - APP_AWS_PROFILE: ${self:custom.settings.awsProfile} # this is needed for local development + APP_AWS_PROFILE: ${self:custom.settings.awsProfile, ""} # this is needed for local development APP_USE_AWS_PROFILE: ${self:custom.settings.useAwsProfile, ""} IS_OFFLINE: true APP_LOCAL_ROLE_AUTO_ADJUST_TRUST: ${self:custom.settings.localRoleAutoAdjustTrust} # Auto adjust trust policy of the lambda execution role to allow assumeRole from local machine diff --git a/main/solution/pre-deployment/config/settings/.defaults.yml b/main/solution/pre-deployment/config/settings/.defaults.yml index ba0dbec38f..1193fac89e 100644 --- a/main/solution/pre-deployment/config/settings/.defaults.yml +++ b/main/solution/pre-deployment/config/settings/.defaults.yml @@ -22,5 +22,3 @@ preDeploymentHandlerRoleName: ${self:custom.settings.namespace}-preDeployment-Ro # The IAM role arn for the Lambda Pre Deployment handler, we need to define it in the settings because it is being passed to lambdas as an env var preDeploymentHandlerRoleArn: 'arn:aws:iam::${self:custom.settings.awsAccountInfo.awsAccountId}:role/${self:custom.settings.preDeploymentHandlerRoleName}' - -useAwsProfile: true \ No newline at end of file diff --git a/main/solution/pre-deployment/serverless.yml b/main/solution/pre-deployment/serverless.yml index 277e33eb62..5218bb98ce 100644 --- a/main/solution/pre-deployment/serverless.yml +++ b/main/solution/pre-deployment/serverless.yml @@ -40,7 +40,7 @@ custom: environmentOverrides: # when running locally provider: APP_AWS_REGION: ${self:custom.settings.awsRegion} # this is needed for local development - APP_AWS_PROFILE: ${self:custom.settings.awsProfile} # this is needed for local development + APP_AWS_PROFILE: ${self:custom.settings.awsProfile, ""} # this is needed for local development APP_USE_AWS_PROFILE: ${self:custom.settings.useAwsProfile, ""} IS_OFFLINE: true APP_LOCAL_ROLE_AUTO_ADJUST_TRUST: ${self:custom.settings.localRoleAutoAdjustTrust} # Auto adjust trust policy of the lambda execution role to allow assumeRole from local machine