chore(release): 1.25.0

see CHANGELOG
eduardomourar · Feb 19, 2020 · 5ced526 · 5ced526
2 parents 6619e36 + 83f04f6
commit 5ced526
Show file tree

Hide file tree

Showing 219 changed files with 4,538 additions and 2,638 deletions.
diff --git a/.mergify.yml b/.mergify.yml
@@ -18,8 +18,35 @@ pull_request_rules:
         strict_method: merge
       delete_head_branch: {}
     conditions:
+      - base!=release
+      - -title~=(WIP|wip)
+      - -label~=(blocked|do-not-merge|no-squash)
+      - -merged
+      - -closed
+      - author!=dependabot[bot]
+      - author!=dependabot-preview[bot]
+      - "#approved-reviews-by>=1"
+      - -approved-reviews-by~=author
+      - "#changes-requested-reviews-by=0"
+      - status-success~=AWS CodeBuild us-east-1
+      - status-success=Semantic Pull Request
+      - status-success=mandatory-changes
+  - name: automatic merge
+    actions:
+      comment:
+        message: Thank you for contributing! Your pull request is now being automatically merged without squashing.
+      merge:
+        strict: smart
+        # Merge instead of squash
+        method: merge
+        strict_method: merge
+      delete_head_branch: {}
+    conditions:
+      - base!=release
       - -title~=(WIP|wip)
       - -label~=(blocked|do-not-merge)
