Merge pull request #2203 from hhiroshell/fix-pack-2199

Update the Google builder in the list of known builders.
buildpacks · Jul 9, 2024 · 0b0614b · 0b0614b
2 parents 7d3a810 + 2c3d5f6
commit 0b0614b
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 9 deletions.
diff --git a/acceptance/assertions/output.go b/acceptance/assertions/output.go
@@ -209,7 +209,7 @@ func (o OutputAssertionManager) IncludesTrustedBuildersHeading() {
 	o.assert.Contains(o.output, "Trusted Builders:")
 }
 
-const googleBuilder = "gcr.io/buildpacks/builder:v1"
+const googleBuilder = "gcr.io/buildpacks/builder:google-22"
 
 func (o OutputAssertionManager) IncludesGoogleBuilder() {
 	o.testObject.Helper()

diff --git a/internal/builder/known_builder.go b/internal/builder/known_builder.go
@@ -11,8 +11,8 @@ type KnownBuilder struct {
 var KnownBuilders = []KnownBuilder{
 	{
 		Vendor:             "Google",
-		Image:              "gcr.io/buildpacks/builder:v1",
-		DefaultDescription: "GCP Builder for all runtimes",
+		Image:              "gcr.io/buildpacks/builder:google-22",
+		DefaultDescription: "Ubuntu 22.04 base image with buildpacks for .NET, Dart, Go, Java, Node.js, PHP, Python, and Ruby",
 		Suggested:          true,
 		Trusted:            true,
 	},

diff --git a/internal/commands/config_trusted_builder_test.go b/internal/commands/config_trusted_builder_test.go
@@ -56,7 +56,7 @@ func testTrustedBuilderCommand(t *testing.T, when spec.G, it spec.S) {
 			h.AssertNil(t, command.Execute())
 			h.AssertContainsAllInOrder(t,
 				outBuf,
-				"gcr.io/buildpacks/builder:v1",
+				"gcr.io/buildpacks/builder:google-22",
 				"heroku/builder:20",
 				"heroku/builder:22",
 				"heroku/builder:24",
@@ -71,7 +71,7 @@ func testTrustedBuilderCommand(t *testing.T, when spec.G, it spec.S) {
 			h.AssertNil(t, command.Execute())
 			h.AssertContainsAllInOrder(t,
 				outBuf,
-				"gcr.io/buildpacks/builder:v1",
+				"gcr.io/buildpacks/builder:google-22",
 				"heroku/builder:20",
 				"heroku/builder:22",
 				"heroku/builder:24",
@@ -93,7 +93,7 @@ func testTrustedBuilderCommand(t *testing.T, when spec.G, it spec.S) {
 			h.AssertNotContains(t, outBuf.String(), builderName)
 			h.AssertContainsAllInOrder(t,
 				outBuf,
-				"gcr.io/buildpacks/builder:v1",
+				"gcr.io/buildpacks/builder:google-22",
 				"heroku/builder:20",
 				"heroku/builder:22",
 				"heroku/builder:24",
@@ -110,7 +110,7 @@ func testTrustedBuilderCommand(t *testing.T, when spec.G, it spec.S) {
 
 			h.AssertContainsAllInOrder(t,
 				outBuf,
-				"gcr.io/buildpacks/builder:v1",
+				"gcr.io/buildpacks/builder:google-22",
 				builderName,
 				"heroku/builder:20",
 				"heroku/builder:22",

diff --git a/internal/commands/list_trusted_builders_test.go b/internal/commands/list_trusted_builders_test.go
@@ -64,7 +64,7 @@ func testListTrustedBuildersCommand(t *testing.T, when spec.G, it spec.S) {
 			h.AssertNotContains(t, outBuf.String(), builderName)
 			h.AssertContainsAllInOrder(t,
 				outBuf,
-				"gcr.io/buildpacks/builder:v1",
+				"gcr.io/buildpacks/builder:google-22",
 				"heroku/builder:20",
 				"heroku/builder:22",
 				"heroku/builder:24",
@@ -86,7 +86,7 @@ func testListTrustedBuildersCommand(t *testing.T, when spec.G, it spec.S) {
 
 			h.AssertContainsAllInOrder(t,
 				outBuf,
-				"gcr.io/buildpacks/builder:v1",
+				"gcr.io/buildpacks/builder:google-22",
 				builderName,
 				"heroku/builder:20",
 				"heroku/builder:22",