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

fix(pipelines): 'ConfirmPermissionsBroadening' uses wrong node version #20861

Merged
merged 2 commits into from
Jun 24, 2022
Merged

fix(pipelines): 'ConfirmPermissionsBroadening' uses wrong node version #20861

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
82c30d7
fix(pipelines): 'ConfirmPermissionsBroadening' uses wrong node version
rix0rrr Jun 24, 2022
36039ee
Update tree.json
rix0rrr Jun 24, 2022
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
3 changes: 3 additions & 0 deletions packages/@aws-cdk/pipelines/lib/private/application-security-check.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,9 @@ export class ApplicationSecurityCheck extends Construct {
` --message "${message.join('\n')}"`;

this.cdkDiffProject = new codebuild.Project(this, 'CDKSecurityCheck', {
environment: {
buildImage: codebuild.LinuxBuildImage.STANDARD_5_0,
},
buildSpec: codebuild.BuildSpec.fromObject({
version: 0.2,
phases: {
Expand Down
17 changes: 14 additions & 3 deletions packages/@aws-cdk/pipelines/test/compliance/security-check.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,9 @@ behavior('security check option generates lambda/codebuild at pipeline scope', (
});

function THEN_codePipelineExpectation() {
Template.fromStack(pipelineStack).resourceCountIs('AWS::Lambda::Function', 1);
Template.fromStack(pipelineStack).hasResourceProperties('AWS::Lambda::Function', {
const template = Template.fromStack(pipelineStack);
template.resourceCountIs('AWS::Lambda::Function', 1);
template.hasResourceProperties('AWS::Lambda::Function', {
Role: {
'Fn::GetAtt': [
stringLike('CdkPipeline*SecurityCheckCDKPipelinesAutoApproveServiceRole*'),
Expand All @@ -50,7 +51,17 @@ behavior('security check option generates lambda/codebuild at pipeline scope', (
},
});
// 1 for github build, 1 for synth stage, and 1 for the application security check
Template.fromStack(pipelineStack).resourceCountIs('AWS::CodeBuild::Project', 3);
template.resourceCountIs('AWS::CodeBuild::Project', 3);

// No CodeBuild project has a build image that is not standard:5.0
const projects = template.findResources('AWS::CodeBuild::Project', {
Properties: {
Environment: {
Image: 'aws/codebuild/standard:5.0',
},
},
});
expect(Object.keys(projects).length).toEqual(3);
}
});

Expand Down
4 changes: 2 additions & 2 deletions ...aws-cdk/pipelines/test/pipeline-security.integ.snapshot/PipelineSecurityStack.assets.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,15 +27,15 @@
}
}
},
"89f6e045568a0cd52d21d8215bb87ce0d05485ee8c757b0eb4ac080ddc9f1d6f": {
"7f17b1fbdb3783f2f992a94602a37c674f58741617a65f348b43ba1a7637a115": {
"source": {
"path": "PipelineSecurityStack.template.json",
"packaging": "file"
},
"destinations": {
"current_account-current_region": {
"bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}",
"objectKey": "89f6e045568a0cd52d21d8215bb87ce0d05485ee8c757b0eb4ac080ddc9f1d6f.json",
"objectKey": "7f17b1fbdb3783f2f992a94602a37c674f58741617a65f348b43ba1a7637a115.json",
"assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}"
}
}
Expand Down
4 changes: 2 additions & 2 deletions ...s-cdk/pipelines/test/pipeline-security.integ.snapshot/PipelineSecurityStack.template.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2603,7 +2603,7 @@
},
"Environment": {
"ComputeType": "BUILD_GENERAL1_SMALL",
"Image": "aws/codebuild/standard:1.0",
"Image": "aws/codebuild/standard:5.0",
"ImagePullCredentialsType": "CODEBUILD",
"PrivilegedMode": false,
"Type": "LINUX_CONTAINER"
Expand Down Expand Up @@ -2947,7 +2947,7 @@
},
"Environment": {
"ComputeType": "BUILD_GENERAL1_SMALL",
"Image": "aws/codebuild/standard:1.0",
"Image": "aws/codebuild/standard:5.0",
"ImagePullCredentialsType": "CODEBUILD",
"PrivilegedMode": false,
"Type": "LINUX_CONTAINER"
Expand Down
2 changes: 1 addition & 1 deletion packages/@aws-cdk/pipelines/test/pipeline-security.integ.snapshot/manifest.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@
"validateOnSynth": false,
"assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-deploy-role-${AWS::AccountId}-${AWS::Region}",
"cloudFormationExecutionRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-cfn-exec-role-${AWS::AccountId}-${AWS::Region}",
"stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/89f6e045568a0cd52d21d8215bb87ce0d05485ee8c757b0eb4ac080ddc9f1d6f.json",
"stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/7f17b1fbdb3783f2f992a94602a37c674f58741617a65f348b43ba1a7637a115.json",
"requiresBootstrapStackVersion": 6,
"bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version",
"additionalDependencies": [
Expand Down
6 changes: 3 additions & 3 deletions packages/@aws-cdk/pipelines/test/pipeline-security.integ.snapshot/tree.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -268,7 +268,7 @@
"attributes": {
"aws:cdk:cloudformation:type": "AWS::KMS::Alias",
"aws:cdk:cloudformation:props": {
"aliasName": "alias/codepipeline-pipelinesecuritystacktestpipelinef7060861",
"aliasName": "alias/codepipeline-pipelinesecuritystack-testpipeline-f7060861",
"targetKeyId": {
"Fn::GetAtt": [
"TestPipelineArtifactsBucketEncryptionKey13258842",
Expand Down Expand Up @@ -3519,7 +3519,7 @@
},
"environment": {
"type": "LINUX_CONTAINER",
"image": "aws/codebuild/standard:1.0",
"image": "aws/codebuild/standard:5.0",
"imagePullCredentialsType": "CODEBUILD",
"privilegedMode": false,
"computeType": "BUILD_GENERAL1_SMALL"
Expand Down Expand Up @@ -4065,7 +4065,7 @@
},
"environment": {
"type": "LINUX_CONTAINER",
"image": "aws/codebuild/standard:1.0",
"image": "aws/codebuild/standard:5.0",
"imagePullCredentialsType": "CODEBUILD",
"privilegedMode": false,
"computeType": "BUILD_GENERAL1_SMALL"
Expand Down