From b33cb2446ec42355839b3f328c4d8a43b8c279df Mon Sep 17 00:00:00 2001
From: seebees <ryanemer@amazon.com>
Date: Mon, 30 Oct 2023 13:19:35 -0700
Subject: [PATCH 1/2] chore: update CFN template

Include all repos so that CI
can use the test resources
---
 cfn/CI.yaml | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/cfn/CI.yaml b/cfn/CI.yaml
index 26de838fe..0f962f750 100644
--- a/cfn/CI.yaml
+++ b/cfn/CI.yaml
@@ -22,10 +22,6 @@ Parameters:
     Type: String
     Description: A prefix that will be applied to any names
     Default: DDBEC-Dafny
-  GitHubRepo:
-    Type: String
-    Description: GitHub Repo that invokes CI
-    Default: aws/aws-database-encryption-sdk-dynamodb-java
 
 Resources:
   TestTable:
@@ -315,7 +311,10 @@ Resources:
                   "token.actions.githubusercontent.com:aud": "sts.amazonaws.com"
                 },
                 "StringLike": {
-                  "token.actions.githubusercontent.com:sub": "repo:${GitHubRepo}:*"
+                  "token.actions.githubusercontent.com:sub": [
+                    "repo:aws/aws-database-encryption-sdk-dynamodb-java:*",
+                    "repo:aws/private-aws-database-encryption-sdk-dynamodb-java-staging:*"
+                  ]
                 }
               }
             },
@@ -366,7 +365,10 @@ Resources:
                   "token.actions.githubusercontent.com:aud": "sts.amazonaws.com"
                 },
                 "StringLike": {
-                  "token.actions.githubusercontent.com:sub": "repo:${GitHubRepo}:*"
+                  "token.actions.githubusercontent.com:sub": [
+                    "repo:aws/aws-database-encryption-sdk-dynamodb-java:*",
+                    "repo:aws/private-aws-database-encryption-sdk-dynamodb-java-staging:*"
+                  ]
                 }
               }
             },
@@ -417,7 +419,10 @@ Resources:
                   "token.actions.githubusercontent.com:aud": "sts.amazonaws.com"
                 },
                 "StringLike": {
-                  "token.actions.githubusercontent.com:sub": "repo:${GitHubRepo}:*"
+                  "token.actions.githubusercontent.com:sub": [
+                    "repo:aws/aws-database-encryption-sdk-dynamodb-java:*",
+                    "repo:aws/private-aws-database-encryption-sdk-dynamodb-java-staging:*"
+                  ]
                 }
               }
             },

From f99c0c0157648500367f7897b7c9ab3c83966e17 Mon Sep 17 00:00:00 2001
From: seebees <ryanemer@amazon.com>
Date: Mon, 30 Oct 2023 14:39:03 -0700
Subject: [PATCH 2/2] =?UTF-8?q?Don=E2=80=99t=20remove=20the=20param?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 cfn/CI.yaml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/cfn/CI.yaml b/cfn/CI.yaml
index 0f962f750..6fc81ba8f 100644
--- a/cfn/CI.yaml
+++ b/cfn/CI.yaml
@@ -22,6 +22,12 @@ Parameters:
     Type: String
     Description: A prefix that will be applied to any names
     Default: DDBEC-Dafny
+  # This parameter is no longer used.
+  # However removing it causes CloudFormation indigestion 
+  GitHubRepo:
+    Type: String
+    Description: GitHub Repo that invokes CI
+    Default: aws/aws-database-encryption-sdk-dynamodb-java
 
 Resources:
   TestTable: