Merge branch 'main' into scheduler-reduce-key-permissions

aws · Oct 28, 2024 · 09521ad · 09521ad
2 parents 404f0aa + 8c15b5f
commit 09521ad
Show file tree

Hide file tree

Showing 12 changed files with 866 additions and 8 deletions.
diff --git a/...ting/framework-integ/test/aws-codebuild/test/integ.github-org-webhook.js.snapshot/cdk.out b/...ting/framework-integ/test/aws-codebuild/test/integ.github-org-webhook.js.snapshot/cdk.out
diff --git a/...ebuild/test/integ.github-org-webhook.js.snapshot/codebuild-github-org-webhook.assets.json b/...ebuild/test/integ.github-org-webhook.js.snapshot/codebuild-github-org-webhook.assets.json
diff --git a/...uild/test/integ.github-org-webhook.js.snapshot/codebuild-github-org-webhook.template.json b/...uild/test/integ.github-org-webhook.js.snapshot/codebuild-github-org-webhook.template.json
@@ -0,0 +1,181 @@
+{
+  "Resources": {
+    "MyProjectRole9BBE5233": {
+      "Type": "AWS::IAM::Role",
+      "Properties": {
+        "AssumeRolePolicyDocument": {
+          "Statement": [
+            {
+              "Action": "sts:AssumeRole",
+              "Effect": "Allow",
+              "Principal": {
+                "Service": "codebuild.amazonaws.com"
+              }
+            }
+          ],
+          "Version": "2012-10-17"
+        }
+      }
+    },
+    "MyProjectRoleDefaultPolicyB19B7C29": {
+      "Type": "AWS::IAM::Policy",
+      "Properties": {
+        "PolicyDocument": {
+          "Statement": [
+            {
+              "Action": [
+                "logs:CreateLogGroup",
+                "logs:CreateLogStream",
+                "logs:PutLogEvents"
+              ],
+              "Effect": "Allow",
+              "Resource": [
+                {
+                  "Fn::Join": [
+                    "",
+                    [
+                      "arn:",
+                      {
+                        "Ref": "AWS::Partition"
+                      },
+                      ":logs:",
+                      {
+                        "Ref": "AWS::Region"
+                      },
+                      ":",
+                      {
+                        "Ref": "AWS::AccountId"
+                      },
+                      ":log-group:/aws/codebuild/",
+                      {
+                        "Ref": "MyProject39F7B0AE"
+                      },
+                      ":*"
+                    ]
+                  ]
+                },
+                {
+                  "Fn::Join": [
+                    "",
+                    [
+                      "arn:",
+                      {
+                        "Ref": "AWS::Partition"
+                      },
+                      ":logs:",
+                      {
+                        "Ref": "AWS::Region"
+                      },
+                      ":",
+                      {
+                        "Ref": "AWS::AccountId"
+                      },
+                      ":log-group:/aws/codebuild/",
+                      {
+                        "Ref": "MyProject39F7B0AE"
+                      }
+                    ]
+                  ]
+                }
+              ]
+            }
+          ],
+          "Version": "2012-10-17"
+        },
+        "PolicyName": "MyProjectRoleDefaultPolicyB19B7C29",
+        "Roles": [
+          {
+            "Ref": "MyProjectRole9BBE5233"
+          }
+        ]
+      }
+    },
+    "MyProject39F7B0AE": {
+      "Type": "AWS::CodeBuild::Project",
+      "Properties": {
+        "Artifacts": {
+          "Type": "NO_ARTIFACTS"
+        },
+        "Cache": {
+          "Type": "NO_CACHE"
+        },
+        "EncryptionKey": "alias/aws/s3",
+        "Environment": {
+          "ComputeType": "BUILD_GENERAL1_SMALL",
+          "Image": "aws/codebuild/standard:7.0",
+          "ImagePullCredentialsType": "CODEBUILD",
+          "PrivilegedMode": false,
+          "Type": "LINUX_CONTAINER"
+        },
+        "ServiceRole": {
+          "Fn::GetAtt": [
+            "MyProjectRole9BBE5233",
+            "Arn"
+          ]
+        },
+        "Source": {
+          "Location": "CODEBUILD_DEFAULT_WEBHOOK_SOURCE_LOCATION",
+          "ReportBuildStatus": false,
+          "Type": "GITHUB"
+        },
+        "Triggers": {
+          "FilterGroups": [
+            [
+              {
+                "Pattern": "WORKFLOW_JOB_QUEUED",
+                "Type": "EVENT"
+              },
+              {
+                "Pattern": "aws-cdk.*",
+                "Type": "REPOSITORY_NAME"
+              },
+              {
+                "ExcludeMatchedPattern": true,
+                "Pattern": "aws-cdk-lib",
+                "Type": "REPOSITORY_NAME"
+              }
+            ]
+          ],
+          "ScopeConfiguration": {
+            "Name": "aws"
+          },
+          "Webhook": true
+        }
+      }
+    }
+  },
+  "Parameters": {
+    "BootstrapVersion": {
+      "Type": "AWS::SSM::Parameter::Value<String>",
+      "Default": "/cdk-bootstrap/hnb659fds/version",
+      "Description": "Version of the CDK Bootstrap resources in this environment, automatically retrieved from SSM Parameter Store. [cdk:skip]"
+    }
+  },
+  "Rules": {
+    "CheckBootstrapVersion": {
+      "Assertions": [
+        {
+          "Assert": {
+            "Fn::Not": [
+              {
+                "Fn::Contains": [
+                  [
+                    "1",
+                    "2",
+                    "3",
+                    "4",
+                    "5"
+                  ],
+                  {
+                    "Ref": "BootstrapVersion"
+                  }
+                ]
+              }
+            ]
+          },
+          "AssertDescription": "CDK bootstrap stack version 6 required. Please run 'cdk bootstrap' with a recent version of the CDK CLI."
+        }
+      ]
+    }
+  }
+}
diff --git a/...ook.js.snapshot/codebuildgithuborgwebhookintegDefaultTestDeployAssertB287C481.assets.json b/...ook.js.snapshot/codebuildgithuborgwebhookintegDefaultTestDeployAssertB287C481.assets.json
diff --git a/...k.js.snapshot/codebuildgithuborgwebhookintegDefaultTestDeployAssertB287C481.template.json b/...k.js.snapshot/codebuildgithuborgwebhookintegDefaultTestDeployAssertB287C481.template.json
diff --git a/...g/framework-integ/test/aws-codebuild/test/integ.github-org-webhook.js.snapshot/integ.json b/...g/framework-integ/test/aws-codebuild/test/integ.github-org-webhook.js.snapshot/integ.json