CMDCT-4105 - trying out a deploy with sls license key

Enterprise-CMCS · Jan 8, 2025 · fbbeacf · fbbeacf
1 parent 58b5385
commit fbbeacf
Show file tree

Hide file tree

Showing 11 changed files with 144 additions and 1,005 deletions.
diff --git a/.env.tpl b/.env.tpl
@@ -30,3 +30,5 @@ CYPRESS_STATE_USER_2=op://mdct_devs/qmr_secrets/CYPRESS_STATE_USER_2
 CYPRESS_STATE_USER_4=op://mdct_devs/qmr_secrets/CYPRESS_STATE_USER_4
 CYPRESS_ADMIN_USER=op://mdct_devs/qmr_secrets/CYPRESS_ADMIN_USER
 CYPRESS_QMR_PASSWORD=op://mdct_devs/qmr_secrets/CYPRESS_QMR_PASSWORD # pragma: allowlist secret
+
+SERVERLESS_LICENSE_KEY=op://mdct_devs/qmr_secrets/SERVERLESS_LICENSE_KEY
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
@@ -57,6 +57,8 @@ jobs:
         run: |
           echo "PATH=$(pwd)/node_modules/.bin/:$PATH" >> $GITHUB_ENV
       - name: deploy
+        env:
+          SERVERLESS_LICENSE_KEY: ${{ secrets.SERVERLESS_LICENSE_KEY }}
         run: |
           # When deploying multiple copies of this quickstart to the same AWS Account (not ideal), a prefix helps prevent stepping on each other.
           # This can optionally be set as an GitHub Actions Secret

diff --git a/run b/run
@@ -34,7 +34,7 @@ fi
 # check serverless is installed globally.
 if ! which serverless > /dev/null ; then
 	echo "installing serverless globally"
-	yarn global add serverless@3.38.0
+	yarn global add serverless@4.4.18
 fi
 
 # have to ensure that yarn install is up to date.

diff --git a/serverless-compose.yml b/serverless-compose.yml
@@ -2,51 +2,51 @@ services:
   # wave 1: no dependencies
   database:
     path: services/database
-  topics:
-    path: services/topics
-  ui:
-    path: services/ui
+  # topics:
+  #   path: services/topics
+  # ui:
+  #   path: services/ui
 
-  # wave 2: depends on database
-  uploads:
-    path: services/uploads
-    params:
-      MeasureTable: ${database.MeasureTable}
-      CoreSetTable: ${database.CoreSetTable}
-      RateTable: ${database.RateTable}
+  # # wave 2: depends on database
+  # uploads:
+  #   path: services/uploads
+  #   params:
+  #     MeasureTable: ${database.MeasureTable}
+  #     CoreSetTable: ${database.CoreSetTable}
+  #     RateTable: ${database.RateTable}
 
-  app-api:
-    path: services/app-api
-    params:
-      CoreSetTable: ${database.CoreSetTable}
-      CoreSetTableStreamArn: ${database.CoreSetTableStreamArn}
-      MeasureTable: ${database.MeasureTable}
-      MeasureTableStreamArn: ${database.MeasureTableStreamArn}
-      RateTable: ${database.RateTable}
-      RateTableStreamArn: ${database.RateTableStreamArn}
-      BannerTableName: ${database.BannerTableName}
+  # app-api:
+  #   path: services/app-api
+  #   params:
+  #     CoreSetTable: ${database.CoreSetTable}
+  #     CoreSetTableStreamArn: ${database.CoreSetTableStreamArn}
+  #     MeasureTable: ${database.MeasureTable}
+  #     MeasureTableStreamArn: ${database.MeasureTableStreamArn}
+  #     RateTable: ${database.RateTable}
+  #     RateTableStreamArn: ${database.RateTableStreamArn}
+  #     BannerTableName: ${database.BannerTableName}
 
-  # wave 3: depends on many
-  ui-auth:
-    path: services/ui-auth
-    params:
-      AttachmentsBucketArn: ${uploads.AttachmentsBucketArn}
-      ApiGatewayRestApiName: ${app-api.ApiGatewayRestApiName}
-      ApplicationEndpointUrl: ${ui.ApplicationEndpointUrl}
+  # # wave 3: depends on many
+  # ui-auth:
+  #   path: services/ui-auth
+  #   params:
+  #     AttachmentsBucketArn: ${uploads.AttachmentsBucketArn}
+  #     ApiGatewayRestApiName: ${app-api.ApiGatewayRestApiName}
+  #     ApplicationEndpointUrl: ${ui.ApplicationEndpointUrl}
 
