Combine the makefiles and delete batect

no10ds · May 2, 2024 · 5bcbe28 · 5bcbe28
1 parent b942e84
commit 5bcbe28
Show file tree

Hide file tree

Showing 22 changed files with 228 additions and 870 deletions.
diff --git a/.env.example b/.env.example
@@ -1,22 +1,38 @@
 AWS_ACCOUNT=123456
 AWS_REGION=eu-west-2
 
-# API Specific
+# API
+
+## Application variables
 ALLOWED_EMAIL_DOMAINS=example1.com,example2.com
 DATA_BUCKET=the-bucket
 RESOURCE_PREFIX=rapid
 DOMAIN_NAME=example.com
 COGNITO_USER_POOL_ID=11111111
 LAYERS=raw,layer
 CUSTOM_USER_NAME_REGEX="regex_expression"
-# SDK Specific
+
+## Build variables
+ECS_SERVICE=rapid-ecs-service
+ECS_CLUSTER=rapid-cluster
+API_IMAGE_NAME=rapid
+
+# SDK
+
 RAPID_CLIENT_ID=
 RAPID_CLIENT_SECRET=
 RAPID_URL=
-# UI Specific
+
+# UI
+
+## Application variables
 NEXT_PUBLIC_API_URL=
 NEXT_PUBLIC_API_URL_PROXY=
 
+## Build variables
+UI_IMAGE_NAME=rapid-image
+
+
 # UI Specific for integration tests
 DOMAIN=
 RESOURCE_PREFIX=
diff --git a/.github/.github.env b/.github/.github.env
@@ -5,3 +5,8 @@ LAYERS=raw,layer
 DOMAIN_NAME=example.com
 DATA_BUCKET=the-bucket
 CUSTOM_USER_NAME_REGEX=[a-zA-Z][a-zA-Z0-9@._-]{2,127}
+
+ECS_SERVICE=rapid-preprod-ecs-service
+ECS_CLUSTER=rapid-preprod-cluster
+API_IMAGE_NAME=data-f1-registry
+UI_IMAGE_NAME=ui-f1-registry
diff --git a/.github/workflows/dev.yml b/.github/workflows/dev.yml
@@ -50,16 +50,16 @@ jobs:
           echo AWS_DEFAULT_REGION=${{ secrets.AWS_REGION }} >> .env
 
       - name: Build API Image
-        run: make api-create-image
+        run: make api/create-image
 
       - name: API Static Analysis
-        run: make api-lint
+        run: make api/lint
 
       - name: API Tests
-        run: make api-test
+        run: make api/test
 
       - name: API Tag and Upload
-        run: make api-tag-and-upload
+        run: make api/tag-and-upload
 
   sdk-dev:
     needs:
@@ -84,18 +84,17 @@ jobs:
 
       - name: Setup Python Environment
         run: |
-          make sdk-setup
-          source sdk/.venv/bin/activate
+          make sdk/setup
 
       - name: SDK Test
-        run: make sdk-test
+        run: make sdk/test
 
       - name: Set env variable
         run: echo "TEST_SDK_VERSION=$(date +%Y%m%d%H%M%S)" >> $GITHUB_ENV
 
       - name: SDK Test Deploy
-        run: make sdk-release-test
-        
+        run: make sdk/release-test
+
   ui-dev:
     needs:
       - setup
@@ -111,10 +110,10 @@ jobs:
           node-version: 19
 
       - name: Install UI Packages
-        run: make ui-setup
+        run: make ui/setup
 
       - name: UI Test
-        run: make ui-test
+        run: make ui/test
 
   cleanup:
     needs:
@@ -130,4 +129,4 @@ jobs:
 
       - name: Clean Docker Context
         if: always()
-        run: make clean-pipeline-docker-context
+        run: make api/clean-docker
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -49,32 +49,32 @@ jobs:
           echo AWS_DEFAULT_REGION=${{ secrets.AWS_REGION }} >> .env
 
       - name: Build API Image
-        run: make api-create-image
+        run: make api/create-image
 
       - name: API Static Analysis
-        run: make api-lint
+        run: make api/lint
 
       - name: API Tests
-        run: make api-test
+        run: make api/test
 
       - name: API Tag and Upload
-        run: make api-tag-and-upload
+        run: make api/tag-and-upload
 
       - name: API Check Image Scan for Vulnerabilities
