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.

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

Renames the repo from go-compiler -> go-dist #65

Merged
merged 1 commit into from
Jun 18, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Go Compiler Cloud Native Buildpack
# Go Distribution Cloud Native Buildpack

The Go Compiler CNB provides the Go binary distribution that can be used to
The Go Distribution CNB provides the Go binary distribution that can be used to
execute [Go tooling](https://golang.org/cmd/go/). The buildpack installs the Go
binary distribution onto the `$PATH` which makes it available for subsequent
buildpacks. These buildpacks can then use that distribution to run Go tooling
Expand All @@ -11,7 +11,7 @@ CNB](https://github.com/paketo-buildpacks/dep).

## Integration

The Go Compiler CNB provides Go as a dependency. Downstream buildpacks, like
The Go Distribution CNB provides Go as a dependency. Downstream buildpacks, like
[Go Mod](https://github.com/paketo-buildpacks/go-mod) or
[Dep](https://github.com/paketo-buildpacks/dep), can require the go dependency
by generating a [Build Plan
Expand Down
2 changes: 1 addition & 1 deletion build.go
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package gocompiler
package godist

import (
"path/filepath"
Expand Down
2 changes: 1 addition & 1 deletion build_plan_refinery.go
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package gocompiler
package godist

import (
"github.com/paketo-buildpacks/packit"
Expand Down
8 changes: 4 additions & 4 deletions build_plan_refinery_test.go
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package gocompiler_test
package godist_test

import (
"testing"

gocompiler "github.com/paketo-buildpacks/go-compiler"
godist "github.com/paketo-buildpacks/go-dist"
"github.com/paketo-buildpacks/packit"
"github.com/paketo-buildpacks/packit/postal"
"github.com/sclevine/spec"
Expand All @@ -15,11 +15,11 @@ func testBuildPlanRefinery(t *testing.T, context spec.G, it spec.S) {
var (
Expect = NewWithT(t).Expect

refinery gocompiler.BuildPlanRefinery
refinery godist.BuildPlanRefinery
)

it.Before(func() {
refinery = gocompiler.NewBuildPlanRefinery()
refinery = godist.NewBuildPlanRefinery()
})

context("BillOfMaterials", func() {
Expand Down
10 changes: 5 additions & 5 deletions build_test.go
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package gocompiler_test
package godist_test

import (
"bytes"
Expand All @@ -9,8 +9,8 @@ import (
"testing"
"time"

gocompiler "github.com/paketo-buildpacks/go-compiler"
"github.com/paketo-buildpacks/go-compiler/fakes"
godist "github.com/paketo-buildpacks/go-dist"
"github.com/paketo-buildpacks/go-dist/fakes"
"github.com/paketo-buildpacks/packit"
"github.com/paketo-buildpacks/packit/chronos"
"github.com/paketo-buildpacks/packit/postal"
Expand Down Expand Up @@ -75,9 +75,9 @@ func testBuild(t *testing.T, context spec.G, it spec.S) {
}

buffer = bytes.NewBuffer(nil)
logEmitter := gocompiler.NewLogEmitter(buffer)
logEmitter := godist.NewLogEmitter(buffer)

build = gocompiler.Build(entryResolver, dependencyManager, planRefinery, clock, logEmitter)
build = godist.Build(entryResolver, dependencyManager, planRefinery, clock, logEmitter)
})

it.After(func() {
Expand Down
6 changes: 3 additions & 3 deletions buildpack.toml
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
api = "0.2"

[buildpack]
id = "paketo-buildpacks/go-compiler"
name = "Go Compiler Buildpack"
id = "paketo-buildpacks/go-dist"
name = "Go Distribution Buildpack"
version = ""
homepage = "https://github.com/paketo-buildpacks/go-compiler"
homepage = "https://github.com/paketo-buildpacks/go-dist"

[metadata]
include_files = ["bin/run", "bin/build", "bin/detect", "buildpack.toml", "go.mod", "go.sum"]
Expand Down
2 changes: 1 addition & 1 deletion buildpack_yaml_parser.go
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package gocompiler
package godist

import (
"errors"
Expand Down
8 changes: 4 additions & 4 deletions buildpack_yaml_parser_test.go
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
package gocompiler_test
package godist_test

import (
"io/ioutil"
"os"
"testing"

gocompiler "github.com/paketo-buildpacks/go-compiler"
godist "github.com/paketo-buildpacks/go-dist"
"github.com/sclevine/spec"

. "github.com/onsi/gomega"
Expand All @@ -15,11 +15,11 @@ func testBuildpackYAMLParser(t *testing.T, context spec.G, it spec.S) {
var (
Expect = NewWithT(t).Expect

parser gocompiler.BuildpackYAMLParser
parser godist.BuildpackYAMLParser
)

it.Before(func() {
parser = gocompiler.NewBuildpackYAMLParser()
parser = godist.NewBuildpackYAMLParser()
})

context("ParseVersion", func() {
Expand Down
2 changes: 1 addition & 1 deletion constants.go
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package gocompiler
package godist

const (
DependencySHAKey = "dependency-sha"
Expand Down
2 changes: 1 addition & 1 deletion detect.go
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package gocompiler
package godist

import (
"path/filepath"
Expand Down
10 changes: 5 additions & 5 deletions detect_test.go
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
package gocompiler_test
package godist_test

import (
"errors"
"testing"

gocompiler "github.com/paketo-buildpacks/go-compiler"
"github.com/paketo-buildpacks/go-compiler/fakes"
godist "github.com/paketo-buildpacks/go-dist"
"github.com/paketo-buildpacks/go-dist/fakes"
"github.com/paketo-buildpacks/packit"
"github.com/sclevine/spec"

Expand All @@ -24,7 +24,7 @@ func testDetect(t *testing.T, context spec.G, it spec.S) {
it.Before(func() {
buildpackYAMLParser = &fakes.VersionParser{}

detect = gocompiler.Detect(buildpackYAMLParser)
detect = godist.Detect(buildpackYAMLParser)
})

it("returns a plan that provides go", func() {
Expand Down Expand Up @@ -62,7 +62,7 @@ func testDetect(t *testing.T, context spec.G, it spec.S) {
{
Name: "go",
Version: "some-version",
Metadata: gocompiler.BuildPlanMetadata{
Metadata: godist.BuildPlanMetadata{
VersionSource: "buildpack.yml",
},
},
Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
module github.com/paketo-buildpacks/go-compiler
module github.com/paketo-buildpacks/go-dist

go 1.14

Expand Down
36 changes: 9 additions & 27 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,6 @@ github.com/cloudfoundry/libcfbuildpack v1.91.23/go.mod h1:h95FwHvbelcd0cSOhLC8SG
github.com/cloudfoundry/packit v0.0.4/go.mod h1:9xu1MT6SrenSB4oFOXtruMapQ+vdfGXLzBZDnPjhYrM=
github.com/cloudfoundry/packit v0.0.5 h1:k1zwXcVRMmkiO15G6KJ8DHw9gnKXNdVIfEpJZDP662M=
github.com/cloudfoundry/packit v0.0.5/go.mod h1:9xu1MT6SrenSB4oFOXtruMapQ+vdfGXLzBZDnPjhYrM=
github.com/cloudfoundry/packit v0.0.7 h1:10j4d31TrJVCahe04A3bQ7QJUO3rpBLvQ+NGFXzg7os=
github.com/cloudfoundry/packit v0.0.7/go.mod h1:KCQ69DsYeruJQfZy2pxNR9ozg1OFKEYCFvUHl37t1+Q=
github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
Expand All @@ -48,6 +46,7 @@ github.com/fatih/color v1.9.0 h1:8xPHl4/q1VyqGIPif1F+1V3Y3lSmrq01EabUW3CoW5s=
github.com/fatih/color v1.9.0/go.mod h1:eQcE1qtQxscV5RaZvpXrrb8Drkc3/DdQ+uUYCNjL+zU=
github.com/fsnotify/fsnotify v1.4.7 h1:IXs+QLmnXW2CcXuY+8Mzv/fWEsPGWxqefPtCP5CnV9I=
github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
github.com/fsnotify/fsnotify v1.4.9 h1:hsms1Qyu0jgnwNXIxa+/V/PDsU6CfLf6CNO8H7IWoS4=
github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ=
github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8=
github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=
Expand All @@ -65,12 +64,14 @@ github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod h1:x
github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrUpVNzEA03Pprs=
github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:WU3c8KckQ9AFe+yFwt9sWVRKCVIyN9cPHBJSNnbL67w=
github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0=
github.com/golang/protobuf v1.4.2 h1:+Z5KGCizgyZCbGh1KZqA0fcLLkwbsjIzS4aV2v7wJX0=
github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI=
github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M=
github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
github.com/google/go-cmp v0.4.0 h1:xsAVV57WRhGj6kEIi8ReJzQlHHqcBYCElAvkovg3B/4=
github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
github.com/google/go-github v17.0.0+incompatible h1:N0LgJ1j65A7kfXrZnUDaYCs/Sf4rEjNlfyDHW9dolSY=
github.com/google/go-github v17.0.0+incompatible/go.mod h1:zLgOLi98H3fifZn+44m+umXrS52loVEgC2AApnigrVQ=
Expand All @@ -97,6 +98,7 @@ github.com/kr/pretty v0.2.0/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfn
github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE=
github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
github.com/magiconair/properties v1.8.1/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ=
github.com/mattn/go-colorable v0.1.2/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE=
Expand All @@ -116,46 +118,24 @@ github.com/mattn/go-runewidth v0.0.9 h1:Lm995f3rfxdpd6TSmuVCHVb/QhupuXlYr8sCI/Qd
github.com/mattn/go-runewidth v0.0.9/go.mod h1:H031xJmbD/WCDINGzjvQ9THkh0rPKHF+m2gUSrubnMI=
github.com/mitchellh/mapstructure v1.1.2 h1:fmNYVwqnSfB9mZU6OS2O6GsXM+wcskZDuKQzvN1EDeE=
github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y=
github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e h1:fD57ERR4JtEqsWbfPhv4DMiApHyliiK5xCTNVSPiaAs=
github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno=
github.com/nxadm/tail v1.4.4 h1:DQuhQpB1tVlglWS2hLQ5OV6B5r8aGxSrPc5Qo6uTN78=
github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A=
github.com/oklog/ulid v1.3.1 h1:EGfNDEx6MqHz8B3uNV6QAib1UR2Lm97sHi3ocA6ESJ4=
github.com/oklog/ulid v1.3.1/go.mod h1:CirwcVhetQ6Lv90oh/F+FBtV6XMibvdAFo93nm5qn4U=
github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
github.com/onsi/ginkgo v1.11.0 h1:JAKSXpt1YjtLA7YpPiqO9ss6sNXEsPfSGdwN0UHqzrw=
github.com/onsi/ginkgo v1.11.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
github.com/onsi/ginkgo v1.12.1 h1:mFwc4LvZ0xpSvDZ3E+k8Yte0hLOMxXUlP+yXtJqkYfQ=
github.com/onsi/ginkgo v1.12.1/go.mod h1:zj2OWP4+oCPe1qIXoGWkgMRwljMUYCdkwsT2108oapk=
github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY=
github.com/onsi/gomega v1.8.1/go.mod h1:Ho0h+IUsWyvy1OpqCwxlQ/21gkhVunqlU8fDGcoTdcA=
github.com/onsi/gomega v1.9.0/go.mod h1:Ho0h+IUsWyvy1OpqCwxlQ/21gkhVunqlU8fDGcoTdcA=
github.com/onsi/gomega v1.10.0 h1:Gwkk+PTu/nfOwNMtUB/mRUv0X7ewW5dO4AERT1ThVKo=
github.com/onsi/gomega v1.10.0/go.mod h1:Ho0h+IUsWyvy1OpqCwxlQ/21gkhVunqlU8fDGcoTdcA=
github.com/onsi/gomega v1.10.1 h1:o0+MgICZLuZ7xjH7Vx6zS/zcu93/BEp1VwkIW1mEXCE=
github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo=
github.com/paketo-buildpacks/occam v0.0.4 h1:NFvufTzuKaPkOhir+Rl2F6OCS5cdSYklwy88To3ZE2o=
github.com/paketo-buildpacks/occam v0.0.4/go.mod h1:GNW2KzdEjWkcAJZj/aI+PSfXxGHkA8XxEkaUaCP5ttY=
github.com/paketo-buildpacks/occam v0.0.5/go.mod h1:WSAaKpxQ6YtaKZMm+nwgpPI6S+KPs2SdN9zuP0O9eis=
github.com/paketo-buildpacks/occam v0.0.6 h1:2agmAZFnK9tufHi2O6T5GGMsJIIcBYz3k6PiyumR0vM=
github.com/paketo-buildpacks/occam v0.0.6/go.mod h1:WSAaKpxQ6YtaKZMm+nwgpPI6S+KPs2SdN9zuP0O9eis=
github.com/paketo-buildpacks/occam v0.0.8 h1:Of7BUZi/EzwO89XEhLhFULDBeggtSP2wpHzPCJBjnk0=
github.com/paketo-buildpacks/occam v0.0.8/go.mod h1:kJRrFPHH2/mr7nqBQE8Wb/VvEJ2JOcVWx40haWHJjO4=
github.com/paketo-buildpacks/occam v0.0.9 h1:4R3UNM49T6zJPn6pvodqXgqwlr4VDmotZGSbbXIMW8I=
github.com/paketo-buildpacks/occam v0.0.9/go.mod h1:AexMesORz5Wa+3sULK/s2WD0Qo/AuLiPVeoxKPwDwq4=
github.com/paketo-buildpacks/occam v0.0.10 h1:rx/eU6Qgqvzu8zeAjTzTxGGET+7chc6NDA/Drp70SJo=
github.com/paketo-buildpacks/occam v0.0.10/go.mod h1:k+FU6/tXabu8rnmC+Kdk6pMzEDGF9GkGOZ3K12TI5/s=
github.com/paketo-buildpacks/occam v0.0.11 h1:u5G3HCKYfBKD3kSft46/Pgl+dt3YdrQgmfVqw/D4qAE=
github.com/paketo-buildpacks/occam v0.0.11/go.mod h1:48up+AjEEuAvQdK4Pp/5qhjE6ES7TdC29VfGlBO5n/0=
github.com/paketo-buildpacks/occam v0.0.12 h1:j2yl/dx7ut4nwHwFndoES3szhO8G+CeDe+vAbrQRQfw=
github.com/paketo-buildpacks/occam v0.0.12/go.mod h1:eY5lAyFJLmNq7bc3bSIyvoUSXnyQSBQ138RZPvv5EC8=
github.com/paketo-buildpacks/occam v0.0.13 h1:KWA4YVFe+shbBwM1TYxJMkl7sOW7OC+1UQFtb2Vkt64=
github.com/paketo-buildpacks/occam v0.0.13/go.mod h1:YzM19WUBeTUYldLWujLR1BE0BfyFiECvluds0ZhbORo=
github.com/paketo-buildpacks/packit v0.0.8 h1:bDixAQpv33yf91eYY/WXJtRwP3LGwwJjCiWUAHjmk3o=
github.com/paketo-buildpacks/packit v0.0.8/go.mod h1:S2ud8PcMgCjnOjIYnlituwDFL12uQ9eWy9qjTHlM/IM=
github.com/paketo-buildpacks/packit v0.0.10 h1:W29he2huZn6UcSWO6nMgBUQlLBUi4pCrQS+VXcCfYBQ=
github.com/paketo-buildpacks/packit v0.0.10/go.mod h1:S2ud8PcMgCjnOjIYnlituwDFL12uQ9eWy9qjTHlM/IM=
github.com/paketo-buildpacks/packit v0.0.12 h1:GuGXq52bnLYxM7zzFPhp8rZOID+7d4zwlqM6zeoBaZc=
github.com/paketo-buildpacks/packit v0.0.12/go.mod h1:b40wtWWAcgB47+vYGDD9KKhzOtBjI8KPqGxwGvV+XNs=
github.com/paketo-buildpacks/packit v0.0.13 h1:+PFK/qKFX7DiZ73y5uZ/e0msislNqvEBZNXs724cNVA=
github.com/paketo-buildpacks/packit v0.0.13/go.mod h1:b40wtWWAcgB47+vYGDD9KKhzOtBjI8KPqGxwGvV+XNs=
github.com/paketo-buildpacks/packit v0.0.14 h1:ySq6WC/WKsOmUdsg9Uh1ggpDkyV0opJuJTus5DYv+lg=
github.com/paketo-buildpacks/packit v0.0.14/go.mod h1:b40wtWWAcgB47+vYGDD9KKhzOtBjI8KPqGxwGvV+XNs=
github.com/paketo-buildpacks/packit v0.0.15 h1:BYcZAyHcKF+n9DKroAiYC1CgbCHIshcerxeMYq5rq4A=
Expand Down Expand Up @@ -311,11 +291,13 @@ google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ
google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM=
google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod h1:A+miEFZTKqfCUM6K7xSMQL9OKL/b6hQv+e19PK+JZNE=
google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzikPIcrTAo=
google.golang.org/protobuf v1.23.0 h1:4MY060fB1DLGMB/7MBTLnwQUY6+F09GEiz6SsrNqyzM=
google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 h1:YR8cESwS4TdDjEe65xsg0ogRM/Nc3DYOhEAlW+xobZo=
gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f h1:BLraFXnmrev5lT+xlilqcH8XK9/i0At2xKjWk4p6zsU=
gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI=
gopkg.in/fsnotify.v1 v1.4.7 h1:xOHLXZwVvI9hhs+cLKq5+I5onOuwQLhQwiu63xxlHs4=
Expand Down
4 changes: 2 additions & 2 deletions init_test.go
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package gocompiler_test
package godist_test

import (
"testing"
Expand All @@ -8,7 +8,7 @@ import (
)

func TestUnit(t *testing.T) {
suite := spec.New("go-compiler", spec.Report(report.Terminal{}), spec.Parallel())
suite := spec.New("go-dist", spec.Report(report.Terminal{}), spec.Parallel())
suite("Build", testBuild)
suite("BuildPlanRefinery", testBuildPlanRefinery)
suite("BuildpackYAMLParser", testBuildpackYAMLParser)
Expand Down
2 changes: 1 addition & 1 deletion integration/buildpack_yaml_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ func testBuildpackYAML(t *testing.T, context spec.G, it spec.S) {
Expect(err).ToNot(HaveOccurred())

Expect(logs).To(ContainLines(
fmt.Sprintf("Go Compiler Buildpack %s", buildpackVersion),
fmt.Sprintf("Go Distribution Buildpack %s", buildpackVersion),
" Resolving Go version",
" Candidate version sources (in priority order):",
" buildpack.yml -> \"1.14.*\"",
Expand Down
4 changes: 2 additions & 2 deletions integration/default_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ func testDefault(t *testing.T, context spec.G, it spec.S) {
Expect(err).ToNot(HaveOccurred())

Expect(logs).To(ContainLines(
fmt.Sprintf("Go Compiler Buildpack %s", buildpackVersion),
fmt.Sprintf("Go Distribution Buildpack %s", buildpackVersion),
" Resolving Go version",
" Candidate version sources (in priority order):",
" <unknown> -> \"\"",
Expand All @@ -89,7 +89,7 @@ func testDefault(t *testing.T, context spec.G, it spec.S) {
"",
" Executing build process",
MatchRegexp(` Installing Go 1\.14\.\d+`),
MatchRegexp(` Completed in \d+\.\d+`),
MatchRegexp(` Completed in ([0-9]*(\.[0-9]*)?[a-z]+)+`),
))
})
})
Expand Down
18 changes: 9 additions & 9 deletions integration/layer_reuse_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -78,14 +78,14 @@ func testLayerReuse(t *testing.T, context spec.G, it spec.S) {
imageIDs[firstImage.ID] = struct{}{}

Expect(firstImage.Buildpacks).To(HaveLen(2))
Expect(firstImage.Buildpacks[0].Key).To(Equal("paketo-buildpacks/go-compiler"))
Expect(firstImage.Buildpacks[0].Key).To(Equal("paketo-buildpacks/go-dist"))
Expect(firstImage.Buildpacks[0].Layers).To(HaveKey("go"))

buildpackVersion, err := GetGitVersion()
Expect(err).ToNot(HaveOccurred())

Expect(logs).To(ContainLines(
fmt.Sprintf("Go Compiler Buildpack %s", buildpackVersion),
fmt.Sprintf("Go Distribution Buildpack %s", buildpackVersion),
" Resolving Go version",
" Candidate version sources (in priority order):",
" <unknown> -> \"\"",
Expand Down Expand Up @@ -114,18 +114,18 @@ func testLayerReuse(t *testing.T, context spec.G, it spec.S) {
imageIDs[secondImage.ID] = struct{}{}

Expect(secondImage.Buildpacks).To(HaveLen(2))
Expect(secondImage.Buildpacks[0].Key).To(Equal("paketo-buildpacks/go-compiler"))
Expect(secondImage.Buildpacks[0].Key).To(Equal("paketo-buildpacks/go-dist"))
Expect(secondImage.Buildpacks[0].Layers).To(HaveKey("go"))

Expect(logs).To(ContainLines(
fmt.Sprintf("Go Compiler Buildpack %s", buildpackVersion),
fmt.Sprintf("Go Distribution Buildpack %s", buildpackVersion),
" Resolving Go version",
" Candidate version sources (in priority order):",
" <unknown> -> \"\"",
"",
MatchRegexp(` Selected Go version \(using <unknown>\): 1\.14\.\d+`),
"",
" Reusing cached layer /layers/paketo-buildpacks_go-compiler/go",
" Reusing cached layer /layers/paketo-buildpacks_go-dist/go",
))

secondContainer, err = docker.Container.Run.WithCommand("go run main.go").Execute(secondImage.ID)
Expand Down Expand Up @@ -171,14 +171,14 @@ func testLayerReuse(t *testing.T, context spec.G, it spec.S) {
imageIDs[firstImage.ID] = struct{}{}

Expect(firstImage.Buildpacks).To(HaveLen(2))
Expect(firstImage.Buildpacks[0].Key).To(Equal("paketo-buildpacks/go-compiler"))
Expect(firstImage.Buildpacks[0].Key).To(Equal("paketo-buildpacks/go-dist"))
Expect(firstImage.Buildpacks[0].Layers).To(HaveKey("go"))

buildpackVersion, err := GetGitVersion()
Expect(err).ToNot(HaveOccurred())

Expect(logs).To(ContainLines(
fmt.Sprintf("Go Compiler Buildpack %s", buildpackVersion),
fmt.Sprintf("Go Distribution Buildpack %s", buildpackVersion),
" Resolving Go version",
" Candidate version sources (in priority order):",
" buildpack.yml -> \"1.14.*\"",
Expand Down Expand Up @@ -214,11 +214,11 @@ go:
imageIDs[secondImage.ID] = struct{}{}

Expect(secondImage.Buildpacks).To(HaveLen(2))
Expect(secondImage.Buildpacks[0].Key).To(Equal("paketo-buildpacks/go-compiler"))
Expect(secondImage.Buildpacks[0].Key).To(Equal("paketo-buildpacks/go-dist"))
Expect(secondImage.Buildpacks[0].Layers).To(HaveKey("go"))

Expect(logs).To(ContainLines(
fmt.Sprintf("Go Compiler Buildpack %s", buildpackVersion),
fmt.Sprintf("Go Distribution Buildpack %s", buildpackVersion),
" Resolving Go version",
" Candidate version sources (in priority order):",
" buildpack.yml -> \"1.13.*\"",
Expand Down
Loading