Merge branch 'master' into k8s_name_validatation

aws · Mar 7, 2022 · f004bf4 · f004bf4
2 parents c93002a + 242836b
commit f004bf4
Show file tree

Hide file tree

Showing 11 changed files with 88 additions and 44 deletions.
diff --git a/.github/workflows/cr-checklist.yml b/.github/workflows/cr-checklist.yml
@@ -9,7 +9,7 @@ jobs:
     name: Creates a checklist for PRs that contain changes to custom resources
     steps:
       - name: Checkout repo
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
       - name: Dynamic checklist action
         uses: vishalsinha21/dynamic-checklist@v1
         with:

diff --git a/.github/workflows/pr-linter.yml b/.github/workflows/pr-linter.yml
@@ -21,7 +21,7 @@ jobs:
     steps:
 
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       - name: Install & Build prlint
         run: yarn install --frozen-lockfile && cd tools/@aws-cdk/prlint && yarn build+test

diff --git a/.github/workflows/v2-pull-request.yml b/.github/workflows/v2-pull-request.yml
@@ -23,7 +23,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
         with:
           branch: ${{ github.event.pull_request.head.ref }}
           token: ${{ secrets.GITHUB_TOKEN }}

diff --git a/.github/workflows/yarn-upgrade.yml b/.github/workflows/yarn-upgrade.yml
@@ -15,7 +15,7 @@ jobs:
     steps:
 
       - name: Check Out
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       - name: Set up Node
         uses: actions/setup-node@v3
@@ -87,7 +87,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Check Out
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       - name: Download patch
         uses: actions/download-artifact@v2

diff --git a/packages/@aws-cdk/aws-apigateway/lib/integrations/stepfunctions.ts b/packages/@aws-cdk/aws-apigateway/lib/integrations/stepfunctions.ts
@@ -203,7 +203,7 @@ function integrationResponse() {
           '#if($input.path(\'$.status\').toString().equals("FAILED"))', 
             '#set($context.responseOverride.status = 500)', 
             '{',
-              '"error": "$input.path(\'$.error\')"',
+              '"error": "$input.path(\'$.error\')",',
               '"cause": "$input.path(\'$.cause\')"',
             '}',
           '#else',

diff --git a/packages/@aws-cdk/aws-apigateway/test/integ.stepfunctions-api.expected.json b/packages/@aws-cdk/aws-apigateway/test/integ.stepfunctions-api.expected.json
@@ -160,7 +160,7 @@
           "IntegrationResponses": [
             {
               "ResponseTemplates": {
-                "application/json": "#set($inputRoot = $input.path('$'))\n#if($input.path('$.status').toString().equals(\"FAILED\"))\n#set($context.responseOverride.status = 500)\n{\n\"error\": \"$input.path('$.error')\"\n\"cause\": \"$input.path('$.cause')\"\n}\n#else\n$input.path('$.output')\n#end"
+                "application/json": "#set($inputRoot = $input.path('$'))\n#if($input.path('$.status').toString().equals(\"FAILED\"))\n#set($context.responseOverride.status = 500)\n{\n\"error\": \"$input.path('$.error')\",\n\"cause\": \"$input.path('$.cause')\"\n}\n#else\n$input.path('$.output')\n#end"
               },
               "StatusCode": "200"
             },

diff --git a/packages/@aws-cdk/aws-apigateway/test/integrations/stepfunctions.test.ts b/packages/@aws-cdk/aws-apigateway/test/integrations/stepfunctions.test.ts
@@ -418,7 +418,7 @@ function getIntegrationResponse() {
           '#if($input.path(\'$.status\').toString().equals("FAILED"))',
           '#set($context.responseOverride.status = 500)',
           '{',
-          '"error": "$input.path(\'$.error\')"',
+          '"error": "$input.path(\'$.error\')",',
           '"cause": "$input.path(\'$.cause\')"',
           '}',
           '#else',

diff --git a/packages/@aws-cdk/aws-apigateway/test/stepfunctions-api.test.ts b/packages/@aws-cdk/aws-apigateway/test/stepfunctions-api.test.ts
@@ -181,7 +181,7 @@ function getIntegrationResponse() {
           '#if($input.path(\'$.status\').toString().equals("FAILED"))',
           '#set($context.responseOverride.status = 500)',
           '{',
-          '"error": "$input.path(\'$.error\')"',
+          '"error": "$input.path(\'$.error\')",',
           '"cause": "$input.path(\'$.cause\')"',
           '}',
           '#else',

diff --git a/packages/@aws-cdk/cfnspec/spec-source/cfn-docs/cfn-docs.json b/packages/@aws-cdk/cfnspec/spec-source/cfn-docs/cfn-docs.json
diff --git a/packages/@aws-cdk/lambda-layer-awscli/layer/requirements.txt b/packages/@aws-cdk/lambda-layer-awscli/layer/requirements.txt
@@ -1 +1 @@
-awscli==1.22.63
+awscli==1.22.68
diff --git a/packages/@aws-cdk/pipelines/lib/codepipeline/codepipeline-source.ts b/packages/@aws-cdk/pipelines/lib/codepipeline/codepipeline-source.ts
@@ -139,21 +139,27 @@ export abstract class CodePipelineSource extends Step implements ICodePipelineAc
    * What attributes are available depends on the type of source. These attributes
    * are supported:
    *
-   * - GitHub, CodeCommit, and CodeStar connection
+   * - GitHub, CodeCommit, and CodeStarSourceConnection
    *   - `AuthorDate`
    *   - `BranchName`
    *   - `CommitId`
    *   - `CommitMessage`
+   * - GitHub, CodeCommit and ECR
+   *   - `RepositoryName`
    * - GitHub and CodeCommit
    *   - `CommitterDate`
-   *   - `RepositoryName`
    * - GitHub
    *   - `CommitUrl`
-   * - CodeStar Connection
+   * - CodeStarSourceConnection
    *   - `FullRepositoryName`
    * - S3
    *   - `ETag`
    *   - `VersionId`
+   * - ECR
+   *   - `ImageDigest`
+   *   - `ImageTag`
+   *   - `ImageURI`
+   *   - `RegistryId`
    *
    * @see https://docs.aws.amazon.com/codepipeline/latest/userguide/reference-variables.html#reference-variables-list
    */