Merge branch 'master' into cli-change-set-name

aws · Feb 23, 2021 · d6cf535 · d6cf535
2 parents 39d3546 + e628a73
commit d6cf535
Show file tree

Hide file tree

Showing 211 changed files with 5,106 additions and 2,130 deletions.
diff --git a/.dependabot/config.yml b/.dependabot/config.yml
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -0,0 +1,13 @@
+# Reference: https://docs.github.com/en/github/administering-a-repository/configuration-options-for-dependency-updates
+# NOTE: dependabot only takes care of updating non-npm deps
+# npm dependencies are updated through the "yarn-upgrade" github workflow.
+
+version: 2
+updates:
+ - package-ecosystem: "github-actions"
+ directory: "/"
+ schedule:
+ interval: "weekly"
+ labels:
+ - "pr/auto-approve"
+ open-pull-requests-limit: 5
diff --git a/.github/workflows/auto-approve-dependabot.yml b/.github/workflows/auto-approve-dependabot.yml
diff --git a/.github/workflows/auto-approve.yml b/.github/workflows/auto-approve.yml
@@ -0,0 +1,17 @@
+# Approve PRs with "pr/auto-approve". mergify takes care of the actual merge.
+
+name: auto-approve
+on: pull_request
+
+jobs:
+ auto-approve:
+ if: >
+ contains(github.event.pull_request.labels.*.name, 'pr/auto-approve') && 
+ (github.event.pull_request.user.login == 'aws-cdk-automation' 
+ || github.event.pull_request.user.login == 'dependabot[bot]' 
+ || github.event.pull_request.user.login == 'dependabot-preview[bot]')
+ runs-on: ubuntu-latest
+ steps:
+ - uses: hmarr/auto-approve-action@v2.0.0
+ with:
+ github-token: "${{ secrets.GITHUB_TOKEN }}"
diff --git a/.github/workflows/v2-pull-request.yml b/.github/workflows/v2-pull-request.yml
@@ -32,15 +32,3 @@ jobs:
  uses: stefanzweifel/git-auto-commit-action@v4
  with:
  commit_message: 'automatic pkglint fixes'
-
- # Approve automated PRs
- # Only approve! mergify takes care of the actual merge.
- auto-approve:
- if: >
- github.event.pull_request.user.login == 'aws-cdk-automation'
- && contains(github.event.pull_request.labels.*.name, 'pr/auto-approve')
- runs-on: ubuntu-latest
- steps:
- - uses: hmarr/auto-approve-action@v2.0.0
- with:
- github-token: "${{ secrets.GITHUB_TOKEN }}"
diff --git a/.github/workflows/yarn-upgrade.yml b/.github/workflows/yarn-upgrade.yml
@@ -25,7 +25,7 @@ jobs:
  run: echo "::set-output name=dir::$(yarn cache dir)"
 
  - name: Restore Yarn cache
- uses: actions/cache@v2
+ uses: actions/cache@v2.1.4
  with:
  path: ${{ steps.yarn-cache.outputs.dir }}
  key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
@@ -74,7 +74,7 @@ jobs:
  title: 'chore: npm-check-updates && yarn upgrade'
  body: |-
  Ran npm-check-updates and yarn upgrade to keep the `yarn.lock` file up-to-date.
- labels: contribution/core,dependencies
+ labels: contribution/core,dependencies,pr/auto-approve
  team-reviewers: aws-cdk-team
  # Privileged token so automated PR validation happens
  token: ${{ secrets.AUTOMATION_GITHUB_TOKEN }}
diff --git a/...ages/@aws-cdk-containers/ecs-service-extensions/test/integ.assign-public-ip.expected.json b/...ages/@aws-cdk-containers/ecs-service-extensions/test/integ.assign-public-ip.expected.json
@@ -400,7 +400,9 @@
  "Type": "AWS::SQS::Queue",
  "Properties": {
  "MessageRetentionPeriod": 1209600
- }
+ },
+ "UpdateReplacePolicy": "Delete",
+ "DeletionPolicy": "Delete"
  },
  "nameserviceTaskRecordManagerEventsQueueF805A6C1": {
  "Type": "AWS::SQS::Queue",
@@ -415,7 +417,9 @@
  "maxReceiveCount": 500
  },
  "VisibilityTimeout": 30
