Merge branch 'master' into prpagate-ec2-tags-to-volumes

aws · Dec 9, 2021 · f527c67 · f527c67
2 parents f0e08b8 + 0b80db5
commit f527c67
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 2 deletions.
diff --git a/packages/@aws-cdk/aws-apigateway/lib/stage.ts b/packages/@aws-cdk/aws-apigateway/lib/stage.ts
@@ -316,7 +316,7 @@ export class Stage extends Resource implements IStage {
         cacheDataEncrypted: options.cacheDataEncrypted,
         cacheTtlInSeconds: options.cacheTtl && options.cacheTtl.toSeconds(),
         cachingEnabled: options.cachingEnabled,
-        dataTraceEnabled: options.dataTraceEnabled,
+        dataTraceEnabled: options.dataTraceEnabled ?? false,
         loggingLevel: options.loggingLevel,
         metricsEnabled: options.metricsEnabled,
         throttlingBurstLimit: options.throttlingBurstLimit,

diff --git a/packages/@aws-cdk/aws-apigateway/test/integ.restapi.expected.json b/packages/@aws-cdk/aws-apigateway/test/integ.restapi.expected.json
@@ -95,6 +95,7 @@
           },
           {
             "CachingEnabled": true,
+            "DataTraceEnabled": false,
             "HttpMethod": "GET",
             "ResourcePath": "/~1api~1appliances"
           }

diff --git a/packages/@aws-cdk/aws-apigateway/test/stage.test.ts b/packages/@aws-cdk/aws-apigateway/test/stage.test.ts
@@ -87,6 +87,7 @@ describe('stage', () => {
     expect(stack).toHaveResource('AWS::ApiGateway::Stage', {
       MethodSettings: [
         {
+          DataTraceEnabled: false,
           HttpMethod: '*',
           LoggingLevel: 'INFO',
           ResourcePath: '/*',
@@ -119,12 +120,14 @@ describe('stage', () => {
     expect(stack).toHaveResource('AWS::ApiGateway::Stage', {
       MethodSettings: [
         {
+          DataTraceEnabled: false,
           HttpMethod: '*',
           LoggingLevel: 'INFO',
           ResourcePath: '/*',
           ThrottlingRateLimit: 12,
         },
         {
+          DataTraceEnabled: false,
           HttpMethod: 'GET',
           LoggingLevel: 'ERROR',
           ResourcePath: '/~1goo~1bar',
@@ -207,6 +210,7 @@ describe('stage', () => {
       CacheClusterSize: '0.5',
       MethodSettings: [
         {
+          DataTraceEnabled: false,
           CachingEnabled: true,
           HttpMethod: '*',
           ResourcePath: '/*',

diff --git a/packages/@aws-cdk/aws-codepipeline/lib/private/cross-region-support-stack.ts b/packages/@aws-cdk/aws-codepipeline/lib/private/cross-region-support-stack.ts
@@ -77,6 +77,7 @@ export class CrossRegionSupportConstruct extends Construct {
       bucketName: cdk.PhysicalName.GENERATE_IF_NEEDED,
       encryption: encryptionAlias ? s3.BucketEncryption.KMS : s3.BucketEncryption.KMS_MANAGED,
       encryptionKey: encryptionAlias,
+      blockPublicAccess: s3.BlockPublicAccess.BLOCK_ALL,
     });
   }
 }

diff --git a/packages/@aws-cdk/aws-codepipeline/test/cross-env.test.ts b/packages/@aws-cdk/aws-codepipeline/test/cross-env.test.ts
@@ -129,7 +129,14 @@ describe.each([
 
         // THEN
         expect(supportStack).not.toHaveResource('AWS::KMS::Key');
-        expect(supportStack).toHaveResource('AWS::S3::Bucket');
+        expect(supportStack).toHaveResourceLike('AWS::S3::Bucket', {
+          PublicAccessBlockConfiguration: {
+            BlockPublicAcls: true,
+            BlockPublicPolicy: true,
+            IgnorePublicAcls: true,
+            RestrictPublicBuckets: true,
+          },
+        });
       });
 
       test('when twiddling another stack', () => {