Merge pull request #41 from govuk-one-login/LIME-2113

LIME-2113 Add common param for test-resources

Author: SarahHillGDS

.secrets.baseline

@@ -133,58 +133,58 @@
         "filename": "deploy/template.yaml",
         "hashed_secret": "aa1dd0ad4d2da161dd67db89e3d1aff921426385",
         "is_verified": false,
-        "line_number": 111
+        "line_number": 115
       },
       {
         "type": "Secret Keyword",
         "filename": "deploy/template.yaml",
         "hashed_secret": "5f784906cd85d6336c8506e9da9d102405771429",
         "is_verified": false,
-        "line_number": 114
+        "line_number": 118
       },
       {
         "type": "Secret Keyword",
         "filename": "deploy/template.yaml",
         "hashed_secret": "1ef0d2ac7a97bfe12f63f5d79979f912500adae1",
         "is_verified": false,
-        "line_number": 117
+        "line_number": 121
       },
       {
         "type": "Secret Keyword",
         "filename": "deploy/template.yaml",
         "hashed_secret": "5f399dc88587898510cf56b7503b482c870d0121",
         "is_verified": false,
-        "line_number": 120
+        "line_number": 124
       },
       {
         "type": "Secret Keyword",
         "filename": "deploy/template.yaml",
         "hashed_secret": "dc2050b23f4157e1b630f2bdf2f0a76b82f0f51a",
         "is_verified": false,
-        "line_number": 123
+        "line_number": 127
       },
       {
         "type": "Secret Keyword",
         "filename": "deploy/template.yaml",
         "hashed_secret": "b811ac90fe7fab03f6144a17aaebc38dcf3e007b",
         "is_verified": false,
-        "line_number": 136
+        "line_number": 140
       },
       {
         "type": "Secret Keyword",
         "filename": "deploy/template.yaml",
         "hashed_secret": "690de9fd42add772818ae392cb68a4f81d1511e3",
         "is_verified": false,
-        "line_number": 152
+        "line_number": 156
       },
       {
         "type": "Base64 High Entropy String",
         "filename": "deploy/template.yaml",
         "hashed_secret": "407b058c0f67be53116117c4b021b5e95f9dca9e",
         "is_verified": false,
-        "line_number": 178
+        "line_number": 182
       }
     ]
   },
-  "generated_at": "2026-03-19T14:43:34Z"
+  "generated_at": "2026-04-22T11:27:34Z"
 }

deploy/template.yaml

@@ -87,6 +87,10 @@ Conditions:
       - 0
   UseParameterPrefix: !Not
     - !Equals [ !Ref ParameterPrefix, "none"]
+  IsNotProduction: !Not [ !Equals [ !Ref Environment, production ] ]
+  CreateTestResourcesParam: !And
+    - !Condition IsDeployedFromPipeline
+    - !Condition IsNotProduction
 
 Globals:
   Function:
@@ -191,7 +195,7 @@ Resources:
     Properties:
       Location:
         ApplicationId: arn:aws:serverlessrepo:eu-west-2:667736788427:applications/di-ipv-cri-oauth-common
-        SemanticVersion: 0.0.0
+        SemanticVersion: 0.3.0
       Parameters:
         AuditEventNamePrefix: !Ref AuditEventNamePrefix
         CriIdentifier: !Ref CriIdentifier
@@ -569,6 +573,16 @@ Resources:
               ArnLike:
                 "kms:EncryptionContext:aws:logs:arn": !Sub "arn:aws:logs:${AWS::Region}:${AWS::AccountId}:*"
 
+  OAuthCommonStackNameParam:
+    Type: AWS::SSM::Parameter
+    Condition: CreateTestResourcesParam
+    Properties:
+      Name: /common-cri/oauth-common/stack-name
+      Type: String
+      Value: !GetAtt OAuth.Outputs.StackName
+      Description: The stack currently used for OAuth (oauth-common). Only required for test-resources.
+
+
   ####################################################################
   #                                                                  #
   # Alarms                                                           #
@@ -718,7 +732,7 @@ Resources:
     Properties:
       Name: !Sub
         - "/${OAuthStackName}/clients/ipv-core-stub-local/jwtAuthentication/redirectUri"
-        - OAuthStackName: !Select [1, !Split ['/', !Select [5, !Split [':', !Ref OAuth]]]]
+        - OAuthStackName: !GetAtt OAuth.Outputs.StackName
       Type: String
       Value: !FindInMap [ IPVCoreStubLocalMapping, !Ref Environment, redirectUri ]
 
@@ -728,7 +742,7 @@ Resources:
     Properties:
       Name: !Sub
         - "/${OAuthStackName}/clients/ipv-core-stub-local/jwtAuthentication/issuer"
-        - OAuthStackName: !Select [1, !Split ['/', !Select [5, !Split [':', !Ref OAuth]]]]
+        - OAuthStackName: !GetAtt OAuth.Outputs.StackName
       Type: String
       Value: !FindInMap [ IPVCoreStubLocalMapping, !Ref Environment, issuer ]
 
@@ -738,7 +752,7 @@ Resources:
     Properties:
       Name: !Sub
         - "/${OAuthStackName}/clients/ipv-core-stub-local/jwtAuthentication/audience"
-        - OAuthStackName: !Select [1, !Split ['/', !Select [5, !Split [':', !Ref OAuth]]]]
+        - OAuthStackName: !GetAtt OAuth.Outputs.StackName
       Type: String
       Value:
         !FindInMap [ IPVCoreStubLocalMapping, !Ref Environment, audience ]
@@ -749,7 +763,7 @@ Resources:
     Properties:
       Name: !Sub
         - "/${OAuthStackName}/clients/ipv-core-stub-local/jwtAuthentication/publicSigningJwkBase64"
-        - OAuthStackName: !Select [1, !Split ['/', !Select [5, !Split [':', !Ref OAuth]]]]
+        - OAuthStackName: !GetAtt OAuth.Outputs.StackName
       Type: String
       Value: !FindInMap [ IPVCoreStubLocalMapping, !Ref Environment, publicSigningJwkBase64Mapping ]
 
@@ -759,7 +773,7 @@ Resources:
     Properties:
       Name: !Sub
         - "/${OAuthStackName}/clients/ipv-core-stub-local/jwtAuthentication/jwksEndpoint"
-        - OAuthStackName: !Select [1, !Split ['/', !Select [5, !Split [':', !Ref OAuth]]]]
+        - OAuthStackName: !GetAtt OAuth.Outputs.StackName
       Type: String
       Value: !FindInMap [ IPVCoreStubLocalMapping, !Ref Environment, jwksEndpoint ]
 
@@ -769,7 +783,7 @@ Resources:
     Properties:
       Name: !Sub
         - "/${OAuthStackName}/clients/ipv-core-stub-local/jwtAuthentication/authenticationAlg"
-        - OAuthStackName: !Select [1, !Split ['/', !Select [5, !Split [':', !Ref OAuth]]]]
+        - OAuthStackName: !GetAtt OAuth.Outputs.StackName
       Type: String
       Value: !FindInMap [ IPVCoreStubLocalMapping, !Ref Environment, authenticationAlg ]