- }
+ },
+ "UpdateReplacePolicy": "Delete",
+ "DeletionPolicy": "Delete"
  },
  "nameserviceTaskRecordManagerEventsQueuePolicy65CC6F9E": {
  "Type": "AWS::SQS::QueuePolicy",
@@ -746,14 +750,12 @@
  ]
  }
  },
- "Handler": "index.queue_handler",
  "Role": {
  "Fn::GetAtt": [
  "nameserviceTaskRecordManagerEventHandlerServiceRoleE66EE52A",
  "Arn"
  ]
  },
- "Runtime": "python3.8",
  "Environment": {
  "Variables": {
  "HOSTED_ZONE_ID": {
@@ -777,7 +779,9 @@
  }
  }
  },
+ "Handler": "index.queue_handler",
  "ReservedConcurrentExecutions": 1,
+ "Runtime": "python3.8",
  "Timeout": 30
  },
  "DependsOn": [
@@ -788,14 +792,14 @@
  "nameserviceTaskRecordManagerEventHandlerSqsEventSourceawsecsintegnameserviceTaskRecordManagerEventsQueueC5EE9A869F1EB155": {
  "Type": "AWS::Lambda::EventSourceMapping",
  "Properties": {
+ "FunctionName": {
+ "Ref": "nameserviceTaskRecordManagerEventHandler4B8C6905"
+ },
  "EventSourceArn": {
  "Fn::GetAtt": [
  "nameserviceTaskRecordManagerEventsQueueF805A6C1",
  "Arn"
  ]
- },
- "FunctionName": {
- "Ref": "nameserviceTaskRecordManagerEventHandler4B8C6905"
  }
  }
  },
@@ -909,13 +913,13 @@
  ]
  }
  },
- "Handler": "index.cleanup_resource_handler",
  "Role": {
  "Fn::GetAtt": [
  "nameserviceTaskRecordManagerCleanupResourceProviderHandlerServiceRoleCCA462F0",
  "Arn"
  ]
  },
+ "Handler": "index.cleanup_resource_handler",
  "Runtime": "python3.8",
  "Timeout": 300
  },
@@ -1022,14 +1026,12 @@
  ]
  }
  },
- "Handler": "framework.onEvent",
  "Role": {
  "Fn::GetAtt": [
  "nameserviceTaskRecordManagerCleanupResourceProviderframeworkonEventServiceRoleF0570BD0",
  "Arn"
  ]
  },
- "Runtime": "nodejs10.x",
  "Description": "AWS CDK resource provider framework - onEvent (aws-ecs-integ/name-service/TaskRecordManager/CleanupResourceProvider)",
  "Environment": {
  "Variables": {
@@ -1041,6 +1043,8 @@
  }
  }
  },
+ "Handler": "framework.onEvent",
+ "Runtime": "nodejs10.x",
  "Timeout": 900
  },
  "DependsOn": [
@@ -1242,13 +1246,13 @@
  ]
  }
  },
- "Handler": "index.handler",
  "Role": {
  "Fn::GetAtt": [
  "AWS679f53fac002430cb0da5b7982bd2287ServiceRoleC1EA0FF2",
  "Arn"
  ]
  },
+ "Handler": "index.handler",
  "Runtime": "nodejs12.x",
  "Timeout": 120
  },

diff --git a/.../@aws-cdk-containers/ecs-service-extensions/test/integ.imported-environment.expected.json b/.../@aws-cdk-containers/ecs-service-extensions/test/integ.imported-environment.expected.json
@@ -49,7 +49,9 @@
  ]
  ]
  }
