Skip to content

Commit 9ca153c

Browse files
mergify[bot]mergify[bot]
authored
Merge branch 'main' into TheRealAmazonKendra/bedrock
2 parents e4c308b + 8bb8c55 commit 9ca153c

409 files changed

Lines changed: 120581 additions & 81431 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎CHANGELOG.v2.alpha.md‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,17 @@
22

33
All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
44

5+
## [2.138.0-alpha.0](https://github.com/aws/aws-cdk/compare/v2.137.0-alpha.0...v2.138.0-alpha.0) (2024-04-18)
6+
7+
8+
### ⚠ BREAKING CHANGES TO EXPERIMENTAL FEATURES
9+
10+
* **cognito-identitypool-alpha:** The argument of `IdentityPoolProviderUrl.userPool()` has been changed from `url: string` to `userPool: UserPool, userPoolClient: UserPoolClient`. If you want to specify custom identifier string, use `IdentityPoolProviderUrl.custom()` instead.
11+
12+
### Bug Fixes
13+
14+
* **cognito-identitypool-alpha:** inconvenient IdentityPoolProviderUrl.userPool() ([#29025](https://github.com/aws/aws-cdk/issues/29025)) ([90a7734](https://github.com/aws/aws-cdk/commit/90a773407753b4ff868dede4442bf20243dfeaec))
15+
516
## [2.137.0-alpha.0](https://github.com/aws/aws-cdk/compare/v2.136.1-alpha.0...v2.137.0-alpha.0) (2024-04-10)
617

718

‎CHANGELOG.v2.md‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,31 @@
22

33
All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
44

5+
## [2.138.0](https://github.com/aws/aws-cdk/compare/v2.137.0...v2.138.0) (2024-04-18)
6+
7+
8+
### Features
9+
10+
* **AppSync:** addRdsDataSource support for DatabaseCluster ([#29544](https://github.com/aws/aws-cdk/issues/29544)) ([1894f2d](https://github.com/aws/aws-cdk/commit/1894f2db54eed7d65c9f54cb07cee6dd84200ad7)), closes [#29302](https://github.com/aws/aws-cdk/issues/29302)
11+
* **cognito:** support provider details for `UserPoolIdentityProviderSaml` ([#29588](https://github.com/aws/aws-cdk/issues/29588)) ([375f1a6](https://github.com/aws/aws-cdk/commit/375f1a6c0bd5952091b1bb4634faaabcb4ca126e)), closes [#29494](https://github.com/aws/aws-cdk/issues/29494) [#29598](https://github.com/aws/aws-cdk/issues/29598)
12+
* **custom-resources:** add logging property to `AwsSdkCall` and create `Logging` class ([#29648](https://github.com/aws/aws-cdk/issues/29648)) ([b049064](https://github.com/aws/aws-cdk/commit/b0490640a25eb1946aa9db748cf85867e841f243))
13+
* **ec2:** well-known port aliases ([#29793](https://github.com/aws/aws-cdk/issues/29793)) ([f10494c](https://github.com/aws/aws-cdk/commit/f10494cab79c033d7913a435b0e2db12fe59698d))
14+
* **elasticloadbalancingv2:** add removeSuffix param for ExternalApplicationListener.addAction() ([#29746](https://github.com/aws/aws-cdk/issues/29746)) ([f4af330](https://github.com/aws/aws-cdk/commit/f4af33018e374ea97346e8ec70776feb46f6ab7b)), closes [#29496](https://github.com/aws/aws-cdk/issues/29496)
15+
* **route53:** `DNSSEC` zone signing ([#28604](https://github.com/aws/aws-cdk/issues/28604)) ([213fffc](https://github.com/aws/aws-cdk/commit/213fffc84f2206f064ae5143b8dc6eff9d21b50d))
16+
* **sns:** add TracingConfig prop ([#29783](https://github.com/aws/aws-cdk/issues/29783)) ([f14b60f](https://github.com/aws/aws-cdk/commit/f14b60fc990cb98d1d2b0e48f9a89492bddf868c)), closes [#29714](https://github.com/aws/aws-cdk/issues/29714)
17+
* **stepfunctions-tasks:** add httpinvoke step functions task ([#28673](https://github.com/aws/aws-cdk/issues/28673)) ([178e481](https://github.com/aws/aws-cdk/commit/178e48189524c608decd631c5e76e95a34fe5122)), closes [#28278](https://github.com/aws/aws-cdk/issues/28278)
18+
* update L1 CloudFormation resource definitions ([#29798](https://github.com/aws/aws-cdk/issues/29798)) ([7103fed](https://github.com/aws/aws-cdk/commit/7103fed9bc03062e464d907818afcf32c27ba6b2)), closes [/docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-launchtemplate.html#aws-resource-ec2](https://github.com/aws//docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-launchtemplate.html/issues/aws-resource-ec2) [/docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-launchtemplate.html#aws-resource-ec2](https://github.com/aws//docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-launchtemplate.html/issues/aws-resource-ec2) [/docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-security-group.html#cfn-ec2](https://github.com/aws//docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-security-group.html/issues/cfn-ec2) [/docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-security-group.html#cfn-ec2](https://github.com/aws//docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-security-group.html/issues/cfn-ec2)
19+
20+
21+
### Bug Fixes
22+
23+
* **ecs-patterns:** integ test failed with certificate error ([#29623](https://github.com/aws/aws-cdk/issues/29623)) ([5347369](https://github.com/aws/aws-cdk/commit/5347369fa11f4f11ab3893b9ac4c8467c5d514c3)), closes [/github.com/aws/aws-cdk/pull/29186#issuecomment-1959231406](https://github.com/aws//github.com/aws/aws-cdk/pull/29186/issues/issuecomment-1959231406) [/github.com/aws/aws-cdk/pull/29186#issuecomment-1959231406](https://github.com/aws//github.com/aws/aws-cdk/pull/29186/issues/issuecomment-1959231406)
24+
* **eks:** add support of Helm charts located in ECR of AWS CN region ([#29778](https://github.com/aws/aws-cdk/issues/29778)) ([0da25e5](https://github.com/aws/aws-cdk/commit/0da25e5da491b0778eed0444cbb05455bd562b42)), closes [#28460](https://github.com/aws/aws-cdk/issues/28460)
25+
* **globalaccelerator:** changing `installLatestAwsSdk` breaks Security Group reference ([#29620](https://github.com/aws/aws-cdk/issues/29620)) ([ece7eb6](https://github.com/aws/aws-cdk/commit/ece7eb671e588aff6e9d0f2ee4b53933cb9589a5)), closes [#23796](https://github.com/aws/aws-cdk/issues/23796) [/github.com/aws/aws-cdk/blob/main/packages/aws-cdk-lib/aws-globalaccelerator/lib/_accelerator-security-group.ts#L32](https://github.com/aws//github.com/aws/aws-cdk/blob/main/packages/aws-cdk-lib/aws-globalaccelerator/lib/_accelerator-security-group.ts/issues/L32)
26+
* **lambda:** version.fromVersionArn creates invalid Version object ([#29820](https://github.com/aws/aws-cdk/issues/29820)) ([8198884](https://github.com/aws/aws-cdk/commit/819888470248fed2ddbdac689f14254688eef88f))
27+
* **spec2cdk:** get tag gives null result in Java CDK ([#29870](https://github.com/aws/aws-cdk/issues/29870)) ([5a918d1](https://github.com/aws/aws-cdk/commit/5a918d12ec0455626b5630b35aa47e6d9da6df7c))
28+
* **stepfunctions:** the catch field in CustomState is not rendered ([#29654](https://github.com/aws/aws-cdk/issues/29654)) ([77e9fc6](https://github.com/aws/aws-cdk/commit/77e9fc6bd2066862312355801f7f04c5a5f02d6a))
29+
530
## [2.137.0](https://github.com/aws/aws-cdk/compare/v2.136.1...v2.137.0) (2024-04-10)
631

732

‎packages/@aws-cdk-testing/cli-integ/lib/eventually.ts‎

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
/**
2+
* @param maxAttempts the maximum number of attempts
3+
* @param interval interval in milliseconds to observe between attempts
4+
*/
5+
export type EventuallyOptions = {
6+
maxAttempts?: number;
7+
interval?: number;
8+
};
9+
10+
const wait = (ms: number): Promise<void> => new Promise((resolve) => setTimeout(resolve, ms));
11+
const DEFAULT_INTERVAL = 1000;
12+
const DEFAULT_MAX_ATTEMPTS = 10;
13+
14+
/**
15+
* Runs a function on an interval until the maximum number of attempts has
16+
* been reached.
17+
*
18+
* Default interval = 1000 milliseconds
19+
* Default maxAttempts = 10
20+
*
21+
* @param fn function to run
22+
* @param options EventuallyOptions
23+
*/
24+
const eventually = async <T>(call: () => Promise<T>, options?: EventuallyOptions): Promise<T> => {
25+
const opts = {
26+
interval: options?.interval ? options.interval : DEFAULT_INTERVAL,
27+
maxAttempts: options?.maxAttempts ? options.maxAttempts : DEFAULT_MAX_ATTEMPTS,
28+
};
29+
30+
while (opts.maxAttempts-- >= 0) {
31+
try {
32+
return await call();
33+
} catch (err) {
34+
if (opts.maxAttempts <= 0) throw err;
35+
}
36+
await wait(opts.interval);
37+
}
38+
39+
throw new Error('An unexpected error has occurred.');
40+
};
41+
42+
export default eventually;

‎packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/bootstrapping.integtest.ts‎

Lines changed: 19 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ import * as fs from 'fs';
33
import * as path from 'path';
44
import * as yaml from 'yaml';
55
import { integTest, randomString, withoutBootstrap } from '../../lib';
6+
import eventually from '../../lib/eventually';
67

78
jest.setTimeout(2 * 60 * 60_000); // Includes the time to acquire locks, worst-case single-threaded runtime
89

@@ -283,17 +284,25 @@ integTest('can remove customPermissionsBoundary', withoutBootstrap(async (fixtur
283284
}),
284285
});
285286
policyArn = policy.Policy?.Arn;
286-
await fixture.cdkBootstrapModern({
287-
// toolkitStackName doesn't matter for this particular invocation
288-
toolkitStackName: bootstrapStackName,
289-
customPermissionsBoundary: policyName,
290-
});
291287

292-
const response = await fixture.aws.cloudFormation('describeStacks', { StackName: bootstrapStackName });
293-
expect(
294-
response.Stacks?.[0].Parameters?.some(
295-
param => (param.ParameterKey === 'InputPermissionsBoundary' && param.ParameterValue === policyName),
296-
)).toEqual(true);
288+
// Policy creation and consistency across regions is "almost immediate"
289+
// See: https://docs.aws.amazon.com/IAM/latest/UserGuide/troubleshoot_general.html#troubleshoot_general_eventual-consistency
290+
// We will put this in an `eventually` block to retry stack creation with a reasonable timeout
291+
const createStackWithPermissionBoundary = async (): Promise<void> => {
292+
await fixture.cdkBootstrapModern({
293+
// toolkitStackName doesn't matter for this particular invocation
294+
toolkitStackName: bootstrapStackName,
295+
customPermissionsBoundary: policyName,
296+
});
297+
298+
const response = await fixture.aws.cloudFormation('describeStacks', { StackName: bootstrapStackName });
299+
expect(
300+
response.Stacks?.[0].Parameters?.some(
301+
param => (param.ParameterKey === 'InputPermissionsBoundary' && param.ParameterValue === policyName),
302+
)).toEqual(true);
303+
};
304+
305+
await eventually(createStackWithPermissionBoundary, { maxAttempts: 3 });
297306

298307
await fixture.cdkBootstrapModern({
299308
// toolkitStackName doesn't matter for this particular invocation

‎packages/@aws-cdk-testing/framework-integ/test/aws-appconfig/test/integ.multi-config-env.js.snapshot/appconfigmulticonfigenvDefaultTestDeployAssert1621E45D.assets.json‎

Lines changed: 19 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎packages/@aws-cdk-testing/framework-integ/test/aws-appconfig/test/integ.multi-config-env.js.snapshot/appconfigmulticonfigenvDefaultTestDeployAssert1621E45D.template.json‎

Lines changed: 36 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎packages/@aws-cdk-testing/framework-integ/test/aws-appconfig/test/integ.multi-config-env.js.snapshot/aws-appconfig-multi-config-env.assets.json‎

Lines changed: 19 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎packages/@aws-cdk-testing/framework-integ/test/aws-appconfig/test/integ.multi-config-env.js.snapshot/aws-appconfig-multi-config-env.template.json‎

Lines changed: 156 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,156 @@
1+
{
2+
"Resources": {
3+
"MyApplicationForEnv1F597ED9": {
4+
"Type": "AWS::AppConfig::Application",
5+
"Properties": {
6+
"Name": "awsappconfigmulticonfigenv-MyApplicationForEnv-1EE3EA95"
7+
}
8+
},
9+
"MultiConfigEnvironment5F41B747": {
10+
"Type": "AWS::AppConfig::Environment",
11+
"Properties": {
12+
"ApplicationId": {
13+
"Ref": "MyApplicationForEnv1F597ED9"
14+
},
15+
"Name": "awsappconfigmulticonfigenv-MultiConfigEnvironment-59525230"
16+
}
17+
},
18+
"QuickDeploymentStrategy980252EC": {
19+
"Type": "AWS::AppConfig::DeploymentStrategy",
20+
"Properties": {
21+
"DeploymentDurationInMinutes": 1,
22+
"GrowthFactor": 50,
23+
"GrowthType": "LINEAR",
24+
"Name": "awsappconfigmulticonfigenv-QuickDeploymentStrategy-CAB72574",
25+
"ReplicateTo": "NONE"
26+
}
27+
},
28+
"MyFirstConfigConfigurationProfileAB11F87A": {
29+
"Type": "AWS::AppConfig::ConfigurationProfile",
30+
"Properties": {
31+
"ApplicationId": {
32+
"Ref": "MyApplicationForEnv1F597ED9"
33+
},
34+
"LocationUri": "hosted",
35+
"Name": "awsappconfigmulticonfigenv-MyFirstConfig-2FF7CAAB"
36+
}
37+
},
38+
"MyFirstConfig117AFBAC": {
39+
"Type": "AWS::AppConfig::HostedConfigurationVersion",
40+
"Properties": {
41+
"ApplicationId": {
42+
"Ref": "MyApplicationForEnv1F597ED9"
43+
},
44+
"ConfigurationProfileId": {
45+
"Ref": "MyFirstConfigConfigurationProfileAB11F87A"
46+
},
47+
"Content": "first config content",
48+
"ContentType": "application/octet-stream"
49+
},
50+
"UpdateReplacePolicy": "Retain",
51+
"DeletionPolicy": "Retain"
52+
},
53+
"MyFirstConfigDeployment5AEBAD52B8EE4": {
54+
"Type": "AWS::AppConfig::Deployment",
55+
"Properties": {
56+
"ApplicationId": {
57+
"Ref": "MyApplicationForEnv1F597ED9"
58+
},
59+
"ConfigurationProfileId": {
60+
"Ref": "MyFirstConfigConfigurationProfileAB11F87A"
61+
},
62+
"ConfigurationVersion": {
63+
"Ref": "MyFirstConfig117AFBAC"
64+
},
65+
"DeploymentStrategyId": {
66+
"Ref": "QuickDeploymentStrategy980252EC"
67+
},
68+
"EnvironmentId": {
69+
"Ref": "MultiConfigEnvironment5F41B747"
70+
}
71+
}
72+
},
73+
"MySecondConfigConfigurationProfileD0CC1BAA": {
74+
"Type": "AWS::AppConfig::ConfigurationProfile",
75+
"Properties": {
76+
"ApplicationId": {
77+
"Ref": "MyApplicationForEnv1F597ED9"
78+
},
79+
"LocationUri": "hosted",
80+
"Name": "awsappconfigmulticonfigenv-MySecondConfig-4F837809"
81+
}
82+
},
83+
"MySecondConfig28DEBAC4": {
84+
"Type": "AWS::AppConfig::HostedConfigurationVersion",
85+
"Properties": {
86+
"ApplicationId": {
87+
"Ref": "MyApplicationForEnv1F597ED9"
88+
},
89+
"ConfigurationProfileId": {
90+
"Ref": "MySecondConfigConfigurationProfileD0CC1BAA"
91+
},
92+
"Content": "second config content",
93+
"ContentType": "application/octet-stream"
94+
},
95+
"UpdateReplacePolicy": "Retain",
96+
"DeletionPolicy": "Retain"
97+
},
98+
"MySecondConfigDeployment5AEBAD1470BE4": {
99+
"Type": "AWS::AppConfig::Deployment",
100+
"Properties": {
101+
"ApplicationId": {
102+
"Ref": "MyApplicationForEnv1F597ED9"
103+
},
104+
"ConfigurationProfileId": {
105+
"Ref": "MySecondConfigConfigurationProfileD0CC1BAA"
106+
},
107+
"ConfigurationVersion": {
108+
"Ref": "MySecondConfig28DEBAC4"
109+
},
110+
"DeploymentStrategyId": {
111+
"Ref": "QuickDeploymentStrategy980252EC"
112+
},
113+
"EnvironmentId": {
114+
"Ref": "MultiConfigEnvironment5F41B747"
115+
}
116+
},
117+
"DependsOn": [
118+
"MyFirstConfigDeployment5AEBAD52B8EE4"
119+
]
120+
}
121+
},
122+
"Parameters": {
123+
"BootstrapVersion": {
124+
"Type": "AWS::SSM::Parameter::Value<String>",
125+
"Default": "/cdk-bootstrap/hnb659fds/version",
126+
"Description": "Version of the CDK Bootstrap resources in this environment, automatically retrieved from SSM Parameter Store. [cdk:skip]"
127+
}
128+
},
129+
"Rules": {
130+
"CheckBootstrapVersion": {
131+
"Assertions": [
132+
{
133+
"Assert": {
134+
"Fn::Not": [
135+
{
136+
"Fn::Contains": [
137+
[
138+
"1",
139+
"2",
140+
"3",
141+
"4",
142+
"5"
143+
],
144+
{
145+
"Ref": "BootstrapVersion"
146+
}
147+
]
148+
}
149+
]
150+
},
151+
"AssertDescription": "CDK bootstrap stack version 6 required. Please run 'cdk bootstrap' with a recent version of the CDK CLI."
152+
}
153+
]
154+
}
155+
}
156+
}

‎packages/@aws-cdk-testing/framework-integ/test/aws-appconfig/test/integ.multi-config-env.js.snapshot/cdk.out‎

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎packages/@aws-cdk-testing/framework-integ/test/aws-appconfig/test/integ.multi-config-env.js.snapshot/integ.json‎

Lines changed: 12 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)