Skip to content

Commit f5856d6

Browse files
dwillistdwillist
authored
Merge branch 'main' into fix/1081-1108-buildpack-duplicates
2 parents 12b5d22 + b364ad3 commit f5856d6

36 files changed

+945
-91
lines changed

‎acceptance/acceptance_test.go

+7-7
Original file line numberDiff line numberDiff line change
@@ -2041,7 +2041,7 @@ include = [ "*.jar", "media/mountain.jpg", "/media/person.png", ]
20412041

20422042
expectedOutput := pack.FixtureManager().TemplateVersionedFixture(
20432043
"inspect_%s_builder_nested_output.txt",
2044-
createBuilderPack.Version(),
2044+
createBuilderPack.SanitizedVersion(),
20452045
"inspect_builder_nested_output.txt",
20462046
map[string]interface{}{
20472047
"builder_name": builderName,
@@ -2079,7 +2079,7 @@ include = [ "*.jar", "media/mountain.jpg", "/media/person.png", ]
20792079

20802080
expectedOutput := pack.FixtureManager().TemplateVersionedFixture(
20812081
"inspect_%s_builder_nested_depth_2_output.txt",
2082-
createBuilderPack.Version(),
2082+
createBuilderPack.SanitizedVersion(),
20832083
"inspect_builder_nested_depth_2_output.txt",
20842084
map[string]interface{}{
20852085
"builder_name": builderName,
@@ -2120,7 +2120,7 @@ include = [ "*.jar", "media/mountain.jpg", "/media/person.png", ]
21202120

21212121
expectedOutput := pack.FixtureManager().TemplateVersionedFixture(
21222122
"inspect_%s_builder_nested_output_toml.txt",
2123-
createBuilderPack.Version(),
2123+
createBuilderPack.SanitizedVersion(),
21242124
"inspect_builder_nested_output_toml.txt",
21252125
map[string]interface{}{
21262126
"builder_name": builderName,
@@ -2157,7 +2157,7 @@ include = [ "*.jar", "media/mountain.jpg", "/media/person.png", ]
21572157

21582158
expectedOutput := pack.FixtureManager().TemplateVersionedFixture(
21592159
"inspect_%s_builder_nested_output_yaml.txt",
2160-
createBuilderPack.Version(),
2160+
createBuilderPack.SanitizedVersion(),
21612161
"inspect_builder_nested_output_yaml.txt",
21622162
map[string]interface{}{
21632163
"builder_name": builderName,
@@ -2198,7 +2198,7 @@ include = [ "*.jar", "media/mountain.jpg", "/media/person.png", ]
21982198

21992199
expectedOutput := pack.FixtureManager().TemplateVersionedFixture(
22002200
"inspect_%s_builder_nested_output_json.txt",
2201-
createBuilderPack.Version(),
2201+
createBuilderPack.SanitizedVersion(),
22022202
"inspect_builder_nested_output_json.txt",
22032203
map[string]interface{}{
22042204
"builder_name": builderName,
@@ -2237,7 +2237,7 @@ include = [ "*.jar", "media/mountain.jpg", "/media/person.png", ]
22372237

22382238
expectedOutput := pack.FixtureManager().TemplateVersionedFixture(
22392239
"inspect_%s_builder_output.txt",
2240-
createBuilderPack.Version(),
2240+
createBuilderPack.SanitizedVersion(),
22412241
"inspect_builder_output.txt",
22422242
map[string]interface{}{
22432243
"builder_name": builderName,
@@ -2277,7 +2277,7 @@ include = [ "*.jar", "media/mountain.jpg", "/media/person.png", ]
22772277

22782278
expectedOutput := pack.FixtureManager().TemplateVersionedFixture(
22792279
"inspect_%s_builder_output.txt",
2280-
createBuilderPack.Version(),
2280+
createBuilderPack.SanitizedVersion(),
22812281
"inspect_builder_output.txt",
22822282
map[string]interface{}{
22832283
"builder_name": builderName,

‎acceptance/invoke/pack.go

+8-3
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ import (
88
"os"
99
"os/exec"
1010
"path/filepath"
11+
"regexp"
1112
"strings"
1213
"sync"
1314
"testing"
@@ -167,10 +168,14 @@ func (c *InterruptCmd) Wait() error {
167168

168169
func (i *PackInvoker) Version() string {
169170
i.testObject.Helper()
171+
return strings.TrimSpace(i.RunSuccessfully("version"))
172+
}
170173

171-
output := i.RunSuccessfully("version")
172-
173-
return strings.TrimSpace(output)
174+
func (i *PackInvoker) SanitizedVersion() string {
175+
i.testObject.Helper()
176+
// Sanitizing any git commit sha and build number from the version output
177+
re := regexp.MustCompile(`\d+\.\d+\.\d+`)
178+
return re.FindString(strings.TrimSpace(i.RunSuccessfully("version")))
174179
}
175180

176181
func (i *PackInvoker) EnableExperimental() {

‎acceptance/invoke/pack_fixtures.go

-1
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,6 @@ func (m PackFixtureManager) TemplateVersionedFixture(
6868
templateData map[string]interface{},
6969
) string {
7070
m.testObject.Helper()
71-
7271
outputTemplate, err := ioutil.ReadFile(m.VersionedFixtureOrFallbackLocation(versionedPattern, version, fallback))
7372
m.assert.Nil(err)
7473

‎acceptance/testdata/pack_fixtures/inspect_0.18.0_builder_nested_depth_2_output.txt

+93
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,93 @@
1+
Inspecting builder: '{{.builder_name}}'
2+
3+
REMOTE:
4+
5+
Created By:
6+
Name: Pack CLI
7+
Version: {{.pack_version}}
8+
9+
Trusted: {{.trusted}}
10+
11+
Stack:
12+
ID: pack.test.stack
13+
Mixins:
14+
mixinA
15+
netcat
16+
mixin3
17+
build:mixinTwo
18+
19+
Lifecycle:
20+
Version: {{.lifecycle_version}}
21+
Buildpack APIs:
22+
Deprecated: {{ .deprecated_buildpack_apis }}
23+
Supported: {{ .supported_buildpack_apis }}
24+
Platform APIs:
25+
Deprecated: {{ .deprecated_platform_apis }}
26+
Supported: {{ .supported_platform_apis }}
27+
28+
Run Images:
29+
some-registry.com/pack-test/run1 (user-configured)
30+
pack-test/run
31+
{{.run_image_mirror}}
32+
33+
Buildpacks:
34+
ID NAME VERSION HOMEPAGE
35+
noop.buildpack - noop.buildpack.later-version http://geocities.com/cool-bp
36+
noop.buildpack - noop.buildpack.version -
37+
read/env - read-env-version -
38+
simple/layers - simple-layers-version -
39+
simple/nested-level-1 - nested-l1-version -
40+
simple/nested-level-2 - nested-l2-version -
41+
42+
Detection Order:
43+
└ Group #1:
44+
├ simple/nested-level-1
45+
│ └ Group #1:
46+
│ └ simple/nested-level-2@nested-l2-version
47+
└ read/env@read-env-version (optional)
48+
49+
LOCAL:
50+
51+
Created By:
52+
Name: Pack CLI
53+
Version: {{.pack_version}}
54+
55+
Trusted: {{.trusted}}
56+
57+
Stack:
58+
ID: pack.test.stack
59+
Mixins:
60+
mixinA
61+
netcat
62+
mixin3
63+
build:mixinTwo
64+
65+
Lifecycle:
66+
Version: {{.lifecycle_version}}
67+
Buildpack APIs:
68+
Deprecated: {{ .deprecated_buildpack_apis }}
69+
Supported: {{ .supported_buildpack_apis }}
70+
Platform APIs:
71+
Deprecated: {{ .deprecated_platform_apis }}
72+
Supported: {{ .supported_platform_apis }}
73+
74+
Run Images:
75+
some-registry.com/pack-test/run1 (user-configured)
76+
pack-test/run
77+
{{.run_image_mirror}}
78+
79+
Buildpacks:
80+
ID NAME VERSION HOMEPAGE
81+
noop.buildpack - noop.buildpack.later-version http://geocities.com/cool-bp
82+
noop.buildpack - noop.buildpack.version -
83+
read/env - read-env-version -
84+
simple/layers - simple-layers-version -
85+
simple/nested-level-1 - nested-l1-version -
86+
simple/nested-level-2 - nested-l2-version -
87+
88+
Detection Order:
89+
└ Group #1:
90+
├ simple/nested-level-1
91+
│ └ Group #1:
92+
│ └ simple/nested-level-2@nested-l2-version
93+
└ read/env@read-env-version (optional)

‎acceptance/testdata/pack_fixtures/inspect_0.18.0_builder_nested_output.txt

+97
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,97 @@
1+
Inspecting builder: '{{.builder_name}}'
2+
3+
REMOTE:
4+
5+
Created By:
6+
Name: Pack CLI
7+
Version: {{.pack_version}}
8+
9+
Trusted: {{.trusted}}
10+
11+
Stack:
12+
ID: pack.test.stack
13+
Mixins:
14+
mixinA
15+
netcat
16+
mixin3
17+
build:mixinTwo
18+
19+
Lifecycle:
20+
Version: {{.lifecycle_version}}
21+
Buildpack APIs:
22+
Deprecated: {{ .deprecated_buildpack_apis }}
23+
Supported: {{ .supported_buildpack_apis }}
24+
Platform APIs:
25+
Deprecated: {{ .deprecated_platform_apis }}
26+
Supported: {{ .supported_platform_apis }}
27+
28+
Run Images:
29+
some-registry.com/pack-test/run1 (user-configured)
30+
pack-test/run
31+
{{.run_image_mirror}}
32+
33+
Buildpacks:
34+
ID NAME VERSION HOMEPAGE
35+
noop.buildpack - noop.buildpack.later-version http://geocities.com/cool-bp
36+
noop.buildpack - noop.buildpack.version -
37+
read/env - read-env-version -
38+
simple/layers - simple-layers-version -
39+
simple/nested-level-1 - nested-l1-version -
40+
simple/nested-level-2 - nested-l2-version -
41+
42+
Detection Order:
43+
└ Group #1:
44+
├ simple/nested-level-1
45+
│ └ Group #1:
46+
│ └ simple/nested-level-2@nested-l2-version
47+
│ └ Group #1:
48+
│ └ simple/layers@simple-layers-version
49+
└ read/env@read-env-version (optional)
50+
51+
LOCAL:
52+
53+
Created By:
54+
Name: Pack CLI
55+
Version: {{.pack_version}}
56+
57+
Trusted: {{.trusted}}
58+
59+
Stack:
60+
ID: pack.test.stack
61+
Mixins:
62+
mixinA
63+
netcat
64+
mixin3
65+
build:mixinTwo
66+
67+
Lifecycle:
68+
Version: {{.lifecycle_version}}
69+
Buildpack APIs:
70+
Deprecated: {{ .deprecated_buildpack_apis }}
71+
Supported: {{ .supported_buildpack_apis }}
72+
Platform APIs:
73+
Deprecated: {{ .deprecated_platform_apis }}
74+
Supported: {{ .supported_platform_apis }}
75+
76+
Run Images:
77+
some-registry.com/pack-test/run1 (user-configured)
78+
pack-test/run
79+
{{.run_image_mirror}}
80+
81+
Buildpacks:
82+
ID NAME VERSION HOMEPAGE
83+
noop.buildpack - noop.buildpack.later-version http://geocities.com/cool-bp
84+
noop.buildpack - noop.buildpack.version -
85+
read/env - read-env-version -
86+
simple/layers - simple-layers-version -
87+
simple/nested-level-1 - nested-l1-version -
88+
simple/nested-level-2 - nested-l2-version -
89+
90+
Detection Order:
91+
└ Group #1:
92+
├ simple/nested-level-1
93+
│ └ Group #1:
94+
│ └ simple/nested-level-2@nested-l2-version
95+
│ └ Group #1:
96+
│ └ simple/layers@simple-layers-version
97+
└ read/env@read-env-version (optional)

0 commit comments

Comments
 (0)