Merge branch 'v2-main' into njlynch/v2-fixed-changelog

aws · Feb 15, 2021 · 7eec23c · 7eec23c
2 parents 98fc1c8 + 79648b5
commit 7eec23c
Show file tree

Hide file tree

Showing 27 changed files with 814 additions and 376 deletions.
diff --git a/packages/@aws-cdk/aws-codepipeline-actions/lib/codebuild/build-action.ts b/packages/@aws-cdk/aws-codepipeline-actions/lib/codebuild/build-action.ts
@@ -153,7 +153,7 @@ export class CodeBuildAction extends Action {
     options.role.addToPolicy(new iam.PolicyStatement({
       resources: [this.props.project.projectArn],
       actions: [
-        'codebuild:BatchGetBuilds',
+        `codebuild:${this.props.executeBatchBuild ? 'BatchGetBuildBatches' : 'BatchGetBuilds'}`,
         `codebuild:${this.props.executeBatchBuild ? 'StartBuildBatch' : 'StartBuild'}`,
         `codebuild:${this.props.executeBatchBuild ? 'StopBuildBatch' : 'StopBuild'}`,
       ],

diff --git a/...ages/@aws-cdk/aws-codepipeline-actions/test/integ.pipeline-code-build-batch.expected.json b/...ages/@aws-cdk/aws-codepipeline-actions/test/integ.pipeline-code-build-batch.expected.json
@@ -164,7 +164,7 @@
             },
             {
               "Action": [
-                "codebuild:BatchGetBuilds",
+                "codebuild:BatchGetBuildBatches",
                 "codebuild:StartBuildBatch",
                 "codebuild:StopBuildBatch"
               ],

diff --git a/packages/@aws-cdk/aws-lambda-nodejs/package.json b/packages/@aws-cdk/aws-lambda-nodejs/package.json
@@ -67,7 +67,7 @@
     "@aws-cdk/aws-ec2": "0.0.0",
     "cdk-build-tools": "0.0.0",
     "cdk-integ-tools": "0.0.0",
-    "delay": "4.4.1",
+    "delay": "5.0.0",
     "esbuild": "^0.8.44",
     "pkglint": "0.0.0"
   },

diff --git a/packages/@aws-cdk/aws-lambda/README.md b/packages/@aws-cdk/aws-lambda/README.md
@@ -450,10 +450,8 @@ new lambda.Function(this, 'Function', {
     bundling: {
       image: lambda.Runtime.PYTHON_3_6.bundlingDockerImage,
       command: [
-        'bash', '-c', `
-        pip install -r requirements.txt -t /asset-output &&
-        cp -au . /asset-output
-        `,
+        'bash', '-c', 
+        'pip install -r requirements.txt -t /asset-output && cp -au . /asset-output'
       ],
     },
   }),

diff --git a/packages/@aws-cdk/aws-lambda/test/integ.autoscaling.lit.expected.json b/packages/@aws-cdk/aws-lambda/test/integ.autoscaling.lit.expected.json
@@ -35,7 +35,7 @@
       "Type": "AWS::Lambda::Function",
       "Properties": {
         "Code": {
-          "ZipFile": "exports.handler = async () => {\nconsole.log('hello world');\n};"
+          "ZipFile": "exports.handler = async () => { console.log('hello world'); };"
         },
         "Handler": "index.handler",
         "Role": {
@@ -161,4 +161,4 @@
       }
     }
   }
-}
+}
diff --git a/packages/@aws-cdk/aws-lambda/test/integ.autoscaling.lit.ts b/packages/@aws-cdk/aws-lambda/test/integ.autoscaling.lit.ts
@@ -12,7 +12,7 @@ class TestStack extends cdk.Stack {
     super(scope, id);
 
     const fn = new lambda.Function(this, 'MyLambda', {
-      code: new lambda.InlineCode('exports.handler = async () => {\nconsole.log(\'hello world\');\n};'),
+      code: new lambda.InlineCode('exports.handler = async () => { console.log(\'hello world\'); };'),
       handler: 'index.handler',
       runtime: lambda.Runtime.NODEJS_10_X,
     });
@@ -50,4 +50,4 @@ const app = new cdk.App();
 
 new TestStack(app, 'aws-lambda-autoscaling');
 
-app.synth();
+app.synth();
diff --git a/packages/@aws-cdk/cfnspec/CHANGELOG.md b/packages/@aws-cdk/cfnspec/CHANGELOG.md
@@ -1,3 +1,117 @@
+# CloudFormation Resource Specification v27.0.0
+
+## New Resource Types
+
+* AWS::ECR::RegistryPolicy
+* AWS::ECR::ReplicationConfiguration
+* AWS::ElastiCache::GlobalReplicationGroup
+* AWS::ImageBuilder::ContainerRecipe
+
+## Attribute Changes
+
+* AWS::IoTWireless::ServiceProfile LoRaWANResponse (__added__)
+* AWS::MWAA::Environment CreatedAt (__deleted__)
+* AWS::MWAA::Environment LastUpdate (__deleted__)
+* AWS::MWAA::Environment Name (__deleted__)
+* AWS::MWAA::Environment ServiceRoleArn (__deleted__)
+* AWS::MWAA::Environment Status (__deleted__)
+* AWS::MWAA::Environment WebserverUrl (__added__)
+
+## Property Changes
+
+* AWS::AppMesh::GatewayRoute GatewayRouteName.Required (__changed__)
+  * Old: true
+  * New: false
+* AWS::AppMesh::Mesh MeshName.Required (__changed__)
+  * Old: true
+  * New: false
+* AWS::AppMesh::Route RouteName.Required (__changed__)
+  * Old: true
+  * New: false
+* AWS::AppMesh::VirtualGateway VirtualGatewayName.Required (__changed__)
+  * Old: true
+  * New: false
+* AWS::AppMesh::VirtualNode VirtualNodeName.Required (__changed__)
+  * Old: true
+  * New: false
+* AWS::AppMesh::VirtualRouter VirtualRouterName.Required (__changed__)
+  * Old: true
+  * New: false
+* AWS::Cassandra::Keyspace Tags (__added__)
+* AWS::Cassandra::Table PointInTimeRecoveryEnabled (__added__)
+* AWS::Cassandra::Table Tags (__added__)
+* AWS::CloudWatch::MetricStream OutputFormat (__added__)
+* AWS::ECS::Service EnableExecuteCommand (__added__)
+* AWS::ECS::Service PlatformVersion.UpdateType (__changed__)
+  * Old: Immutable
+  * New: Mutable
+* AWS::IoTWireless::Destination NextToken (__deleted__)
+* AWS::IoTWireless::Destination Name.UpdateType (__changed__)
+  * Old: Mutable
+  * New: Immutable
+* AWS::IoTWireless::DeviceProfile LoRaWANDeviceProfile (__deleted__)
+* AWS::IoTWireless::DeviceProfile NextToken (__deleted__)
+* AWS::IoTWireless::DeviceProfile LoRaWAN (__added__)
+* AWS::IoTWireless::ServiceProfile LoRaWANGetServiceProfileInfo (__deleted__)
+* AWS::IoTWireless::ServiceProfile LoRaWANServiceProfile (__deleted__)
+* AWS::IoTWireless::ServiceProfile NextToken (__deleted__)
+* AWS::IoTWireless::ServiceProfile LoRaWAN (__added__)
+* AWS::IoTWireless::WirelessDevice LoRaWANDevice (__deleted__)
+* AWS::IoTWireless::WirelessDevice NextToken (__deleted__)
+* AWS::IoTWireless::WirelessDevice LastUplinkReceivedAt (__added__)
+* AWS::IoTWireless::WirelessDevice LoRaWAN (__added__)
+* AWS::IoTWireless::WirelessGateway LoRaWANGateway (__deleted__)
+* AWS::IoTWireless::WirelessGateway NextToken (__deleted__)
+* AWS::IoTWireless::WirelessGateway LastUplinkReceivedAt (__added__)
+* AWS::IoTWireless::WirelessGateway LoRaWAN (__added__)
+* AWS::MWAA::Environment WebserverUrl (__deleted__)
+* AWS::MWAA::Environment Name (__added__)
+* AWS::MWAA::Environment KmsKey.UpdateType (__changed__)
+  * Old: Mutable
+  * New: Immutable
+* AWS::MWAA::Environment NetworkConfiguration.UpdateType (__changed__)
+  * Old: Immutable
+  * New: Mutable
+* AWS::SageMaker::Model InferenceExecutionConfig (__deleted__)
+
+## Property Type Changes
+
+* AWS::IoTWireless::WirelessDevice.AbpV10X (__removed__)
+* AWS::IoTWireless::WirelessDevice.OtaaV10X (__removed__)
+* AWS::IoTWireless::WirelessDevice.SessionKeysAbpV10X (__removed__)
+* AWS::MWAA::Environment.LastUpdate (__removed__)
+* AWS::MWAA::Environment.SecurityGroupList (__removed__)
+* AWS::MWAA::Environment.SubnetList (__removed__)
+* AWS::MWAA::Environment.UpdateError (__removed__)
+* AWS::SageMaker::Model.InferenceExecutionConfig (__removed__)
+* AWS::DataBrew::Job.CsvOutputOptions (__added__)
+* AWS::DataBrew::Job.OutputFormatOptions (__added__)
+* AWS::IoTWireless::WirelessDevice.AbpV10x (__added__)
+* AWS::IoTWireless::WirelessDevice.OtaaV10x (__added__)
+* AWS::IoTWireless::WirelessDevice.SessionKeysAbpV10x (__added__)
+* AWS::Cognito::UserPoolClient.AnalyticsConfiguration ApplicationArn (__added__)
+* AWS::DataBrew::Job.Output FormatOptions (__added__)
+* AWS::IoTWireless::WirelessDevice.LoRaWANDevice AbpV10X (__deleted__)
+* AWS::IoTWireless::WirelessDevice.LoRaWANDevice OtaaV10X (__deleted__)
+* AWS::IoTWireless::WirelessDevice.LoRaWANDevice AbpV10x (__added__)
+* AWS::IoTWireless::WirelessDevice.LoRaWANDevice OtaaV10x (__added__)
+* AWS::MWAA::Environment.NetworkConfiguration SecurityGroupIds.PrimitiveItemType (__added__)
+* AWS::MWAA::Environment.NetworkConfiguration SecurityGroupIds.Type (__changed__)
+  * Old: SecurityGroupList
+  * New: List
+* AWS::MWAA::Environment.NetworkConfiguration SecurityGroupIds.UpdateType (__changed__)
+  * Old: Immutable
+  * New: Mutable
+* AWS::MWAA::Environment.NetworkConfiguration SubnetIds.PrimitiveItemType (__added__)
+* AWS::MWAA::Environment.NetworkConfiguration SubnetIds.Type (__changed__)
+  * Old: SubnetList
+  * New: List
+* AWS::MediaPackage::PackagingConfiguration.CmafEncryption SpekeKeyProvider.Type (__added__)
+* AWS::MediaPackage::PackagingConfiguration.DashEncryption SpekeKeyProvider.Type (__added__)
+* AWS::MediaPackage::PackagingConfiguration.HlsEncryption SpekeKeyProvider.Type (__added__)
+* AWS::MediaPackage::PackagingConfiguration.MssEncryption SpekeKeyProvider.Type (__added__)
+
+
 # CloudFormation Resource Specification v26.0.0
 
 ## New Resource Types

diff --git a/packages/@aws-cdk/cfnspec/cfn.version b/packages/@aws-cdk/cfnspec/cfn.version
@@ -1 +1 @@
-26.0.0
+27.0.0