Skip to content

Commit

Permalink
Merge branch 'master' into swar8080/validate-iam-principial-is-not-group
Browse files Browse the repository at this point in the history
  • Loading branch information
mergify[bot] committed Jan 18, 2021
2 parents 7d9c47a + a0fc6d3 commit 1d92bbe
Show file tree
Hide file tree
Showing 15 changed files with 72 additions and 54 deletions.
5 changes: 5 additions & 0 deletions packages/@aws-cdk/aws-ec2/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -382,6 +382,11 @@ otherwise. Subnet names will be determined from the `aws-cdk:subnet-name` tag
on the subnet if it exists, or will mirror the subnet type otherwise (i.e.
a public subnet will have the name `"Public"`).

The result of the `Vpc.fromLookup()` operation will be written to a file
called `cdk.context.json`. You must commit this file to source control so
that the lookup values are available in non-privileged environments such
as CI build steps, and to ensure your template builds are repeatable.

Here's how `Vpc.fromLookup()` can be used:

[importing existing VPCs](test/integ.import-default-vpc.lit.ts)
Expand Down
12 changes: 12 additions & 0 deletions packages/@aws-cdk/aws-ec2/lib/instance-types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -260,6 +260,18 @@ export enum InstanceClass {
*/
C6GD = 'c6gd',

/**
* Compute optimized instances for high performance computing, 6th generation with Graviton2 processors
* and high network bandwidth capabilities
*/
COMPUTE6_GRAVITON2_HIGH_NETWORK_BANDWITH = 'c6gn',

/**
* Compute optimized instances for high performance computing, 6th generation with Graviton2 processors
* and high network bandwidth capabilities
*/
C6GN = 'c6gn',

/**
* Storage-optimized instances, 2nd generation
*/
Expand Down
2 changes: 1 addition & 1 deletion packages/@aws-cdk/aws-lambda-nodejs/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@
"cdk-build-tools": "0.0.0",
"cdk-integ-tools": "0.0.0",
"delay": "4.4.0",
"esbuild": "^0.8.32",
"esbuild": "^0.8.33",
"pkglint": "0.0.0"
},
"dependencies": {
Expand Down
2 changes: 1 addition & 1 deletion packages/@aws-cdk/core/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,7 @@
"devDependencies": {
"@types/lodash": "^4.14.167",
"@types/minimatch": "^3.0.3",
"@types/node": "^10.17.48",
"@types/node": "^10.17.51",
"@types/sinon": "^9.0.9",
"cdk-build-tools": "0.0.0",
"cfn2ts": "0.0.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/@monocdk-experiment/assert/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
"devDependencies": {
"@monocdk-experiment/rewrite-imports": "0.0.0",
"@types/jest": "^26.0.15",
"@types/node": "^10.17.48",
"@types/node": "^10.17.51",
"cdk-build-tools": "0.0.0",
"constructs": "^3.2.0",
"jest": "^26.6.3",
Expand Down
2 changes: 1 addition & 1 deletion packages/@monocdk-experiment/rewrite-imports/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
"devDependencies": {
"@types/glob": "^7.1.3",
"@types/jest": "^26.0.15",
"@types/node": "^10.17.48",
"@types/node": "^10.17.51",
"cdk-build-tools": "0.0.0",
"pkglint": "0.0.0"
},
Expand Down
2 changes: 1 addition & 1 deletion packages/aws-cdk-lib/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -279,7 +279,7 @@
"@aws-cdk/region-info": "0.0.0",
"@aws-cdk/yaml-cfn": "0.0.0",
"@types/fs-extra": "^8.1.1",
"@types/node": "^10.17.48",
"@types/node": "^10.17.51",
"cdk-build-tools": "0.0.0",
"constructs": "^3.2.0",
"fs-extra": "^9.0.1",
Expand Down
2 changes: 1 addition & 1 deletion packages/aws-cdk/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
"@types/jest": "^26.0.15",
"@types/minimatch": "^3.0.3",
"@types/mockery": "^1.4.29",
"@types/node": "^10.17.48",
"@types/node": "^10.17.51",
"@types/promptly": "^3.0.1",
"@types/semver": "^7.3.4",
"@types/sinon": "^9.0.9",
Expand Down
2 changes: 1 addition & 1 deletion packages/cdk-assets/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
"@types/jest": "^26.0.15",
"@types/jszip": "^3.4.1",
"@types/mock-fs": "^4.13.0",
"@types/node": "^10.17.48",
"@types/node": "^10.17.51",
"@types/yargs": "^15.0.10",
"cdk-build-tools": "0.0.0",
"jest": "^26.6.3",
Expand Down
2 changes: 1 addition & 1 deletion packages/monocdk/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -278,7 +278,7 @@
"@aws-cdk/region-info": "0.0.0",
"@aws-cdk/yaml-cfn": "0.0.0",
"@types/fs-extra": "^8.1.1",
"@types/node": "^10.17.48",
"@types/node": "^10.17.51",
"cdk-build-tools": "0.0.0",
"constructs": "^3.2.0",
"fs-extra": "^9.0.1",
Expand Down
2 changes: 1 addition & 1 deletion tools/cdk-build-tools/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
"pkglint": "0.0.0"
},
"dependencies": {
"@typescript-eslint/eslint-plugin": "^4.12.0",
"@typescript-eslint/eslint-plugin": "^4.13.0",
"@typescript-eslint/parser": "^4.7.0",
"awslint": "0.0.0",
"colors": "^1.4.0",
Expand Down
2 changes: 1 addition & 1 deletion tools/eslint-plugin-cdk/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
"@types/eslint": "^7.2.6",
"@types/fs-extra": "^8.1.1",
"@types/jest": "^26.0.15",
"@types/node": "^10.17.48",
"@types/node": "^10.17.51",
"eslint-plugin-rulesdir": "^0.1.0",
"jest": "^26.6.3",
"typescript": "~3.9.7"
Expand Down
2 changes: 1 addition & 1 deletion tools/nodeunit-shim/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
},
"devDependencies": {
"@types/jest": "^26.0.15",
"@types/node": "^10.17.48",
"@types/node": "^10.17.51",
"typescript": "~3.9.7"
},
"dependencies": {
Expand Down
2 changes: 1 addition & 1 deletion tools/yarn-cling/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
},
"devDependencies": {
"@types/jest": "^26.0.15",
"@types/node": "^10.17.48",
"@types/node": "^10.17.51",
"@types/yarnpkg__lockfile": "^1.1.4",
"jest": "^26.6.3",
"pkglint": "0.0.0",
Expand Down
85 changes: 43 additions & 42 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -1655,10 +1655,10 @@
resolved "https://registry.yarnpkg.com/@types/node/-/node-14.14.7.tgz#8ea1e8f8eae2430cf440564b98c6dfce1ec5945d"
integrity sha512-Zw1vhUSQZYw+7u5dAwNbIA9TuTotpzY/OF7sJM9FqPOF3SPjKnxrjoTktXDZgUjybf4cWVBP7O8wvKdSaGHweg==

"@types/node@^10.17.48":
version "10.17.48"
resolved "https://registry.yarnpkg.com/@types/node/-/node-10.17.48.tgz#726e7f25d00bf58d79c8f00dd586dd9a10d06a4f"
integrity sha512-Agl6xbYP6FOMDeAsr3QVZ+g7Yzg0uhPHWx0j5g4LFdUBHVtqtU+gH660k/lCEe506jJLOGbEzsnqPDTZGJQLag==
"@types/node@^10.17.51":
version "10.17.51"
resolved "https://registry.yarnpkg.com/@types/node/-/node-10.17.51.tgz#639538575befbcf3d3861f95c41de8e47124d674"
integrity sha512-KANw+MkL626tq90l++hGelbl67irOJzGhUJk6a1Bt8QHOeh9tztJx+L0AqttraWKinmZn7Qi5lJZJzx45Gq0dg==

"@types/nodeunit@^0.0.31":
version "0.0.31"
Expand Down Expand Up @@ -1774,28 +1774,29 @@
resolved "https://registry.yarnpkg.com/@types/yarnpkg__lockfile/-/yarnpkg__lockfile-1.1.4.tgz#445251eb00bd9c1e751f82c7c6bf4f714edfd464"
integrity sha512-/emrKCfQMQmFCqRqqBJ0JueHBT06jBRM3e8OgnvDUcvuExONujIk2hFA5dNsN9Nt41ljGVDdChvCydATZ+KOZw==

"@typescript-eslint/eslint-plugin@^4.12.0":
version "4.12.0"
resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.12.0.tgz#00d1b23b40b58031e6d7c04a5bc6c1a30a2e834a"
integrity sha512-wHKj6q8s70sO5i39H2g1gtpCXCvjVszzj6FFygneNFyIAxRvNSVz9GML7XpqrB9t7hNutXw+MHnLN/Ih6uyB8Q==
"@typescript-eslint/eslint-plugin@^4.13.0":
version "4.13.0"
resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.13.0.tgz#5f580ea520fa46442deb82c038460c3dd3524bb6"
integrity sha512-ygqDUm+BUPvrr0jrXqoteMqmIaZ/bixYOc3A4BRwzEPTZPi6E+n44rzNZWaB0YvtukgP+aoj0i/fyx7FkM2p1w==
dependencies:
"@typescript-eslint/experimental-utils" "4.12.0"
"@typescript-eslint/scope-manager" "4.12.0"
"@typescript-eslint/experimental-utils" "4.13.0"
"@typescript-eslint/scope-manager" "4.13.0"
debug "^4.1.1"
functional-red-black-tree "^1.0.1"
lodash "^4.17.15"
regexpp "^3.0.0"
semver "^7.3.2"
tsutils "^3.17.1"

"@typescript-eslint/experimental-utils@4.12.0", "@typescript-eslint/experimental-utils@^4.0.1":
version "4.12.0"
resolved "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-4.12.0.tgz#372838e76db76c9a56959217b768a19f7129546b"
integrity sha512-MpXZXUAvHt99c9ScXijx7i061o5HEjXltO+sbYfZAAHxv3XankQkPaNi5myy0Yh0Tyea3Hdq1pi7Vsh0GJb0fA==
"@typescript-eslint/experimental-utils@4.13.0", "@typescript-eslint/experimental-utils@^4.0.1":
version "4.13.0"
resolved "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-4.13.0.tgz#9dc9ab375d65603b43d938a0786190a0c72be44e"
integrity sha512-/ZsuWmqagOzNkx30VWYV3MNB/Re/CGv/7EzlqZo5RegBN8tMuPaBgNK6vPBCQA8tcYrbsrTdbx3ixMRRKEEGVw==
dependencies:
"@types/json-schema" "^7.0.3"
"@typescript-eslint/scope-manager" "4.12.0"
"@typescript-eslint/types" "4.12.0"
"@typescript-eslint/typescript-estree" "4.12.0"
"@typescript-eslint/scope-manager" "4.13.0"
"@typescript-eslint/types" "4.13.0"
"@typescript-eslint/typescript-estree" "4.13.0"
eslint-scope "^5.0.0"
eslint-utils "^2.0.0"

Expand All @@ -1809,13 +1810,13 @@
"@typescript-eslint/typescript-estree" "4.7.0"
debug "^4.1.1"

"@typescript-eslint/scope-manager@4.12.0":
version "4.12.0"
resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-4.12.0.tgz#beeb8beca895a07b10c593185a5612f1085ef279"
integrity sha512-QVf9oCSVLte/8jvOsxmgBdOaoe2J0wtEmBr13Yz0rkBNkl5D8bfnf6G4Vhox9qqMIoG7QQoVwd2eG9DM/ge4Qg==
"@typescript-eslint/scope-manager@4.13.0":
version "4.13.0"
resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-4.13.0.tgz#5b45912a9aa26b29603d8fa28f5e09088b947141"
integrity sha512-UpK7YLG2JlTp/9G4CHe7GxOwd93RBf3aHO5L+pfjIrhtBvZjHKbMhBXTIQNkbz7HZ9XOe++yKrXutYm5KmjWgQ==
dependencies:
"@typescript-eslint/types" "4.12.0"
"@typescript-eslint/visitor-keys" "4.12.0"
"@typescript-eslint/types" "4.13.0"
"@typescript-eslint/visitor-keys" "4.13.0"

"@typescript-eslint/scope-manager@4.7.0":
version "4.7.0"
Expand All @@ -1825,23 +1826,23 @@
"@typescript-eslint/types" "4.7.0"
"@typescript-eslint/visitor-keys" "4.7.0"

"@typescript-eslint/types@4.12.0":
version "4.12.0"
resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-4.12.0.tgz#fb891fe7ccc9ea8b2bbd2780e36da45d0dc055e5"
integrity sha512-N2RhGeheVLGtyy+CxRmxdsniB7sMSCfsnbh8K/+RUIXYYq3Ub5+sukRCjVE80QerrUBvuEvs4fDhz5AW/pcL6g==
"@typescript-eslint/types@4.13.0":
version "4.13.0"
resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-4.13.0.tgz#6a7c6015a59a08fbd70daa8c83dfff86250502f8"
integrity sha512-/+aPaq163oX+ObOG00M0t9tKkOgdv9lq0IQv/y4SqGkAXmhFmCfgsELV7kOCTb2vVU5VOmVwXBXJTDr353C1rQ==

"@typescript-eslint/types@4.7.0":
version "4.7.0"
resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-4.7.0.tgz#5e95ef5c740f43d942542b35811f87b62fccca69"
integrity sha512-uLszFe0wExJc+I7q0Z/+BnP7wao/kzX0hB5vJn4LIgrfrMLgnB2UXoReV19lkJQS1a1mHWGGODSxnBx6JQC3Sg==

"@typescript-eslint/typescript-estree@4.12.0":
version "4.12.0"
resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-4.12.0.tgz#3963418c850f564bdab3882ae23795d115d6d32e"
integrity sha512-gZkFcmmp/CnzqD2RKMich2/FjBTsYopjiwJCroxqHZIY11IIoN0l5lKqcgoAPKHt33H2mAkSfvzj8i44Jm7F4w==
"@typescript-eslint/typescript-estree@4.13.0":
version "4.13.0"
resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-4.13.0.tgz#cf6e2207c7d760f5dfd8d18051428fadfc37b45e"
integrity sha512-9A0/DFZZLlGXn5XA349dWQFwPZxcyYyCFX5X88nWs2uachRDwGeyPz46oTsm9ZJE66EALvEns1lvBwa4d9QxMg==
dependencies:
"@typescript-eslint/types" "4.12.0"
"@typescript-eslint/visitor-keys" "4.12.0"
"@typescript-eslint/types" "4.13.0"
"@typescript-eslint/visitor-keys" "4.13.0"
debug "^4.1.1"
globby "^11.0.1"
is-glob "^4.0.1"
Expand All @@ -1863,12 +1864,12 @@
semver "^7.3.2"
tsutils "^3.17.1"

"@typescript-eslint/visitor-keys@4.12.0":
version "4.12.0"
resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-4.12.0.tgz#a470a79be6958075fa91c725371a83baf428a67a"
integrity sha512-hVpsLARbDh4B9TKYz5cLbcdMIOAoBYgFPCSP9FFS/liSF+b33gVNq8JHY3QGhHNVz85hObvL7BEYLlgx553WCw==
"@typescript-eslint/visitor-keys@4.13.0":
version "4.13.0"
resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-4.13.0.tgz#9acb1772d3b3183182b6540d3734143dce9476fe"
integrity sha512-6RoxWK05PAibukE7jElqAtNMq+RWZyqJ6Q/GdIxaiUj2Ept8jh8+FUVlbq9WxMYxkmEOPvCE5cRSyupMpwW31g==
dependencies:
"@typescript-eslint/types" "4.12.0"
"@typescript-eslint/types" "4.13.0"
eslint-visitor-keys "^2.0.0"

"@typescript-eslint/visitor-keys@4.7.0":
Expand Down Expand Up @@ -3943,10 +3944,10 @@ es6-promisify@^5.0.0:
dependencies:
es6-promise "^4.0.3"

esbuild@^0.8.32:
version "0.8.32"
resolved "https://registry.yarnpkg.com/esbuild/-/esbuild-0.8.32.tgz#d3d679ea417925f7afaab37555e52070df317355"
integrity sha512-5IzQapMW/wFy5oxziHCJzawk26K3xeyrIAQPnPN3c0Q84hqRw6IfGDGfGWOdJNw5tAx77yvwqZ4r1QMpo6emJA==
esbuild@^0.8.33:
version "0.8.33"
resolved "https://registry.yarnpkg.com/esbuild/-/esbuild-0.8.33.tgz#4e24ab4e780b08ff5527171bf5a684594c8b56e9"
integrity sha512-2ms/P6Y9zJfopR9dKo2vHzhXKfGSNlquVVoVOF8YnhjuzZVrvManMVBPadBsR/t7jzIkRnwqvxrs7d4f3C3eyg==

escalade@^3.1.1:
version "3.1.1"
Expand Down

0 comments on commit 1d92bbe

Please sign in to comment.