+      # Only if no-squash is set
+      - label~=no-squash
       - -merged
       - -closed
       - author!=dependabot[bot]

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,30 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+
+## [1.25.0](https://github.com/aws/aws-cdk/compare/v1.24.0...v1.25.0) (2020-02-18)
+
+
+### ⚠ BREAKING CHANGES
+
+* **appsync:** Changes `MappingTemplate.dynamoDbPutItem()` to accept
+`PrimaryKey` and `AttributeValues`, which allow configuring the primary
+key and to project an object to a set of attribute values.
+
+### Features
+
+* **appsync:** more general mapping template for DynamoDB PutItem ([#6236](https://github.com/aws/aws-cdk/issues/6236)) ([e9937d3](https://github.com/aws/aws-cdk/commit/e9937d3717d07c679d7732db21231a6b4da80130)), closes [#6225](https://github.com/aws/aws-cdk/issues/6225)
+* **aws-applicationautoscaling:** support Lambda and Comprehend ([#6191](https://github.com/aws/aws-cdk/issues/6191)) ([bdab747](https://github.com/aws/aws-cdk/commit/bdab7477b8464e04730a2b4b09841008bc6e8ab9))
+* **cfn:** update CloudFormation spec to v11.0.0 ([#6311](https://github.com/aws/aws-cdk/issues/6311)) ([ea272fa](https://github.com/aws/aws-cdk/commit/ea272fa270fd7dc09e0388a90e82bfb27a88491f))
+
+
+### Bug Fixes
+
+* **aws-lambda-nodejs:** Fix parcel invocation when invoked from globally installed cdk cli ([#6206](https://github.com/aws/aws-cdk/issues/6206)) ([ce96e08](https://github.com/aws/aws-cdk/commit/ce96e08a10f86361515f9210a52a37c9101e98fe)), closes [#6204](https://github.com/aws/aws-cdk/issues/6204)
+* **codepipeline:** fixed typo in method docs within action.ts ([78a39b7](https://github.com/aws/aws-cdk/commit/78a39b7a07f35b4675fe63cb2134c166f846c6be))
+* **eks:** Helm release name length & `--wait` option. ([#6276](https://github.com/aws/aws-cdk/issues/6276)) ([1811e00](https://github.com/aws/aws-cdk/commit/1811e00ff7e90f235198f855051f11f1d457b3a4)), closes [/github.com/helm/helm/blob/b63822ed12de1badbb61736d2f7ea4e756ef757d/pkg/action/install.go#L52-L55](https://github.com/aws//github.com/helm/helm/blob/b63822ed12de1badbb61736d2f7ea4e756ef757d/pkg/action/install.go/issues/L52-L55)
+* **lambda-nodejs:** not meaningful parcel error message when build fails ([#6277](https://github.com/aws/aws-cdk/issues/6277)) ([a97b48a](https://github.com/aws/aws-cdk/commit/a97b48ae4a7dafe050997e00bb57bf64117b551b)), closes [#6274](https://github.com/aws/aws-cdk/issues/6274)
+
 ## [1.24.0](https://github.com/aws/aws-cdk/compare/v1.23.0...v1.24.0) (2020-02-13)
 
 

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -414,7 +414,8 @@ $ cd packages/@aws-cdk/aws-ec2
 $ ../../../scripts/buildup
 ```
 
-Note that `buildup` uses `foreach.sh`, which means it's resumable. If your build fails and you wish to resume, just run `buildup` again. If you wish to restart, run `buildup --restart`.
+Note that `buildup` uses `foreach.sh`, which means it's resumable. If your build fails and you wish to resume, just run
+`buildup --resume`. If you wish to restart, run `buildup` again.
 
 ### Quick Iteration
 

diff --git a/design/cdk-bootstrap.md b/design/cdk-bootstrap.md
@@ -337,313 +337,5 @@ This should make sure the CFN update succeeds.
 
 ## Bootstrap template
 
-Here is the JSON of the bootstrap CloudFormation template:
-
-```json
-{
-  "Description": "The CDK Toolkit Stack. It was created by `cdk bootstrap` and manages resources necessary for managing your Cloud Applications with AWS CDK.",
-  "Parameters": {
-    "TrustedPrincipals": {
-      "Description": "List of AWS principals that the publish and action roles should trust to be assumed from",
-      "Default": "",
-      "Type": "CommaDelimitedList"
-    },
-    "CloudFormationExecutionPolicies": {
-      "Description": "List of the ManagedPolicy ARN(s) to attach to the CloudFormation deployment role",
-      "Default": "",
-      "Type": "CommaDelimitedList"
-    }
-  },
-  "Conditions": {
-    "HasTrustedPrincipals": {
-      "Fn::Not": [
-        {
-          "Fn::Equals": [
-            "",
-            {
-              "Fn::Join": [
-                "",
-                {
-                  "Ref": "TrustedPrincipals"
-                }
-              ]
-            }
-          ]
-        }
-      ]
-    }
-  },
-  "Resources": {
-    "FileAssetsBucketEncryptionKey": {
-      "Type": "AWS::KMS::Key",
-      "Properties": {
-        "KeyPolicy": {
-          "Statement": [
-            {
-              "Action": [
-                "kms:Create*", "kms:Describe*", "kms:Enable*", "kms:List*", "kms:Put*",
-                "kms:Update*", "kms:Revoke*", "kms:Disable*", "kms:Get*", "kms:Delete*",
-                "kms:ScheduleKeyDeletion", "kms:CancelKeyDeletion", "kms:GenerateDataKey"
-              ],
-              "Effect": "Allow",
-              "Principal": {
-                "AWS": {
-                  "Fn::Sub": "arn:${AWS::Partition}:iam::${AWS::AccountId}:root"
-                }
-              },
-              "Resource": "*"
-            },
-            {
-              "Action": [
-                "kms:Decrypt",    "kms:DescribeKey",     "kms:Encrypt",
-                "kms:ReEncrypt*", "kms:GenerateDataKey*"
-              ],
-              "Effect": "Allow",
-              "Principal": {
-                "AWS": {
-                  "Fn::Sub": "${PublishingRole.Arn}"
-                }
-              },
-              "Resource": "*"
-            }
-          ]
-        }
-      }
-    },
-    "StagingBucket": {
-      "Type": "AWS::S3::Bucket",
-      "Properties": {
-        "BucketName": {
-          "Fn::Sub": "cdk-bootstrap-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}"
-        },
-        "AccessControl": "Private",
-        "BucketEncryption": {
-          "ServerSideEncryptionConfiguration": [{
-            "ServerSideEncryptionByDefault": {
-              "SSEAlgorithm": "aws:kms",
-              "KMSMasterKeyID": {
-                "Fn::Sub": "${FileAssetsBucketEncryptionKey.Arn}"
-              }
-            }
-          }]
-        },
-        "PublicAccessBlockConfiguration": {
-          "BlockPublicAcls": true,
-          "BlockPublicPolicy": true,
-          "IgnorePublicAcls": true,
-          "RestrictPublicBuckets": true
-        }
-      },
-      "UpdateReplacePolicy": "Retain"
-    },
-    "ContainerAssetsRepository": {
-      "Type": "AWS::ECR::Repository",
-      "Properties": {
-        "RepositoryName": {
-          "Fn::Sub": "cdk-bootstrap-hnb659fds-container-assets-${AWS::AccountId}-${AWS::Region}"
-        }
-      }
-    },
-    "PublishingRole": {
-      "Type": "AWS::IAM::Role",
-      "Properties": {
-        "AssumeRolePolicyDocument": {
-          "Statement": [
-            {
-              "Action": "sts:AssumeRole",
-              "Effect": "Allow",
-              "Principal": {
-                "AWS": {
-                  "Ref": "AWS::AccountId"
-                }
-              }
-            },
-            {
-              "Fn::If": [
-                "HasTrustedPrincipals",
-                {
-                  "Action": "sts:AssumeRole",
-                  "Effect": "Allow",
-                  "Principal": {
-                    "AWS": {
-                      "Ref": "TrustedPrincipals"
-                    }
-                  }
-                },
-                {
-                  "Ref": "AWS::NoValue"
-                }
-              ]
-            }
-          ]
-        },
-        "RoleName": {
-          "Fn::Sub": "cdk-bootstrap-hnb659fds-publishing-role-${AWS::AccountId}-${AWS::Region}"
-        }
-      }
-    },
-    "PublishingRoleDefaultPolicy": {
-      "Type": "AWS::IAM::Policy",
-      "Properties": {
-        "PolicyDocument": {
-          "Statement": [
-            {
-              "Action": [
-                "s3:GetObject*",    "s3:GetBucket*", "s3:List*",
-                "s3:DeleteObject*", "s3:PutObject*", "s3:Abort*"
-              ],
-              "Resource": [
-                {
-                  "Fn::Sub": "${StagingBucket.Arn}"
-                },
-                {
-                  "Fn::Sub": "${StagingBucket.Arn}/*"
-                }
-              ]
-            },
-            {
-              "Action": [
-                "kms:Decrypt",    "kms:DescribeKey",     "kms:Encrypt",
-                "kms:ReEncrypt*", "kms:GenerateDataKey*"
-              ],
-              "Effect": "Allow",
-              "Resource": {
-                "Fn::Sub": "${FileAssetsBucketEncryptionKey.Arn}"
-              }
-            },
-            {
-              "Action": [
-                "ecr:PutImage",        "ecr:InitiateLayerUpload",
-                "ecr:UploadLayerPart", "ecr:CompleteLayerUpload"
-              ],
-              "Resource": {
-                "Fn::Sub": "${ContainerAssetsRepository.Arn}"
-              }
-            }
-          ],
-          "Version": "2012-10-17"
-        },
-        "Roles": [{
-          "Ref": "PublishingRole"
-        }],
-        "PolicyName": {
-          "Fn::Sub": "cdk-bootstrap-hnb659fds-publishing-role-default-policy-${AWS::AccountId}-${AWS::Region}"
-        }
-      }
-    },
-    "DeploymentActionRole": {
-      "Type": "AWS::IAM::Role",
-      "Properties": {
-        "AssumeRolePolicyDocument": {
-          "Statement": [
-            {
-              "Action": "sts:AssumeRole",
-              "Effect": "Allow",
-              "Principal": {
-                "AWS": {
-                  "Ref": "AWS::AccountId"
-                }
-              }
-            },
-            {
-              "Fn::If": [
-                "HasTrustedPrincipals",
-                {
-                  "Action": "sts:AssumeRole",
-                  "Effect": "Allow",
-                  "Principal": {
-                    "AWS": {
-                      "Ref": "TrustedPrincipals"
-                    }
-                  }
-                },
-                {
-                  "Ref": "AWS::NoValue"
-                }
-              ]
-            }
-          ]
-        },
-        "Policies": [
-          {
-            "PolicyDocument": {
-              "Statement": [
-                {
-                  "Action": [
-                    "cloudformation:CreateChangeSet",   "cloudformation:DeleteChangeSet",
-                    "cloudformation:DescribeChangeSet", "cloudformation:DescribeStacks",
-                    "cloudformation:ExecuteChangeSet",
-                    "s3:GetObject*",                    "s3:GetBucket*",
-                    "s3:List*",                         "s3:Abort*",
-                    "s3:DeleteObject*",                 "s3:PutObject*",
-                    "kms:Decrypt",                      "kms:DescribeKey"
-                  ],
-                  "Resource": "*"
-                },
-                {
-                  "Action": "iam:PassRole",
-                  "Resource": {
-                    "Fn::Sub": "${CloudFormationExecutionRole.Arn}"
-                  }
-                }
-              ],
-              "Version": "2012-10-17"
-            },
-            "PolicyName": "default"
-          }
-        ],
-        "RoleName": {
-          "Fn::Sub": "cdk-bootstrap-hnb659fds-deployment-action-role-${AWS::AccountId}-${AWS::Region}"
-        },
-        "Condition": "HasTrustedPrincipals"
-      }
-    },
-    "CloudFormationExecutionRole": {
-      "Type": "AWS::IAM::Role",
-      "Properties": {
-        "AssumeRolePolicyDocument": {
-          "Statement": [
-            {
-              "Action": "sts:AssumeRole",
-              "Effect": "Allow",
-              "Principal": {
-                "Service": "cloudformation.amazonaws.com"
-              }
-            }
-          ]
-        },
-        "ManagedPolicyArns": {
-          "Ref": "CloudFormationExecutionPolicies"
-        },
-        "RoleName": {
-          "Fn::Sub": "cdk-bootstrap-hnb659fds-cloudformation-execution-role-${AWS::AccountId}-${AWS::Region}"
-        },
-        "Condition": "HasTrustedPrincipals"
-      }
-    }
-  },
-  "Outputs": {
-    "BucketName": {
-      "Description": "The name of the S3 bucket owned by the CDK toolkit stack",
-      "Value": { "Fn::Sub":  "${StagingBucket.Arn}" },
-      "Export": {
-        "Name": { "Fn::Sub": "${AWS::StackName}:BucketName" }
-      }
-    },
-    "BucketDomainName": {
-      "Description": "The domain name of the S3 bucket owned by the CDK toolkit stack",
-      "Value": { "Fn::Sub":  "${StagingBucket.RegionalDomainName}" },
-      "Export": {
-        "Name": { "Fn::Sub": "${AWS::StackName}:BucketDomainName" }
-      }
-    },
-    "BootstrapVersion": {
-      "Description": "The version of the bootstrap resources that are currently mastered in this stack",
-      "Value": "1",
-      "Export": {
-        "Name": { "Fn::Sub": "AwsCdkBootstrapVersion" }
-      }
-    }
-  }
-}
-```
+The bootstrap template used by the CLI command can be found in the
+[aws-cdk package](../packages/aws-cdk/lib/api/bootstrap/bootstrap-template.json).
diff --git a/lerna.json b/lerna.json
@@ -9,5 +9,5 @@
     "tools/*"
   ],
   "rejectCycles": "true",
-  "version": "1.24.0"
+  "version": "1.25.0"
 }