Merge branch 'main' into integtest-eventbridge

Author: mergify[bot]

.github/workflows/security-guardian.yml

@@ -1,6 +1,6 @@
 name: Security Guardian
 on:
-  pull_request_target: {}
+  pull_request: {}
 
 jobs:
   log-skip:

.github/workflows/security-report.yml

@@ -10,7 +10,6 @@ jobs:
     permissions:
       checks: write
       pull-requests: write
-      id-token: write
       actions: read
     steps:
       - name: Download artifacts

packages/@aws-cdk-testing/framework-integ/test/pipelines/test/integ.pipeline-with-variables.js.snapshot/VariablePipelineStack.assets.json

@@ -142,6 +142,14 @@
     "CustomS3AutoDeleteObjectsCustomResourceProviderRole3B1BD092"
    ]
   },
+  "Fleet30813DF3": {
+   "Type": "AWS::CodeBuild::Fleet",
+   "Properties": {
+    "BaseCapacity": 1,
+    "ComputeType": "BUILD_GENERAL1_SMALL",
+    "EnvironmentType": "LINUX_CONTAINER"
+   }
+  },
   "PipelineArtifactsBucketAEA9A052": {
    "Type": "AWS::S3::Bucket",
    "Properties": {
@@ -728,7 +736,29 @@
     "Description": "Pipeline step VariablePipelineStack/Pipeline/Build/Synth",
     "EncryptionKey": "alias/aws/s3",
     "Environment": {
+     "Certificate": {
+      "Fn::Join": [
+       "",
+       [
+        {
+         "Fn::GetAtt": [
+          "SourceBucketDDD2130A",
+          "Arn"
+         ]
+        },
+        "/my-certificate.pem"
+       ]
+      ]
+     },
      "ComputeType": "BUILD_GENERAL1_SMALL",
+     "Fleet": {
+      "FleetArn": {
+       "Fn::GetAtt": [
+        "Fleet30813DF3",
+        "Arn"
+       ]
+      }
+     },
      "Image": "aws/codebuild/standard:7.0",
      "ImagePullCredentialsType": "CODEBUILD",
      "PrivilegedMode": false,
@@ -962,7 +992,29 @@
     "Description": "Pipeline step VariablePipelineStack/Pipeline/MyWave/Produce",
     "EncryptionKey": "alias/aws/s3",
     "Environment": {
+     "Certificate": {
+      "Fn::Join": [
+       "",
+       [
+        {
+         "Fn::GetAtt": [
+          "SourceBucketDDD2130A",
+          "Arn"
+         ]
+        },
+        "/my-certificate.pem"
+       ]
+      ]
+     },
      "ComputeType": "BUILD_GENERAL1_SMALL",
+     "Fleet": {
+      "FleetArn": {
+       "Fn::GetAtt": [
+        "Fleet30813DF3",
+        "Arn"
+       ]
+      }
+     },
      "Image": "aws/codebuild/standard:7.0",
      "ImagePullCredentialsType": "CODEBUILD",
      "PrivilegedMode": false,
@@ -1196,7 +1248,29 @@
     "Description": "Pipeline step VariablePipelineStack/Pipeline/MyWave/Consume",
     "EncryptionKey": "alias/aws/s3",
     "Environment": {
+     "Certificate": {
+      "Fn::Join": [
+       "",
+       [
+        {
+         "Fn::GetAtt": [
+          "SourceBucketDDD2130A",
+          "Arn"
+         ]
+        },
+        "/my-certificate.pem"
+       ]
+      ]
+     },
      "ComputeType": "BUILD_GENERAL1_SMALL",
+     "Fleet": {
+      "FleetArn": {
+       "Fn::GetAtt": [
+        "Fleet30813DF3",
+        "Arn"
+       ]
+      }
+     },
      "Image": "aws/codebuild/standard:7.0",
      "ImagePullCredentialsType": "CODEBUILD",
      "PrivilegedMode": false,

packages/@aws-cdk-testing/framework-integ/test/pipelines/test/integ.pipeline-with-variables.js.snapshot/VariablePipelineStack.template.json

@@ -23,6 +23,19 @@ class PipelineStack extends Stack {
         // }),
         commands: ['mkdir cdk.out', 'touch cdk.out/dummy'],
       }),
+      codeBuildDefaults: {
+        buildEnvironment: {
+          fleet: new codebuild.Fleet(this, 'Fleet', {
+            baseCapacity: 1,
+            computeType: codebuild.FleetComputeType.SMALL,
+            environmentType: codebuild.EnvironmentType.LINUX_CONTAINER,
+          }),
+          certificate: {
+            bucket: sourceBucket,
+            objectKey: 'my-certificate.pem',
+          },
+        },
+      },
       selfMutation: false,
     });
 

packages/@aws-cdk-testing/framework-integ/test/pipelines/test/integ.pipeline-with-variables.js.snapshot/integ.json

@@ -32,4 +32,3 @@ scripts/*.d.ts
 
 !lib/aws-certificatemanager/dns-validated-certificate-handler/index.js
 !test/aws-certificatemanager/dns-validated-certificate-handler.test.js
-!lib/aws-cloudfront/edge-function/index.js