Merge pull request #2538 from vrk-kpa/allow_cloudstorage_to_use_test_…

…role Allow cloudstorage to use test role in aws
vrk-kpa · Feb 17, 2025 · c42da08 · c42da08
2 parents ed5b59f + b033340
commit c42da08
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/cdk/bin/opendata.ts b/cdk/bin/opendata.ts
@@ -732,5 +732,6 @@ const ciTestStackBeta = new CiTestStack(app, 'CiTestStack-beta', {
   },
   githubOrg: "vrk-kpa",
   githubRepo: "opendata",
+  githubRepo2: "ckanext-cloudstorage",
   testBucketName: "avoindata-ci-test-bucket"
 })
diff --git a/cdk/lib/ci-test-stack-props.ts b/cdk/lib/ci-test-stack-props.ts
@@ -3,5 +3,6 @@ import {StackProps} from "aws-cdk-lib";
 export interface CiTestStackProps extends StackProps {
   testBucketName: string,
   githubOrg: string,
-  githubRepo: string
+  githubRepo: string,
+  githubRepo2: string
 }
diff --git a/cdk/lib/ci-test-stack.ts b/cdk/lib/ci-test-stack.ts
@@ -27,7 +27,9 @@ export class CiTestStack extends Stack {
     const testRole = new aws_iam.Role(this, 'TestRole', {
       assumedBy: new aws_iam.WebIdentityPrincipal(oidcProviderArn, {
           StringLike: {
-            "token.actions.githubusercontent.com:sub": `repo:${props.githubOrg}/${props.githubRepo}:*`
+            "token.actions.githubusercontent.com:sub": [
+              `repo:${props.githubOrg}/${props.githubRepo}:*`,
+              `repo:${props.githubOrg}/${props.githubRepo2}:*`]
           }
       })
     })