From d4d4614eb6079be526b6bac375fe932bf7bfc7c6 Mon Sep 17 00:00:00 2001 From: Hiroshi Hayakawa Date: Thu, 4 Jul 2024 19:20:21 +0900 Subject: [PATCH 1/4] Update the version of the Google builder in the list of known builders. Signed-off-by: Hiroshi Hayakawa --- internal/builder/known_builder.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/builder/known_builder.go b/internal/builder/known_builder.go index 11ccf4323..da5d6dd23 100644 --- a/internal/builder/known_builder.go +++ b/internal/builder/known_builder.go @@ -11,7 +11,7 @@ type KnownBuilder struct { var KnownBuilders = []KnownBuilder{ { Vendor: "Google", - Image: "gcr.io/buildpacks/builder:v1", + Image: "gcr.io/buildpacks/builder:google-22", DefaultDescription: "GCP Builder for all runtimes", Suggested: true, Trusted: true, From dd3971bab27681403e196dbfe3a38c2c4ae50a4f Mon Sep 17 00:00:00 2001 From: Hiroshi Hayakawa Date: Thu, 4 Jul 2024 20:13:45 +0900 Subject: [PATCH 2/4] Fix broken tests. Signed-off-by: Hiroshi Hayakawa --- internal/commands/config_trusted_builder_test.go | 8 ++++---- internal/commands/list_trusted_builders_test.go | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/commands/config_trusted_builder_test.go b/internal/commands/config_trusted_builder_test.go index 1de1a2477..ae7c2c940 100644 --- 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 index 200bc0edc..f07b447e7 100644 --- 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", From a49d9c3999aaf9d6ffe40f8c4f65bfb1e8bf7fac Mon Sep 17 00:00:00 2001 From: Hiroshi Hayakawa Date: Thu, 4 Jul 2024 21:14:33 +0900 Subject: [PATCH 3/4] Align the description of the Google builder with the upstream manifest. Co-authored-by: Ed Morley <501702+edmorley@users.noreply.github.com> Signed-off-by: Hiroshi Hayakawa --- internal/builder/known_builder.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/builder/known_builder.go b/internal/builder/known_builder.go index da5d6dd23..d6a68b1f5 100644 --- a/internal/builder/known_builder.go +++ b/internal/builder/known_builder.go @@ -12,7 +12,7 @@ var KnownBuilders = []KnownBuilder{ { Vendor: "Google", Image: "gcr.io/buildpacks/builder:google-22", - DefaultDescription: "GCP Builder for all runtimes", + DefaultDescription: "Ubuntu 22.04 base image with buildpacks for .NET, Dart, Go, Java, Node.js, PHP, Python, and Ruby", Suggested: true, Trusted: true, }, From 070d7769a02ce4f9abc924df3ff8eeea9372f3a0 Mon Sep 17 00:00:00 2001 From: Hiroshi Hayakawa Date: Thu, 4 Jul 2024 21:03:52 +0900 Subject: [PATCH 4/4] Fix the broken acceptance tests. Signed-off-by: Hiroshi Hayakawa --- acceptance/assertions/output.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/acceptance/assertions/output.go b/acceptance/assertions/output.go index b1bb38f5a..ba8e644a5 100644 --- 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()