Skip to content

Commit bd920f2

Browse files
authored
2 parents bbdb16a + b56d193 commit bd920f2

File tree

611 files changed

+9812
-1533
lines changed

Some content is hidden

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

611 files changed

+9812
-1533
lines changed

.gitpod.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ github:
33
pullRequestsFromForks: true
44
addComment: true
55

6-
image: jsii/superchain:1-buster-slim-node16
6+
image: public.ecr.aws/jsii/superchain:1-buster-slim-node18
77

88
tasks:
99
- init: |

CHANGELOG.v2.alpha.md

+7
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,13 @@
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.81.0-alpha.0](https://github.com/aws/aws-cdk/compare/v2.80.0-alpha.0...v2.81.0-alpha.0) (2023-05-25)
6+
7+
8+
### Features
9+
10+
* **batch-alpha:** tag instances launched from your managed CEs ([#25643](https://github.com/aws/aws-cdk/issues/25643)) ([8498740](https://github.com/aws/aws-cdk/commit/849874045cd1e877619c3b636e6f16a58c85b4a1))
11+
512
## [2.80.0-alpha.0](https://github.com/aws/aws-cdk/compare/v2.79.1-alpha.0...v2.80.0-alpha.0) (2023-05-19)
613

714
## [2.79.1-alpha.0](https://github.com/aws/aws-cdk/compare/v2.79.0-alpha.0...v2.79.1-alpha.0) (2023-05-11)

CHANGELOG.v2.md

+21
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,27 @@
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.81.0](https://github.com/aws/aws-cdk/compare/v2.80.0...v2.81.0) (2023-05-25)
6+
7+
8+
### Features
9+
10+
* **ec2:** added support for network interfaces on ec2 instances by providing an associatePublicIpAddress property ([#25441](https://github.com/aws/aws-cdk/issues/25441)) ([d43834d](https://github.com/aws/aws-cdk/commit/d43834d441ae8eb0192df45c1cfa0101e5533e4e)), closes [#17127](https://github.com/aws/aws-cdk/issues/17127)
11+
* **glue:** Add G.4X and G.8X worker types for AWS Glue ([#25637](https://github.com/aws/aws-cdk/issues/25637)) ([1e4ffcd](https://github.com/aws/aws-cdk/commit/1e4ffcd83c10c9fb17dafc20c03ee9dff30d7e3e))
12+
* **lambda:** lambda code assets are marked as deploy time assets ([#25705](https://github.com/aws/aws-cdk/issues/25705)) ([8a6b376](https://github.com/aws/aws-cdk/commit/8a6b3761adc4c4513bdf894ec5bfa1339b975c1f))
13+
* **logs:** filterName property in MetricFilter ([#25246](https://github.com/aws/aws-cdk/issues/25246)) ([4f8aae5](https://github.com/aws/aws-cdk/commit/4f8aae50884b9238b3e0862874bcca6daea72a31))
14+
* **s3-deployment:** add some convenient methods to `CacheControl` ([#25477](https://github.com/aws/aws-cdk/issues/25477)) ([21fc1d1](https://github.com/aws/aws-cdk/commit/21fc1d1945a5dd75a6d413f4fde563b2c9255c84))
15+
* **secretsmanager:** add support for rotateImmediatelyOnUpdate for secret rotation schedule ([#25652](https://github.com/aws/aws-cdk/issues/25652)) ([cdafcc5](https://github.com/aws/aws-cdk/commit/cdafcc52ad4aea3ef7f1446da7521fb504cb33b9)), closes [#25365](https://github.com/aws/aws-cdk/issues/25365)
16+
* new synthesizer separates assets out per CDK application ([#24430](https://github.com/aws/aws-cdk/issues/24430)) ([ae21ecc](https://github.com/aws/aws-cdk/commit/ae21ecc2a72be14ececdf0c5b8649e49dc456b0c))
17+
18+
19+
### Bug Fixes
20+
21+
* **core:** allow override with cross-stack references ([#24920](https://github.com/aws/aws-cdk/issues/24920)) ([1135356](https://github.com/aws/aws-cdk/commit/11353560be08e86cd1604cd043657948038f0944)), closes [#18882](https://github.com/aws/aws-cdk/issues/18882)
22+
* **core:** cdk deploy stops early if 2 stacks with a dependency between them share an asset ([#25719](https://github.com/aws/aws-cdk/issues/25719)) ([9e45095](https://github.com/aws/aws-cdk/commit/9e450954e26c2ae3c8ddf8fac77ee2dfcc9977bc)), closes [#25714](https://github.com/aws/aws-cdk/issues/25714)
23+
* **lambda:** validation for FunctionUrlCorsOptions.maxAge ([#25495](https://github.com/aws/aws-cdk/issues/25495)) ([0f40880](https://github.com/aws/aws-cdk/commit/0f40880702fb01814b7bb35dea3a8154a7249659))
24+
* **s3:** KMS encryption works fine for server access logging target buckets ([#25350](https://github.com/aws/aws-cdk/issues/25350)) ([6c5b67e](https://github.com/aws/aws-cdk/commit/6c5b67ed3174bfd27a473e1468dc18917c3d7bba))
25+
526
## [2.80.0](https://github.com/aws/aws-cdk/compare/v2.79.1...v2.80.0) (2023-05-19)
627

728

package.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,9 @@
2525
"fs-extra": "^9.1.0",
2626
"graceful-fs": "^4.2.11",
2727
"jest-junit": "^13.2.0",
28-
"jsii-diff": "1.81.0",
29-
"jsii-pacmak": "1.81.0",
30-
"jsii-reflect": "1.81.0",
28+
"jsii-diff": "1.82.0",
29+
"jsii-pacmak": "1.82.0",
30+
"jsii-reflect": "1.82.0",
3131
"jsii-rosetta": "~5.0.8",
3232
"lerna": "^6.6.1",
3333
"nx": "^15.9.4",

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

-1
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,6 @@ type AwsCallIO<T> =
185185
type First<T> = T extends [any, any] ? T[0] : never;
186186
type Second<T> = T extends [any, any] ? T[1] : never;
187187

188-
189188
export function isStackMissingError(e: Error) {
190189
return e.message.indexOf('does not exist') > -1;
191190
}

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

-1
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,6 @@ export function findUp(name: string, directory: string = process.cwd()): string
4545
return findUp(name, path.dirname(absoluteDirectory));
4646
}
4747

48-
4948
/**
5049
* Docker-safe home directory
5150
*/

packages/@aws-cdk-testing/cli-integ/lib/staging/parallel-shell.ts

-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ import PQueue from 'p-queue';
22
import { sleep } from '../aws';
33
import { MemoryStream } from '../corking';
44

5-
65
export type ErrorResponse = 'fail' | 'skip' | 'retry';
76

87
/**

packages/@aws-cdk-testing/cli-integ/lib/with-sam.ts

-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ import { AwsContext, withAws } from './with-aws';
1010
import { cloneDirectory, installNpmPackages, TestFixture, DEFAULT_TEST_TIMEOUT_S } from './with-cdk-app';
1111
import { withTimeout } from './with-timeout';
1212

13-
1413
export interface ActionOutput {
1514
actionSucceeded?: boolean;
1615
actionOutput?: any;

packages/@aws-cdk-testing/cli-integ/test/xpmutex.test.ts

-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@ test('acquire waits', async () => {
3030
await secondProcess;
3131
});
3232

33-
3433
/**
3534
* Poll for some condition every 10ms
3635
*/

packages/@aws-cdk-testing/cli-integ/tests/init-csharp/init-csharp.integtest.ts

-1
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,3 @@ import { integTest, withTemporaryDirectory, ShellHelper, withPackages } from '..
1313
})));
1414
});
1515

16-

packages/@aws-cdk-testing/framework-integ/.gitignore

+2
Original file line numberDiff line numberDiff line change
@@ -13,3 +13,5 @@ nyc.config.js
1313
!**/*.snapshot/**/asset.*/*.d.ts
1414

1515
!**/*.snapshot/**/asset.*/**
16+
17+
**/*.ts.snapshot

packages/@aws-cdk-testing/framework-integ/test/aws-apigateway/test/authorizers/integ.token-authorizer.ts

-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ const restapi = new RestApi(stack, 'MyRestApi', {
2727
},
2828
});
2929

30-
3130
restapi.root.addMethod('ANY', new MockIntegration({
3231
integrationResponses: [
3332
{ statusCode: '200' },

packages/@aws-cdk-testing/framework-integ/test/aws-apigateway/test/integ.domain-name.ts

-3
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,6 @@ const api2 = new Api(testCase, 'IntegApi2', {
9292
path: 'items',
9393
});
9494

95-
9695
/**
9796
* Test 1
9897
*
@@ -151,7 +150,6 @@ secondDomain.addApiMapping(api2.restApi.deploymentStage, {
151150
basePath: 'orders/v2',
152151
});
153152

154-
155153
/**
156154
* Test 3
157155
*
@@ -177,7 +175,6 @@ thirdDomain.addBasePathMapping(api2.restApi, {
177175
basePath: 'v2',
178176
});
179177

180-
181178
/**
182179
* -------------------------------------------------------
183180
* ------------------------- THEN ------------------------

packages/@aws-cdk-testing/framework-integ/test/aws-apigateway/test/integ.method-grant-execute.ts

-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ import * as cdk from 'aws-cdk-lib';
33
import * as integ from '@aws-cdk/integ-tests-alpha';
44
import * as apigw from 'aws-cdk-lib/aws-apigateway';
55

6-
76
const app = new cdk.App();
87
const stack = new cdk.Stack(app, 'GrantExecute');
98

packages/@aws-cdk-testing/framework-integ/test/aws-appsync/test/integ.graphql-iam.ts

-1
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,6 @@ testDS.createResolver('MutationAddTest', {
8989

9090
const lambdaIAM = new Role(stack, 'LambdaIAM', { assumedBy: new ServicePrincipal('lambda') });
9191

92-
9392
api.grant(lambdaIAM, IamResource.custom('types/Query/fields/getTests'), 'appsync:graphql');
9493
api.grant(lambdaIAM, IamResource.ofType('test'), 'appsync:GraphQL');
9594
api.grantMutation(lambdaIAM, 'addTest');

packages/@aws-cdk-testing/framework-integ/test/aws-appsync/test/integ.log-retention.ts

-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ import { GraphqlApi, LogConfig, SchemaFile } from 'aws-cdk-lib/aws-appsync';
77
const app = new App();
88
const stack = new Stack(app, 'AppSyncIntegLogRetention');
99

10-
1110
const retentionTime = RetentionDays.ONE_WEEK;
1211
const logConfig: LogConfig = {
1312
retention: retentionTime,

packages/@aws-cdk-testing/framework-integ/test/aws-autoscaling-hooktargets/test/integ.queue-hook.ts

-1
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,6 @@ const setDesired = integ.assertions.awsApiCall('AutoScaling', 'setDesiredCapacit
5353
DesiredCapacity: 1,
5454
});
5555

56-
5756
const message = integ.assertions.awsApiCall('SQS', 'receiveMessage', {
5857
QueueUrl: testCase.queueUrl,
5958
});

packages/@aws-cdk-testing/framework-integ/test/aws-cloudformation/test/integ.core-cross-region-references.ts

-1
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,6 @@ const integ = new IntegTest(app, 'cross-region-references', {
7777
stackUpdateWorkflow: false,
7878
});
7979

80-
8180
/**
8281
* Test that if the references are still in use, deleting the producer
8382
* stack will fail

packages/@aws-cdk-testing/framework-integ/test/aws-cloudfront/test/integ.cloudfront-cross-region-cert.ts

-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@ const cloudFrontStack = new cdk.Stack(app, 'integ-cloudfront-stack', {
3232
crossRegionReferences: true,
3333
});
3434

35-
3635
const hostedZone = route53.PublicHostedZone.fromHostedZoneAttributes(acmStack, 'HostedZone', {
3736
hostedZoneId,
3837
zoneName: hostedZoneName,

packages/@aws-cdk-testing/framework-integ/test/aws-cloudfront/test/integ.distribution-logbucket.ts

-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ import { TestOrigin } from './test-origin';
33
import * as cloudfront from 'aws-cdk-lib/aws-cloudfront';
44
import * as integ from '@aws-cdk/integ-tests-alpha';
55

6-
76
const app = new cdk.App();
87
const stack = new cdk.Stack(app, 'integ-distribution-logbucket');
98

packages/@aws-cdk-testing/framework-integ/test/aws-cloudtrail/test/integ.cloudtrail-insight.ts

-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@ new cloudtrail.Trail(stack, 'Trail', {
3838
],
3939
});
4040

41-
4241
new integ.IntegTest(app, 'aws-cdk-cloudtrail-inshights', {
4342
testCases: [stack],
4443
});

packages/@aws-cdk-testing/framework-integ/test/aws-cloudwatch-actions/test/integ.ssm-incident-alarm-action.ts

-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@ class SsmIncidentAlarmActionIntegrationTestStack extends Stack {
3737

3838
responsePlan.node.addDependency(replicationSet);
3939

40-
4140
const metric = new cloudwatch.Metric({
4241
namespace: 'CDK/Test',
4342
metricName: 'Metric',

packages/@aws-cdk-testing/framework-integ/test/aws-codebuild/test/integ.asset-build-spec.ts

-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ getBuildProject.assertAtPath(
2828
ExpectedResult.stringLikeRegexp('.+'),
2929
);
3030

31-
3231
const getBuildProjectBuildSpecArn = getBuildProject.getAttString('projects.0.source.buildspec');
3332

3433
// Assert that the buildspec for the project is in fact an S3 object arn

packages/@aws-cdk-testing/framework-integ/test/aws-codedeploy/test/lambda/integ.deployment-group.ts

-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ import * as lambda from 'aws-cdk-lib/aws-lambda';
44
import * as cdk from 'aws-cdk-lib';
55
import * as codedeploy from 'aws-cdk-lib/aws-codedeploy';
66

7-
87
const app = new cdk.App();
98
const stack = new cdk.Stack(app, 'aws-cdk-codedeploy-lambda');
109

packages/@aws-cdk-testing/framework-integ/test/aws-codepipeline-actions/test/integ.pipeline-s3-deploy.ts

-1
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,6 @@ getObjectCall.provider.addToRolePolicy({
9292
Resource: ['*'],
9393
});
9494

95-
9695
const putObjectCall = integ.assertions.awsApiCall('S3', 'putObject', {
9796
Bucket: bucket.bucketName,
9897
Key: 'key',

packages/@aws-cdk-testing/framework-integ/test/aws-codepipeline-actions/test/integ.pipeline-with-replication.ts

-2
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ import { App, Stack, RemovalPolicy } from 'aws-cdk-lib';
66
import { IntegTest } from '@aws-cdk/integ-tests-alpha';
77
import { S3SourceAction, CodeBuildAction } from 'aws-cdk-lib/aws-codepipeline-actions';
88

9-
109
const app = new App({
1110
treeMetadata: false,
1211
});
@@ -23,7 +22,6 @@ const stack2 = new Stack(app, 'integ-pipeline-consumer-stack', {
2322
crossRegionReferences: true,
2423
});
2524

26-
2725
const key = new Key(stack1, 'ReplicationKey');
2826
const bucket = new Bucket(stack1, 'ReplicationBucket', {
2927
encryptionKey: key,

packages/@aws-cdk-testing/framework-integ/test/aws-cognito/test/integ.user-pool-idp.google.ts

-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ import { Secret } from 'aws-cdk-lib/aws-secretsmanager';
22
import { App, CfnOutput, RemovalPolicy, Stack } from 'aws-cdk-lib';
33
import { ProviderAttribute, UserPool, UserPoolIdentityProviderGoogle } from 'aws-cdk-lib/aws-cognito';
44

5-
65
/*
76
* Stack verification steps
87
* * Visit the URL provided by stack output 'SignInLink' in a browser, and verify the 'Google' sign in link shows up.

packages/@aws-cdk-testing/framework-integ/test/aws-config/test/integ.rule.ts

-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@ driftRule.onComplianceChange('ComplianceChange', {
3232
target: new targets.SnsTopic(complianceTopic),
3333
});
3434

35-
3635
new integ.IntegTest(app, 'aws-cdk-config-rule-integ', {
3736
testCases: [stack],
3837
});

packages/@aws-cdk-testing/framework-integ/test/aws-dynamodb/test/integ.global-replicas-provisioned.ts

-1
Original file line numberDiff line numberDiff line change
@@ -21,5 +21,4 @@ new IntegTest(app, 'aws-cdk-dynamodb-global-replicas-provisioned-test', {
2121
testCases: [stack],
2222
});
2323

24-
2524
app.synth();

packages/@aws-cdk-testing/framework-integ/test/aws-ec2/test/import-certificates-handler/index.ts

-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ export async function handler(event: AWSLambda.CloudFormationCustomResourceEvent
2424
}).promise();
2525
}
2626

27-
2827
return {
2928
Data: {
3029
ServerCertificateArn: serverImport?.CertificateArn,

packages/@aws-cdk-testing/framework-integ/test/aws-ec2/test/integ.client-vpn-endpoint.js.snapshot/asset.1ef463e71119677d383a964bbb0740f0c4de382c21d5a8d68be98334d514ae8a/index.ts

-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ export async function handler(event: AWSLambda.CloudFormationCustomResourceEvent
2424
}).promise();
2525
}
2626

27-
2827
return {
2928
Data: {
3029
ServerCertificateArn: serverImport?.CertificateArn,
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
{"version":"31.0.0"}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
{
2+
"version": "31.0.0",
3+
"files": {
4+
"21fbb51d7b23f6a6c262b46a9caee79d744a3ac019fd45422d988b96d44b2a22": {
5+
"source": {
6+
"path": "instancetestDefaultTestDeployAssert5516EAF1.template.json",
7+
"packaging": "file"
8+
},
9+
"destinations": {
10+
"current_account-current_region": {
11+
"bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}",
12+
"objectKey": "21fbb51d7b23f6a6c262b46a9caee79d744a3ac019fd45422d988b96d44b2a22.json",
13+
"assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}"
14+
}
15+
}
16+
}
17+
},
18+
"dockerImages": {}
19+
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
{
2+
"Parameters": {
3+
"BootstrapVersion": {
4+
"Type": "AWS::SSM::Parameter::Value<String>",
5+
"Default": "/cdk-bootstrap/hnb659fds/version",
6+
"Description": "Version of the CDK Bootstrap resources in this environment, automatically retrieved from SSM Parameter Store. [cdk:skip]"
7+
}
8+
},
9+
"Rules": {
10+
"CheckBootstrapVersion": {
11+
"Assertions": [
12+
{
13+
"Assert": {
14+
"Fn::Not": [
15+
{
16+
"Fn::Contains": [
17+
[
18+
"1",
19+
"2",
20+
"3",
21+
"4",
22+
"5"
23+
],
24+
{
25+
"Ref": "BootstrapVersion"
26+
}
27+
]
28+
}
29+
]
30+
},
31+
"AssertDescription": "CDK bootstrap stack version 6 required. Please run 'cdk bootstrap' with a recent version of the CDK CLI."
32+
}
33+
]
34+
}
35+
}
36+
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
{
2+
"version": "31.0.0",
3+
"files": {
4+
"488d9cf540c6790fc09af871e06438e043f47d03101ef192131f1dafbbb434cb": {
5+
"source": {
6+
"path": "integ-ec2-instance.template.json",
7+
"packaging": "file"
8+
},
9+
"destinations": {
10+
"current_account-current_region": {
11+
"bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}",
12+
"objectKey": "488d9cf540c6790fc09af871e06438e043f47d03101ef192131f1dafbbb434cb.json",
13+
"assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}"
14+
}
15+
}
16+
}
17+
},
18+
"dockerImages": {}
19+
}

0 commit comments

Comments
 (0)