Skip to content

Commit

Permalink
Merge branch 'main' into tags
Browse files Browse the repository at this point in the history
  • Loading branch information
mergify[bot] committed May 24, 2023
2 parents 6484288 + 6c5b67e commit 43083ee
Show file tree
Hide file tree
Showing 604 changed files with 9,807 additions and 1,464 deletions.
2 changes: 1 addition & 1 deletion .gitpod.yml
Expand Up @@ -3,7 +3,7 @@ github:
pullRequestsFromForks: true
addComment: true

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

tasks:
- init: |
Expand Down
2 changes: 2 additions & 0 deletions CHANGELOG.v2.alpha.md
Expand Up @@ -2,6 +2,8 @@

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.

## [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)

## [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)

## [2.79.0-alpha.0](https://github.com/aws/aws-cdk/compare/v2.78.0-alpha.0...v2.79.0-alpha.0) (2023-05-10)
Expand Down
26 changes: 26 additions & 0 deletions CHANGELOG.v2.md
Expand Up @@ -2,6 +2,32 @@

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.

## [2.80.0](https://github.com/aws/aws-cdk/compare/v2.79.1...v2.80.0) (2023-05-19)


### ⚠ BREAKING CHANGES TO EXPERIMENTAL FEATURES

* **eks:** A masters role is no longer provisioned by default. Use the `mastersRole` property to explicitly pass a role that needs cluster access. In addition, the creation role no longer allows any identity (with the appropriate `sts:AssumeRole` permissions) to assume it.

### Features

