Skip to content

Commit 7cc08c2

Browse files
paulhcsunpaulhcsun
authored
Merge branch 'main' into add-paulhcs-to-mergify-core-permissions
2 parents a6c4903 + a11ab23 commit 7cc08c2

File tree

15 files changed

+141
-21
lines changed

15 files changed

+141
-21
lines changed

‎packages/@aws-cdk/cloudformation-diff/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@
2323
},
2424
"license": "Apache-2.0",
2525
"dependencies": {
26-
"@aws-cdk/aws-service-spec": "^0.0.33",
27-
"@aws-cdk/service-spec-types": "^0.0.33",
26+
"@aws-cdk/aws-service-spec": "^0.0.34",
27+
"@aws-cdk/service-spec-types": "^0.0.34",
2828
"chalk": "^4",
2929
"diff": "^5.1.0",
3030
"fast-deep-equal": "^3.1.3",

‎packages/@aws-cdk/integ-runner/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@
7474
"@aws-cdk/cloud-assembly-schema": "0.0.0",
7575
"@aws-cdk/cloudformation-diff": "0.0.0",
7676
"@aws-cdk/cx-api": "0.0.0",
77-
"@aws-cdk/aws-service-spec": "^0.0.33",
77+
"@aws-cdk/aws-service-spec": "^0.0.34",
7878
"cdk-assets": "0.0.0",
7979
"@aws-cdk/cdk-cli-wrapper": "0.0.0",
8080
"aws-cdk": "0.0.0",

‎packages/aws-cdk-lib/aws-arczonalshift/.jsiirc.json

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
{
2+
"targets": {
3+
"java": {
4+
"package": "software.amazon.awscdk.services.arczonalshift"
5+
},
6+
"dotnet": {
7+
"package": "Amazon.CDK.AWS.ARCZonalShift"
8+
},
9+
"python": {
10+
"module": "aws_cdk.aws_arczonalshift"
11+
}
12+
}
13+
}

‎packages/aws-cdk-lib/aws-arczonalshift/README.md

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
# AWS::ARCZonalShift Construct Library
2+
<!--BEGIN STABILITY BANNER-->
3+
4+
---
5+
6+
![cfn-resources: Stable](https://img.shields.io/badge/cfn--resources-stable-success.svg?style=for-the-badge)
7+
8+
> All classes with the `Cfn` prefix in this module ([CFN Resources]) are always stable and safe to use.
9+
>
10+
> [CFN Resources]: https://docs.aws.amazon.com/cdk/latest/guide/constructs.html#constructs_lib
11+
12+
---
13+
14+
<!--END STABILITY BANNER-->
15+
16+
This module is part of the [AWS Cloud Development Kit](https://github.com/aws/aws-cdk) project.
17+
18+
```ts nofixture
19+
import * as arczonalshift from 'aws-cdk-lib/aws-arczonalshift';
20+
```
21+
22+
<!--BEGIN CFNONLY DISCLAIMER-->
23+
24+
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:
25+
26+
- Search [Construct Hub for ARCZonalShift construct libraries](https://constructs.dev/search?q=arczonalshift)
27+
- 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.
28+
29+
30+
<!--BEGIN CFNONLY DISCLAIMER-->
31+
32+
There are no hand-written ([L2](https://docs.aws.amazon.com/cdk/latest/guide/constructs.html#constructs_lib)) constructs for this service yet.
33+
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.
34+
35+
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).
36+
37+
(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.)
38+
39+
<!--END CFNONLY DISCLAIMER-->

‎packages/aws-cdk-lib/aws-arczonalshift/index.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
export * from './lib';

‎packages/aws-cdk-lib/aws-arczonalshift/lib/index.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
// AWS::ARCZonalShift Cloudformation Resources
2+
export * from './arczonalshift.generated';

‎packages/aws-cdk-lib/aws-workspacesthinclient/.jsiirc.json

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
{
2+
"targets": {
3+
"java": {
4+
"package": "software.amazon.awscdk.services.workspacesthinclient"
5+
},
6+
"dotnet": {
7+
"package": "Amazon.CDK.AWS.WorkSpacesThinClient"
8+
},
9+
"python": {
10+
"module": "aws_cdk.aws_workspacesthinclient"
11+
}
12+
}
13+
}

‎packages/aws-cdk-lib/aws-workspacesthinclient/README.md

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
# AWS::WorkSpacesThinClient Construct Library
2+
<!--BEGIN STABILITY BANNER-->
3+
4+
---
5+
6+
![cfn-resources: Stable](https://img.shields.io/badge/cfn--resources-stable-success.svg?style=for-the-badge)
7+
8+
> All classes with the `Cfn` prefix in this module ([CFN Resources]) are always stable and safe to use.
9+
>
10+
> [CFN Resources]: https://docs.aws.amazon.com/cdk/latest/guide/constructs.html#constructs_lib
11+
12+
---
13+
14+
<!--END STABILITY BANNER-->
15+
16+
This module is part of the [AWS Cloud Development Kit](https://github.com/aws/aws-cdk) project.
17+
18+
```ts nofixture
19+
import * as workspacesthinclient from 'aws-cdk-lib/aws-workspacesthinclient';
20+
```
21+
22+
<!--BEGIN CFNONLY DISCLAIMER-->
23+
24+
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:
25+
26+
- Search [Construct Hub for WorkSpacesThinClient construct libraries](https://constructs.dev/search?q=workspacesthinclient)
27+
- 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.
28+
29+
30+
<!--BEGIN CFNONLY DISCLAIMER-->
31+
32+
There are no hand-written ([L2](https://docs.aws.amazon.com/cdk/latest/guide/constructs.html#constructs_lib)) constructs for this service yet.
33+
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.
34+
35+
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).
36+
37+
(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.)
38+
39+
<!--END CFNONLY DISCLAIMER-->

‎packages/aws-cdk-lib/aws-workspacesthinclient/index.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
export * from './lib';

‎packages/aws-cdk-lib/aws-workspacesthinclient/lib/index.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
// AWS::WorkSpacesThinClient Cloudformation Resources
2+
export * from './workspacesthinclient.generated';

‎packages/aws-cdk-lib/index.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ export * as aws_apprunner from './aws-apprunner';
2020
export * as aws_appstream from './aws-appstream';
2121
export * as aws_appsync from './aws-appsync';
2222
export * as aws_aps from './aws-aps';
23+
export * as aws_arczonalshift from './aws-arczonalshift';
2324
export * as aws_athena from './aws-athena';
2425
export * as aws_auditmanager from './aws-auditmanager';
2526
export * as aws_autoscaling from './aws-autoscaling';
@@ -251,6 +252,7 @@ export * as aws_wafregional from './aws-wafregional';
251252
export * as aws_wafv2 from './aws-wafv2';
252253
export * as aws_wisdom from './aws-wisdom';
253254
export * as aws_workspaces from './aws-workspaces';
255+
export * as aws_workspacesthinclient from './aws-workspacesthinclient';
254256
export * as aws_workspacesweb from './aws-workspacesweb';
255257
export * as aws_xray from './aws-xray';
256258
export * as cloud_assembly_schema from './cloud-assembly-schema';

‎packages/aws-cdk-lib/package.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@
133133
"yaml": "1.10.2"
134134
},
135135
"devDependencies": {
136-
"@aws-cdk/aws-service-spec": "^0.0.33",
136+
"@aws-cdk/aws-service-spec": "^0.0.34",
137137
"@aws-cdk/cdk-build-tools": "0.0.0",
138138
"@aws-cdk/custom-resource-handlers": "0.0.0",
139139
"@aws-cdk/pkglint": "0.0.0",
@@ -231,6 +231,7 @@
231231
"./aws-appstream": "./aws-appstream/index.js",
232232
"./aws-appsync": "./aws-appsync/index.js",
233233
"./aws-aps": "./aws-aps/index.js",
234+
"./aws-arczonalshift": "./aws-arczonalshift/index.js",
234235
"./aws-athena": "./aws-athena/index.js",
235236
"./aws-auditmanager": "./aws-auditmanager/index.js",
236237
"./aws-autoscaling": "./aws-autoscaling/index.js",
@@ -465,6 +466,7 @@
465466
"./aws-wafv2": "./aws-wafv2/index.js",
466467
"./aws-wisdom": "./aws-wisdom/index.js",
467468
"./aws-workspaces": "./aws-workspaces/index.js",
469+
"./aws-workspacesthinclient": "./aws-workspacesthinclient/index.js",
468470
"./aws-workspacesweb": "./aws-workspacesweb/index.js",
469471
"./aws-xray": "./aws-xray/index.js",
470472
"./cloud-assembly-schema": "./cloud-assembly-schema/index.js",

‎packages/aws-cdk-lib/scripts/scope-map.json

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,9 @@
5353
"aws-aps": [
5454
"AWS::APS"
5555
],
56+
"aws-arczonalshift": [
57+
"AWS::ARCZonalShift"
58+
],
5659
"aws-athena": [
5760
"AWS::Athena"
5861
],
@@ -678,6 +681,9 @@
678681
"aws-workspaces": [
679682
"AWS::WorkSpaces"
680683
],
684+
"aws-workspacesthinclient": [
685+
"AWS::WorkSpacesThinClient"
686+
],
681687
"aws-workspacesweb": [
682688
"AWS::WorkSpacesWeb"
683689
],

‎tools/@aws-cdk/spec2cdk/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,9 @@
3232
},
3333
"license": "Apache-2.0",
3434
"dependencies": {
35-
"@aws-cdk/aws-service-spec": "^0.0.33",
36-
"@aws-cdk/service-spec-importers": "^0.0.9",
37-
"@aws-cdk/service-spec-types": "^0.0.33",
35+
"@aws-cdk/aws-service-spec": "^0.0.34",
36+
"@aws-cdk/service-spec-importers": "^0.0.10",
37+
"@aws-cdk/service-spec-types": "^0.0.34",
3838
"@cdklabs/tskb": "^0.0.3",
3939
"@cdklabs/typewriter": "^0.0.3",
4040
"camelcase": "^6",

‎yarn.lock

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -56,25 +56,25 @@
5656
resolved "https://registry.npmjs.org/@aws-cdk/asset-node-proxy-agent-v6/-/asset-node-proxy-agent-v6-2.0.1.tgz#6dc9b7cdb22ff622a7176141197962360c33e9ac"
5757
integrity sha512-DDt4SLdLOwWCjGtltH4VCST7hpOI5DzieuhGZsBpZ+AgJdSI2GCjklCXm0GCTwJG/SolkL5dtQXyUKgg9luBDg==
5858

59-
"@aws-cdk/aws-service-spec@^0.0.33":
60-
version "0.0.33"
61-
resolved "https://registry.npmjs.org/@aws-cdk/aws-service-spec/-/aws-service-spec-0.0.33.tgz#65f426e956b199d477baa8ff38f2630e39eecdd9"
62-
integrity sha512-8YFeFWfvlZiwl7BSU4dAoVmt79d+mevzul6io5Javjm1uWy9g8GEHxJHOOdGAdk/tZ9K20DxmDy9NiMb2bCbww==
59+
"@aws-cdk/aws-service-spec@^0.0.34":
60+
version "0.0.34"
61+
resolved "https://registry.npmjs.org/@aws-cdk/aws-service-spec/-/aws-service-spec-0.0.34.tgz#0c04646e76c995bfb520f380ed84411521c1562b"
62+
integrity sha512-4M7SEhG05BmqXROKrXYyUFJR0dbE66feqo+lnyq/xNSfoJR6PMSRWpsOWvty8iy1Ih8N4tjKAW0Zbzw+Y8gG4A==
6363
dependencies:
64-
"@aws-cdk/service-spec-types" "^0.0.33"
64+
"@aws-cdk/service-spec-types" "^0.0.34"
6565
"@cdklabs/tskb" "^0.0.3"
6666

6767
"@aws-cdk/lambda-layer-kubectl-v24@^2.0.242":
6868
version "2.0.242"
6969
resolved "https://registry.npmjs.org/@aws-cdk/lambda-layer-kubectl-v24/-/lambda-layer-kubectl-v24-2.0.242.tgz#4273a5ad7714f933a7eba155eb9280823086db71"
7070
integrity sha512-7/wIOo685tmrEe4hh6zqDELhBZh5OQGf3Hd2FU2Vnwy2ZubW8qTmEw5gqJCsCrGKeYDoa1BcVhDRZ/nzjkaqyA==
7171

72-
"@aws-cdk/service-spec-importers@^0.0.9":
73-
version "0.0.9"
74-
resolved "https://registry.npmjs.org/@aws-cdk/service-spec-importers/-/service-spec-importers-0.0.9.tgz#4fbc483e023dfe465e99ead3998b46abad0b541d"
75-
integrity sha512-Y1dNhHDrjPrmnu7sy1M3A4UK70MsD+786OTyouLELOIzUxRlUq+S4rRd/BKOzOJvzHcloPuOzViWlLahRu7VnQ==
72+
"@aws-cdk/service-spec-importers@^0.0.10":
73+
version "0.0.10"
74+
resolved "https://registry.npmjs.org/@aws-cdk/service-spec-importers/-/service-spec-importers-0.0.10.tgz#47dd42fccb1252eb4edfb9ca1f525fe0b28a0053"
75+
integrity sha512-hQk7iEeD8B2fCz3XlmYUA3vysVojMazcoOZNa2J7cNkHbL0RZb3O8jxA9IswT6eQJX2ws89XXYu9Z9f7nRGu8w==
7676
dependencies:
77-
"@aws-cdk/service-spec-types" "^0.0.33"
77+
"@aws-cdk/service-spec-types" "^0.0.34"
7878
"@cdklabs/tskb" "^0.0.3"
7979
ajv "^6"
8080
canonicalize "^2.0.0"
@@ -85,10 +85,10 @@
8585
glob "^8"
8686
sort-json "^2.0.1"
8787

88-
"@aws-cdk/service-spec-types@^0.0.33":
89-
version "0.0.33"
90-
resolved "https://registry.npmjs.org/@aws-cdk/service-spec-types/-/service-spec-types-0.0.33.tgz#a1a0e53f551f4270c0a4d7f08d506783812e67c8"
91-
integrity sha512-fTavmsR2lMfl3TJ3RAyWpopik1N67TGGHD62i5p7JroiAqiaXPRQvBkGrr7MubvtqNhcp2DK2Hwa88xRdk+xFw==
88+
"@aws-cdk/service-spec-types@^0.0.34":
89+
version "0.0.34"
90+
resolved "https://registry.npmjs.org/@aws-cdk/service-spec-types/-/service-spec-types-0.0.34.tgz#79203599ad1fdf3534fead56cf946c4c3809ce26"
91+
integrity sha512-ydG/wOXlbpDLTe5mmKDW2AKZP5/gwMCJPH7YEyR4N51Zs1+4rhYhODWk8ME/KXHs+TUpjWz4q0yE80BJQdhOvw==
9292
dependencies:
9393
"@cdklabs/tskb" "^0.0.3"
9494

0 commit comments

Comments
 (0)