Skip to content

Commit

Permalink
Revert "fix(pipelines): CodeBuild projects are hard to tell apart (aw…
Browse files Browse the repository at this point in the history
…s#18492)"

This reverts commit f6dab8d.
  • Loading branch information
LukvonStrom committed Jan 27, 2022
1 parent 0548da2 commit 6fa16f9
Show file tree
Hide file tree
Showing 4 changed files with 1 addition and 95 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -43,28 +43,6 @@ test('additionalinputs creates the right commands', () => {
});
});

test('CodeBuild projects have a description', () => {
new cdkp.CodePipeline(pipelineStack, 'Pipeline', {
synth: new cdkp.CodeBuildStep('Synth', {
commands: ['/bin/true'],
input: cdkp.CodePipelineSource.gitHub('test/test', 'main'),
}),
});

// THEN
Template.fromStack(pipelineStack).hasResourceProperties(
'AWS::CodeBuild::Project',
{
Description: {
'Fn::Join': [
'',
['Pipeline step ', { Ref: 'Pipeline9850B417' }, '/Build/Synth'],
],
},
},
);
});

test('long duration steps are supported', () => {
// WHEN
new cdkp.CodePipeline(pipelineStack, 'Pipeline', {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1363,18 +1363,6 @@
"Cache": {
"Type": "NO_CACHE"
},
"Description": {
"Fn::Join": [
"",
[
"Pipeline step ",
{
"Ref": "Pipeline9850B417"
},
"/Build/Synth"
]
]
},
"EncryptionKey": "alias/aws/s3",
"VpcConfig": {
"SecurityGroupIds": [
Expand Down Expand Up @@ -1962,18 +1950,6 @@
"Cache": {
"Type": "NO_CACHE"
},
"Description": {
"Fn::Join": [
"",
[
"Pipeline step ",
{
"Ref": "Pipeline9850B417"
},
"/UpdatePipeline/SelfMutate"
]
]
},
"EncryptionKey": "alias/aws/s3",
"VpcConfig": {
"SecurityGroupIds": [
Expand Down Expand Up @@ -2316,18 +2292,6 @@
"Cache": {
"Type": "NO_CACHE"
},
"Description": {
"Fn::Join": [
"",
[
"Pipeline step ",
{
"Ref": "Pipeline9850B417"
},
"/Assets/FileAsset1"
]
]
},
"EncryptionKey": "alias/aws/s3",
"VpcConfig": {
"SecurityGroupIds": [
Expand Down Expand Up @@ -2429,18 +2393,6 @@
"Cache": {
"Type": "NO_CACHE"
},
"Description": {
"Fn::Join": [
"",
[
"Pipeline step ",
{
"Ref": "Pipeline9850B417"
},
"/Assets/FileAsset2"
]
]
},
"EncryptionKey": "alias/aws/s3",
"VpcConfig": {
"SecurityGroupIds": [
Expand Down
24 changes: 0 additions & 24 deletions packages/@aws-cdk/pipelines/test/integ.newpipeline.expected.json
Original file line number Diff line number Diff line change
Expand Up @@ -2044,18 +2044,6 @@
"Cache": {
"Type": "NO_CACHE"
},
"Description": {
"Fn::Join": [
"",
[
"Pipeline step ",
{
"Ref": "Pipeline9850B417"
},
"/Build/Synth"
]
]
},
"EncryptionKey": "alias/aws/s3"
}
},
Expand Down Expand Up @@ -2355,18 +2343,6 @@
"Cache": {
"Type": "NO_CACHE"
},
"Description": {
"Fn::Join": [
"",
[
"Pipeline step ",
{
"Ref": "Pipeline9850B417"
},
"/UpdatePipeline/SelfMutate"
]
]
},
"EncryptionKey": "alias/aws/s3"
}
}
Expand Down
2 changes: 1 addition & 1 deletion packages/@aws-cdk/pipelines/test/testhelpers/matchers.ts
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ class StringLike extends Matcher {

public test(actual: any): MatchResult {
if (typeof(actual) !== 'string') {
throw new Error(`Expected string but found ${typeof(actual)} ${JSON.stringify(actual)}`);
throw new Error(`Expected string but found ${typeof(actual)}`);
}
const re = new RegExp(`^${this.pattern.split('*').map(escapeRegex).join('.*')}$`);

Expand Down

0 comments on commit 6fa16f9

Please sign in to comment.