Skip to content

Commit 985ad66

Browse files
mergify[bot]mergify[bot]
authored
Merge branch 'main' into corymhall/docs/integration-testing
2 parents 3f90eb4 + f98029e commit 985ad66

1,219 files changed

Lines changed: 15248 additions & 13214 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.

‎.github/workflows/yarn-upgrade-v1main.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
- name: Set up Node
2323
uses: actions/setup-node@v3
2424
with:
25-
node-version: 12
25+
node-version: 14
2626

2727
- name: Locate Yarn cache
2828
id: yarn-cache

‎.github/workflows/yarn-upgrade.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
- name: Set up Node
2121
uses: actions/setup-node@v3
2222
with:
23-
node-version: 12
23+
node-version: 14
2424

2525
- name: Locate Yarn cache
2626
id: yarn-cache
@@ -60,14 +60,14 @@ jobs:
6060
# Upgrade dependencies at repository root
6161
ncu --upgrade --filter=@types/node,@types/fs-extra --target=minor
6262
ncu --upgrade --filter=typescript --target=patch
63-
ncu --upgrade --reject=@types/node,@types/fs-extra,constructs,typescript,lerna --target=minor
63+
ncu --upgrade --reject=@types/node,@types/prettier,@types/fs-extra,constructs,typescript,lerna --target=minor
6464
# Upgrade all the packages
6565
lerna exec --parallel ncu -- --upgrade --filter=@types/node,@types/fs-extra --target=minor
6666
lerna exec --parallel ncu -- --upgrade --filter=typescript --target=patch
67-
lerna exec --parallel ncu -- --upgrade --reject='@types/node,@types/fs-extra,constructs,typescript,aws-sdk,aws-sdk-mock,${{ steps.list-packages.outputs.list }}' --target=minor
67+
lerna exec --parallel ncu -- --upgrade --reject='@types/node,@types/prettier,@types/fs-extra,constructs,typescript,aws-sdk,aws-sdk-mock,${{ steps.list-packages.outputs.list }}' --target=minor
6868
# Upgrade package.jsons in init templates
6969
for pj in $(find packages/aws-cdk/lib/init-templates -name package.json); do
70-
(cd $(dirname $pj) && ncu --upgrade --reject='@types/node,@types/fs-extra,constructs,typescript,aws-sdk,aws-sdk-mock,ts-jest,jest,${{ steps.list-packages.outputs.list }}')
70+
(cd $(dirname $pj) && ncu --upgrade --reject='@types/node,@types/prettier,@types/fs-extra,constructs,typescript,aws-sdk,aws-sdk-mock,ts-jest,jest,${{ steps.list-packages.outputs.list }}')
7171
done
7272
7373
# This will ensure the current lockfile is up-to-date with the dependency specifications (necessary for "yarn update" to run)

