Skip to content

Commit

Permalink
Merge branch 'main' into feature/glue-table-properties-parameters
Browse files Browse the repository at this point in the history
  • Loading branch information
mrgrain authored Jul 31, 2023
2 parents 098a80c + 6c588da commit cb96655
Show file tree
Hide file tree
Showing 26 changed files with 230 additions and 47 deletions.
2 changes: 2 additions & 0 deletions .github/workflows/close-stale-issues.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@ on:

jobs:
cleanup:
# this workflow will always fail in forks; bail if this isn't running in the upstream
if: github.repository == 'aws/aws-cdk'
permissions:
issues: write
contents: read
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/close-stale-prs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@ on:
workflow_dispatch:
jobs:
close-stale-prs:
# this workflow will always fail in forks; bail if this isn't running in the upstream
if: github.repository == 'aws/aws-cdk'
permissions:
pull-requests: write
runs-on: ubuntu-latest
Expand Down
4 changes: 3 additions & 1 deletion .github/workflows/handle-stale-discussions.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@ on:

jobs:
handle-stale-discussions:
# this workflow will always fail in forks; bail if this isn't running in the upstream
if: github.repository == 'aws/aws-cdk'
name: Handle stale discussions
runs-on: ubuntu-latest
permissions:
Expand All @@ -15,4 +17,4 @@ jobs:
- name: Stale discussions action
uses: aws-github-ops/handle-stale-discussions@v1
env:
GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
15 changes: 15 additions & 0 deletions CHANGELOG.v2.alpha.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,21 @@

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

## [2.89.0-alpha.0](https:/aws/aws-cdk/compare/v2.88.0-alpha.0...v2.89.0-alpha.0) (2023-07-28)


### Features

