Skip to content

Commit

Permalink
Merge pull request #1350 from edmorley/remove-heroku-buildpacks-18
Browse files Browse the repository at this point in the history 
Remove `heroku/buildpacks:18` from trusted/suggested builders lists
Signed-off-by: David Freilich <freilich.david@gmail.com>
  • Loading branch information
@dfreilich
dfreilich authored Jan 3, 2022
2 parents 0db2c77 + b7ea6e7 commit 9e71e32
Show file tree
Hide file tree
Showing 10 changed files with 2 additions and 35 deletions.
1 change: 0 additions & 1 deletion acceptance/assertions/output.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -182,7 +182,6 @@ func (o OutputAssertionManager) IncludesPrefixedGoogleBuilder() {
}

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

Expand Down
5 changes: 0 additions & 5 deletions internal/builder/suggested_builder.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,6 @@ var SuggestedBuilders = []SuggestedBuilder{
Image: "gcr.io/buildpacks/builder:v1",
DefaultDescription: "GCP Builder for all runtimes",
},
{
Vendor: "Heroku",
Image: "heroku/buildpacks:18",
DefaultDescription: "heroku-18 base image with buildpacks for Ruby, Java, Node.js, Python, Golang, & PHP",
},
{
Vendor: "Heroku",
Image: "heroku/buildpacks:20",
Expand Down
4 changes: 2 additions & 2 deletions internal/commands/build_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -111,9 +111,9 @@ func testBuildCommand(t *testing.T, when spec.G, it spec.S) {
Return(nil)

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

assert.Matches(outBuf.String(), regexp.MustCompile(`Paketo Buildpacks:\s+'paketobuildpacks/builder:base'`))
assert.Matches(outBuf.String(), regexp.MustCompile(`Paketo Buildpacks:\s+'paketobuildpacks/builder:full'`))
assert.Matches(outBuf.String(), regexp.MustCompile(`Heroku:\s+'heroku/buildpacks:18'`))
assert.Matches(outBuf.String(), regexp.MustCompile(`Heroku:\s+'heroku/buildpacks:20'`))
})
})
Expand Down
4 changes: 0 additions & 4 deletions internal/commands/config_trusted_builder_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,6 @@ func testTrustedBuilderCommand(t *testing.T, when spec.G, it spec.S) {
h.AssertContainsAllInOrder(t,
outBuf,
"gcr.io/buildpacks/builder:v1",
"heroku/buildpacks:18",
"heroku/buildpacks:20",
"paketobuildpacks/builder:base",
"paketobuildpacks/builder:full",
Expand All @@ -72,7 +71,6 @@ func testTrustedBuilderCommand(t *testing.T, when spec.G, it spec.S) {
h.AssertContainsAllInOrder(t,
outBuf,
"gcr.io/buildpacks/builder:v1",
"heroku/buildpacks:18",
"heroku/buildpacks:20",
"paketobuildpacks/builder:base",
"paketobuildpacks/builder:full",
Expand All @@ -93,7 +91,6 @@ func testTrustedBuilderCommand(t *testing.T, when spec.G, it spec.S) {
h.AssertContainsAllInOrder(t,
outBuf,
"gcr.io/buildpacks/builder:v1",
"heroku/buildpacks:18",
"heroku/buildpacks:20",
"paketobuildpacks/builder:base",
"paketobuildpacks/builder:full",
Expand All @@ -110,7 +107,6 @@ func testTrustedBuilderCommand(t *testing.T, when spec.G, it spec.S) {
outBuf,
"gcr.io/buildpacks/builder:v1",
builderName,
"heroku/buildpacks:18",
"heroku/buildpacks:20",
"paketobuildpacks/builder:base",
"paketobuildpacks/builder:full",
Expand Down
1 change: 0 additions & 1 deletion internal/commands/inspect_builder_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -215,7 +215,6 @@ func testInspectBuilderCommand(t *testing.T, when spec.G, it spec.S) {

assert.Matches(outBuf.String(), regexp.MustCompile(`Paketo Buildpacks:\s+'paketobuildpacks/builder:base'`))
assert.Matches(outBuf.String(), regexp.MustCompile(`Paketo Buildpacks:\s+'paketobuildpacks/builder:full'`))
assert.Matches(outBuf.String(), regexp.MustCompile(`Heroku:\s+'heroku/buildpacks:18'`))
assert.Matches(outBuf.String(), regexp.MustCompile(`Heroku:\s+'heroku/buildpacks:20'`))
})
})
Expand Down
2 changes: 0 additions & 2 deletions internal/commands/list_trusted_builders_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,6 @@ func testListTrustedBuildersCommand(t *testing.T, when spec.G, it spec.S) {
h.AssertContainsAllInOrder(t,
outBuf,
"gcr.io/buildpacks/builder:v1",
"heroku/buildpacks:18",
"heroku/buildpacks:20",
"paketobuildpacks/builder:base",
"paketobuildpacks/builder:full",
Expand All @@ -88,7 +87,6 @@ func testListTrustedBuildersCommand(t *testing.T, when spec.G, it spec.S) {
outBuf,
"gcr.io/buildpacks/builder:v1",
builderName,
"heroku/buildpacks:18",
"heroku/buildpacks:20",
"paketobuildpacks/builder:base",
"paketobuildpacks/builder:full",
Expand Down
7 changes: 0 additions & 7 deletions internal/commands/stack_suggest.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +19,6 @@ type suggestedStack struct {
}

var suggestedStacks = []suggestedStack{
{
ID: "heroku-18",
Description: "The official Heroku stack based on Ubuntu 18.04",
Maintainer: "Heroku",
BuildImage: "heroku/pack:18-build",
RunImage: "heroku/pack:18",
},
{
ID: "heroku-20",
Description: "The official Heroku stack based on Ubuntu 20.04",
Expand Down
6 changes: 0 additions & 6 deletions internal/commands/stack_suggest_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,12 +32,6 @@ func testStacksSuggestCommand(t *testing.T, when spec.G, it spec.S) {
h.AssertNil(t, command.Execute())
h.AssertEq(t, outBuf.String(), `Stacks maintained by the community:
Stack ID: heroku-18
Description: The official Heroku stack based on Ubuntu 18.04
Maintainer: Heroku
Build Image: heroku/pack:18-build
Run Image: heroku/pack:18
Stack ID: heroku-20
Description: The official Heroku stack based on Ubuntu 20.04
Maintainer: Heroku
Expand Down
6 changes: 0 additions & 6 deletions internal/commands/suggest_stacks_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,12 +37,6 @@ func testSuggestStacksCommand(t *testing.T, when spec.G, it spec.S) {
h.AssertEq(t, outBuf.String(), `Warning: Command 'pack suggest-stacks' has been deprecated, please use 'pack stack suggest' instead
Stacks maintained by the community:
Stack ID: heroku-18
Description: The official Heroku stack based on Ubuntu 18.04
Maintainer: Heroku
Build Image: heroku/pack:18-build
Run Image: heroku/pack:18
Stack ID: heroku-20
Description: The official Heroku stack based on Ubuntu 20.04
Maintainer: Heroku
Expand Down

0 comments on commit 9e71e32

Please sign in to comment.