Merge branch 'byon-main' of https://github.com/hms-dbmi/service-workb…

…ench-on-aws into aim-ahead-dbmi-dev
hms-dbmi · Aug 11, 2023 · 1dc9fac · 1dc9fac
2 parents 5956eca + 401316a
commit 1dc9fac
Show file tree

Hide file tree

Showing 13 changed files with 13 additions and 13 deletions.
diff --git a/addons/addon-base/packages/serverless-settings-helper/examples/basic/serverless.yml b/addons/addon-base/packages/serverless-settings-helper/examples/basic/serverless.yml
@@ -5,7 +5,7 @@ service: ${self:custom.settings.awsRegionShortName}-${self:custom.settings.solut
 provider:
   name: aws
   region: ${self:custom.settings.awsRegion}
-  profile: ${self:custom.settings.awsProfile}
+  profile: ${self:custom.settings.awsProfile, ""}
   stackName: ${self:custom.settings.envName}-${self:service}
 
 custom:

diff --git a/main/cicd/cicd-pipeline/serverless.yml b/main/cicd/cicd-pipeline/serverless.yml
@@ -5,7 +5,7 @@ service: ${self:custom.settings.awsRegionShortName}-${self:custom.settings.solut
 provider:
   name: aws
   region: ${self:custom.settings.awsRegion}
-  profile: ${self:custom.settings.awsProfile}
+  profile: ${self:custom.settings.awsProfile, ""}
   stackName: ${self:custom.settings.envName}-${self:service}
   deploymentBucket:
     name: ${self:custom.settings.deploymentBucketName}

diff --git a/main/cicd/cicd-source/serverless.yml b/main/cicd/cicd-source/serverless.yml
@@ -5,7 +5,7 @@ service: ${self:custom.settings.awsRegionShortName}-${self:custom.settings.solut
 provider:
   name: aws
   region: ${self:custom.settings.awsRegion}
-  profile: ${self:custom.settings.awsProfile}
+  profile: ${self:custom.settings.awsProfile, ""}
   stackName: ${self:custom.settings.envName}-${self:service}
   deploymentBucket:
     # The deployment bucket is named "${self:custom.settings.deploymentBucketName}" for all other serverless projects

diff --git a/main/solution/backend/serverless.yml b/main/solution/backend/serverless.yml
@@ -10,7 +10,7 @@ provider:
   name: aws
   runtime: nodejs16.x
   region: ${self:custom.settings.awsRegion}
-  profile: ${self:custom.settings.awsProfile}
+  profile: ${self:custom.settings.awsProfile, ""}
   stackName: ${self:custom.settings.envName}-${self:service}
   deploymentBucket:
     name: ${self:custom.settings.deploymentBucketName}

diff --git a/main/solution/edge-lambda/serverless.yml b/main/solution/edge-lambda/serverless.yml
@@ -5,7 +5,7 @@ service: ${self:custom.settings.awsRegionShortName}-${self:custom.settings.solut
 provider:
   name: aws
   region: ${self:custom.settings.awsRegion}
-  profile: ${self:custom.settings.awsProfile}
+  profile: ${self:custom.settings.awsProfile, ""}
   stackName: ${self:custom.settings.envName}-${self:service}
   deploymentBucket:
     name: ${self:custom.settings.deploymentBucketName}

diff --git a/main/solution/environment-tools/serverless.yml b/main/solution/environment-tools/serverless.yml
@@ -12,7 +12,7 @@ package:
 provider:
   name: aws
   region: ${self:custom.settings.awsRegion}
-  profile: ${self:custom.settings.awsProfile}
+  profile: ${self:custom.settings.awsProfile, ""}
 
 custom:
   settings: ${file(./config/settings/.settings.js):merged}

diff --git a/main/solution/infrastructure/serverless.yml b/main/solution/infrastructure/serverless.yml
@@ -5,7 +5,7 @@ service: ${self:custom.settings.awsRegionShortName}-${self:custom.settings.solut
 provider:
   name: aws
   region: ${self:custom.settings.awsRegion}
-  profile: ${self:custom.settings.awsProfile}
+  profile: ${self:custom.settings.awsProfile, ""}
   stackName: ${self:custom.settings.envName}-${self:service}
   deploymentBucket:
     name: ${self:custom.settings.deploymentBucketName}

diff --git a/main/solution/machine-images/serverless.yml b/main/solution/machine-images/serverless.yml
@@ -12,7 +12,7 @@ package:
 provider:
   name: aws
   region: ${self:custom.settings.awsRegion}
-  profile: ${self:custom.settings.awsProfile}
+  profile: ${self:custom.settings.awsProfile, ""}
 
 custom:
   default.aws.profile: '' # Keep default profile to use as empty string to force people to specify profile or use env

diff --git a/main/solution/post-deployment/serverless.yml b/main/solution/post-deployment/serverless.yml
@@ -10,7 +10,7 @@ provider:
   name: aws
   runtime: nodejs16.x
   region: ${self:custom.settings.awsRegion}
-  profile: ${self:custom.settings.awsProfile}
+  profile: ${self:custom.settings.awsProfile, ""}
   stackName: ${self:custom.settings.envName}-${self:service}
   deploymentBucket:
     name: ${self:custom.settings.deploymentBucketName}

diff --git a/main/solution/pre-deployment/serverless.yml b/main/solution/pre-deployment/serverless.yml
@@ -10,7 +10,7 @@ provider:
   name: aws
   runtime: nodejs16.x
   region: ${self:custom.settings.awsRegion}
-  profile: ${self:custom.settings.awsProfile}
+  profile: ${self:custom.settings.awsProfile, ""}
   stackName: ${self:custom.settings.envName}-${self:service}
   deploymentBucket:
     name: ${self:custom.settings.deploymentBucketName}

diff --git a/main/solution/prepare-master-acc/serverless.yml b/main/solution/prepare-master-acc/serverless.yml
@@ -5,7 +5,7 @@ service: ${self:custom.settings.awsRegionShortName}-${self:custom.settings.solut
 provider:
   name: aws
   region: ${self:custom.settings.awsRegion}
-  profile: ${self:custom.settings.awsProfile}
+  profile: ${self:custom.settings.awsProfile, ""}
   stackName: ${self:custom.settings.envName}-${self:service}
   deploymentBucket:
     name: ${self:custom.settings.globalNamespace}-raas-master-artifacts

diff --git a/main/solution/ui/serverless.yml b/main/solution/ui/serverless.yml
@@ -5,7 +5,7 @@ service: ${self:custom.settings.awsRegionShortName}-${self:custom.settings.solut
 provider:
   name: aws
   region: ${self:custom.settings.awsRegion}
-  profile: ${self:custom.settings.awsProfile}
+  profile: ${self:custom.settings.awsProfile, ""}
   stackName: ${self:custom.settings.envName}-${self:service}
   deploymentBucket:
     name: ${self:custom.settings.deploymentBucketName}

diff --git a/scripts/cicd-deploy.sh b/scripts/cicd-deploy.sh
@@ -22,7 +22,7 @@ install_dependencies "$@"
 pushd "$SOLUTION_ROOT_DIR/main/cicd/cicd-pipeline" > /dev/null
 
 # Disable serverless stats (only strictly needs to be done one time)
-$EXEC sls slstats --disable -s "$STAGE"
+$EXEC sls slstats --disable
 
 # Deploy the updated stack of the CICD
 printf "\n\n---- Deploy CICD Stack\n"