- }
+ },
+ "UpdateReplacePolicy": "Delete",
+ "DeletionPolicy": "Delete"
  },
  "ServiceloadbalancerD5D60894": {
  "Type": "AWS::ElasticLoadBalancingV2::LoadBalancer",

diff --git a/packages/@aws-cdk/aws-apigateway/README.md b/packages/@aws-cdk/aws-apigateway/README.md
@@ -163,7 +163,7 @@ The following example shows how to use an API Key with a usage plan:
 
 ```ts
 const hello = new lambda.Function(this, 'hello', {
- runtime: lambda.Runtime.NODEJS_10_X,
+ runtime: lambda.Runtime.NODEJS_12_X,
  handler: 'hello.handler',
  code: lambda.Code.fromAsset('lambda')
 });
@@ -230,7 +230,7 @@ The following example shows how to use a rate limited api key :
 
 ```ts
 const hello = new lambda.Function(this, 'hello', {
- runtime: lambda.Runtime.NODEJS_10_X,
+ runtime: lambda.Runtime.NODEJS_12_X,
  handler: 'hello.handler',
  code: lambda.Code.fromAsset('lambda')
 });
@@ -260,7 +260,7 @@ have to define your models and mappings for the request, response, and integrati
 
 ```ts
 const hello = new lambda.Function(this, 'hello', {
- runtime: lambda.Runtime.NODEJS_10_X,
+ runtime: lambda.Runtime.NODEJS_12_X,
  handler: 'hello.handler',
  code: lambda.Code.fromAsset('lambda')
 });

diff --git a/packages/@aws-cdk/aws-apigateway/test/authorizers/integ.cognito-authorizer.expected.json b/packages/@aws-cdk/aws-apigateway/test/authorizers/integ.cognito-authorizer.expected.json
@@ -27,7 +27,9 @@
  "EmailSubject": "Verify your new account",
  "SmsMessage": "The verification code to your new account is {####}"
  }
- }
+ },
+ "UpdateReplacePolicy": "Retain",
+ "DeletionPolicy": "Retain"
  },
  "myauthorizer23CB99DD": {
  "Type": "AWS::ApiGateway::Authorizer",

diff --git a/packages/@aws-cdk/aws-apigateway/test/integ.restapi-import.lit.expected.json b/packages/@aws-cdk/aws-apigateway/test/integ.restapi-import.lit.expected.json
@@ -130,7 +130,9 @@
  "Ref": "RestApi0C43BF4B"
  }
  }
- }
+ },
+ "UpdateReplacePolicy": "Delete",
+ "DeletionPolicy": "Delete"
  },
  "integrestapiimportBooksStackNestedStackintegrestapiimportBooksStackNestedStackResource395C2C9B": {
  "Type": "AWS::CloudFormation::Stack",
@@ -192,7 +194,9 @@
  "Ref": "RestApi0C43BF4B"
  }
  }
- }
+ },
+ "UpdateReplacePolicy": "Delete",
+ "DeletionPolicy": "Delete"
  },
  "integrestapiimportDeployStackNestedStackintegrestapiimportDeployStackNestedStackResource0D0EE737": {
  "Type": "AWS::CloudFormation::Stack",
@@ -252,7 +256,9 @@
  "DependsOn": [
  "integrestapiimportBooksStackNestedStackintegrestapiimportBooksStackNestedStackResource395C2C9B",
  "integrestapiimportPetsStackNestedStackintegrestapiimportPetsStackNestedStackResource2B31898B"
- ]
+ ],
+ "UpdateReplacePolicy": "Delete",
+ "DeletionPolicy": "Delete"
  }
  },
  "Outputs": {

diff --git a/packages/@aws-cdk/aws-apigatewayv2-authorizers/test/http/integ.user-pool.expected.json b/packages/@aws-cdk/aws-apigatewayv2-authorizers/test/http/integ.user-pool.expected.json
@@ -157,7 +157,9 @@
  "EmailSubject": "Verify your new account",
  "SmsMessage": "The verification code to your new account is {####}"
  }
- }
+ },
+ "UpdateReplacePolicy": "Retain",
+ "DeletionPolicy": "Retain"
  },
  "userpoolmyclientFAD947AB": {
  "Type": "AWS::Cognito::UserPoolClient",

diff --git a/packages/@aws-cdk/aws-appsync/README.md b/packages/@aws-cdk/aws-appsync/README.md
@@ -107,9 +107,13 @@ const secret = new rds.DatabaseSecret(stack, 'AuroraSecret', {
  username: 'clusteradmin',
 });
 
-// Create the DB cluster, provide all values needed to customise the database.
-const cluster = new rds.DatabaseCluster(stack, 'AuroraCluster', {
- engine: rds.DatabaseClusterEngine.auroraMysql({ version: rds.AuroraMysqlEngineVersion.VER_2_07_1 }),
+// The VPC to place the cluster in
+const vpc = new ec2.Vpc(stack, 'AuroraVpc');
+
+// Create the serverless cluster, provide all values needed to customise the database.
+const cluster = new rds.ServerlessCluster(stack, 'AuroraCluster', {
+ engine: rds.DatabaseClusterEngine.AURORA_MYSQL,
+ vpc,
  credentials: { username: 'clusteradmin' },
  clusterIdentifier: 'db-endpoint-test',
  defaultDatabaseName: 'demos',