feat: #611 Remove AWS CodeCommit from stack (#619)

.github/workflows/actions/deploy/action.yml

@@ -0,0 +1,35 @@
+name: "Deploy environment"
+description: "Trigger deployment of the specified environment"
+
+inputs:
+  environment-name:
+    required: true
+    default: "production"
+  artifacts-s3-bucket:
+    required: true
+
+runs:
+  using: "composite"
+  steps:
+    - uses: actions/checkout@v4
+      with:
+        fetch-depth: 0
+        fetch-tags: 'true'
+
+    - name: Set VERSION in environment
+      shell: bash
+      run: |
+        app_version=$(git describe --tags --first-parent --abbrev=11 --long --dirty --always)
+        echo "VERSION=${app_version}" >> .env
+
+    - name: Zip artifact
+      shell: bash
+      run: |
+        artifact_name="${{ inputs.environment-name }}-entrypoint.zip"
+        zip -r -q $artifact_name .
+
+    - name: Send artifact to S3
+      shell: bash
+      run: |
+        artifact_name="${{ inputs.environment-name }}-entrypoint"
+        aws s3 cp "${artifact_name}.zip" "s3://${{ inputs.artifacts-s3-bucket }}/${artifact_name}"

.github/workflows/deploy-prod.yml

@@ -0,0 +1,25 @@
+name: "Deploy to production"
+
+concurrency: Production
+
+on:
+  workflow_dispatch:
+
+jobs:
+  deployment:
+    runs-on: ubuntu-latest
+    environment: Production
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+          fetch-tags: 'true'
+
+      - uses: ./.github/workflows/actions/deploy
+        with:
+          environment-name: 'saas-prod'
+          artifacts-s3-bucket: '${{ secrets.SB_CI_ARTIFACTS_BUCKET }}'
+        env:
+          AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
+          AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+          AWS_DEFAULT_REGION: ${{ secrets.AWS_DEFAULT_REGION }}

.github/workflows/deploy-qa.yml

@@ -0,0 +1,25 @@
+name: "Deploy to QA"
+
+concurrency: QA
+
+on:
+  workflow_dispatch:
+
+jobs:
+  deployment:
+    runs-on: ubuntu-latest
+    environment: QA
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+          fetch-tags: 'true'
+
+      - uses: ./.github/workflows/actions/deploy
+        with:
+          environment-name: 'saas-qa'
+          artifacts-s3-bucket: '${{ secrets.SB_CI_ARTIFACTS_BUCKET }}'
+        env:
+          AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
+          AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+          AWS_DEFAULT_REGION: ${{ secrets.AWS_DEFAULT_REGION }}

.github/workflows/infra.yml

@@ -14,7 +14,6 @@ jobs:
         infra-lib-name:
           - infra-core
           - infra-shared
-          - infra-functions
     steps:
       - uses: actions/checkout@v3
         with:

.versionrc.js

@@ -90,10 +90,6 @@ module.exports = {
       filename: './packages/infra/infra-core/package.json',
       type: 'json',
     },
