Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Suggest/trust heroku/builder:20 instead of heroku/buildpacks:20 #1924

Merged
merged 1 commit into from
Oct 16, 2023
Merged

Suggest/trust heroku/builder:20 instead of heroku/buildpacks:20 #1924

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion acceptance/assertions/output.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,8 +182,8 @@ func (o OutputAssertionManager) IncludesPrefixedGoogleBuilder() {
}

var herokuBuilders = []string{
"heroku/builder:20",
"heroku/builder:22",
"heroku/buildpacks:20",
}

func (o OutputAssertionManager) IncludesHerokuBuilders() {
Expand Down
6 changes: 3 additions & 3 deletions internal/builder/suggested_builder.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,12 @@ var SuggestedBuilders = []SuggestedBuilder{
{
Vendor: "Heroku",
Image: "heroku/builder:22",
DefaultDescription: "Heroku-22 base image with buildpacks for Go, Java, Node.js, PHP, Python, Scala & Ruby",
DefaultDescription: "Heroku-22 (Ubuntu 22.04) base image with buildpacks for Go, Java, Node.js, PHP, Python, Ruby & Scala",
},
{
Vendor: "Heroku",
Image: "heroku/buildpacks:20",
DefaultDescription: "Heroku-20 base image with buildpacks for Go, Java, Node.js, PHP, Python, Scala & Ruby",
Image: "heroku/builder:20",
DefaultDescription: "Heroku-20 (Ubuntu 20.04) base image with buildpacks for Go, Java, Node.js, PHP, Python, Ruby & Scala",
},
{
Vendor: "Paketo Buildpacks",
Expand Down
4 changes: 2 additions & 2 deletions internal/commands/build_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,9 +121,9 @@ func testBuildCommand(t *testing.T, when spec.G, it spec.S) {
Return(nil)

logger.WantVerbose(true)
command.SetArgs([]string{"image", "--builder", "heroku/buildpacks:20"})
command.SetArgs([]string{"image", "--builder", "heroku/builder:22"})
h.AssertNil(t, command.Execute())
h.AssertContains(t, outBuf.String(), "Builder 'heroku/buildpacks:20' is trusted")
h.AssertContains(t, outBuf.String(), "Builder 'heroku/builder:22' is trusted")
})
})
})
Expand Down
3 changes: 2 additions & 1 deletion internal/commands/builder_inspect_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -254,7 +254,8 @@ func testBuilderInspectCommand(t *testing.T, when spec.G, it spec.S) {

assert.Matches(outBuf.String(), regexp.MustCompile(`Paketo Buildpacks:\s+'paketobuildpacks/builder-jammy-base'`))
assert.Matches(outBuf.String(), regexp.MustCompile(`Paketo Buildpacks:\s+'paketobuildpacks/builder-jammy-full'`))
assert.Matches(outBuf.String(), regexp.MustCompile(`Heroku:\s+'heroku/buildpacks:20'`))
assert.Matches(outBuf.String(), regexp.MustCompile(`Heroku:\s+'heroku/builder:20'`))
assert.Matches(outBuf.String(), regexp.MustCompile(`Heroku:\s+'heroku/builder:22'`))
})
})

Expand Down
8 changes: 4 additions & 4 deletions internal/commands/config_trusted_builder_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,8 +57,8 @@ func testTrustedBuilderCommand(t *testing.T, when spec.G, it spec.S) {
h.AssertContainsAllInOrder(t,
outBuf,
"gcr.io/buildpacks/builder:v1",
"heroku/builder:20",
"heroku/builder:22",
"heroku/buildpacks:20",
"paketobuildpacks/builder-jammy-base",
"paketobuildpacks/builder-jammy-full",
"paketobuildpacks/builder-jammy-tiny",
Expand All @@ -71,8 +71,8 @@ func testTrustedBuilderCommand(t *testing.T, when spec.G, it spec.S) {
h.AssertContainsAllInOrder(t,
outBuf,
"gcr.io/buildpacks/builder:v1",
"heroku/builder:20",
"heroku/builder:22",
"heroku/buildpacks:20",
"paketobuildpacks/builder-jammy-base",
"paketobuildpacks/builder-jammy-full",
"paketobuildpacks/builder-jammy-tiny",
Expand All @@ -92,8 +92,8 @@ func testTrustedBuilderCommand(t *testing.T, when spec.G, it spec.S) {
h.AssertContainsAllInOrder(t,
outBuf,
"gcr.io/buildpacks/builder:v1",
"heroku/builder:20",
"heroku/builder:22",
"heroku/buildpacks:20",
"paketobuildpacks/builder-jammy-base",
"paketobuildpacks/builder-jammy-full",
"paketobuildpacks/builder-jammy-tiny",
Expand All @@ -109,8 +109,8 @@ func testTrustedBuilderCommand(t *testing.T, when spec.G, it spec.S) {
outBuf,
"gcr.io/buildpacks/builder:v1",
builderName,
"heroku/builder:20",
"heroku/builder:22",
"heroku/buildpacks:20",
"paketobuildpacks/builder-jammy-base",
"paketobuildpacks/builder-jammy-full",
"paketobuildpacks/builder-jammy-tiny",
Expand Down
3 changes: 2 additions & 1 deletion internal/commands/inspect_builder_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -215,7 +215,8 @@ func testInspectBuilderCommand(t *testing.T, when spec.G, it spec.S) {

assert.Matches(outBuf.String(), regexp.MustCompile(`Paketo Buildpacks:\s+'paketobuildpacks/builder-jammy-base'`))
assert.Matches(outBuf.String(), regexp.MustCompile(`Paketo Buildpacks:\s+'paketobuildpacks/builder-jammy-full'`))
assert.Matches(outBuf.String(), regexp.MustCompile(`Heroku:\s+'heroku/buildpacks:20'`))
assert.Matches(outBuf.String(), regexp.MustCompile(`Heroku:\s+'heroku/builder:20'`))
assert.Matches(outBuf.String(), regexp.MustCompile(`Heroku:\s+'heroku/builder:22'`))
})
})

Expand Down
5 changes: 3 additions & 2 deletions internal/commands/list_trusted_builders_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,8 +65,8 @@ func testListTrustedBuildersCommand(t *testing.T, when spec.G, it spec.S) {
h.AssertContainsAllInOrder(t,
outBuf,
"gcr.io/buildpacks/builder:v1",
"heroku/builder:20",
"heroku/builder:22",
"heroku/buildpacks:20",
"paketobuildpacks/builder-jammy-base",
"paketobuildpacks/builder-jammy-full",
"paketobuildpacks/builder-jammy-tiny",
Expand All @@ -87,7 +87,8 @@ func testListTrustedBuildersCommand(t *testing.T, when spec.G, it spec.S) {
outBuf,
"gcr.io/buildpacks/builder:v1",
builderName,
"heroku/buildpacks:20",
"heroku/builder:20",
"heroku/builder:22",
"paketobuildpacks/builder-jammy-base",
"paketobuildpacks/builder-jammy-full",
"paketobuildpacks/builder-jammy-tiny",
Expand Down
Loading