‎CONTRIBUTING.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ The following tools need to be installed on your system prior to installing the
5757
- [Node.js >= 14.15.0](https://nodejs.org/download/release/latest-v14.x/)
5858
- We recommend using a version in [Active LTS](https://nodejs.org/en/about/releases/)
5959
- [Yarn >= 1.19.1, < 2](https://yarnpkg.com/lang/en/docs/install)
60-
- [.NET Core SDK 3.1.x](https://www.microsoft.com/net/download)
60+
- [.NET Core SDK >= 3.1.x](https://www.microsoft.com/net/download)
6161
- [Python >= 3.6.5, < 4.0](https://www.python.org/downloads/release/python-365/)
6262
- [Docker >= 19.03](https://docs.docker.com/get-docker/)
6363
- the Docker daemon must also be running

‎INTEGRATION_TESTS.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ const stack = new cdk.Stack(app, 'aws-cdk-lambda-1');
9494
const fn = new lambda.Function(stack, 'MyLambda', {
9595
code: new lambda.InlineCode('foo'),
9696
handler: 'index.handler',
97-
runtime: lambda.Runtime.NODEJS_10_X,
97+
runtime: lambda.Runtime.NODEJS_14_X,
9898
});
9999

100100
new integ.IntegTest(app, 'LambdaTest', {

‎package.json‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -18,25 +18,25 @@
1818
"devDependencies": {
1919
"@types/prettier": "2.6.0",
2020
"@yarnpkg/lockfile": "^1.1.0",
21-
"cdk-generate-synthetic-examples": "^0.1.10",
21+
"cdk-generate-synthetic-examples": "^0.1.12",
2222
"conventional-changelog-cli": "^2.2.2",
2323
"fs-extra": "^9.1.0",
2424
"graceful-fs": "^4.2.10",
2525
"jest-junit": "^13.2.0",
26-
"jsii-diff": "^1.58.0",
27-
"jsii-pacmak": "^1.58.0",
28-
"jsii-reflect": "^1.58.0",
29-
"jsii-rosetta": "^1.58.0",
26+
"jsii-diff": "^1.60.1",
27+
"jsii-pacmak": "^1.60.1",
28+
"jsii-reflect": "^1.60.1",
29+
"jsii-rosetta": "^1.60.1",
3030
"lerna": "^4.0.0",
3131
"patch-package": "^6.4.7",
3232
"semver": "^6.3.0",
33-
"standard-version": "^9.3.2",
33+
"standard-version": "^9.5.0",
3434
"typescript": "~3.9.10"
3535
},
3636
"resolutions": {
3737
"colors": "1.4.0",
38-
"string-width": "^4.2.3",
39-
"markdown-it": "^12.3.2"
38+
"markdown-it": "^12.3.2",
39+
"string-width": "^4.2.3"
4040
},
4141
"repository": {
4242
"type": "git",

‎packages/@aws-cdk-containers/ecs-service-extensions/lib/extensions/extension-interfaces.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import * as ecs from '@aws-cdk/aws-ecs';
22
import * as cdk from '@aws-cdk/core';
3-
import { Service, ConnectToProps } from '../service';
43
import { Construct } from 'constructs';
4+
import { Service, ConnectToProps } from '../service';
55

66
/**
77
* The types of capacity that are supported. These capacity types may change the

‎packages/@aws-cdk-containers/ecs-service-extensions/lib/extensions/injecter.ts‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,10 @@
11
import * as ecs from '@aws-cdk/aws-ecs';
22
import * as sns from '@aws-cdk/aws-sns';
3+
import { Construct } from 'constructs';
34
import { Service } from '../service';
45
import { Container } from './container';
56
import { ContainerMutatingHook, ServiceExtension } from './extension-interfaces';
67

7-
// Keep this import separate from other imports to reduce chance for merge conflicts with v2-main
8-
// eslint-disable-next-line no-duplicate-imports, import/order
9-
import { Construct } from 'constructs';
10-
118
/**
129
* An interface that will be implemented by all the resources that can be published events or written data to.
1310
*/

‎packages/@aws-cdk-containers/ecs-service-extensions/lib/service.ts‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,11 @@
11
import * as ec2 from '@aws-cdk/aws-ec2';
22
import * as ecs from '@aws-cdk/aws-ecs';
33
import * as iam from '@aws-cdk/aws-iam';
4+
import { Construct } from 'constructs';
45
import { IEnvironment } from './environment';
56
import { EnvironmentCapacityType, ServiceBuild } from './extensions/extension-interfaces';
67
import { ServiceDescription } from './service-description';
78

8-
// keep this import separate from other imports to reduce chance for merge conflicts with v2-main
9-
// eslint-disable-next-line no-duplicate-imports, import/order
10-
import { Construct } from 'constructs';
11-
129
/**
1310
* connectToProps will have all the extra parameters which are required for connecting services.
1411
*/

‎packages/@aws-cdk-containers/ecs-service-extensions/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
},
3939
"license": "Apache-2.0",
4040
"devDependencies": {
41-
"@types/jest": "^27.5.0",
41+
"@types/jest": "^27.5.2",
4242
"@aws-cdk/cdk-build-tools": "0.0.0",
4343
"@aws-cdk/integ-runner": "0.0.0",
4444
"@aws-cdk/aws-autoscaling": "0.0.0",

‎packages/@aws-cdk-containers/ecs-service-extensions/test/assign-public-ip.integ.snapshot/aws-ecs-integ.assets.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"version": "17.0.0",
2+
"version": "20.0.0",
33
"files": {
44
"8f06a3db22794ebc7ff89b4745fd706afd46e17816fe46da72e5125cabae725d": {
55
"source": {
@@ -40,15 +40,15 @@
4040
}
4141
}
4242
},
43-
"80aa78a4817ba118f8e03b489e7276a0100cd9dae8b7dd32db16e53b45d438b4": {
43+
"0b2a2f517aed512c15790ab888051365faa60d6c56c60f963b9f68bd63700087": {
4444
"source": {
4545
"path": "aws-ecs-integ.template.json",
4646
"packaging": "file"
4747
},
4848
"destinations": {
4949
"current_account-current_region": {
5050
"bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}",
51-
"objectKey": "80aa78a4817ba118f8e03b489e7276a0100cd9dae8b7dd32db16e53b45d438b4.json",
51+
"objectKey": "0b2a2f517aed512c15790ab888051365faa60d6c56c60f963b9f68bd63700087.json",
5252
"assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}"
5353
}
5454
}

0 commit comments

Comments
 (0)