Skip to content

Commit 63ed9ab

Browse files
mergify[bot]mergify[bot]
authored
Merge branch 'master' into math-expressions
2 parents 1cedcb8 + 86e63f8 commit 63ed9ab

173 files changed

Lines changed: 7946 additions & 5892 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.

‎allowed-breaking-changes.txt‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,3 +74,7 @@ removed:@aws-cdk/aws-stepfunctions-tasks.BatchSubmitJobProps.jobDefinition
7474
strengthened:@aws-cdk/aws-stepfunctions-tasks.BatchSubmitJobProps
7575
removed:@aws-cdk/aws-lambda-event-sources.ManagedKafkaEventSourceProps.cluster
7676
strengthened:@aws-cdk/aws-lambda-event-sources.ManagedKafkaEventSourceProps
77+
78+
# Remove IO2 from autoscaling EbsDeviceVolumeType. This value is not supported
79+
# at the moment and was not supported in the past.
80+
removed:@aws-cdk/aws-autoscaling.EbsDeviceVolumeType.IO2

‎buildspec-pr.yaml‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,4 +14,6 @@ phases:
1414
- yarn --version || npm -g install yarn
1515
build:
1616
commands:
17-
- /bin/bash ./build.sh --extract && git diff-index --exit-code --ignore-space-at-eol --stat HEAD
17+
- /bin/bash ./build.sh --extract
18+
- /bin/bash ./scripts/transform.sh --extract
19+
- git diff-index --exit-code --ignore-space-at-eol --stat HEAD

‎buildspec.yaml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ phases:
1717
- 'if ${BUMP_CANDIDATE:-false}; then /bin/bash ./scripts/bump-candidate.sh; fi'
1818
- /bin/bash ./scripts/align-version.sh
1919
- /bin/bash ./build.sh
20+
- /bin/bash ./scripts/transform.sh
2021
post_build:
2122
commands:
2223
- "[ -f .BUILD_COMPLETED ] && /bin/bash ./pack.sh"

