Skip to content

Commit

Permalink
chore(release): 1.129.0 (#17093)
Browse files Browse the repository at this point in the history
  • Loading branch information
mergify[bot] committed Oct 21, 2021
2 parents 6a3dabe + 3987808 commit fb43f89
Show file tree
Hide file tree
Showing 107 changed files with 2,308 additions and 674 deletions.
2 changes: 2 additions & 0 deletions .gitallowed
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@ account: '856666278305'
account: '840364872350'
account: '422531588944'
account: '924023996002'
account: '919366029133' #cn-north-1
account: '919830735681' #cn-northwest-1

# The account IDs of password rotation applications of Serverless Application Repository
# https://docs.aws.amazon.com/secretsmanager/latest/userguide/enable-rotation-rds.html
Expand Down
47 changes: 47 additions & 0 deletions .github/workflows/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
# AWS CDK GitHub Actions

These workflows and actions are configured in the AWS CDK GitHub repository.

## Pull Request Triggered

### Auto Approve
[auto-approve.yml](auto-approve.yml): Approves merging PRs with the
`pr/auto-approve` label.
Owner: Core CDK team

### PR Linter
[pr-linter.yml](pr-linter.yml): Runs `tools/@aws-cdk-prlint` on each PR to
check for correctness.
Owner: Core CDK team

### v2-main PR automation
[v2-pull-request.yml](v2-pull-request.yml): Runs `pkglint` on merge forward PRs
and commits the results.
Owner: Core CDK team

### Label Assigner
[issue-label-assign.yml](issue-label-assign.yml): Github action for automatically adding labels and/or setting assignees when an Issue or PR is opened or edited based on user-defined Area
Owner: CDK support team

## Issue Triggered

### Closed Issue Message
[closed-issue-message.yml](closed-issue-message.yml): Adds a reminder message
to issues that are closed.
Owner: CDK support team

### Label Assigner
[issue-label-assign.yml](issue-label-assign.yml): Github action for automatically adding labels and/or setting assignees when an Issue or PR is opened or edited based on user-defined Area
Owner: CDK support team

## Scheduled Actions

### Issue Lifecycle Handling
[close-stale-issues.yml](close-stale-issues.yml): Handles labeling issues and
PRs with `closing-soon`, `response-requested`, etc.
Owner: CDK support team

### Yarn Upgrader
[yarn-upgrade.yml](yarn-upgrade.yml): Upgrades yarn dependencies and creates a
patch file for downloading.
Owner: Core CDK team
2 changes: 1 addition & 1 deletion .github/workflows/close-stale-issues.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ name: "Close Stale Issues"
on:
workflow_dispatch:
schedule:
- cron: "0 6 * * *"
- cron: "0 */4 * * *"

jobs:
cleanup:
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/issue-label-assign.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ jobs:
test:
permissions:
issues: write
pull-requests: write
runs-on: ubuntu-latest
steps:
- uses: peterwoodworth/issue-action@main
Expand Down
9 changes: 6 additions & 3 deletions .mergify.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,8 @@
# See https://doc.mergify.io
queue_rules:
- name: default
conditions:
- status-success~=AWS CodeBuild us-east-1

pull_request_rules:
- name: label core
Expand All @@ -12,10 +16,9 @@ pull_request_rules:
actions:
comment:
message: Thank you for contributing! Your pull request will be updated from master and then merged automatically (do not update manually, and be sure to [allow changes to be pushed to your fork](https://help.github.com/en/github/collaborating-with-issues-and-pull-requests/allowing-changes-to-a-pull-request-branch-created-from-a-fork)).
merge:
strict: smart
queue:
name: default
method: squash
strict_method: merge
commit_message: title+body
conditions:
- base!=release
Expand Down
1 change: 1 addition & 0 deletions .yarnrc
Original file line number Diff line number Diff line change
Expand Up @@ -7,3 +7,4 @@
# be forced to registry.yarnpkg.com.
# https://github.com/npm/cli/issues/3783
registry "https://registry.npmjs.org"
ignore-engines true # the 'engines' key for 'aws-cdk-lib' has specifies node14 as min while v1 will remain at node10
26 changes: 26 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
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.

## [1.129.0](https://github.com/aws/aws-cdk/compare/v1.128.0...v1.129.0) (2021-10-21)


### Features

* **aws-autoscaling:** add flag and aspect to require imdsv2 ([#16052](https://github.com/aws/aws-cdk/issues/16052)) ([ef7e20d](https://github.com/aws/aws-cdk/commit/ef7e20df08b4321f210bfc050afa42d7b4901931))
* **codebuild:** add support for small ARM machine type ([#16635](https://github.com/aws/aws-cdk/issues/16635)) ([55fbc86](https://github.com/aws/aws-cdk/commit/55fbc866ef0195fdfc722206e4d69a1f4469cd40)), closes [#16633](https://github.com/aws/aws-cdk/issues/16633)
* **dynamodb:** add option to skip waiting for global replication to finish ([#16983](https://github.com/aws/aws-cdk/issues/16983)) ([254601f](https://github.com/aws/aws-cdk/commit/254601f477a4da309e81f5384140427f1b958bfd)), closes [#16611](https://github.com/aws/aws-cdk/issues/16611)
* **ec2:** add aspect to require imdsv2 ([#16051](https://github.com/aws/aws-cdk/issues/16051)) ([0947b21](https://github.com/aws/aws-cdk/commit/0947b21c1e3186042324820ec5ab433237246f58))
* **eks:** configure serviceIpv4Cidr on the cluster ([#16957](https://github.com/aws/aws-cdk/issues/16957)) ([72102c7](https://github.com/aws/aws-cdk/commit/72102c750bfd6564cd51c1a5d8abc79b1ba1d3ce)), closes [#16541](https://github.com/aws/aws-cdk/issues/16541)
* **events:** Add DLQ support for SQS target ([#16916](https://github.com/aws/aws-cdk/issues/16916)) ([7fda903](https://github.com/aws/aws-cdk/commit/7fda90318e18b3a5d126b040e35a0146634d5f2d)), closes [#16417](https://github.com/aws/aws-cdk/issues/16417)
* **msk:** add Kafka version 2.8.1 ([#16881](https://github.com/aws/aws-cdk/issues/16881)) ([7db5c8c](https://github.com/aws/aws-cdk/commit/7db5c8cdafe7b9b22b6b40cb25ed8bd1946301f4))
* **stepfunctions-tasks:** add `enableNetworkIsolation` property to `SageMakerCreateTrainingJobProps` ([#16792](https://github.com/aws/aws-cdk/issues/16792)) ([69ac520](https://github.com/aws/aws-cdk/commit/69ac520452b219bf242f2fbb4740f6b1b8b8790f)), closes [#16779](https://github.com/aws/aws-cdk/issues/16779)


### Bug Fixes

* **apigatewayv2:** unable to retrieve domain url for default stage ([#16854](https://github.com/aws/aws-cdk/issues/16854)) ([c6db91e](https://github.com/aws/aws-cdk/commit/c6db91eee2cb658ce347c7ac6d6e3c95bc5977dc)), closes [#16638](https://github.com/aws/aws-cdk/issues/16638)
* **cfn-diff:** correctly handle Date strings in diff ([#16591](https://github.com/aws/aws-cdk/issues/16591)) ([86f2714](https://github.com/aws/aws-cdk/commit/86f2714613f06aaf2bcee27da2f66066c8e863d0)), closes [#16444](https://github.com/aws/aws-cdk/issues/16444)
* **ecs:** imported services don't have account & region set correctly ([#16997](https://github.com/aws/aws-cdk/issues/16997)) ([dc6f743](https://github.com/aws/aws-cdk/commit/dc6f7433f01b9bc2c8206fb03d72ab8404fe4f6a)), closes [#11199](https://github.com/aws/aws-cdk/issues/11199) [#11199](https://github.com/aws/aws-cdk/issues/11199) [#15944](https://github.com/aws/aws-cdk/issues/15944)
* **events:** PhysicalName.GENERATE_IF_NEEDED does not work for EventBus ([#17008](https://github.com/aws/aws-cdk/issues/17008)) ([707fa00](https://github.com/aws/aws-cdk/commit/707fa003a458039878a1ae5173b6665a84c1170b)), closes [#14337](https://github.com/aws/aws-cdk/issues/14337)
* **lambda:** docker image function fails when insightsVersion is specified ([#16781](https://github.com/aws/aws-cdk/issues/16781)) ([d0e15cc](https://github.com/aws/aws-cdk/commit/d0e15ccaca22c5e05b9186aa1a241e744d67c96a)), closes [#16642](https://github.com/aws/aws-cdk/issues/16642)
* **lambda-layer-node-proxy-agent:** Replace use of package.json with Dockerfile command `npm install [package]@[version]` ([#17078](https://github.com/aws/aws-cdk/issues/17078)) ([a129046](https://github.com/aws/aws-cdk/commit/a129046495a926561f94f5ce1f41c34b1df3afde))
* **opensearch:** add validation to domainName property ([#17017](https://github.com/aws/aws-cdk/issues/17017)) ([3ec6832](https://github.com/aws/aws-cdk/commit/3ec683283e96159d588797bd46d33c82ff3076f1)), closes [#17016](https://github.com/aws/aws-cdk/issues/17016)
* **pipelines:** `additionalInputs` fails for deep directory ([#17074](https://github.com/aws/aws-cdk/issues/17074)) ([403d3ce](https://github.com/aws/aws-cdk/commit/403d3ce3bc0f4e30e9694e5c20743f0032009464)), closes [#16936](https://github.com/aws/aws-cdk/issues/16936)

## [1.128.0](https://github.com/aws/aws-cdk/compare/v1.127.0...v1.128.0) (2021-10-14)


Expand Down
8 changes: 4 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,10 @@
"fs-extra": "^9.1.0",
"graceful-fs": "^4.2.8",
"jest-junit": "^12.3.0",
"jsii-diff": "^1.39.0",
"jsii-pacmak": "^1.39.0",
"jsii-reflect": "^1.39.0",
"jsii-rosetta": "^1.39.0",
"jsii-diff": "^1.40.0",
"jsii-pacmak": "^1.40.0",
"jsii-reflect": "^1.40.0",
"jsii-rosetta": "^1.40.0",
"lerna": "^4.0.0",
"patch-package": "^6.4.7",
"standard-version": "^9.3.1",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -138,6 +138,7 @@ export class AppMeshExtension extends ServiceExtension {

public useTaskDefinition(taskDefinition: ecs.TaskDefinition) {
var region = cdk.Stack.of(this.scope).region;
var partition = cdk.Stack.of(this.scope).partition;
var appMeshRepo;

// This is currently necessary because App Mesh has different images in each region,
Expand All @@ -151,6 +152,8 @@ export class AppMeshExtension extends ServiceExtension {
'ap-southeast-1': this.accountIdForRegion('ap-southeast-1'),
'ap-southeast-2': this.accountIdForRegion('ap-southeast-1'),
'ca-central-1': this.accountIdForRegion('ca-central-1'),
'cn-north-1': this.accountIdForRegion('cn-north-1'),
'cn-northwest-1': this.accountIdForRegion('cn-northwest-1'),
'eu-central-1': this.accountIdForRegion('eu-central-1'),
'eu-north-1': this.accountIdForRegion('eu-north-1'),
'eu-south-1': this.accountIdForRegion('eu-south-1'),
Expand All @@ -177,7 +180,7 @@ export class AppMeshExtension extends ServiceExtension {
`${this.parentService.id}-envoy-repo`,
{
repositoryName: 'aws-appmesh-envoy',
repositoryArn: `arn:aws:ecr:${region}:${ownerAccount}:repository/aws-appmesh-envoy`,
repositoryArn: `arn:${partition}:ecr:${region}:${ownerAccount}:repository/aws-appmesh-envoy`,
},
);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -949,7 +949,11 @@
"Fn::Join": [
"",
[
"arn:aws:ecr:",
"arn:",
{
"Ref": "AWS::Partition"
},
":ecr:",
{
"Ref": "AWS::Region"
},
Expand Down Expand Up @@ -1818,7 +1822,11 @@
"Fn::Join": [
"",
[
"arn:aws:ecr:",
"arn:",
{
"Ref": "AWS::Partition"
},
":ecr:",
{
"Ref": "AWS::Region"
},
Expand Down Expand Up @@ -2806,7 +2814,11 @@
"Fn::Join": [
"",
[
"arn:aws:ecr:",
"arn:",
{
"Ref": "AWS::Partition"
},
":ecr:",
{
"Ref": "AWS::Region"
},
Expand Down Expand Up @@ -3316,6 +3328,12 @@
"ca-central-1": {
"ecrRepo": "840364872350"
},
"cn-north-1": {
"ecrRepo": "919366029133"
},
"cn-northwest-1": {
"ecrRepo": "919830735681"
},
"eu-central-1": {
"ecrRepo": "840364872350"
},
Expand Down Expand Up @@ -3378,6 +3396,12 @@
"ca-central-1": {
"ecrRepo": "840364872350"
},
"cn-north-1": {
"ecrRepo": "919366029133"
},
"cn-northwest-1": {
"ecrRepo": "919830735681"
},
"eu-central-1": {
"ecrRepo": "840364872350"
},
Expand Down Expand Up @@ -3440,6 +3464,12 @@
"ca-central-1": {
"ecrRepo": "840364872350"
},
"cn-north-1": {
"ecrRepo": "919366029133"
},
"cn-northwest-1": {
"ecrRepo": "919830735681"
},
"eu-central-1": {
"ecrRepo": "840364872350"
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1304,7 +1304,11 @@
"Fn::Join": [
"",
[
"arn:aws:ecr:",
"arn:",
{
"Ref": "AWS::Partition"
},
":ecr:",
{
"Ref": "AWS::Region"
},
Expand Down Expand Up @@ -1828,7 +1832,11 @@
"Fn::Join": [
"",
[
"arn:aws:ecr:",
"arn:",
{
"Ref": "AWS::Partition"
},
":ecr:",
{
"Ref": "AWS::Region"
},
Expand Down Expand Up @@ -2135,6 +2143,12 @@
"ca-central-1": {
"ecrRepo": "840364872350"
},
"cn-north-1": {
"ecrRepo": "919366029133"
},
"cn-northwest-1": {
"ecrRepo": "919830735681"
},
"eu-central-1": {
"ecrRepo": "840364872350"
},
Expand Down Expand Up @@ -2197,6 +2211,12 @@
"ca-central-1": {
"ecrRepo": "840364872350"
},
"cn-north-1": {
"ecrRepo": "919366029133"
},
"cn-northwest-1": {
"ecrRepo": "919830735681"
},
"eu-central-1": {
"ecrRepo": "840364872350"
},
Expand Down
13 changes: 10 additions & 3 deletions packages/@aws-cdk/aws-apigatewayv2/lib/http/stage.ts
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,11 @@ export interface IHttpStage extends IStage {
*/
readonly api: IHttpApi;

/**
* The custom domain URL to this stage
*/
readonly domainUrl: string;

/**
* Metric for the number of client-side errors captured in a given period.
*
Expand Down Expand Up @@ -96,6 +101,7 @@ export interface HttpStageAttributes extends StageAttributes {
}

abstract class HttpStageBase extends StageBase implements IHttpStage {
public abstract readonly domainUrl: string;
public abstract readonly api: IHttpApi;

public metricClientError(props?: MetricOptions): Metric {
Expand Down Expand Up @@ -140,6 +146,10 @@ export class HttpStage extends HttpStageBase {
get url(): string {
throw new Error('url is not available for imported stages.');
}

get domainUrl(): string {
throw new Error('domainUrl is not available for imported stages.');
}
}
return new Import(scope, id);
}
Expand Down Expand Up @@ -177,9 +187,6 @@ export class HttpStage extends HttpStageBase {
return `https://${this.api.apiId}.execute-api.${s.region}.${s.urlSuffix}/${urlPath}`;
}

/**
* The custom domain URL to this stage
*/
public get domainUrl(): string {
if (!this._apiMapping) {
throw new Error('domainUrl is not available when no API mapping is associated with the Stage');
Expand Down
24 changes: 23 additions & 1 deletion packages/@aws-cdk/aws-apigatewayv2/test/http/api.test.ts
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
import { Match, Template } from '@aws-cdk/assertions';
import { Certificate } from '@aws-cdk/aws-certificatemanager';
import { Metric } from '@aws-cdk/aws-cloudwatch';
import * as ec2 from '@aws-cdk/aws-ec2';
import { Duration, Stack } from '@aws-cdk/core';
import {
CorsHttpMethod,
CorsHttpMethod, DomainName,
HttpApi, HttpAuthorizer, HttpIntegrationType, HttpMethod, HttpRouteAuthorizerBindOptions, HttpRouteAuthorizerConfig,
HttpRouteIntegrationBindOptions, HttpRouteIntegrationConfig, IHttpRouteAuthorizer, IHttpRouteIntegration, HttpNoneAuthorizer, PayloadFormatVersion,
} from '../../lib';
Expand Down Expand Up @@ -374,6 +375,27 @@ describe('HttpApi', () => {
expect(() => api.apiEndpoint).toThrow(/apiEndpoint is not configured/);
});

test('domainUrl can be retrieved for default stage', () => {
const stack = new Stack();
const dn = new DomainName(stack, 'DN', {
domainName: 'example.com',
certificate: Certificate.fromCertificateArn(stack, 'cert', 'arn:aws:acm:us-east-1:111111111111:certificate'),
});

const api = new HttpApi(stack, 'Api', {
createDefaultStage: true,
defaultDomainMapping: {
domainName: dn,
},
});

expect(stack.resolve(api.defaultStage?.domainUrl)).toEqual({
'Fn::Join': ['', [
'https://', { Ref: 'DNFDC76583' }, '/',
]],
});
});


describe('default authorization settings', () => {
test('can add default authorizer', () => {
Expand Down

0 comments on commit fb43f89

Please sign in to comment.