CCM-11990 Workflow fixes (#80)

* CCM-11990 Workflow fixes

* CCM-11990 Workflow fixes

* CCM-1190 adding a test for amplify CI

* CCM-11990 adding a test for amplify CI

Author: aidenvaines-cgi

.github/workflows/cicd-1-pull-request.yaml

@@ -6,10 +6,14 @@ on:
   push:
     branches:
       - "**"
-  pull_request:
-    types: [opened, reopened]
-    branches:
-      - main
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.head_ref || github.ref_name }}
+  cancel-in-progress: false
+
+permissions:
+  id-token: write
+  contents: read
 
 jobs:
   metadata:

.github/workflows/pr_closed.yaml

@@ -60,6 +60,4 @@ jobs:
             --targetEnvironment "main" \
             --targetAccountGroup "nhs-notify-client-config-dev" \
             --targetComponent "${{ matrix.component }}" \
-            --terraformAction "apply" \
-            --overrideProjectName "nhs" \
-            --overrideRoleName "nhs-main-acct-client-config-github-deploy"
+            --terraformAction "apply"

.github/workflows/stage-1-commit.yaml

@@ -32,6 +32,10 @@ on:
         required: true
         type: string
 
+permissions:
+  id-token: write
+  contents: read
+
 jobs:
   scan-secrets:
     name: "Scan secrets"
@@ -71,11 +75,9 @@ jobs:
     runs-on: ubuntu-latest
     needs: detect-terraform-changes
     if: needs.detect-terraform-changes.outputs.terraform_changed == 'true'
-    permissions:
-        contents: write
     steps:
       - name: "Checkout code"
-        uses: actions/checkout@v5
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0 # Full history is needed to compare branches
       - name: "Check to see if Terraform Docs are up-to-date"

.github/workflows/stage-4-acceptance.yaml

@@ -27,11 +27,18 @@ on:
         description: "Terraform version, set by the CI/CD pipeline workflow"
         required: true
         type: string
+      pr_number:
+        required: true
+        type: string
       version:
         description: "Version of the software, set by the CI/CD pipeline workflow"
         required: true
         type: string
 
+permissions:
+  id-token: write
+  contents: read
+
 jobs:
   environment-set-up:
     name: "Environment set up"

frontend/src/__tests__/app/page.test.tsx

@@ -0,0 +1,14 @@
+import { render, screen } from '@testing-library/react';
+import Page from '../../app/page';
+
+describe('Home page', () => {
+  it('renders the Hello World heading', () => {
+    render(<Page />);
+    expect(screen.getByRole('heading', { name: /hello world/i })).toBeInTheDocument();
+  });
+
+  it('renders a main landmark', () => {
+    render(<Page />);
+    expect(screen.getByRole('main')).toBeInTheDocument();
+  });
+});