Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(region-info): Model region-specific information #1839

Merged
merged 19 commits into from
Mar 13, 2019
Merged

feat(region-info): Model region-specific information #1839

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
7bb5cc1
feat(region-info): Model AWS region information
RomainMuller Mar 5, 2019
0647297
Some API changes. Still a WIP
RomainMuller Mar 5, 2019
d95058f
WIP
RomainMuller Mar 5, 2019
bf37d86
build: Allow using jest as a test framework
RomainMuller Mar 5, 2019
26d37f8
Enforce coverage thresholds to be set
RomainMuller Mar 5, 2019
b327471
Merge branch 'rmuller/allow-using-jest' into rmuller/service-principals
RomainMuller Mar 5, 2019
aac7a85
Flip to less modeled facts database.
RomainMuller Mar 6, 2019
1c26bb3
Update service principals from the IAM library
RomainMuller Mar 6, 2019
ad0a0b2
fix: Don't add the AWS::CDK::Metadata in regions where it is not present
RomainMuller Mar 6, 2019
d00654a
Rename present to available
RomainMuller Mar 6, 2019
e61b43c
Update README
RomainMuller Mar 6, 2019
e293b15
Add region-info to decdk
RomainMuller Mar 7, 2019
a21a9e3
Merge remote-tracking branch 'origin/master' into rmuller/service-pri…
RomainMuller Mar 8, 2019
e2748fc
Update lockfile
RomainMuller Mar 11, 2019
8f527eb
PR feedback.
RomainMuller Mar 12, 2019
18d5b25
Add new API
RomainMuller Mar 12, 2019
3c9d7b2
Update README
RomainMuller Mar 12, 2019
6c5fa11
Improved defaulting behavior
RomainMuller Mar 12, 2019
423bc7f
Merge remote-tracking branch 'origin/master' into rmuller/service-pri…
RomainMuller Mar 12, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1,656 changes: 695 additions & 961 deletions package-lock.json
View file
Open in desktop

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@
"lerna": "^3.13.1",
"nodeunit": "^0.11.2",
"nyc": "^13.3.0",
"tslint": "^5.13.0",
"@types/jest": "^24.0.6",
"jest": "^24.1.0",
"tslint": "^5.13.1",
"@types/jest": "^24.0.11",
"jest": "^24.4.0",
"ts-jest": "^24.0.0",
"typescript": "^3.3.3333"
},
Expand Down
40 changes: 30 additions & 10 deletions packages/@aws-cdk/app-delivery/test/integ.cicd.expected.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,17 @@
"Action": "sts:AssumeRole",
"Effect": "Allow",
"Principal": {
"Service": "codepipeline.amazonaws.com"
"Service": {
"Fn::Join": [
"",
[
"codepipeline.",
{
"Ref": "AWS::URLSuffix"
}
]
]
}
}
}
],
Expand Down Expand Up @@ -145,12 +155,6 @@
"CodePipelineB74E5936": {
"Type": "AWS::CodePipeline::Pipeline",
"Properties": {
"ArtifactStore": {
"Location": {
"Ref": "ArtifactBucket7410C9EF"
},
"Type": "S3"
},
"RoleArn": {
"Fn::GetAtt": [
"CodePipelineRoleB3A660B4",
Expand Down Expand Up @@ -236,7 +240,13 @@
],
"Name": "Deploy"
}
]
],
"ArtifactStore": {
"Location": {
"Ref": "ArtifactBucket7410C9EF"
},
"Type": "S3"
}
},
"DependsOn": [
"CodePipelineRoleDefaultPolicy8D520A8D",
Expand All @@ -252,7 +262,17 @@
"Action": "sts:AssumeRole",
"Effect": "Allow",
"Principal": {
"Service": "cloudformation.amazonaws.com"
"Service": {
"Fn::Join": [
"",
[
"cloudformation.",
{
"Ref": "AWS::URLSuffix"
}
]
]
}
}
}
],
Expand All @@ -261,4 +281,4 @@
}
}
}
}
}
4 changes: 2 additions & 2 deletions packages/@aws-cdk/assets-docker/test/test.image-asset.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ export = {
// WHEN
asset.repository.addToResourcePolicy(new iam.PolicyStatement()
.addAction('BOOM')
.addPrincipal(new iam.ServicePrincipal('DAMN')));
.addPrincipal(new iam.ServicePrincipal('test.service')));

