Skip to content

Commit b364ad3

Browse files
dfreilichdfreilich
authored
Merge pull request #1119 from samj1912/name
Add buildpack name to buildpack and builder metadata Signed-off-by: David Freilich <freilich.david@gmail.com>
2 parents d2d29c1 + 5e5d167 commit b364ad3

28 files changed

Lines changed: 856 additions & 79 deletions

‎acceptance/acceptance_test.go‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1993,7 +1993,7 @@ include = [ "*.jar", "media/mountain.jpg", "/media/person.png", ]
19931993

19941994
expectedOutput := pack.FixtureManager().TemplateVersionedFixture(
19951995
"inspect_%s_builder_nested_output.txt",
1996-
createBuilderPack.Version(),
1996+
createBuilderPack.SanitizedVersion(),
19971997
"inspect_builder_nested_output.txt",
19981998
map[string]interface{}{
19991999
"builder_name": builderName,
@@ -2031,7 +2031,7 @@ include = [ "*.jar", "media/mountain.jpg", "/media/person.png", ]
20312031

20322032
expectedOutput := pack.FixtureManager().TemplateVersionedFixture(
20332033
"inspect_%s_builder_nested_depth_2_output.txt",
2034-
createBuilderPack.Version(),
2034+
createBuilderPack.SanitizedVersion(),
20352035
"inspect_builder_nested_depth_2_output.txt",
20362036
map[string]interface{}{
20372037
"builder_name": builderName,
@@ -2072,7 +2072,7 @@ include = [ "*.jar", "media/mountain.jpg", "/media/person.png", ]
20722072

20732073
expectedOutput := pack.FixtureManager().TemplateVersionedFixture(
20742074
"inspect_%s_builder_nested_output_toml.txt",
2075-
createBuilderPack.Version(),
2075+
createBuilderPack.SanitizedVersion(),
20762076
"inspect_builder_nested_output_toml.txt",
20772077
map[string]interface{}{
20782078
"builder_name": builderName,
@@ -2109,7 +2109,7 @@ include = [ "*.jar", "media/mountain.jpg", "/media/person.png", ]
21092109

21102110
expectedOutput := pack.FixtureManager().TemplateVersionedFixture(
21112111
"inspect_%s_builder_nested_output_yaml.txt",
2112-
createBuilderPack.Version(),
2112+
createBuilderPack.SanitizedVersion(),
21132113
"inspect_builder_nested_output_yaml.txt",
21142114
map[string]interface{}{
21152115
"builder_name": builderName,
@@ -2150,7 +2150,7 @@ include = [ "*.jar", "media/mountain.jpg", "/media/person.png", ]
21502150

21512151
expectedOutput := pack.FixtureManager().TemplateVersionedFixture(
21522152
"inspect_%s_builder_nested_output_json.txt",
2153-
createBuilderPack.Version(),
2153+
createBuilderPack.SanitizedVersion(),
21542154
"inspect_builder_nested_output_json.txt",
21552155
map[string]interface{}{
21562156
"builder_name": builderName,
@@ -2189,7 +2189,7 @@ include = [ "*.jar", "media/mountain.jpg", "/media/person.png", ]
21892189

21902190
expectedOutput := pack.FixtureManager().TemplateVersionedFixture(
21912191
"inspect_%s_builder_output.txt",
2192-
createBuilderPack.Version(),
2192+
createBuilderPack.SanitizedVersion(),
21932193
"inspect_builder_output.txt",
21942194
map[string]interface{}{
21952195
"builder_name": builderName,
@@ -2229,7 +2229,7 @@ include = [ "*.jar", "media/mountain.jpg", "/media/person.png", ]
22292229

22302230
expectedOutput := pack.FixtureManager().TemplateVersionedFixture(
22312231
"inspect_%s_builder_output.txt",
2232-
createBuilderPack.Version(),
2232+
createBuilderPack.SanitizedVersion(),
22332233
"inspect_builder_output.txt",
22342234
map[string]interface{}{
22352235
"builder_name": builderName,

‎acceptance/invoke/pack.go‎

Lines changed: 8 additions & 3 deletions
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‎

Lines changed: 0 additions & 1 deletion
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‎

Lines changed: 93 additions & 0 deletions
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‎

Lines changed: 97 additions & 0 deletions
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)