* **apigateway:** add grantExecute to API Methods ([#25630](https://github.com/aws/aws-cdk/issues/25630)) ([ecb59fd](https://github.com/aws/aws-cdk/commit/ecb59fda50078e29d579b7b0ee82600f553aec75))
* **appmesh:** access log format support for app mesh ([#25229](https://github.com/aws/aws-cdk/issues/25229)) ([c4b00be](https://github.com/aws/aws-cdk/commit/c4b00bee9a2ada024c8d838ba083549bc69889f8))
* **appsync:** Add Private API support when creating a GraphqlApi ([#25569](https://github.com/aws/aws-cdk/issues/25569)) ([d7e263d](https://github.com/aws/aws-cdk/commit/d7e263d5d175f5f189f3ea3d1a5501b975a26281))
* **cfnspec:** cloudformation spec v122.0.0 ([#25555](https://github.com/aws/aws-cdk/issues/25555)) ([5ccc569](https://github.com/aws/aws-cdk/commit/5ccc56975c323ea19fd0917def51184e13f440d9))
* **cli:** assets can now depend on stacks ([#25536](https://github.com/aws/aws-cdk/issues/25536)) ([25d5d60](https://github.com/aws/aws-cdk/commit/25d5d60fd0ed852b1817d749b65c68d5279b38a3))
* **cli:** logging can be corked ([#25644](https://github.com/aws/aws-cdk/issues/25644)) ([0643020](https://github.com/aws/aws-cdk/commit/064302007e902a1521ccc6948a5691cd777afc15)), closes [#25536](https://github.com/aws/aws-cdk/issues/25536)
* **codepipeline-actions:** add KMSEncryptionKeyARN for S3DeployAction ([#24536](https://github.com/aws/aws-cdk/issues/24536)) ([b60876f](https://github.com/aws/aws-cdk/commit/b60876f7bd973f88e965c7e6204ced11c55c55a3)), closes [#24535](https://github.com/aws/aws-cdk/issues/24535)
* **eks:** alb controller include versions 2.4.2 - 2.5.1 ([#25330](https://github.com/aws/aws-cdk/issues/25330)) ([83c4c36](https://github.com/aws/aws-cdk/commit/83c4c36e56917be248bdee1bc11516982d50b17a)), closes [#25307](https://github.com/aws/aws-cdk/issues/25307)
* **msk:** Kafka version 3.4.0 ([#25557](https://github.com/aws/aws-cdk/issues/25557)) ([6317518](https://github.com/aws/aws-cdk/commit/6317518e5d68e5659237b676668fd69bfbd2f42f)), closes [#25522](https://github.com/aws/aws-cdk/issues/25522)
* **scheduler:** schedule expression construct ([#25422](https://github.com/aws/aws-cdk/issues/25422)) ([97a698e](https://github.com/aws/aws-cdk/commit/97a698ee9e1e47ffb4af5d7d06cd309ddd3a2732))


### Bug Fixes

* **bootstrap:** bootstrap doesn't work in non-aws partitions anymore (revert security hub finding fix) ([#25540](https://github.com/aws/aws-cdk/issues/25540)) ([8854739](https://github.com/aws/aws-cdk/commit/8854739a6b4cdd33dc0da3b76b634b5ab151437b)), closes [/github.com/aws/aws-cdk/issues/19380#issuecomment-1512009270](https://github.com/aws//github.com/aws/aws-cdk/issues/19380/issues/issuecomment-1512009270) [#25272](https://github.com/aws/aws-cdk/issues/25272) [#25273](https://github.com/aws/aws-cdk/issues/25273) [#25507](https://github.com/aws/aws-cdk/issues/25507)
* **eks:** overly permissive trust policies ([#25473](https://github.com/aws/aws-cdk/issues/25473)) ([51f0193](https://github.com/aws/aws-cdk/commit/51f0193bf34cca8254743561a1176e3ca5d83a74)). We would like to thank @twelvemo and @stefreak for reporting this issue.

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


Expand Down
1 change: 0 additions & 1 deletion packages/@aws-cdk-testing/cli-integ/lib/aws.ts
Expand Up @@ -185,7 +185,6 @@ type AwsCallIO<T> =
type First<T> = T extends [any, any] ? T[0] : never;
type Second<T> = T extends [any, any] ? T[1] : never;


export function isStackMissingError(e: Error) {
return e.message.indexOf('does not exist') > -1;
}
Expand Down
1 change: 0 additions & 1 deletion packages/@aws-cdk-testing/cli-integ/lib/files.ts
Expand Up @@ -45,7 +45,6 @@ export function findUp(name: string, directory: string = process.cwd()): string
return findUp(name, path.dirname(absoluteDirectory));
}


/**
* Docker-safe home directory
*/
Expand Down
Expand Up @@ -2,7 +2,6 @@ import PQueue from 'p-queue';
import { sleep } from '../aws';
import { MemoryStream } from '../corking';


export type ErrorResponse = 'fail' | 'skip' | 'retry';

/**
Expand Down
1 change: 0 additions & 1 deletion packages/@aws-cdk-testing/cli-integ/lib/with-sam.ts
Expand Up @@ -10,7 +10,6 @@ import { AwsContext, withAws } from './with-aws';
import { cloneDirectory, installNpmPackages, TestFixture, DEFAULT_TEST_TIMEOUT_S } from './with-cdk-app';
import { withTimeout } from './with-timeout';


export interface ActionOutput {
actionSucceeded?: boolean;
actionOutput?: any;
Expand Down
1 change: 0 additions & 1 deletion packages/@aws-cdk-testing/cli-integ/test/xpmutex.test.ts
Expand Up @@ -30,7 +30,6 @@ test('acquire waits', async () => {
await secondProcess;
});


/**
* Poll for some condition every 10ms
*/
Expand Down
Expand Up @@ -13,4 +13,3 @@ import { integTest, withTemporaryDirectory, ShellHelper, withPackages } from '..
})));
});


2 changes: 2 additions & 0 deletions packages/@aws-cdk-testing/framework-integ/.gitignore
Expand Up @@ -13,3 +13,5 @@ nyc.config.js
!**/*.snapshot/**/asset.*/*.d.ts

!**/*.snapshot/**/asset.*/**

**/*.ts.snapshot
Expand Up @@ -27,7 +27,6 @@ const restapi = new RestApi(stack, 'MyRestApi', {
},
});


restapi.root.addMethod('ANY', new MockIntegration({
integrationResponses: [
{ statusCode: '200' },
Expand Down
Expand Up @@ -92,7 +92,6 @@ const api2 = new Api(testCase, 'IntegApi2', {
path: 'items',
});


/**
* Test 1
*
Expand Down Expand Up @@ -151,7 +150,6 @@ secondDomain.addApiMapping(api2.restApi.deploymentStage, {
basePath: 'orders/v2',
});


/**
* Test 3
*
Expand All @@ -177,7 +175,6 @@ thirdDomain.addBasePathMapping(api2.restApi, {
basePath: 'v2',
});


/**
* -------------------------------------------------------
* ------------------------- THEN ------------------------
Expand Down
@@ -0,0 +1,19 @@
{
"version": "31.0.0",
"files": {
"454874b4674a38a5eb7ede0bc79fe77dcbf5062acaeb3b4424c7919758ae5191": {
"source": {
"path": "GrantExecute.template.json",
"packaging": "file"
},
"destinations": {
"current_account-current_region": {
"bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}",
"objectKey": "454874b4674a38a5eb7ede0bc79fe77dcbf5062acaeb3b4424c7919758ae5191.json",
"assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}"
}
}
}
},
"dockerImages": {}
}
@@ -0,0 +1,179 @@
{
"Resources": {
"user2C2B57AE": {
"Type": "AWS::IAM::User"
},
"userDefaultPolicy083DF682": {
"Type": "AWS::IAM::Policy",
"Properties": {
"PolicyDocument": {
"Statement": [
{
"Action": "execute-api:Invoke",
"Effect": "Allow",
"Resource": {
"Fn::Join": [
"",
[
"arn:",
{
"Ref": "AWS::Partition"
},
":execute-api:",
{
"Ref": "AWS::Region"
},
":",
{
"Ref": "AWS::AccountId"
},
":",
{
"Ref": "testapiD6451F70"
},
"/",
{
"Ref": "testapiDeploymentStageprod5C9E92A4"
},
"/GET/pets"
]
]
}
}
],
"Version": "2012-10-17"
},
"PolicyName": "userDefaultPolicy083DF682",
"Users": [
{
"Ref": "user2C2B57AE"
}
]
}
},
"testapiD6451F70": {
"Type": "AWS::ApiGateway::RestApi",
"Properties": {
"Name": "test-api"
}
},
"testapiDeployment356D2C358af14d7f8fefbad1c57a65ea01cc6136": {
"Type": "AWS::ApiGateway::Deployment",
"Properties": {
"RestApiId": {
"Ref": "testapiD6451F70"
},
"Description": "Automatically created by the RestApi construct"
},
"DependsOn": [
"testapipetsGET25A78130",
"testapipets981F319E"
]
},
"testapiDeploymentStageprod5C9E92A4": {
"Type": "AWS::ApiGateway::Stage",
"Properties": {
"RestApiId": {
"Ref": "testapiD6451F70"
},
"DeploymentId": {
"Ref": "testapiDeployment356D2C358af14d7f8fefbad1c57a65ea01cc6136"
},
"StageName": "prod"
}
},
"testapipets981F319E": {
"Type": "AWS::ApiGateway::Resource",
"Properties": {
"ParentId": {
"Fn::GetAtt": [
"testapiD6451F70",
"RootResourceId"
]
},
"PathPart": "pets",
"RestApiId": {
"Ref": "testapiD6451F70"
}
}
},
"testapipetsGET25A78130": {
"Type": "AWS::ApiGateway::Method",
"Properties": {
"HttpMethod": "GET",
"ResourceId": {
"Ref": "testapipets981F319E"
},
"RestApiId": {
"Ref": "testapiD6451F70"
},
"AuthorizationType": "NONE",
"Integration": {
"Type": "MOCK"
}
}
}
},
"Outputs": {
"testapiEndpoint4AE34D29": {
"Value": {
"Fn::Join": [
"",
[
"https://",
{
"Ref": "testapiD6451F70"
},
".execute-api.",
{
"Ref": "AWS::Region"
},
".",
{
"Ref": "AWS::URLSuffix"
},
"/",
{
"Ref": "testapiDeploymentStageprod5C9E92A4"
},
"/"
]
]
}
}
},
"Parameters": {
"BootstrapVersion": {
"Type": "AWS::SSM::Parameter::Value<String>",
"Default": "/cdk-bootstrap/hnb659fds/version",
"Description": "Version of the CDK Bootstrap resources in this environment, automatically retrieved from SSM Parameter Store. [cdk:skip]"
}
},
"Rules": {
"CheckBootstrapVersion": {
"Assertions": [
{
"Assert": {
"Fn::Not": [
{
"Fn::Contains": [
[
"1",
"2",
"3",
"4",
"5"
],
{
"Ref": "BootstrapVersion"
}
]
}
]
},
"AssertDescription": "CDK bootstrap stack version 6 required. Please run 'cdk bootstrap' with a recent version of the CDK CLI."
}
]
}
}
}
@@ -0,0 +1,19 @@
{
"version": "31.0.0",
"files": {
"21fbb51d7b23f6a6c262b46a9caee79d744a3ac019fd45422d988b96d44b2a22": {
"source": {
"path": "GrantExecuteTestDefaultTestDeployAssertA66B6F20.template.json",
"packaging": "file"
},
"destinations": {
"current_account-current_region": {
"bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}",
"objectKey": "21fbb51d7b23f6a6c262b46a9caee79d744a3ac019fd45422d988b96d44b2a22.json",
"assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}"
}
}
}
},
"dockerImages": {}
}
@@ -0,0 +1,36 @@
{
"Parameters": {
"BootstrapVersion": {
"Type": "AWS::SSM::Parameter::Value<String>",
"Default": "/cdk-bootstrap/hnb659fds/version",
"Description": "Version of the CDK Bootstrap resources in this environment, automatically retrieved from SSM Parameter Store. [cdk:skip]"
}
},
"Rules": {
"CheckBootstrapVersion": {
"Assertions": [
{
"Assert": {
"Fn::Not": [
{
"Fn::Contains": [
[
"1",
"2",
"3",
"4",
"5"
],
{
"Ref": "BootstrapVersion"
}
]
}
]
},
"AssertDescription": "CDK bootstrap stack version 6 required. Please run 'cdk bootstrap' with a recent version of the CDK CLI."
}
]
}
}
}
@@ -0,0 +1 @@
{"version":"31.0.0"}

0 comments on commit 43083ee

Please sign in to comment.