// THEN
expect(stack).to(haveResource('Custom::ECRAdoptedRepository', {
Expand All @@ -117,7 +117,7 @@ export = {
"Action": "BOOM",
"Effect": "Allow",
"Principal": {
"Service": "DAMN"
"Service": "test.service"
}
}
],
Expand Down
50 changes: 45 additions & 5 deletions packages/@aws-cdk/aws-apigateway/test/integ.restapi.books.expected.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,17 @@
"Action": "sts:AssumeRole",
"Effect": "Allow",
"Principal": {
"Service": "lambda.amazonaws.com"
"Service": {
"Fn::Join": [
"",
[
"lambda.",
{
"Ref": "AWS::URLSuffix"
}
]
]
}
}
}
],
Expand Down Expand Up @@ -203,7 +213,17 @@
"Action": "sts:AssumeRole",
"Effect": "Allow",
"Principal": {
"Service": "lambda.amazonaws.com"
"Service": {
"Fn::Join": [
"",
[
"lambda.",
{
"Ref": "AWS::URLSuffix"
}
]
]
}
}
}
],
Expand Down Expand Up @@ -397,7 +417,17 @@
"Action": "sts:AssumeRole",
"Effect": "Allow",
"Principal": {
"Service": "lambda.amazonaws.com"
"Service": {
"Fn::Join": [
"",
[
"lambda.",
{
"Ref": "AWS::URLSuffix"
}
]
]
}
}
}
],
Expand Down Expand Up @@ -555,7 +585,17 @@
"Action": "sts:AssumeRole",
"Effect": "Allow",
"Principal": {
"Service": "apigateway.amazonaws.com"
"Service": {
"Fn::Join": [
"",
[
"apigateway.",
{
"Ref": "AWS::URLSuffix"
}
]
]
}
}
}
],
Expand Down Expand Up @@ -850,4 +890,4 @@
}
}
}
}
}
14 changes: 12 additions & 2 deletions packages/@aws-cdk/aws-apigateway/test/integ.restapi.defaults.expected.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,17 @@
"Action": "sts:AssumeRole",
"Effect": "Allow",
"Principal": {
"Service": "apigateway.amazonaws.com"
"Service": {
"Fn::Join": [
"",
[
"apigateway.",
{
"Ref": "AWS::URLSuffix"
}
]
]
}
}
}
],
Expand Down Expand Up @@ -123,4 +133,4 @@
}
}
}
}
}
26 changes: 23 additions & 3 deletions packages/@aws-cdk/aws-apigateway/test/integ.restapi.expected.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,17 @@
"Action": "sts:AssumeRole",
"Effect": "Allow",
"Principal": {
"Service": "apigateway.amazonaws.com"
"Service": {
"Fn::Join": [
"",
[
"apigateway.",
{
"Ref": "AWS::URLSuffix"
}
]
]
}
}
}
],
Expand Down Expand Up @@ -329,7 +339,17 @@
"Action": "sts:AssumeRole",
"Effect": "Allow",
"Principal": {
"Service": "lambda.amazonaws.com"
"Service": {
"Fn::Join": [
"",
[
"lambda.",
{
"Ref": "AWS::URLSuffix"
}
]
]
}
}
}
],
Expand Down Expand Up @@ -615,4 +635,4 @@
}
}
}
}
}
2 changes: 1 addition & 1 deletion packages/@aws-cdk/aws-apigateway/test/test.restapi.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ export = {
{
Action: "sts:AssumeRole",
Effect: "Allow",
Principal: { Service: "apigateway.amazonaws.com" }
Principal: { Service: { "Fn::Join": ["", ["apigateway.", { Ref: "AWS::URLSuffix" }]] } }
}
],
Version: "2012-10-17"
Expand Down
12 changes: 11 additions & 1 deletion packages/@aws-cdk/aws-autoscaling/test/integ.amazonlinux2.expected.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -375,7 +375,17 @@
"Action": "sts:AssumeRole",
"Effect": "Allow",
"Principal": {
"Service": "ec2.amazonaws.com"
"Service": {
"Fn::Join": [
"",
[
"ec2.",
{
"Ref": "AWS::URLSuffix"
}
]
]
}
}
}
],
Expand Down
14 changes: 12 additions & 2 deletions packages/@aws-cdk/aws-autoscaling/test/integ.asg-w-classic-loadbalancer.expected.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -549,7 +549,17 @@
"Action": "sts:AssumeRole",
"Effect": "Allow",
"Principal": {
"Service": "ec2.amazonaws.com"
"Service": {
"Fn::Join": [
"",
[
"ec2.",
{
"Ref": "AWS::URLSuffix"
}
]
]
}
}
}
],
Expand Down Expand Up @@ -716,4 +726,4 @@
]
}
}
}
}
22 changes: 16 additions & 6 deletions packages/@aws-cdk/aws-autoscaling/test/integ.asg-w-elbv2.expected.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -396,7 +396,17 @@
"Action": "sts:AssumeRole",
"Effect": "Allow",
"Principal": {
"Service": "ec2.amazonaws.com"
"Service": {
"Fn::Join": [
"",
[
"ec2.",
{
"Ref": "AWS::URLSuffix"
}
]
]
}
}
}
],
Expand Down Expand Up @@ -640,13 +650,13 @@
"Properties": {
"Port": 80,
"Protocol": "HTTP",
"VpcId": {
"Ref": "VPCB9E5F0B4"
},
"TargetGroupAttributes": [],
"Targets": [],
"TargetType": "instance"
"TargetType": "instance",
"VpcId": {
"Ref": "VPCB9E5F0B4"
}
}
}
}
}
}
12 changes: 11 additions & 1 deletion packages/@aws-cdk/aws-autoscaling/test/integ.custom-scaling.expected.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -375,7 +375,17 @@
"Action": "sts:AssumeRole",
"Effect": "Allow",
"Principal": {
"Service": "ec2.amazonaws.com"
"Service": {
"Fn::Join": [
"",
[
"ec2.",
{
"Ref": "AWS::URLSuffix"
}
]
]
}
}
}
],
Expand Down
12 changes: 11 additions & 1 deletion packages/@aws-cdk/aws-autoscaling/test/integ.external-role.expected.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -505,7 +505,17 @@
"Action": "sts:AssumeRole",
"Effect": "Allow",
"Principal": {
"Service": "ec2.amazonaws.com"
"Service": {
"Fn::Join": [
"",
[
"ec2.",
{
"Ref": "AWS::URLSuffix"
}
]
]
}
}
}
],
Expand Down
2 changes: 1 addition & 1 deletion packages/@aws-cdk/aws-autoscaling/test/test.lifecyclehooks.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ export = {
{
Action: "sts:AssumeRole",
Effect: "Allow",
Principal: { Service: "autoscaling.amazonaws.com" }
Principal: { Service: { "Fn::Join": ["", ["autoscaling.", { Ref: "AWS::URLSuffix" }]] } }
}
],
}
Expand Down
Loading