* **app-staging-synthesizer:** option to specify staging stack name prefix ([#26324](https:/aws/aws-cdk/issues/26324)) ([1b36124](https:/aws/aws-cdk/commit/1b3612457078f8195fb5a73b9f0e44caf99fae96))
* **apprunner:** make `Service` implement `IGrantable` ([#26130](https:/aws/aws-cdk/issues/26130)) ([6033c9a](https:/aws/aws-cdk/commit/6033c9a01322be74f8ae7ddd0a3856cc22e28975)), closes [#26089](https:/aws/aws-cdk/issues/26089)
* **neptune-alpha:** support for Neptune serverless ([#26445](https:/aws/aws-cdk/issues/26445)) ([b42dbc8](https:/aws/aws-cdk/commit/b42dbc800eabff64bc86cb8fb5629c2ce7496767)), closes [#26428](https:/aws/aws-cdk/issues/26428)
* **scheduler:** ScheduleGroup ([#26196](https:/aws/aws-cdk/issues/26196)) ([27dc8ff](https:/aws/aws-cdk/commit/27dc8ffd62d450154ab2574cc453bb5fcdd7c0b8))


### Bug Fixes

* **cli-lib:** set skipLibCheck on generateSchema to prevent intermittent test failures ([#26551](https:/aws/aws-cdk/issues/26551)) ([1807f57](https:/aws/aws-cdk/commit/1807f5754885e4b1b1c8d12ca7a1cc7efab9ef2c))

## [2.88.0-alpha.0](https:/aws/aws-cdk/compare/v2.87.0-alpha.0...v2.88.0-alpha.0) (2023-07-20)


Expand Down
30 changes: 30 additions & 0 deletions CHANGELOG.v2.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,36 @@

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

## [2.89.0](https:/aws/aws-cdk/compare/v2.88.0...v2.89.0) (2023-07-28)


### Features

* support max-buffer-size for AWSLogs driver ([#26396](https:/aws/aws-cdk/issues/26396)) ([a74536b](https:/aws/aws-cdk/commit/a74536b030a6050ee7fdae289abdbe5a1226ba19))
* update AWS Service Spec ([#26541](https:/aws/aws-cdk/issues/26541)) ([b1ca3c0](https:/aws/aws-cdk/commit/b1ca3c09e68a2c1f5bf5ce4c9c40f12db7f1767f))
* **cli:** add diff message on the number of stacks with differences ([#26297](https:/aws/aws-cdk/issues/26297)) ([a9e2789](https:/aws/aws-cdk/commit/a9e2789d2f927c26db0aee4ce7cb2cc073a99bc5)), closes [#10417](https:/aws/aws-cdk/issues/10417)
* **logs:** configure custom subscription filter name ([#26498](https:/aws/aws-cdk/issues/26498)) ([7ddb305](https:/aws/aws-cdk/commit/7ddb3059915fb3bd05d9d59eee46f90833c62861)), closes [#26485](https:/aws/aws-cdk/issues/26485)
* **opensearchservice:** L2 properties for offPeakWindowOptions and softwareUpdateOptions ([#26403](https:/aws/aws-cdk/issues/26403)) ([02e8d58](https:/aws/aws-cdk/commit/02e8d5892a35f9e5a467e32413a0532b217ca3bc)), closes [#26388](https:/aws/aws-cdk/issues/26388)
* **rds:** `isFromLegacyInstanceProps` migration flag with `ClusterInstance.serverlessV2` ([#26472](https:/aws/aws-cdk/issues/26472)) ([6ec9829](https:/aws/aws-cdk/commit/6ec9829ac2d20855a35dad03c4110c46dd89cba8)), closes [/github.com/aws/aws-cdk/issues/20197#issuecomment-1284485844](https:/aws/aws/aws-cdk/issues/20197/issues/issuecomment-1284485844) [#25942](https:/aws/aws-cdk/issues/25942)
* **rds:** support aurora mysql 3.03.1 ([#26507](https:/aws/aws-cdk/issues/26507)) ([7fa74c4](https:/aws/aws-cdk/commit/7fa74c48d77461c5305e00f68127621abe975086))
* **route53:** support geolocation routing ([#26383](https:/aws/aws-cdk/issues/26383)) ([6bd9a2d](https:/aws/aws-cdk/commit/6bd9a2d1293b94e83cb6fe9b3768155f646d9066)), closes [#9478](https:/aws/aws-cdk/issues/9478)
* **stepfunctions:** add stateMachineRevisionId property to StateMachine ([#26443](https:/aws/aws-cdk/issues/26443)) ([3e47d1b](https:/aws/aws-cdk/commit/3e47d1b2e82bdb156bcac797ead5d9f2e522a018)), closes [#26440](https:/aws/aws-cdk/issues/26440)


### Bug Fixes

* **autoscaling:** StepScalingPolicy intervals not checked for going over allowable maximum ([#26490](https:/aws/aws-cdk/issues/26490)) ([58b004e](https:/aws/aws-cdk/commit/58b004ef7385cfb42910b6978b4b5b836cbb69f7)), closes [/github.com/aws/aws-cdk/blob/bc029fe5ac69a8b7fd2dfdbcd8834e9a2cf8e000/packages/aws-cdk-lib/aws-autoscaling/lib/step-scaling-policy.ts#L136-L166](https:/aws/aws/aws-cdk/blob/bc029fe5ac69a8b7fd2dfdbcd8834e9a2cf8e000/packages/aws-cdk-lib/aws-autoscaling/lib/step-scaling-policy.ts/issues/L136-L166) [/github.com/aws/aws-cdk/blob/bc029fe5ac69a8b7fd2dfdbcd8834e9a2cf8e000/packages/aws-cdk-lib/aws-autoscaling/lib/step-scaling-policy.ts#L105-L134](https:/aws/aws/aws-cdk/blob/bc029fe5ac69a8b7fd2dfdbcd8834e9a2cf8e000/packages/aws-cdk-lib/aws-autoscaling/lib/step-scaling-policy.ts/issues/L105-L134) [#26215](https:/aws/aws-cdk/issues/26215)
* **cdk:** allow bootstrap with policy names with a path ([#26378](https:/aws/aws-cdk/issues/26378)) ([1820fc9](https:/aws/aws-cdk/commit/1820fc902c6f37faed0538305bd701103dae43ff)), closes [#26320](https:/aws/aws-cdk/issues/26320)
* **core:** policy validation trace incorrect for larger constructs ([#26466](https:/aws/aws-cdk/issues/26466)) ([fd181c7](https:/aws/aws-cdk/commit/fd181c70f3668b2f0ec0ccbca38a5ef9100eb86b))
* **ecs:** deployment alarm configurations are being added in isolated partitions ([#26458](https:/aws/aws-cdk/issues/26458)) ([eea223b](https:/aws/aws-cdk/commit/eea223b52f4445e6084b1fa1fa15a3a78f83fa18)), closes [#26456](https:/aws/aws-cdk/issues/26456)
* **ecs-patterns:** `minHealthyPercent` and `maxHealthyPercent` props validation ([#26193](https:/aws/aws-cdk/issues/26193)) ([bdfdc91](https:/aws/aws-cdk/commit/bdfdc91b1b8f86104290a9fb6899013617e307ef)), closes [#26158](https:/aws/aws-cdk/issues/26158)
* **lambda:** bundling fails with pnpm >= 8.4.0 ([#26478](https:/aws/aws-cdk/issues/26478)) ([#26479](https:/aws/aws-cdk/issues/26479)) ([1df243a](https:/aws/aws-cdk/commit/1df243a0130ed15034f53d95e6544935de911a88))
* **rds:** Add missing Aurora engine 8.0.mysql_aurora.3.02.3 ([#26462](https:/aws/aws-cdk/issues/26462)) ([ac9bb1a](https:/aws/aws-cdk/commit/ac9bb1a27c704f5bcb4d8ca15dc5a224a592bd27))
* **secretsmanager:** `arnForPolicies` evaluates to the partial ARN if accessed from a cross-env stack ([#26308](https:/aws/aws-cdk/issues/26308)) ([0e808d8](https:/aws/aws-cdk/commit/0e808d81d8a6b4b860f9dbf6be6bdf85429eaf77))
* **sns-subscriptions:** SQS queue encrypted by AWS managed KMS key is allowed to be specified as subscription and dead-letter queue ([#26110](https:/aws/aws-cdk/issues/26110)) ([0531492](https:/aws/aws-cdk/commit/0531492451b4f99fe469380ba926f22addbfc492)), closes [#19796](https:/aws/aws-cdk/issues/19796)
* **stepfunctions-tasks:** Default Retry policy for `LambdaInvoke` does not include `Lambda.ClientExecutionTimeoutException` default Retry settings ([#26474](https:/aws/aws-cdk/issues/26474)) ([f22bd4e](https:/aws/aws-cdk/commit/f22bd4e2b1914b42450ffa061d27009039469b2b)), closes [#26470](https:/aws/aws-cdk/issues/26470)
* **stepfunctions-tasks:** specify tags in BatchSubmitJob properties ([#26349](https:/aws/aws-cdk/issues/26349)) ([f24ece1](https:/aws/aws-cdk/commit/f24ece1dba43e1a0fda3cc917e04af61d90040fc)), closes [#26336](https:/aws/aws-cdk/issues/26336)

## [2.88.0](https:/aws/aws-cdk/compare/v2.87.0...v2.88.0) (2023-07-20)


Expand Down
9 changes: 9 additions & 0 deletions allowed-breaking-changes.txt
Original file line number Diff line number Diff line change
Expand Up @@ -164,3 +164,12 @@ removed:aws-cdk-lib.triggers.TriggerProps.timeout
change-return-type:aws-cdk-lib.aws_ec2.SecurityGroup.determineRuleScope
# broken only in non-JS/TS, where that was not previously usable
strengthened:aws-cdk-lib.aws_s3_deployment.BucketDeploymentProps

# Fix for non-working property
# loadBalancerName is used to idenitfy a Classic Load Balancer
# However TaskSet only works with modern Application or Network LBs
removed:aws-cdk-lib.aws_ecs.CfnTaskSet.LoadBalancerProperty.loadBalancerName

# Introduction of a new feature
# Previously only BlueGreenUpdatePolicy could be set, now BlueGreenUpdatePolicy or new RollingUpdatePolicy can be provided
weakened:aws-cdk-lib.aws_sagemaker.CfnEndpoint.DeploymentConfigProperty
40 changes: 40 additions & 0 deletions packages/@aws-cdk-testing/framework-integ/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
# AWS CDK Framework Integration Test Suite

Run the full test suite with `yarn integ`.

See `integ-runner` package or `yarn integ --help` for detailed instructions.

## Common Errors

### Error: For this test you must provide your own HostedZoneId/HostedZoneName/DomainName

Some test cases require a publicly available domain name attached to a Amazon Route 53 Hosted Zone to work.
These test cases need to add DNS records that are then retrieved via the public internet infrastructure. This can be a subdomain to an existing domain, but it must have a Hosted Zone configured and nameservers delegated to it.

If you haven't got one ready, see the [Route 53 guide](https://docs.aws.amazon.com/Route53/latest/DeveloperGuide/CreatingHostedZone.html) to manually create a hosted zone.

AWS CDK core team members, please check our team internal docs for guidance on how to configure domains for testing.

#### How to correctly run these tests

**A) Each test needs exclusive access to the Hosted Zone.**\
You can only run one test at a time.

**B) Must be run with `--disable-update-workflow`**\
The checked-in snapshot uses dummy values that will not deploy.

- Go to your Hosted Zone and write down the values for `HostedZoneId`, `HostedZoneName` and `DomainName`.
All values must related to the **same** Hosted Zone.
- In your terminal run the following commands:

```console
export HOSTED_ZONE_ID=your_hosted_zone_id
export HOSTED_ZONE_NAME=your_hosted_zone_name
export DOMAIN_NAME=your_domain_name
```

- Finally, in the same terminal run your specific test case with the **update workflow disabled**. For example:

```console
yarn integ --disable-update-workflow aws-certificatemanager/test/integ.certificate-name
```
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@ import { Certificate, CertificateValidation } from 'aws-cdk-lib/aws-certificatem
*
*/
const hostedZoneId = process.env.CDK_INTEG_HOSTED_ZONE_ID ?? process.env.HOSTED_ZONE_ID;
if (!hostedZoneId) throw new Error('For this test you must provide your own HostedZoneId as an env var "HOSTED_ZONE_ID"');
if (!hostedZoneId) throw new Error('For this test you must provide your own HostedZoneId as an env var "HOSTED_ZONE_ID". See framework-integ/README.md for details.');
const hostedZoneName = process.env.CDK_INTEG_HOSTED_ZONE_NAME ?? process.env.HOSTED_ZONE_NAME;
if (!hostedZoneName) throw new Error('For this test you must provide your own HostedZoneName as an env var "HOSTED_ZONE_NAME"');
if (!hostedZoneName) throw new Error('For this test you must provide your own HostedZoneName as an env var "HOSTED_ZONE_NAME". See framework-integ/README.md for details.');
const domainName = process.env.CDK_INTEG_DOMAIN_NAME ?? process.env.DOMAIN_NAME;
if (!domainName) throw new Error('For this test you must provide your own Domain Name as an env var "DOMAIN_NAME"');
if (!domainName) throw new Error('For this test you must provide your own DomainName as an env var "DOMAIN_NAME". See framework-integ/README.md for details.');

const app = new App();
const stack = new Stack(app, 'integ-certificate-name');
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,11 @@ import { DnsValidatedCertificate, CertificateValidation } from 'aws-cdk-lib/aws-
*/

const hostedZoneId = process.env.CDK_INTEG_HOSTED_ZONE_ID ?? process.env.HOSTED_ZONE_ID;
if (!hostedZoneId) throw new Error('For this test you must provide your own HostedZoneId as an env var "HOSTED_ZONE_ID"');
if (!hostedZoneId) throw new Error('For this test you must provide your own HostedZoneId as an env var "HOSTED_ZONE_ID". See framework-integ/README.md for details.');
const hostedZoneName = process.env.CDK_INTEG_HOSTED_ZONE_NAME ?? process.env.HOSTED_ZONE_NAME;
if (!hostedZoneName) throw new Error('For this test you must provide your own HostedZoneName as an env var "HOSTED_ZONE_NAME"');
if (!hostedZoneName) throw new Error('For this test you must provide your own HostedZoneName as an env var "HOSTED_ZONE_NAME". See framework-integ/README.md for details.');
const domainName = process.env.CDK_INTEG_DOMAIN_NAME ?? process.env.DOMAIN_NAME;
if (!domainName) throw new Error('For this test you must provide your own Domain Name as an env var "DOMAIN_NAME"');
if (!domainName) throw new Error('For this test you must provide your own DomainName as an env var "DOMAIN_NAME". See framework-integ/README.md for details.');

const app = new App();
const stack = new Stack(app, 'integ-dns-validated-certificate');
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@ import * as cloudfront from 'aws-cdk-lib/aws-cloudfront';

const account = process.env.CDK_INTEG_ACCOUNT ?? process.env.CDK_DEFAULT_ACCOUNT;
const hostedZoneId = process.env.CDK_INTEG_HOSTED_ZONE_ID ?? process.env.HOSTED_ZONE_ID;
if (!hostedZoneId) throw new Error('For this test you must provide your own HostedZoneId as an env var "HOSTED_ZONE_ID"');
if (!hostedZoneId) throw new Error('For this test you must provide your own HostedZoneId as an env var "HOSTED_ZONE_ID". See framework-integ/README.md for details.');
const hostedZoneName = process.env.CDK_INTEG_HOSTED_ZONE_NAME ?? process.env.HOSTED_ZONE_NAME;
if (!hostedZoneName) throw new Error('For this test you must provide your own HostedZoneName as an env var "HOSTED_ZONE_NAME"');
if (!hostedZoneName) throw new Error('For this test you must provide your own HostedZoneName as an env var "HOSTED_ZONE_NAME". See framework-integ/README.md for details.');
const domainName = process.env.CDK_INTEG_DOMAIN_NAME ?? process.env.DOMAIN_NAME;
if (!domainName) throw new Error('For this test you must provide your own Domain Name as an env var "DOMAIN_NAME"');
if (!domainName) throw new Error('For this test you must provide your own DomainName as an env var "DOMAIN_NAME". See framework-integ/README.md for details.');

const app = new cdk.App({
treeMetadata: false,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -955,7 +955,9 @@
"awslogs-stream-prefix": "firelens",
"awslogs-region": {
"Ref": "AWS::Region"
}
},
"mode": "non-blocking",
"max-buffer-size": "26214400b"
}
},
"MemoryReservation": 50,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1526,7 +1526,9 @@
"awslogs-stream-prefix": "firelens",
"awslogs-region": {
"Ref": "AWS::Region"
}
},
"mode": "non-blocking",
"max-buffer-size": "26214400b"
}
},
"firelensConfiguration": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,11 @@ taskDefinition.addFirelensLogRouter('log_router', {
configFileType: ecs.FirelensConfigFileType.S3,
},
},
logging: new ecs.AwsLogDriver({ streamPrefix: 'firelens' }),
logging: new ecs.AwsLogDriver({
streamPrefix: 'firelens',
mode: ecs.AwsLogDriverMode.NON_BLOCKING,
maxBufferSize: cdk.Size.mebibytes(25),
}),
memoryReservationMiB: 50,
});

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -175,11 +175,11 @@ class CognitoStack extends Stack {
*
*/
const hostedZoneId = process.env.CDK_INTEG_HOSTED_ZONE_ID ?? process.env.HOSTED_ZONE_ID;
if (!hostedZoneId) throw new Error('For this test you must provide your own HostedZoneId as an env var "HOSTED_ZONE_ID"');
if (!hostedZoneId) throw new Error('For this test you must provide your own HostedZoneId as an env var "HOSTED_ZONE_ID". See framework-integ/README.md for details.');
const hostedZoneName = process.env.CDK_INTEG_HOSTED_ZONE_NAME ?? process.env.HOSTED_ZONE_NAME;
if (!hostedZoneName) throw new Error('For this test you must provide your own HostedZoneName as an env var "HOSTED_ZONE_NAME"');
if (!hostedZoneName) throw new Error('For this test you must provide your own HostedZoneName as an env var "HOSTED_ZONE_NAME". See framework-integ/README.md for details.');
const domainName = process.env.CDK_INTEG_DOMAIN_NAME ?? process.env.DOMAIN_NAME;
if (!domainName) throw new Error('For this test you must provide your own Domain Name as an env var "DOMAIN_NAME"');
if (!domainName) throw new Error('For this test you must provide your own DomainName as an env var "DOMAIN_NAME". See framework-integ/README.md for details.');

const app = new App();
const testCase = new CognitoStack(app, 'integ-cognito', {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -155,11 +155,11 @@ class AlbOidcStack extends Stack {
*
*/
const hostedZoneId = process.env.CDK_INTEG_HOSTED_ZONE_ID ?? process.env.HOSTED_ZONE_ID;
if (!hostedZoneId) throw new Error('For this test you must provide your own HostedZoneId as an env var "HOSTED_ZONE_ID"');
if (!hostedZoneId) throw new Error('For this test you must provide your own HostedZoneId as an env var "HOSTED_ZONE_ID". See framework-integ/README.md for details.');
const hostedZoneName = process.env.CDK_INTEG_HOSTED_ZONE_NAME ?? process.env.HOSTED_ZONE_NAME;
if (!hostedZoneName) throw new Error('For this test you must provide your own HostedZoneName as an env var "HOSTED_ZONE_NAME"');
if (!hostedZoneName) throw new Error('For this test you must provide your own HostedZoneName as an env var "HOSTED_ZONE_NAME". See framework-integ/README.md for details.');
const domainName = process.env.CDK_INTEG_DOMAIN_NAME ?? process.env.DOMAIN_NAME;
if (!domainName) throw new Error('For this test you must provide your own Domain Name as an env var "DOMAIN_NAME"');
if (!domainName) throw new Error('For this test you must provide your own DomainName as an env var "DOMAIN_NAME". See framework-integ/README.md for details.');

const app = new App();
const testCase = new AlbOidcStack(app, 'IntegAlbOidc', {
Expand Down
Loading

0 comments on commit cb96655

Please sign in to comment.