From 9112182913e44e96e29198d79a30145d34aa1a69 Mon Sep 17 00:00:00 2001
From: Jamie Bentham <jamie.bentham@digital.cabinet-office.gov.uk>
Date: Thu, 9 May 2024 14:14:00 +0100
Subject: [PATCH 1/2] LIME-1076: Moving repo permissions and deployment from
 Orange to Lime

---
 .github/pull_request_template.md    | 2 +-
 .github/workflows/deploy-branch.yml | 2 +-
 CODEOWNERS                          | 2 +-
 deploy.sh                           | 3 +--
 4 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
index 3352c92a..f38df4cd 100644
--- a/.github/pull_request_template.md
+++ b/.github/pull_request_template.md
@@ -17,7 +17,7 @@
 <!-- List any related ADRs or RFCs -->
 <!-- Delete/copy as appropriate -->
 
-- [OJ-XXXX](https://govukverify.atlassian.net/browse/OJ-XXXX)
+- [LIME-XXXX](https://govukverify.atlassian.net/browse/LIME-XXXX)
 
 ## Checklists
 
diff --git a/.github/workflows/deploy-branch.yml b/.github/workflows/deploy-branch.yml
index e3ac6f37..cb2fd188 100644
--- a/.github/workflows/deploy-branch.yml
+++ b/.github/workflows/deploy-branch.yml
@@ -57,7 +57,7 @@ jobs:
           tags: |
             cri:component=ipv-cri-kbv-hmrc-api
             cri:stack-type=preview
-            cri:application=Orange
+            cri:application=Lime
             cri:deployment-source=github-actions
           parameters: |
             Environment=dev
diff --git a/CODEOWNERS b/CODEOWNERS
index 291cff34..ad2b65c4 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -1 +1 @@
-* @govuk-one-login/cri-orange-team @govuk-one-login/cri-orange-admins @govuk-one-login/cri-lime-team-leads @govuk-one-login/identity-sre # Team ownership with break-glass overrides
+* @govuk-one-login/cri-orange-team @govuk-one-login/cri-orange-admins @govuk-one-login/cri-lime-team-leads @govuk-one-login/cri-lime-team @govuk-one-login/cri-lime-team-leads @govuk-one-login/identity-sre # Team ownership with break-glass overrides
diff --git a/deploy.sh b/deploy.sh
index 4d449e30..4a49899d 100755
--- a/deploy.sh
+++ b/deploy.sh
@@ -11,7 +11,6 @@ if ! [[ "$stack_name" ]]; then
   echo "» Using stack name '$stack_name'"
 fi
 
-sam validate -t infrastructure/template.yaml
 sam validate -t infrastructure/template.yaml --lint
 
 sam build -t infrastructure/template.yaml --cached --parallel
@@ -26,7 +25,7 @@ sam deploy --stack-name "$stack_name" \
   --tags \
   cri:component=ipv-cri-kbv-hmrc-api \
   cri:stack-type=dev \
-  cri:application=Orange \
+  cri:application=Lime \
   cri:deployment-source=manual \
   --parameter-overrides \
   ${common_stack_name:+CommonStackName=$common_stack_name} \

From c17022e1ca93bcd8a1da96803c040c324aa6ea43 Mon Sep 17 00:00:00 2001
From: Jamie Bentham <jamie.bentham@digital.cabinet-office.gov.uk>
Date: Thu, 9 May 2024 15:37:57 +0100
Subject: [PATCH 2/2] LIME-1076: Failed test that was failing following change
 from current year returned to current and previous

---
 .github/workflows/run-aws-tests.yml                         | 2 +-
 .../aws/get-ivq-questions/get-ivq-questions-happy.test.ts   | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/run-aws-tests.yml b/.github/workflows/run-aws-tests.yml
index 9158b348..8e7048e9 100644
--- a/.github/workflows/run-aws-tests.yml
+++ b/.github/workflows/run-aws-tests.yml
@@ -51,4 +51,4 @@ jobs:
         env:
           AWS_REGION: ${{ inputs.aws-region }}
           STACK_NAME: ${{ inputs.stack-name }}
-        run: npm run test:aws -- --config jest.config.ci.ts
+        run: npm run test:aws -- --config jest.config.ci.ts --runInBand
diff --git a/integration-tests/tests/aws/get-ivq-questions/get-ivq-questions-happy.test.ts b/integration-tests/tests/aws/get-ivq-questions/get-ivq-questions-happy.test.ts
index 2d4b92fc..69d770bb 100644
--- a/integration-tests/tests/aws/get-ivq-questions/get-ivq-questions-happy.test.ts
+++ b/integration-tests/tests/aws/get-ivq-questions/get-ivq-questions-happy.test.ts
@@ -26,7 +26,8 @@ describe("get-ivq-questions-happy", () => {
       correlationId: "93dcc67c-fe6d-4bd7-b68f-2bd848e0d572",
       questionKey: "rti-p60-payment-for-year",
       info: {
-        currentTaxYear: "2022/23",
+        currentTaxYear: "2023/24",
+        previousTaxYear: "2022/23",
       },
     },
     {
@@ -35,7 +36,8 @@ describe("get-ivq-questions-happy", () => {
       correlationId: "93dcc67c-fe6d-4bd7-b68f-2bd848e0d573",
       questionKey: "rti-p60-employee-ni-contributions",
       info: {
-        currentTaxYear: "2022/23",
+        currentTaxYear: "2023/24",
+        previousTaxYear: "2022/23",
       },
     },
     {