‎package.json‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,16 @@
7171
"nohoist": [
7272
"**/jszip",
7373
"**/jszip/**",
74+
"@aws-cdk/assertions-alpha/colors",
75+
"@aws-cdk/assertions-alpha/colors/**",
76+
"@aws-cdk/assertions-alpha/diff",
77+
"@aws-cdk/assertions-alpha/diff/**",
78+
"@aws-cdk/assertions-alpha/fast-deep-equal",
79+
"@aws-cdk/assertions-alpha/fast-deep-equal/**",
80+
"@aws-cdk/assertions-alpha/string-width",
81+
"@aws-cdk/assertions-alpha/string-width/**",
82+
"@aws-cdk/assertions-alpha/table",
83+
"@aws-cdk/assertions-alpha/table/**",
7484
"@aws-cdk/assertions/colors",
7585
"@aws-cdk/assertions/colors/**",
7686
"@aws-cdk/assertions/diff",

‎packages/@aws-cdk/assertions/vendor-in.sh‎

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,16 @@ echo "⏳ Vendoring in modules..."
1717

1818
scriptdir=$(cd $(dirname $0) && pwd)
1919
cd $scriptdir
20+
21+
if [[ "$PHASE" == "transform" ]]; then
22+
# Make the script short-circuit when running in the packages/individual-packages build context.
23+
# That's required because the build done by individual-pkg-gen does import re-writing when copying the TS files
24+
# (because it needs to know which modules are also unstable to do the rewriting correctly),
25+
# but the vendor.sh script runs only after the 'build' script for this package has been invoked,
26+
# which means any TS files copied by it successfully would not have their imports re-written.
27+
exit 0
28+
fi
29+
2030
set -euo pipefail
2131
dest="lib/vendored"
2232
mkdir -p $dest
@@ -44,4 +54,4 @@ They also cannot be bundled since they are part of the monorepo.
4454
Instead vendor them directly into the assertv2 library.
4555
EOF
4656

47-
echo "✅ Vendoring complete"
57+
echo "✅ Vendoring complete"

‎packages/@aws-cdk/aws-apigatewayv2/lib/http/api.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@ import { Construct } from 'constructs';
44
import { CfnApi, CfnApiProps } from '../apigatewayv2.generated';
55
import { IApi } from '../common/api';
66
import { ApiBase } from '../common/base';
7-
import { DomainMappingOptions, IStage } from '../common/stage';
7+
import { DomainMappingOptions } from '../common/stage';
88
import { IHttpRouteAuthorizer } from './authorizer';
99
import { IHttpRouteIntegration, HttpIntegration, HttpRouteIntegrationConfig } from './integration';
1010
import { BatchHttpRouteOptions, HttpMethod, HttpRoute, HttpRouteKey } from './route';
11-
import { HttpStage, HttpStageOptions } from './stage';
11+
import { IHttpStage, HttpStage, HttpStageOptions } from './stage';
1212
import { VpcLink, VpcLinkProps } from './vpc-link';
1313

1414
/**
@@ -366,7 +366,7 @@ export class HttpApi extends HttpApiBase {
366366
/**
367367
* The default stage of this API
368368
*/
369-
public readonly defaultStage: IStage | undefined;
369+
public readonly defaultStage: IHttpStage | undefined;
370370

371371
private readonly _apiEndpoint: string;
372372

‎packages/@aws-cdk/aws-athena/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@
7676
"@types/jest": "^26.0.24",
7777
"cdk-build-tools": "0.0.0",
7878
"cdk-integ-tools": "0.0.0",
79-
"nodeunit-shim": "0.0.0",
79+
"jest": "^26.6.3",
8080
"cfn2ts": "0.0.0",
8181
"pkglint": "0.0.0",
8282
"@aws-cdk/assertions": "0.0.0"

‎packages/@aws-cdk/aws-autoscaling/lib/auto-scaling-group.ts‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1145,6 +1145,8 @@ export class AutoScalingGroup extends AutoScalingGroupBase implements
11451145
embedFingerprint: options.embedFingerprint,
11461146
printLog: options.printLog,
11471147
ignoreFailures: options.ignoreFailures,
1148+
includeRole: options.includeRole,
1149+
includeUrl: options.includeUrl,
11481150
});
11491151
}
11501152

@@ -1780,4 +1782,23 @@ export interface ApplyCloudFormationInitOptions {
17801782
* @default false
17811783
*/
17821784
readonly ignoreFailures?: boolean;
1785+
1786+
/**
1787+
* Include --url argument when running cfn-init and cfn-signal commands
1788+
*
1789+
* This will be the cloudformation endpoint in the deployed region
1790+
* e.g. https://cloudformation.us-east-1.amazonaws.com
1791+
*
1792+
* @default false
1793+
*/
1794+
readonly includeUrl?: boolean;
1795+
1796+
/**
1797+
* Include --role argument when running cfn-init and cfn-signal commands
1798+
*
1799+
* This will be the IAM instance profile attached to the EC2 instance
1800+
*
1801+
* @default false
1802+
*/
1803+
readonly includeRole?: boolean;
17831804
}

‎packages/@aws-cdk/aws-autoscaling/lib/volume.ts‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -182,11 +182,6 @@ export enum EbsDeviceVolumeType {
182182
*/
183183
IO1 = 'io1',
184184

185-
/**
186-
* Provisioned IOPS SSD - IO2
187-
*/
188-
IO2 = 'io2',
189-
190185
/**
191186
* General Purpose SSD - GP2
192187
*/

‎packages/@aws-cdk/aws-cloudfront/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@
7878
"cdk-build-tools": "0.0.0",
7979
"cdk-integ-tools": "0.0.0",
8080
"cfn2ts": "0.0.0",
81-
"nodeunit-shim": "0.0.0",
81+
"jest": "^26.6.3",
8282
"pkglint": "0.0.0",
8383
"@aws-cdk/assert-internal": "0.0.0"
8484
},

0 commit comments

Comments
 (0)