Merge branch 'main' into add-paulhcs-to-mergify-core-permissions

aws · Dec 5, 2023 · 7cc08c2 · 7cc08c2
2 parents a6c4903 + a11ab23
commit 7cc08c2
Show file tree

Hide file tree

Showing 15 changed files with 141 additions and 21 deletions.
diff --git a/packages/@aws-cdk/cloudformation-diff/package.json b/packages/@aws-cdk/cloudformation-diff/package.json
@@ -23,8 +23,8 @@
   },
   "license": "Apache-2.0",
   "dependencies": {
-    "@aws-cdk/aws-service-spec": "^0.0.33",
-    "@aws-cdk/service-spec-types": "^0.0.33",
+    "@aws-cdk/aws-service-spec": "^0.0.34",
+    "@aws-cdk/service-spec-types": "^0.0.34",
     "chalk": "^4",
     "diff": "^5.1.0",
     "fast-deep-equal": "^3.1.3",

diff --git a/packages/@aws-cdk/integ-runner/package.json b/packages/@aws-cdk/integ-runner/package.json
@@ -74,7 +74,7 @@
     "@aws-cdk/cloud-assembly-schema": "0.0.0",
     "@aws-cdk/cloudformation-diff": "0.0.0",
     "@aws-cdk/cx-api": "0.0.0",
-    "@aws-cdk/aws-service-spec": "^0.0.33",
+    "@aws-cdk/aws-service-spec": "^0.0.34",
     "cdk-assets": "0.0.0",
     "@aws-cdk/cdk-cli-wrapper": "0.0.0",
     "aws-cdk": "0.0.0",

diff --git a/packages/aws-cdk-lib/aws-arczonalshift/.jsiirc.json b/packages/aws-cdk-lib/aws-arczonalshift/.jsiirc.json
@@ -0,0 +1,13 @@
+{
+  "targets": {
+    "java": {
+      "package": "software.amazon.awscdk.services.arczonalshift"
+    },
+    "dotnet": {
+      "package": "Amazon.CDK.AWS.ARCZonalShift"
+    },
+    "python": {
+      "module": "aws_cdk.aws_arczonalshift"
+    }
+  }
+}
diff --git a/packages/aws-cdk-lib/aws-arczonalshift/README.md b/packages/aws-cdk-lib/aws-arczonalshift/README.md
@@ -0,0 +1,39 @@
+# AWS::ARCZonalShift Construct Library
+<!--BEGIN STABILITY BANNER-->
+
+---
+
+![cfn-resources: Stable](https://img.shields.io/badge/cfn--resources-stable-success.svg?style=for-the-badge)
+
+> All classes with the `Cfn` prefix in this module ([CFN Resources]) are always stable and safe to use.
+>
+> [CFN Resources]: https://docs.aws.amazon.com/cdk/latest/guide/constructs.html#constructs_lib
+
+---
+
+<!--END STABILITY BANNER-->
+
+This module is part of the [AWS Cloud Development Kit](https://github.com/aws/aws-cdk) project.
+
+```ts nofixture
+import * as arczonalshift from 'aws-cdk-lib/aws-arczonalshift';
+```
+
+<!--BEGIN CFNONLY DISCLAIMER-->
+
+There are no official hand-written ([L2](https://docs.aws.amazon.com/cdk/latest/guide/constructs.html#constructs_lib)) constructs for this service yet. Here are some suggestions on how to proceed:
+
+- Search [Construct Hub for ARCZonalShift construct libraries](https://constructs.dev/search?q=arczonalshift)
+- Use the automatically generated [L1](https://docs.aws.amazon.com/cdk/latest/guide/constructs.html#constructs_l1_using) constructs, in the same way you would use [the CloudFormation AWS::ARCZonalShift resources](https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/AWS_ARCZonalShift.html) directly.
+
+
+<!--BEGIN CFNONLY DISCLAIMER-->
+
+There are no hand-written ([L2](https://docs.aws.amazon.com/cdk/latest/guide/constructs.html#constructs_lib)) constructs for this service yet. 
+However, you can still use the automatically generated [L1](https://docs.aws.amazon.com/cdk/latest/guide/constructs.html#constructs_l1_using) constructs, and use this service exactly as you would using CloudFormation directly.
+
+For more information on the resources and properties available for this service, see the [CloudFormation documentation for AWS::ARCZonalShift](https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/AWS_ARCZonalShift.html).
+
+(Read the [CDK Contributing Guide](https://github.com/aws/aws-cdk/blob/main/CONTRIBUTING.md) and submit an RFC if you are interested in contributing to this construct library.)
+
+<!--END CFNONLY DISCLAIMER-->
diff --git a/packages/aws-cdk-lib/aws-arczonalshift/index.ts b/packages/aws-cdk-lib/aws-arczonalshift/index.ts
@@ -0,0 +1 @@
+export * from './lib';
diff --git a/packages/aws-cdk-lib/aws-arczonalshift/lib/index.ts b/packages/aws-cdk-lib/aws-arczonalshift/lib/index.ts
@@ -0,0 +1,2 @@
+// AWS::ARCZonalShift Cloudformation Resources
+export * from './arczonalshift.generated';
diff --git a/packages/aws-cdk-lib/aws-workspacesthinclient/.jsiirc.json b/packages/aws-cdk-lib/aws-workspacesthinclient/.jsiirc.json
@@ -0,0 +1,13 @@
+{
+  "targets": {
+    "java": {
+      "package": "software.amazon.awscdk.services.workspacesthinclient"
+    },
+    "dotnet": {
+      "package": "Amazon.CDK.AWS.WorkSpacesThinClient"
+    },
+    "python": {
+      "module": "aws_cdk.aws_workspacesthinclient"
+    }
+  }
+}
diff --git a/packages/aws-cdk-lib/aws-workspacesthinclient/README.md b/packages/aws-cdk-lib/aws-workspacesthinclient/README.md
@@ -0,0 +1,39 @@
+# AWS::WorkSpacesThinClient Construct Library
+<!--BEGIN STABILITY BANNER-->
+
+---
+
+![cfn-resources: Stable](https://img.shields.io/badge/cfn--resources-stable-success.svg?style=for-the-badge)
+
+> All classes with the `Cfn` prefix in this module ([CFN Resources]) are always stable and safe to use.
+>
+> [CFN Resources]: https://docs.aws.amazon.com/cdk/latest/guide/constructs.html#constructs_lib
+
+---
+
+<!--END STABILITY BANNER-->
+
+This module is part of the [AWS Cloud Development Kit](https://github.com/aws/aws-cdk) project.
+
+```ts nofixture
+import * as workspacesthinclient from 'aws-cdk-lib/aws-workspacesthinclient';
+```
+
+<!--BEGIN CFNONLY DISCLAIMER-->
+
+There are no official hand-written ([L2](https://docs.aws.amazon.com/cdk/latest/guide/constructs.html#constructs_lib)) constructs for this service yet. Here are some suggestions on how to proceed:
+
+- Search [Construct Hub for WorkSpacesThinClient construct libraries](https://constructs.dev/search?q=workspacesthinclient)
+- Use the automatically generated [L1](https://docs.aws.amazon.com/cdk/latest/guide/constructs.html#constructs_l1_using) constructs, in the same way you would use [the CloudFormation AWS::WorkSpacesThinClient resources](https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/AWS_WorkSpacesThinClient.html) directly.
+
+
+<!--BEGIN CFNONLY DISCLAIMER-->
+
+There are no hand-written ([L2](https://docs.aws.amazon.com/cdk/latest/guide/constructs.html#constructs_lib)) constructs for this service yet. 
+However, you can still use the automatically generated [L1](https://docs.aws.amazon.com/cdk/latest/guide/constructs.html#constructs_l1_using) constructs, and use this service exactly as you would using CloudFormation directly.
+
+For more information on the resources and properties available for this service, see the [CloudFormation documentation for AWS::WorkSpacesThinClient](https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/AWS_WorkSpacesThinClient.html).
+
+(Read the [CDK Contributing Guide](https://github.com/aws/aws-cdk/blob/main/CONTRIBUTING.md) and submit an RFC if you are interested in contributing to this construct library.)
+
+<!--END CFNONLY DISCLAIMER-->
diff --git a/packages/aws-cdk-lib/aws-workspacesthinclient/index.ts b/packages/aws-cdk-lib/aws-workspacesthinclient/index.ts
@@ -0,0 +1 @@
+export * from './lib';
diff --git a/packages/aws-cdk-lib/aws-workspacesthinclient/lib/index.ts b/packages/aws-cdk-lib/aws-workspacesthinclient/lib/index.ts
@@ -0,0 +1,2 @@
+// AWS::WorkSpacesThinClient Cloudformation Resources
+export * from './workspacesthinclient.generated';
diff --git a/packages/aws-cdk-lib/index.ts b/packages/aws-cdk-lib/index.ts
@@ -20,6 +20,7 @@ export * as aws_apprunner from './aws-apprunner';
 export * as aws_appstream from './aws-appstream';
 export * as aws_appsync from './aws-appsync';
 export * as aws_aps from './aws-aps';
+export * as aws_arczonalshift from './aws-arczonalshift';
 export * as aws_athena from './aws-athena';
 export * as aws_auditmanager from './aws-auditmanager';
 export * as aws_autoscaling from './aws-autoscaling';
@@ -251,6 +252,7 @@ export * as aws_wafregional from './aws-wafregional';
 export * as aws_wafv2 from './aws-wafv2';
 export * as aws_wisdom from './aws-wisdom';
 export * as aws_workspaces from './aws-workspaces';
+export * as aws_workspacesthinclient from './aws-workspacesthinclient';
 export * as aws_workspacesweb from './aws-workspacesweb';
 export * as aws_xray from './aws-xray';
 export * as cloud_assembly_schema from './cloud-assembly-schema';

diff --git a/packages/aws-cdk-lib/package.json b/packages/aws-cdk-lib/package.json
@@ -133,7 +133,7 @@
     "yaml": "1.10.2"
   },
   "devDependencies": {
-    "@aws-cdk/aws-service-spec": "^0.0.33",
+    "@aws-cdk/aws-service-spec": "^0.0.34",
     "@aws-cdk/cdk-build-tools": "0.0.0",
     "@aws-cdk/custom-resource-handlers": "0.0.0",
     "@aws-cdk/pkglint": "0.0.0",
@@ -231,6 +231,7 @@
     "./aws-appstream": "./aws-appstream/index.js",
     "./aws-appsync": "./aws-appsync/index.js",
     "./aws-aps": "./aws-aps/index.js",
+    "./aws-arczonalshift": "./aws-arczonalshift/index.js",
     "./aws-athena": "./aws-athena/index.js",
     "./aws-auditmanager": "./aws-auditmanager/index.js",
     "./aws-autoscaling": "./aws-autoscaling/index.js",
@@ -465,6 +466,7 @@
     "./aws-wafv2": "./aws-wafv2/index.js",
     "./aws-wisdom": "./aws-wisdom/index.js",
     "./aws-workspaces": "./aws-workspaces/index.js",
+    "./aws-workspacesthinclient": "./aws-workspacesthinclient/index.js",
     "./aws-workspacesweb": "./aws-workspacesweb/index.js",
     "./aws-xray": "./aws-xray/index.js",
     "./cloud-assembly-schema": "./cloud-assembly-schema/index.js",

diff --git a/packages/aws-cdk-lib/scripts/scope-map.json b/packages/aws-cdk-lib/scripts/scope-map.json
@@ -53,6 +53,9 @@
   "aws-aps": [
     "AWS::APS"
   ],
+  "aws-arczonalshift": [
+    "AWS::ARCZonalShift"
+  ],
   "aws-athena": [
     "AWS::Athena"
   ],
@@ -678,6 +681,9 @@
   "aws-workspaces": [
     "AWS::WorkSpaces"
   ],
+  "aws-workspacesthinclient": [
+    "AWS::WorkSpacesThinClient"
+  ],
   "aws-workspacesweb": [
     "AWS::WorkSpacesWeb"
   ],

diff --git a/tools/@aws-cdk/spec2cdk/package.json b/tools/@aws-cdk/spec2cdk/package.json
@@ -32,9 +32,9 @@
   },
   "license": "Apache-2.0",
   "dependencies": {
-    "@aws-cdk/aws-service-spec": "^0.0.33",
-    "@aws-cdk/service-spec-importers": "^0.0.9",
-    "@aws-cdk/service-spec-types": "^0.0.33",
+    "@aws-cdk/aws-service-spec": "^0.0.34",
+    "@aws-cdk/service-spec-importers": "^0.0.10",
+    "@aws-cdk/service-spec-types": "^0.0.34",
     "@cdklabs/tskb": "^0.0.3",
     "@cdklabs/typewriter": "^0.0.3",
     "camelcase": "^6",

diff --git a/yarn.lock b/yarn.lock
@@ -56,25 +56,25 @@
   resolved "https://registry.npmjs.org/@aws-cdk/asset-node-proxy-agent-v6/-/asset-node-proxy-agent-v6-2.0.1.tgz#6dc9b7cdb22ff622a7176141197962360c33e9ac"
   integrity sha512-DDt4SLdLOwWCjGtltH4VCST7hpOI5DzieuhGZsBpZ+AgJdSI2GCjklCXm0GCTwJG/SolkL5dtQXyUKgg9luBDg==
 
-"@aws-cdk/aws-service-spec@^0.0.33":
-  version "0.0.33"
-  resolved "https://registry.npmjs.org/@aws-cdk/aws-service-spec/-/aws-service-spec-0.0.33.tgz#65f426e956b199d477baa8ff38f2630e39eecdd9"
-  integrity sha512-8YFeFWfvlZiwl7BSU4dAoVmt79d+mevzul6io5Javjm1uWy9g8GEHxJHOOdGAdk/tZ9K20DxmDy9NiMb2bCbww==
+"@aws-cdk/aws-service-spec@^0.0.34":
+  version "0.0.34"
+  resolved "https://registry.npmjs.org/@aws-cdk/aws-service-spec/-/aws-service-spec-0.0.34.tgz#0c04646e76c995bfb520f380ed84411521c1562b"
+  integrity sha512-4M7SEhG05BmqXROKrXYyUFJR0dbE66feqo+lnyq/xNSfoJR6PMSRWpsOWvty8iy1Ih8N4tjKAW0Zbzw+Y8gG4A==
   dependencies:
-    "@aws-cdk/service-spec-types" "^0.0.33"
+    "@aws-cdk/service-spec-types" "^0.0.34"
     "@cdklabs/tskb" "^0.0.3"
 
 "@aws-cdk/lambda-layer-kubectl-v24@^2.0.242":
   version "2.0.242"
   resolved "https://registry.npmjs.org/@aws-cdk/lambda-layer-kubectl-v24/-/lambda-layer-kubectl-v24-2.0.242.tgz#4273a5ad7714f933a7eba155eb9280823086db71"
   integrity sha512-7/wIOo685tmrEe4hh6zqDELhBZh5OQGf3Hd2FU2Vnwy2ZubW8qTmEw5gqJCsCrGKeYDoa1BcVhDRZ/nzjkaqyA==
 
-"@aws-cdk/service-spec-importers@^0.0.9":
-  version "0.0.9"
-  resolved "https://registry.npmjs.org/@aws-cdk/service-spec-importers/-/service-spec-importers-0.0.9.tgz#4fbc483e023dfe465e99ead3998b46abad0b541d"
-  integrity sha512-Y1dNhHDrjPrmnu7sy1M3A4UK70MsD+786OTyouLELOIzUxRlUq+S4rRd/BKOzOJvzHcloPuOzViWlLahRu7VnQ==
+"@aws-cdk/service-spec-importers@^0.0.10":
+  version "0.0.10"
+  resolved "https://registry.npmjs.org/@aws-cdk/service-spec-importers/-/service-spec-importers-0.0.10.tgz#47dd42fccb1252eb4edfb9ca1f525fe0b28a0053"
+  integrity sha512-hQk7iEeD8B2fCz3XlmYUA3vysVojMazcoOZNa2J7cNkHbL0RZb3O8jxA9IswT6eQJX2ws89XXYu9Z9f7nRGu8w==
   dependencies:
-    "@aws-cdk/service-spec-types" "^0.0.33"
+    "@aws-cdk/service-spec-types" "^0.0.34"
     "@cdklabs/tskb" "^0.0.3"
     ajv "^6"
     canonicalize "^2.0.0"
@@ -85,10 +85,10 @@
     glob "^8"
     sort-json "^2.0.1"
 
-"@aws-cdk/service-spec-types@^0.0.33":
-  version "0.0.33"
-  resolved "https://registry.npmjs.org/@aws-cdk/service-spec-types/-/service-spec-types-0.0.33.tgz#a1a0e53f551f4270c0a4d7f08d506783812e67c8"
-  integrity sha512-fTavmsR2lMfl3TJ3RAyWpopik1N67TGGHD62i5p7JroiAqiaXPRQvBkGrr7MubvtqNhcp2DK2Hwa88xRdk+xFw==
+"@aws-cdk/service-spec-types@^0.0.34":
+  version "0.0.34"
+  resolved "https://registry.npmjs.org/@aws-cdk/service-spec-types/-/service-spec-types-0.0.34.tgz#79203599ad1fdf3534fead56cf946c4c3809ce26"
+  integrity sha512-ydG/wOXlbpDLTe5mmKDW2AKZP5/gwMCJPH7YEyR4N51Zs1+4rhYhODWk8ME/KXHs+TUpjWz4q0yE80BJQdhOvw==
   dependencies:
     "@cdklabs/tskb" "^0.0.3"
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		// AWS::ARCZonalShift Cloudformation Resources
		export * from './arczonalshift.generated';
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		// AWS::WorkSpacesThinClient Cloudformation Resources
		export * from './workspacesthinclient.generated';