-        run: make api-scan-for-vulns-and-tag
+        run: make api/scan-for-vulns-and-tag
 
       - name: API Tag PROD Candidate
-        run: make api-tag-prod-candidate
+        run: make api/tag-prod-candidate
 
       - name: API Deploy Image to Prod
-        run: make api-app-live-in-prod
+        run: make api/app-live-in-prod
 
       - name: API Allow for Application to Start
         run: sleep 120
 
       - name: API Wait for Running Application
         id: await-running-app
-        run: make api-check-app-is-running
+        run: make api/check-app-is-running
 
       - name: API E2E Tests
         id: e2e-tests
@@ -85,11 +85,11 @@ jobs:
         run: |
           # Export AWS credentials to env for e2e tests
           eval "$(aws configure export-credentials --format env)"
-          make api-test-e2e
+          make api/test-e2e
 
       - name: API Tag Image as Failure
         if: always() && steps.await-running-app.conclusion == 'failure' || steps.e2e-tests.conclusion == 'failure'
-        run: make api-tag-prod-failure
+        run: make api/tag-prod-failure
 
   cleanup:
     needs:
@@ -103,4 +103,4 @@ jobs:
 
       - name: Clean Docker Context
         if: always()
-        run: make clean-pipeline-docker-context
+        run: make api/clean-docker
diff --git a/.github/workflows/release_api.yml b/.github/workflows/release_api.yml
@@ -30,10 +30,10 @@ jobs:
           echo AWS_REGION=${{ secrets.AWS_REGION }} >> .env
 
       - name: Build API Image
-        run: make api-create-image
+        run: make api/create-image
 
       - name: API Tag and Upload Release Image
-        run: make api-tag-and-upload-release-image
+        run: make api/tag-and-upload-release-image
 
   ui-release:
     needs:
@@ -46,30 +46,16 @@ jobs:
       - name: Setup Node
         uses: actions/setup-node@v3
         with:
-          node-version: 19
+          node-version: 20
 
       - name: Install UI Packages
-        run: make ui-setup
+        run: make ui/setup
 
       - name: UI Build Static Files
-        run: make ui-create-static-out
+        run: make ui/create-static-out
 
       - name: UI Zip and Release
         env:
           TAG: ${{ github.event.release.tag_name }}
           GH_TOKEN: ${{ github.token }}
-        run: make ui-zip-and-release tag=$TAG
-
-  cleanup:
-    needs:
-      - setup
-      - api-release
-      - ui-release
-    runs-on: self-hosted
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v3
-
-      - name: Clean Docker Context
-        if: always()
-        run: make clean-pipeline-docker-context
+        run: make ui/zip-and-release tag=$TAG
diff --git a/.github/workflows/release_sdk.yml b/.github/workflows/release_sdk.yml
@@ -37,21 +37,7 @@ jobs:
 
       - name: Setup Python Environment
         run: |
-          make sdk-setup
-          source sdk/.venv/bin/activate
+          make sdk/setup
 
       - name: SDK Release
-        run: make sdk-release
-
-  cleanup:
-    needs:
-      - setup
-      - sdk-release
-    runs-on: self-hosted
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v3
-
-      - name: Clean Docker Context
-        if: always()
-        run: make clean-pipeline-docker-context
+        run: make sdk/release
diff --git a/.github/workflows/scheduled-vulnerability-check.yml b/.github/workflows/scheduled-vulnerability-check.yml
@@ -22,4 +22,4 @@ jobs:
         run: echo AWS_REGION=${{ secrets.AWS_REGION }} >> .env
 
       - name: Check for vulnerabilities
-        run: make api-scheduled-prod-scan
+        run: make api/scheduled-prod-scan
diff --git a/.github/workflows/ui-tests.yml b/.github/workflows/ui-tests.yml
@@ -31,7 +31,7 @@ jobs:
           npx playwright install
 
       - name: Run playwright tests
-        run: make ui-test-e2e
+        run: make ui/test-e2e
         env:
           E2E_DOMAIN_NAME: ${{ secrets.E2E_DOMAIN_NAME }}
           E2E_RESOURCE_PREFIX: ${{ secrets.E2E_RESOURCE_PREFIX }}

diff --git a/Brewfile b/Brewfile
@@ -0,0 +1,8 @@
+brew "pyenv"
+brew "terraform"
+brew "checkov"
+brew "pre-commit"
+brew "nvm"
+brew "mkdocs"
+brew "gh"
+brew "jq"