e2e in workflow

Author: robertnovac1

.github/workflows/pr-deploy-to-int.yml

@@ -4,11 +4,6 @@ on:
   push:
     branches: [VED-358-github-actions-for-int]
   workflow_dispatch:
-    inputs:
-      dummy:
-        description: 'Manual trigger (optional input)'
-        required: false
-        default: ''
 
 jobs:
   test-oidc:
@@ -37,29 +32,32 @@ jobs:
           terraform_version: "1.12.2"
 
       - name: Terraform Init
-        working-directory: ./terraform_old
+        working-directory: ./terraform
         run: |
           make init
           
       - name: Terraform Plan
-        working-directory: ./terraform_old
+        working-directory: ./terraform
         run: |
           make plan environment=green aws_account_name=int
 
-      # - name: Set up Python
-      #   id: setup_python
-      #   uses: actions/setup-python@v5
-      #   with:
-      #     python-version: "3.10.16" # this is for e2e tests
 
-      # - name: cache virtualenv
-      #   uses: actions/cache@v4
-      #   id: cache-venv
-      #   with:
-      #     path: ./.venv/
-      #     key: ${{ hashFiles('**/*requirements.txt') }}
-      #     restore-keys: ${{ hashFiles('**/*requirements.txt') }}
-
-      # - name: Install dependencies
-      #   if: steps.cache-venv.outputs.cache-hit != 'true'
-      #   run: make install-dev-requirements
+  # # --- APPROVAL REQUIRED HERE ---
+  # manual-approval:
+  #   needs: test-oidc
+  #   runs-on: ubuntu-latest
+  #   environment:
+  #     name: int-approval
+  #     # protection rules set in GitHub UI will pause here until approval
+  #   steps:
+  #     - name: Wait for approval
+  #       run: echo "Waiting for manual approval..."
+
+  # terraform-apply:
+  #   needs: manual-approval
+  #   runs-on: ubuntu-latest
+  #   steps:
+  #     - name: Terraform Apply
+  #       working-directory: ./terraform_old
+  #       run: |
+  #         make plan environment=green aws_account_name=int

.github/workflows/run-e2e-tests.yml

@@ -0,0 +1,83 @@
+name: PR build and test
+
+on:
+  push:
+    branches: [VED-358-github-actions-for-int]
+  workflow_dispatch:
+
+jobs:
+  test-oidc:
+    runs-on: ubuntu-latest
+    permissions:
+      id-token: write
+      contents: read
+    steps:
+      - name: Debug OIDC
+        uses: aws-actions/configure-aws-credentials@v4
+        with:
+          aws-region: eu-west-2
+          role-to-assume: arn:aws:iam::345594581768:role/auto-ops
+          role-session-name: github-actions
+
+      - name: Whoami
+        run: aws sts get-caller-identity
+
+      - name: Checkout
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 1
+
+      - name: Set up Python
+        id: setup_python
+        uses: actions/setup-python@v5
+        with:
+          python-version: "3.10"
+      
+      - name: Install Poetry
+        run: |
+          curl -sSL https://install.python-poetry.org | python3 -
+          echo "$HOME/.local/bin" >> $GITHUB_PATH
+
+      - name: Install dependencies with Poetry (from e2e folder)
+        working-directory: ./e2e
+        run: |
+          poetry install
+      
+      - uses: hashicorp/setup-terraform@v3
+        with:
+          terraform_version: "1.12.2"
+
+      - name: Terraform Init
+        working-directory: ./terraform
+        run: |
+          make init
+          
+      - name: Terraform Plan
+        working-directory: ./terraform
+        run: |
+          make plan environment=dev sub_environment=internal-dev
+
+      - name: Run e2e
+        working-directory: ./e2e
+        run: |
+          apigee_token=$(aws ssm get-parameter \
+            --name "/imms/apigee/non-prod/token" \
+            --with-decryption \
+            --query "Parameter.Value" \
+            --output text)
+
+          status_api_key=$(aws ssm get-parameter \
+            --name "/imms/apigee/non-prod/status-api-key" \
+            --with-decryption \
+            --query "Parameter.Value" \
+            --output text)
+          
+          export APIGEE_ACCESS_TOKEN=$apigee_token
+          export [email protected]
+          export APIGEE_ENVIRONMENT=non-prod
+          export STATUS_API_KEY=$status_api_key
+          export PROXY_NAME=immunisation-fhir-api-internal-dev
+          export SERVICE_BASE_PATH=immunisation-fhir-api/FHIR/R4
+          export SSO_LOGIN_URL=https://login.apigee.com
+
+          make run