Merge branch 'v1-main' into merge-back/1.181.1

Author: mergify[bot]

.github/workflows/close-stale-issues.yml

@@ -15,7 +15,7 @@ jobs:
     runs-on: ubuntu-latest
     name: Stale issue job
     steps:
-    - uses: aws-actions/stale-issue-cleanup@v5
+    - uses: aws-actions/stale-issue-cleanup@v6
       with:
         # Setting messages to an empty string will cause the automation to skip
         # that category

package.json

@@ -17,7 +17,7 @@
   "devDependencies": {
     "@types/prettier": "2.6.0",
     "@yarnpkg/lockfile": "^1.1.0",
-    "cdk-generate-synthetic-examples": "^0.1.64",
+    "cdk-generate-synthetic-examples": "^0.1.71",
     "conventional-changelog-cli": "^2.2.2",
     "fs-extra": "^9.1.0",
     "graceful-fs": "^4.2.10",

packages/@aws-cdk/aws-eks/package.json

@@ -91,7 +91,7 @@
     "@types/sinon": "^9.0.11",
     "@types/yaml": "1.9.6",
     "aws-sdk": "^2.848.0",
-    "cdk8s": "^1.8.44",
+    "cdk8s": "^1.8.51",
     "cdk8s-plus-21": "^1.0.0-beta.186",
     "jest": "^27.5.1",
     "sinon": "^9.2.4"

packages/@aws-cdk/aws-lambda-nodejs/package.json

@@ -78,7 +78,7 @@
     "@aws-cdk/pkglint": "0.0.0",
     "@types/jest": "^27.5.2",
     "delay": "5.0.0",
-    "esbuild": "^0.15.14"
+    "esbuild": "^0.15.15"
   },
   "dependencies": {
     "@aws-cdk/aws-lambda": "0.0.0",

packages/@aws-cdk/cloud-assembly-schema/package.json

@@ -67,7 +67,7 @@
     "@types/semver": "^7.3.13",
     "jest": "^27.5.1",
     "mock-fs": "^4.14.0",
-    "typescript-json-schema": "^0.54.0"
+    "typescript-json-schema": "^0.55.0"
   },
   "repository": {
     "url": "https://github.com/aws/aws-cdk.git",

packages/@aws-cdk/cloud-assembly-schema/schema/cloud-assembly.schema.json

@@ -429,42 +429,8 @@
                     "description": "The provider from which we expect this context key to be obtained."
                 },
                 "props": {
-                    "description": "A set of provider-specific options.",
-                    "anyOf": [
-                        {
-                            "$ref": "#/definitions/AmiContextQuery"
-                        },
-                        {
-                            "$ref": "#/definitions/AvailabilityZonesContextQuery"
-                        },
-                        {
-                            "$ref": "#/definitions/HostedZoneContextQuery"
-                        },
-                        {
-                            "$ref": "#/definitions/SSMParameterContextQuery"
-                        },
-                        {
-                            "$ref": "#/definitions/VpcContextQuery"
-                        },
-                        {
-                            "$ref": "#/definitions/EndpointServiceAvailabilityZonesContextQuery"
-                        },
-                        {
-                            "$ref": "#/definitions/LoadBalancerContextQuery"
-                        },
-                        {
-                            "$ref": "#/definitions/LoadBalancerListenerContextQuery"
-                        },
-                        {
-                            "$ref": "#/definitions/SecurityGroupContextQuery"
-                        },
-                        {
-                            "$ref": "#/definitions/KeyContextQuery"
-                        },
-                        {
-                            "$ref": "#/definitions/PluginContextQuery"
-                        }
-                    ]
+                    "$ref": "#/definitions/ContextQueryProperties",
+                    "description": "A set of provider-specific options."
                 }
             },
             "required": [
@@ -490,6 +456,43 @@
             ],
             "type": "string"
         },
+        "ContextQueryProperties": {
+            "anyOf": [
+                {
+                    "$ref": "#/definitions/AmiContextQuery"
+                },
+                {
+                    "$ref": "#/definitions/AvailabilityZonesContextQuery"
+                },
+                {
+                    "$ref": "#/definitions/HostedZoneContextQuery"
+                },
+                {
+                    "$ref": "#/definitions/SSMParameterContextQuery"
+                },
+                {
+                    "$ref": "#/definitions/VpcContextQuery"
+                },
+                {
+                    "$ref": "#/definitions/EndpointServiceAvailabilityZonesContextQuery"
+                },
+                {
+                    "$ref": "#/definitions/LoadBalancerContextQuery"
+                },
+                {
+                    "$ref": "#/definitions/LoadBalancerListenerContextQuery"
+                },
+                {
+                    "$ref": "#/definitions/SecurityGroupContextQuery"
+                },
+                {
+                    "$ref": "#/definitions/KeyContextQuery"
+                },
+                {
+                    "$ref": "#/definitions/PluginContextQuery"
+                }
+            ]
+        },
         "AmiContextQuery": {
             "description": "Query to AMI context provider",
             "type": "object",
@@ -639,7 +642,7 @@
                     }
                 },
                 "returnAsymmetricSubnets": {
-                    "description": "Whether to populate the subnetGroups field of the{@linkVpcContextResponse},\nwhich contains potentially asymmetric subnet groups.",
+                    "description": "Whether to populate the subnetGroups field of the {@link VpcContextResponse},\nwhich contains potentially asymmetric subnet groups.",
                     "default": false,
                     "type": "boolean"
                 },

packages/@aws-cdk/cloud-assembly-schema/schema/cloud-assembly.version.json

@@ -1 +1 @@
-{"version":"20.0.0"}
+{"version":"21.0.0"}

packages/@aws-cdk/integ-runner/THIRD_PARTY_LICENSES

@@ -156,7 +156,7 @@ THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH RE
 
 ----------------
 
-** aws-sdk@2.1255.0 - https://www.npmjs.com/package/aws-sdk/v/2.1255.0 | Apache-2.0
+** aws-sdk@2.1260.0 - https://www.npmjs.com/package/aws-sdk/v/2.1260.0 | Apache-2.0
 AWS SDK for JavaScript
 Copyright 2012-2017 Amazon.com, Inc. or its affiliates. All Rights Reserved.
 

packages/@aws-cdk/lambda-layer-awscli/layer/requirements.txt

@@ -1 +1 @@
-awscli==1.27.8
+awscli==1.27.17

packages/aws-cdk-lib/package.json

@@ -369,7 +369,7 @@
     "@types/fs-extra": "^8.1.2",
     "@types/node": "^10.17.60",
     "constructs": "^3.3.69",
-    "esbuild": "^0.15.14",
+    "esbuild": "^0.15.15",
     "fs-extra": "^9.1.0",
     "ts-node": "^9.1.1",
     "typescript": "~3.8.3"