-    {
-      filename: './packages/infra/infra-functions/package.json',
-      type: 'json',
-    },
     {
       filename: './packages/infra/infra-shared/package.json',
       type: 'json',

bitbucket-pipelines.yml

@@ -51,14 +51,20 @@ definitions:
       --filter=webapp...
 
   steps:
-    - step: &codecommitPush
-        name: Push code to CodeCommit
+    - step: &deploy-current-branch
+        name: Deploy environment
+        trigger: manual
         clone:
           depth: full
         script:
-          - git remote add codecommit "$CODE_COMMIT_REPO"
-          - git push --force -u codecommit "$BITBUCKET_BRANCH"
-          - git push codecommit --tags --force
+          - *setupAwsCli
+          - sudo apt-get install zip
+          - |
+            app_version=$(git describe --tags --first-parent --abbrev=11 --long --dirty --always)
+            echo "VERSION=${app_version}" >> .env
+            artifact_name="${SB_DEPLOY_ENVIRONMENT_NAME}-entrypoint"
+            zip -r -q "${artifact_name}.zip" .
+            aws s3 cp "${artifact_name}.zip" "s3://${SB_CI_ARTIFACTS_BUCKET}/${artifact_name}"
 
     - step: &webappTest
         name: 'webapp: Lint & test'
@@ -443,21 +449,6 @@ definitions:
           - pnpminfrashared
           - clis
 
-    - step: &infraFunctionsBuild
-        name: 'infra/infra-functions: Lint & build'
-        image: atlassian/default-image:4
-        script:
-          - *initializeStep
-          - pnpm install
-            --include-workspace-root
-            --frozen-lockfile
-            --filter=infra-functions...
-          - pnpm nx run infra-functions:lint
-          - pnpm nx run infra-functions:build
-        caches:
-          - pnpminfrafunctions
-          - clis
-
     # Internal steps
 
     - step: &internalDocsBuild
@@ -513,8 +504,6 @@ definitions:
 pipelines:
   default:
     - parallel:
-        - step: *codecommitPush
-
         - step: *webappTest
         - step: *webappBuild
         - step: *webappCoreTest
@@ -535,7 +524,6 @@ pipelines:
 
         - step: *infraCoreBuild
         - step: *infraSharedBuild
-        - step: *infraFunctionsBuild
 
         - step: *internalDocsBuild
         - step: *internalStatusDashboardBuild
@@ -544,8 +532,6 @@ pipelines:
   branches:
     master:
       - parallel:
-        - step: *codecommitPush
-
         - step: *webappTest
         - step: *webappBuild
         - step: *webappCoreTest
@@ -566,12 +552,16 @@ pipelines:
 
         - step: *infraCoreBuild
         - step: *infraSharedBuild
-        - step: *infraFunctionsBuild
 
         - step: *internalDocsBuild
         - step: *internalStatusDashboardBuild
         - step: *internalToolsBuild
-        - step:
-            name: Delete unused branches from CodeCommit
-            script:
-              - /bin/bash packages/internal/tools/scripts/clean-codebuild-branches.sh
+
+      - step:
+          <<: *deploy-current-branch
+          name: Deploy to Production env
+          deployment: production
+      - step:
+          <<: *deploy-current-branch
+          name: Deploy to QA env
+          deployment: qa

packages/infra/infra-core/src/lib/env-config.ts

@@ -13,7 +13,6 @@ declare const process: {
     SB_LOAD_BALANCER_CERTIFICATE_ARN: string;
     SB_HOSTED_ZONE_ID: string;
     SB_HOSTED_ZONE_NAME: string;
-    SB_DEPLOY_BRANCHES: string;
     PROJECT_NAME: string;
     ENV_STAGE: string;
     VERSION: string;
@@ -77,7 +76,6 @@ interface CIConfig {
 
 export interface EnvironmentSettings {
   appBasicAuth: string | null | undefined;
-  deployBranches: Array<string>;
   domains: EnvConfigFileDomains;
   envStage: string;
   hostedZone: EnvConfigHostedZone;
@@ -97,7 +95,6 @@ interface ConfigFileContent {
 }
 
 export interface EnvConfigFileContent {
-  deployBranches: Array<string>;
   hostedZone: EnvConfigHostedZone;
   basicAuth: string | null | undefined;
   domains: EnvConfigFileDomains;
@@ -163,7 +160,6 @@ async function readEnvConfig(envStage: string): Promise<EnvConfigFileContent> {
       id: process.env.SB_HOSTED_ZONE_ID ?? '',
       name: hostedZoneName,
     },
-    deployBranches: process.env.SB_DEPLOY_BRANCHES?.split(',') ?? [],
   };
 }
 
@@ -192,7 +188,6 @@ export async function loadEnvSettings(): Promise<EnvironmentSettings> {
     appBasicAuth: envConfig.basicAuth,
     hostedZone: envConfig.hostedZone,
     domains: envConfig.domains,
-    deployBranches: envConfig.deployBranches,
     webAppEnvVariables: {
       ...(config?.webAppConfig?.envVariables || {}),
       ...(envConfig?.webAppConfig?.envVariables || {}),