-  # wave 4: depends on most
-  ui-src:
-    path: services/ui-src
-    params:
-      ApiRegion: ${app-api.Region}
-      ApiGatewayRestApiUrl: ${app-api.ApiGatewayRestApiUrl}
-      CognitoRegion: ${ui-auth.Region}
-      IdentityPoolId: ${ui-auth.IdentityPoolId}
-      UserPoolId: ${ui-auth.UserPoolId}
-      UserPoolClientId: ${ui-auth.UserPoolClientId}
-      UserPoolClientDomain: ${ui-auth.UserPoolClientDomain}
-      AttachmentsBucketRegion: ${uploads.Region}
-      AttachmentsBucketName: ${uploads.AttachmentsBucketName}
-      S3BucketName: ${ui.S3BucketName}
-      CloudFrontDistributionId: ${ui.CloudFrontDistributionId}
-      ApplicationEndpointUrl: ${ui.ApplicationEndpointUrl}
+  # # wave 4: depends on most
+  # ui-src:
+  #   path: services/ui-src
+  #   params:
+  #     ApiRegion: ${app-api.Region}
+  #     ApiGatewayRestApiUrl: ${app-api.ApiGatewayRestApiUrl}
+  #     CognitoRegion: ${ui-auth.Region}
+  #     IdentityPoolId: ${ui-auth.IdentityPoolId}
+  #     UserPoolId: ${ui-auth.UserPoolId}
+  #     UserPoolClientId: ${ui-auth.UserPoolClientId}
+  #     UserPoolClientDomain: ${ui-auth.UserPoolClientDomain}
+  #     AttachmentsBucketRegion: ${uploads.Region}
+  #     AttachmentsBucketName: ${uploads.AttachmentsBucketName}
+  #     S3BucketName: ${ui.S3BucketName}
+  #     CloudFrontDistributionId: ${ui.CloudFrontDistributionId}
+  #     ApplicationEndpointUrl: ${ui.ApplicationEndpointUrl}
diff --git a/services/app-api/serverless.yml b/services/app-api/serverless.yml
@@ -7,7 +7,7 @@ package:
   individually: true
 
 plugins:
-  - serverless-plugin-typescript
+  # - serverless-plugin-typescript
   - serverless-associate-waf
   - "@enterprise-cmcs/serverless-waf-plugin"
   - serverless-offline-ssm

diff --git a/services/topics/serverless.yml b/services/topics/serverless.yml
@@ -22,9 +22,9 @@ provider:
   name: aws
   runtime: nodejs20.x
   region: us-east-1
-  stackTags:  
+  stackTags:
     PROJECT: ${self:custom.project}
-    SERVICE: ${self:service}  
+    SERVICE: ${self:service}
   iam:
     role:
       path: ${env:IAM_PATH, ssm:/configuration/${self:custom.stage}/iam/path, ssm:/configuration/default/iam/path, "/"}
@@ -94,7 +94,7 @@ functions:
       securityGroupIds:
         - Ref: LambdaSecurityGroup
       subnetIds: ${self:custom.privateSubnets}
-    timeout: 300     
+    timeout: 300
 
 resources:
   Resources:

diff --git a/services/ui-auth/serverless.yml b/services/ui-auth/serverless.yml
@@ -12,7 +12,7 @@ provider:
   region: us-east-1
   stackTags:
     PROJECT: ${self:custom.project}
-    SERVICE: ${self:service}  
+    SERVICE: ${self:service}
   iam:
     role:
       path: ${ssm:/configuration/${self:custom.stage}/iam/path, ssm:/configuration/default/iam/path, "/"}

diff --git a/services/ui-src/serverless.yml b/services/ui-src/serverless.yml
@@ -15,7 +15,7 @@ provider:
   region: us-east-1
   stackTags:
     PROJECT: ${self:custom.project}
-    SERVICE: ${self:service}  
+    SERVICE: ${self:service}
 
 custom:
   project: "qmr"

diff --git a/services/ui/serverless.yml b/services/ui/serverless.yml
@@ -9,7 +9,7 @@ provider:
   region: us-east-1
   stackTags:
     PROJECT: ${self:custom.project}
-    SERVICE: ${self:service}    
+    SERVICE: ${self:service}
   iam:
     role:
       path: ${ssm:/configuration/${self:custom.stage}/iam/path, ssm:/configuration/default/iam/path, "/"}

diff --git a/src/run.ts b/src/run.ts
@@ -132,7 +132,10 @@ async function install_deps_for_services(runner: LabeledProcessRunner) {
 async function deploy(options: { stage: string }) {
   const runner = new LabeledProcessRunner();
   await install_deps_for_services(runner);
-  const deployCmd = ["sls", "deploy", "--stage", options.stage];
+  const someCmd = ["sls", "--version"];
+  await runner.run_command_and_output("SLS Version", someCmd, ".");
+
+  const deployCmd = ["sls", "deploy", "--stage", options.stage, "--debug"];
   await runner.run_command_and_output("SLS Deploy", deployCmd, ".");
 }