Merge pull request #1119 from samj1912/name

Add buildpack name to buildpack and builder metadata Signed-off-by: David Freilich <[email protected]>
buildpacks · Apr 6, 2021 · b364ad3 · b364ad3
2 parents d2d29c1 + 5e5d167
commit b364ad3
Show file tree

Hide file tree

Showing 28 changed files with 856 additions and 79 deletions.
diff --git a/acceptance/acceptance_test.go b/acceptance/acceptance_test.go
@@ -1993,7 +1993,7 @@ include = [ "*.jar", "media/mountain.jpg", "/media/person.png", ]
 
 						expectedOutput := pack.FixtureManager().TemplateVersionedFixture(
 							"inspect_%s_builder_nested_output.txt",
-							createBuilderPack.Version(),
+							createBuilderPack.SanitizedVersion(),
 							"inspect_builder_nested_output.txt",
 							map[string]interface{}{
 								"builder_name":              builderName,
@@ -2031,7 +2031,7 @@ include = [ "*.jar", "media/mountain.jpg", "/media/person.png", ]
 
 						expectedOutput := pack.FixtureManager().TemplateVersionedFixture(
 							"inspect_%s_builder_nested_depth_2_output.txt",
-							createBuilderPack.Version(),
+							createBuilderPack.SanitizedVersion(),
 							"inspect_builder_nested_depth_2_output.txt",
 							map[string]interface{}{
 								"builder_name":              builderName,
@@ -2072,7 +2072,7 @@ include = [ "*.jar", "media/mountain.jpg", "/media/person.png", ]
 
 							expectedOutput := pack.FixtureManager().TemplateVersionedFixture(
 								"inspect_%s_builder_nested_output_toml.txt",
-								createBuilderPack.Version(),
+								createBuilderPack.SanitizedVersion(),
 								"inspect_builder_nested_output_toml.txt",
 								map[string]interface{}{
 									"builder_name":              builderName,
@@ -2109,7 +2109,7 @@ include = [ "*.jar", "media/mountain.jpg", "/media/person.png", ]
 
 							expectedOutput := pack.FixtureManager().TemplateVersionedFixture(
 								"inspect_%s_builder_nested_output_yaml.txt",
-								createBuilderPack.Version(),
+								createBuilderPack.SanitizedVersion(),
 								"inspect_builder_nested_output_yaml.txt",
 								map[string]interface{}{
 									"builder_name":              builderName,
@@ -2150,7 +2150,7 @@ include = [ "*.jar", "media/mountain.jpg", "/media/person.png", ]
 
 							expectedOutput := pack.FixtureManager().TemplateVersionedFixture(
 								"inspect_%s_builder_nested_output_json.txt",
-								createBuilderPack.Version(),
+								createBuilderPack.SanitizedVersion(),
 								"inspect_builder_nested_output_json.txt",
 								map[string]interface{}{
 									"builder_name":              builderName,
@@ -2189,7 +2189,7 @@ include = [ "*.jar", "media/mountain.jpg", "/media/person.png", ]
 
 					expectedOutput := pack.FixtureManager().TemplateVersionedFixture(
 						"inspect_%s_builder_output.txt",
-						createBuilderPack.Version(),
+						createBuilderPack.SanitizedVersion(),
 						"inspect_builder_output.txt",
 						map[string]interface{}{
 							"builder_name":              builderName,
@@ -2229,7 +2229,7 @@ include = [ "*.jar", "media/mountain.jpg", "/media/person.png", ]
 
 					expectedOutput := pack.FixtureManager().TemplateVersionedFixture(
 						"inspect_%s_builder_output.txt",
-						createBuilderPack.Version(),
+						createBuilderPack.SanitizedVersion(),
 						"inspect_builder_output.txt",
 						map[string]interface{}{
 							"builder_name":              builderName,

diff --git a/acceptance/invoke/pack.go b/acceptance/invoke/pack.go
@@ -8,6 +8,7 @@ import (
 	"os"
 	"os/exec"
 	"path/filepath"
+	"regexp"
 	"strings"
 	"sync"
 	"testing"
@@ -167,10 +168,14 @@ func (c *InterruptCmd) Wait() error {
 
 func (i *PackInvoker) Version() string {
 	i.testObject.Helper()
+	return strings.TrimSpace(i.RunSuccessfully("version"))
+}
 
-	output := i.RunSuccessfully("version")
-
-	return strings.TrimSpace(output)
+func (i *PackInvoker) SanitizedVersion() string {
+	i.testObject.Helper()
+	// Sanitizing any git commit sha and build number from the version output
+	re := regexp.MustCompile(`\d+\.\d+\.\d+`)
+	return re.FindString(strings.TrimSpace(i.RunSuccessfully("version")))
 }
 
 func (i *PackInvoker) EnableExperimental() {

diff --git a/acceptance/invoke/pack_fixtures.go b/acceptance/invoke/pack_fixtures.go
@@ -68,7 +68,6 @@ func (m PackFixtureManager) TemplateVersionedFixture(
 	templateData map[string]interface{},
 ) string {
 	m.testObject.Helper()
-
 	outputTemplate, err := ioutil.ReadFile(m.VersionedFixtureOrFallbackLocation(versionedPattern, version, fallback))
 	m.assert.Nil(err)
 

diff --git a/acceptance/testdata/pack_fixtures/inspect_0.18.0_builder_nested_depth_2_output.txt b/acceptance/testdata/pack_fixtures/inspect_0.18.0_builder_nested_depth_2_output.txt
@@ -0,0 +1,93 @@
+Inspecting builder: '{{.builder_name}}'
+
+REMOTE:
+
+Created By:
+  Name: Pack CLI
+  Version: {{.pack_version}}
+
+Trusted: {{.trusted}}
+
+Stack:
+  ID: pack.test.stack
+  Mixins:
+    mixinA
+    netcat
+    mixin3
+    build:mixinTwo
+
+Lifecycle:
+  Version: {{.lifecycle_version}}
+  Buildpack APIs:
+    Deprecated: {{ .deprecated_buildpack_apis }}
+    Supported: {{ .supported_buildpack_apis }}
+  Platform APIs:
+    Deprecated: {{ .deprecated_platform_apis }}
+    Supported: {{ .supported_platform_apis }}
+
+Run Images:
+  some-registry.com/pack-test/run1    (user-configured)
+  pack-test/run
+  {{.run_image_mirror}}
+
+Buildpacks:
+  ID                           NAME        VERSION                             HOMEPAGE
+  noop.buildpack               -           noop.buildpack.later-version        http://geocities.com/cool-bp
+  noop.buildpack               -           noop.buildpack.version              -
+  read/env                     -           read-env-version                    -
+  simple/layers                -           simple-layers-version               -
+  simple/nested-level-1        -           nested-l1-version                   -
+  simple/nested-level-2        -           nested-l2-version                   -
+
+Detection Order:
+ └ Group #1:
+    ├ simple/nested-level-1
+    │  └ Group #1:
+    │     └ simple/nested-level-2@nested-l2-version
+    └ read/env@read-env-version                        (optional)
+
+LOCAL:
+
+Created By:
+  Name: Pack CLI
+  Version: {{.pack_version}}
+
+Trusted: {{.trusted}}
+
+Stack:
+  ID: pack.test.stack
+  Mixins:
+    mixinA
+    netcat
+    mixin3
+    build:mixinTwo
+
+Lifecycle:
+  Version: {{.lifecycle_version}}
+  Buildpack APIs:
+    Deprecated: {{ .deprecated_buildpack_apis }}
+    Supported: {{ .supported_buildpack_apis }}
+  Platform APIs:
+    Deprecated: {{ .deprecated_platform_apis }}
+    Supported: {{ .supported_platform_apis }}
+
+Run Images:
+  some-registry.com/pack-test/run1    (user-configured)
+  pack-test/run
+  {{.run_image_mirror}}
+
+Buildpacks:
+  ID                           NAME        VERSION                             HOMEPAGE
+  noop.buildpack               -           noop.buildpack.later-version        http://geocities.com/cool-bp
+  noop.buildpack               -           noop.buildpack.version              -
+  read/env                     -           read-env-version                    -
+  simple/layers                -           simple-layers-version               -
+  simple/nested-level-1        -           nested-l1-version                   -
+  simple/nested-level-2        -           nested-l2-version                   -
+
+Detection Order:
+ └ Group #1:
+    ├ simple/nested-level-1
+    │  └ Group #1:
+    │     └ simple/nested-level-2@nested-l2-version
+    └ read/env@read-env-version                        (optional)
diff --git a/acceptance/testdata/pack_fixtures/inspect_0.18.0_builder_nested_output.txt b/acceptance/testdata/pack_fixtures/inspect_0.18.0_builder_nested_output.txt
@@ -0,0 +1,97 @@
+Inspecting builder: '{{.builder_name}}'
+
+REMOTE:
+
+Created By:
+  Name: Pack CLI
+  Version: {{.pack_version}}
+
+Trusted: {{.trusted}}
+
+Stack:
+  ID: pack.test.stack
+  Mixins:
+    mixinA
+    netcat
+    mixin3
+    build:mixinTwo
+
+Lifecycle:
+  Version: {{.lifecycle_version}}
+  Buildpack APIs:
+    Deprecated: {{ .deprecated_buildpack_apis }}
+    Supported: {{ .supported_buildpack_apis }}
+  Platform APIs:
+    Deprecated: {{ .deprecated_platform_apis }}
+    Supported: {{ .supported_platform_apis }}
+
+Run Images:
+  some-registry.com/pack-test/run1    (user-configured)
+  pack-test/run
+  {{.run_image_mirror}}
+
+Buildpacks:
+  ID                           NAME        VERSION                             HOMEPAGE
+  noop.buildpack               -           noop.buildpack.later-version        http://geocities.com/cool-bp
+  noop.buildpack               -           noop.buildpack.version              -
+  read/env                     -           read-env-version                    -
+  simple/layers                -           simple-layers-version               -
+  simple/nested-level-1        -           nested-l1-version                   -
+  simple/nested-level-2        -           nested-l2-version                   -
+
+Detection Order:
+ └ Group #1:
+    ├ simple/nested-level-1
+    │  └ Group #1:
+    │     └ simple/nested-level-2@nested-l2-version
+    │        └ Group #1:
+    │           └ simple/layers@simple-layers-version
+    └ read/env@read-env-version                          (optional)
+
+LOCAL:
+
+Created By:
+  Name: Pack CLI
+  Version: {{.pack_version}}
+
+Trusted: {{.trusted}}
+
+Stack:
+  ID: pack.test.stack
+  Mixins:
+    mixinA
+    netcat
+    mixin3
+    build:mixinTwo
+
+Lifecycle:
+  Version: {{.lifecycle_version}}
+  Buildpack APIs:
+    Deprecated: {{ .deprecated_buildpack_apis }}
+    Supported: {{ .supported_buildpack_apis }}
+  Platform APIs:
+    Deprecated: {{ .deprecated_platform_apis }}
+    Supported: {{ .supported_platform_apis }}
+
+Run Images:
+  some-registry.com/pack-test/run1    (user-configured)
+  pack-test/run
+  {{.run_image_mirror}}
+
+Buildpacks:
+  ID                           NAME        VERSION                             HOMEPAGE
+  noop.buildpack               -           noop.buildpack.later-version        http://geocities.com/cool-bp
+  noop.buildpack               -           noop.buildpack.version              -
+  read/env                     -           read-env-version                    -
+  simple/layers                -           simple-layers-version               -
+  simple/nested-level-1        -           nested-l1-version                   -
+  simple/nested-level-2        -           nested-l2-version                   -
+
+Detection Order:
+ └ Group #1:
+    ├ simple/nested-level-1
+    │  └ Group #1:
+    │     └ simple/nested-level-2@nested-l2-version
+    │        └ Group #1:
+    │           └ simple/layers@simple-layers-version
+    └ read/env@read-env-version                          (optional)