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(ecr-assets): simplify docker asset publishing #5733

Merged
merged 5 commits into from
Jan 16, 2020
Merged

feat(ecr-assets): simplify docker asset publishing #5733

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
209b1e4
feat(ecr-assets): simplify docker asset publishing
Jan 15, 2020
33629fa
Merge remote-tracking branch 'origin/master' into benisrae/container-…
Jan 15, 2020
3654d5d
update test expectations
Jan 15, 2020
04cb4dd
Merge branch 'master' into benisrae/container-asset-changes-2
Jan 15, 2020
6240b5b
Merge branch 'master' into benisrae/container-asset-changes-2
Jan 16, 2020
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
33 changes: 21 additions & 12 deletions packages/@aws-cdk/aws-cloudformation/test/test.nested-stack.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -788,19 +788,28 @@ export = {
});

// THEN
const parentParams = SynthUtils.toCloudFormation(parent).Parameters;
const nestedParams = SynthUtils.toCloudFormation(nested).Parameters;
test.ok(parentParams.AssetParametershashofsourceImageName1CFB7817);
test.ok(nestedParams.referencetomystackAssetParametershashofsourceImageName7D5F0882Ref);

// verify parameter is passed to nested stack
expect(parent).to(haveResource('AWS::CloudFormation::Stack', {
Parameters: {
referencetomystackAssetParametershashofsourceImageName7D5F0882Ref: {
Ref: "AssetParametershashofsourceImageName1CFB7817"
}
const asm = app.synth();
test.deepEqual(asm.getStackArtifact(parent.artifactId).assets, [
{
repositoryName: 'aws-cdk/assets',
imageTag: 'hash-of-source',
id: 'hash-of-source',
packaging: 'container-image',
path: 'my-image',
sourceHash: 'hash-of-source',
buildArgs: { key: 'value', boom: 'bam' },
target: 'buildTarget'
},
{
path: 'mystacknestedstackFAE12FB5.nested.template.json',
id: 'fcdaee79eb79f37eca3a9b1cc0cc9ba150e4eea8c5d6d0c343cb6cd9dc68e2e5',
packaging: 'file',
sourceHash: 'fcdaee79eb79f37eca3a9b1cc0cc9ba150e4eea8c5d6d0c343cb6cd9dc68e2e5',
s3BucketParameter: 'AssetParametersfcdaee79eb79f37eca3a9b1cc0cc9ba150e4eea8c5d6d0c343cb6cd9dc68e2e5S3Bucket67A749F8',
s3KeyParameter: 'AssetParametersfcdaee79eb79f37eca3a9b1cc0cc9ba150e4eea8c5d6d0c343cb6cd9dc68e2e5S3VersionKeyE1E6A8D4',
artifactHashParameter: 'AssetParametersfcdaee79eb79f37eca3a9b1cc0cc9ba150e4eea8c5d6d0c343cb6cd9dc68e2e5ArtifactHash0AEDBE8A'
}
}));
]);

test.done();
},
Expand Down
233 changes: 3 additions & 230 deletions packages/@aws-cdk/aws-codebuild/test/integ.docker-asset.lit.expected.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,181 +1,5 @@
{
"Resources": {
"MyImageAdoptRepository6CA902F6": {
"Type": "Custom::ECRAdoptedRepository",
"Properties": {
"ServiceToken": {
"Fn::GetAtt": [
"AdoptEcrRepositorydbc60defc59544bcaa5c28c95d68f62c52BE89E9",
"Arn"
]
},
"RepositoryName": {
"Fn::Select": [
0,
{
"Fn::Split": [
"@sha256:",
{
"Ref": "AssetParameters90a0be42035e43667ec935f49efc23c6bd6c9ec566b92dae96a94f505f091f2bImageName2105B480"
}
]
}
]
}
},
"DependsOn": [
"AdoptEcrRepositorydbc60defc59544bcaa5c28c95d68f62cServiceRoleDefaultPolicy6BC8737C",
"AdoptEcrRepositorydbc60defc59544bcaa5c28c95d68f62cServiceRoleD788AA17"
],
"UpdateReplacePolicy": "Delete",
"DeletionPolicy": "Delete"
},
"AdoptEcrRepositorydbc60defc59544bcaa5c28c95d68f62cServiceRoleD788AA17": {
"Type": "AWS::IAM::Role",
"Properties": {
"AssumeRolePolicyDocument": {
"Statement": [
{
"Action": "sts:AssumeRole",
"Effect": "Allow",
"Principal": {
"Service": "lambda.amazonaws.com"
}
}
],
"Version": "2012-10-17"
},
"ManagedPolicyArns": [
{
"Fn::Join": [
"",
[
"arn:",
{
"Ref": "AWS::Partition"
},
":iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
]
]
}
]
}
},
"AdoptEcrRepositorydbc60defc59544bcaa5c28c95d68f62cServiceRoleDefaultPolicy6BC8737C": {
"Type": "AWS::IAM::Policy",
"Properties": {
"PolicyDocument": {
"Statement": [
{
"Action": [
"ecr:GetRepositoryPolicy",
"ecr:SetRepositoryPolicy",
"ecr:DeleteRepository",
"ecr:ListImages",
"ecr:BatchDeleteImage"
],
"Effect": "Allow",
"Resource": {
"Fn::Join": [
"",
[
"arn:",
{
"Ref": "AWS::Partition"
},
":ecr:",
{
"Ref": "AWS::Region"
},
":",
{
"Ref": "AWS::AccountId"
},
":repository/",
{
"Fn::Select": [
0,
{
"Fn::Split": [
"@sha256:",
{
"Ref": "AssetParameters90a0be42035e43667ec935f49efc23c6bd6c9ec566b92dae96a94f505f091f2bImageName2105B480"
}
]
}
]
}
]
]
}
}
],
"Version": "2012-10-17"
},
"PolicyName": "AdoptEcrRepositorydbc60defc59544bcaa5c28c95d68f62cServiceRoleDefaultPolicy6BC8737C",
"Roles": [
{
"Ref": "AdoptEcrRepositorydbc60defc59544bcaa5c28c95d68f62cServiceRoleD788AA17"
}
]
}
},
"AdoptEcrRepositorydbc60defc59544bcaa5c28c95d68f62c52BE89E9": {
"Type": "AWS::Lambda::Function",
"Properties": {
"Code": {
"S3Bucket": {
"Ref": "AssetParametersea7034d81c091be1158bcd85b4958dc86ec6672c345be27607d68fdfcf26b1c1S3BucketE797C7BB"
},
"S3Key": {
"Fn::Join": [
"",
[
{
"Fn::Select": [
0,
{
"Fn::Split": [
"||",
{
"Ref": "AssetParametersea7034d81c091be1158bcd85b4958dc86ec6672c345be27607d68fdfcf26b1c1S3VersionKey56C3F6D7"
}
]
}
]
},
{
"Fn::Select": [
1,
{
"Fn::Split": [
"||",
{
"Ref": "AssetParametersea7034d81c091be1158bcd85b4958dc86ec6672c345be27607d68fdfcf26b1c1S3VersionKey56C3F6D7"
}
]
}
]
}
]
]
}
},
"Handler": "handler.handler",
"Role": {
"Fn::GetAtt": [
"AdoptEcrRepositorydbc60defc59544bcaa5c28c95d68f62cServiceRoleD788AA17",
"Arn"
]
},
"Runtime": "nodejs10.x",
"Timeout": 300
},
"DependsOn": [
"AdoptEcrRepositorydbc60defc59544bcaa5c28c95d68f62cServiceRoleDefaultPolicy6BC8737C",
"AdoptEcrRepositorydbc60defc59544bcaa5c28c95d68f62cServiceRoleD788AA17"
]
},
"MyProjectRole9BBE5233": {
"Type": "AWS::IAM::Role",
"Properties": {
Expand Down Expand Up @@ -221,13 +45,7 @@
{
"Ref": "AWS::AccountId"
},
":repository/",
{
"Fn::GetAtt": [
"MyImageAdoptRepository6CA902F6",
"RepositoryName"
]
}
":repository/aws-cdk/assets"
]
]
}
Expand Down Expand Up @@ -328,34 +146,7 @@
{
"Ref": "AWS::URLSuffix"
},
"/",
{
"Fn::Select": [
0,
{
"Fn::Split": [
"@sha256:",
{
"Ref": "AssetParameters90a0be42035e43667ec935f49efc23c6bd6c9ec566b92dae96a94f505f091f2bImageName2105B480"
}
]
}
]
},
"@sha256:",
{
"Fn::Select": [
1,
{
"Fn::Split": [
"@sha256:",
{
"Ref": "AssetParameters90a0be42035e43667ec935f49efc23c6bd6c9ec566b92dae96a94f505f091f2bImageName2105B480"
}
]
}
]
}
"/aws-cdk/assets:ee9ebbb592f461ed4638ea9ea64fab9fd384fd2f890c4fef981f9938d82419f4"
]
]
},
Expand All @@ -375,23 +166,5 @@
}
}
}
},
"Parameters": {
"AssetParameters90a0be42035e43667ec935f49efc23c6bd6c9ec566b92dae96a94f505f091f2bImageName2105B480": {
"Type": "String",
"Description": "ECR repository name and tag for asset \"90a0be42035e43667ec935f49efc23c6bd6c9ec566b92dae96a94f505f091f2b\""
},
"AssetParametersea7034d81c091be1158bcd85b4958dc86ec6672c345be27607d68fdfcf26b1c1S3BucketE797C7BB": {
"Type": "String",
"Description": "S3 bucket for asset \"ea7034d81c091be1158bcd85b4958dc86ec6672c345be27607d68fdfcf26b1c1\""
},
"AssetParametersea7034d81c091be1158bcd85b4958dc86ec6672c345be27607d68fdfcf26b1c1S3VersionKey56C3F6D7": {
"Type": "String",
"Description": "S3 key for asset version \"ea7034d81c091be1158bcd85b4958dc86ec6672c345be27607d68fdfcf26b1c1\""
},
"AssetParametersea7034d81c091be1158bcd85b4958dc86ec6672c345be27607d68fdfcf26b1c1ArtifactHash7E5AE478": {
"Type": "String",
"Description": "Artifact hash for asset \"ea7034d81c091be1158bcd85b4958dc86ec6672c345be27607d68fdfcf26b1c1\""
}
}
}
}
1 change: 0 additions & 1 deletion packages/@aws-cdk/aws-ecr-assets/lib/adopt-repository/.gitignore
View file
Open in desktop

This file was deleted.

Loading