Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(bootstrap): added partition to allow non-standard regions #25507

Closed
wants to merge 2 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 0 additions & 8 deletions packages/@aws-cdk/aws-lambda-go-alpha/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,6 @@
"description": "The CDK Construct Library for AWS Lambda in Golang",
"main": "lib/index.js",
"types": "lib/index.d.ts",
"typesVersions": {
"<=3.9": {
"*": [
".types-compat/ts3.9/*",
".types-compat/ts3.9/*/index.d.ts"
]
}
},
"jsii": {
"outdir": "dist",
"targets": {
Expand Down
4 changes: 2 additions & 2 deletions packages/@aws-cdk/cli-lib-alpha/THIRD_PARTY_LICENSES
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
The @aws-cdk/cli-lib-alpha package includes the following third-party software/licensing:

** @jsii/check-node@1.78.1 - https://www.npmjs.com/package/@jsii/check-node/v/1.78.1 | Apache-2.0
** @jsii/check-node@1.80.0 - https://www.npmjs.com/package/@jsii/check-node/v/1.80.0 | Apache-2.0
jsii
Copyright 2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.

Expand Down Expand Up @@ -268,7 +268,7 @@ THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH RE

----------------

** aws-sdk@2.1367.0 - https://www.npmjs.com/package/aws-sdk/v/2.1367.0 | Apache-2.0
** aws-sdk@2.1373.0 - https://www.npmjs.com/package/aws-sdk/v/2.1373.0 | Apache-2.0
AWS SDK for JavaScript
Copyright 2012-2017 Amazon.com, Inc. or its affiliates. All Rights Reserved.

Expand Down
13 changes: 13 additions & 0 deletions packages/aws-cdk-lib/aws-backupgateway/.jsiirc.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
{
"targets": {
"java": {
"package": "services.backupgateway"
},
"dotnet": {
"package": "Amazon.CDK.AWS.BackupGateway"
},
"python": {
"module": "aws_cdk.aws_backupgateway"
}
}
}
2 changes: 2 additions & 0 deletions packages/aws-cdk-lib/aws-backupgateway/index.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
// AWS::BackupGateway Cloudformation Resources
export * from './lib/backupgateway.generated'
13 changes: 13 additions & 0 deletions packages/aws-cdk-lib/aws-proton/.jsiirc.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
{
"targets": {
"java": {
"package": "services.proton"
},
"dotnet": {
"package": "Amazon.CDK.AWS.Proton"
},
"python": {
"module": "aws_cdk.aws_proton"
}
}
}
2 changes: 2 additions & 0 deletions packages/aws-cdk-lib/aws-proton/index.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
// AWS::Proton Cloudformation Resources
export * from './lib/proton.generated'
4 changes: 3 additions & 1 deletion packages/aws-cdk-lib/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -249,4 +249,6 @@ export * as lambda_layer_kubectl from './lambda-layer-kubectl';
export * as lambda_layer_node_proxy_agent from './lambda-layer-node-proxy-agent';
export * as pipelines from './pipelines';
export * as region_info from './region-info';
export * as triggers from './triggers';
export * as triggers from './triggers';
export * as aws_backupgateway from './aws-backupgateway';
export * as aws_proton from './aws-proton';
4 changes: 3 additions & 1 deletion packages/aws-cdk-lib/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -442,7 +442,9 @@
"./aws-kinesisfirehose/lib/kinesisfirehose-canned-metrics.generated": "./aws-kinesisfirehose/lib/kinesisfirehose-canned-metrics.generated.js",
"./aws-synthetics/lib/synthetics-canned-metrics.generated": "./aws-synthetics/lib/synthetics-canned-metrics.generated.js",
"./aws-gamelift/lib/gamelift-canned-metrics.generated": "./aws-gamelift/lib/gamelift-canned-metrics.generated.js",
"./core": "./core/index.js"
"./core": "./core/index.js",
"./aws-backupgateway": "./aws-backupgateway/index.js",
"./aws-proton": "./aws-proton/index.js"
},
"preferredCdkCliVersion": "2",
"publishConfig": {
Expand Down
6 changes: 6 additions & 0 deletions packages/aws-cdk-lib/scripts/scope-map.json
Original file line number Diff line number Diff line change
Expand Up @@ -650,5 +650,11 @@
],
"core": [
"AWS::CloudFormation"
],
"aws-backupgateway": [
"AWS::BackupGateway"
],
"aws-proton": [
"AWS::Proton"
]
}
4 changes: 2 additions & 2 deletions packages/aws-cdk/lib/api/bootstrap/bootstrap-template.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -492,10 +492,10 @@ Resources:
Fn::Split:
- "|"
- Fn::Sub:
- "arn:aws:kms:*:${JoinedAccounts}:*"
- "arn:${AWS::Partition}:kms:*:${JoinedAccounts}:*"
- JoinedAccounts:
Fn::Join:
- ":*|arn:aws:kms:*:"
- ":*|arn:${AWS::Partition}:kms:*:"
- { Ref: TrustedAccounts }
Condition:
StringEquals:
Expand Down
2 changes: 1 addition & 1 deletion yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -3540,7 +3540,7 @@ console-control-strings@^1.0.0, console-control-strings@^1.1.0, console-control-
resolved "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz#3d7cf4464db6446ea644bf4b39507f9851008e8e"
integrity sha512-ty/fTekppD2fIwRvnZAVdeOiGd1c7YXEixbgJTNzqcxJWKQnjJ/V1bNEEE6hygpM3WjwHFUVK6HTjWSzV4a8sQ==

constructs@^10.0.0, constructs@^10.2.17:
constructs@^10.0.0:
version "10.2.17"
resolved "https://registry.npmjs.org/constructs/-/constructs-10.2.17.tgz#3d3f233ca583fc6ba18611f11232c6d2be280928"
integrity sha512-D3a/+iKMkBj8Elf1NIl1jBNIrK07Pg7ICBe5QEgtEKYEZOuHQvlCK9PK1f87SQ+GhtOnwSyvP+q+Pq5zBLu5kg==
Expand Down
Loading