Skip to content

Commit

Permalink
libpak go v2 module changes
Browse files Browse the repository at this point in the history
Signed-off-by: Ozzy Osborne <[email protected]>
  • Loading branch information
BarDweller committed Aug 14, 2023
1 parent 6553c32 commit 35ae3e3
Show file tree
Hide file tree
Showing 59 changed files with 95 additions and 94 deletions.
2 changes: 1 addition & 1 deletion bard/formatter_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ import (
. "github.com/onsi/gomega"
"github.com/sclevine/spec"

"github.com/paketo-buildpacks/libpak/bard"
"github.com/paketo-buildpacks/libpak/v2/bard"
)

func testFormatter(t *testing.T, context spec.G, it spec.S) {
Expand Down
2 changes: 1 addition & 1 deletion bard/logger_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ import (
. "github.com/onsi/gomega"
"github.com/sclevine/spec"

"github.com/paketo-buildpacks/libpak/bard"
"github.com/paketo-buildpacks/libpak/v2/bard"
)

func testLogger(t *testing.T, context spec.G, it spec.S) {
Expand Down
2 changes: 1 addition & 1 deletion bard/writer_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ import (
. "github.com/onsi/gomega"
"github.com/sclevine/spec"

"github.com/paketo-buildpacks/libpak/bard"
"github.com/paketo-buildpacks/libpak/v2/bard"
)

func testWriter(t *testing.T, context spec.G, it spec.S) {
Expand Down
2 changes: 1 addition & 1 deletion bindings/resolve_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import (
. "github.com/onsi/gomega"
"github.com/sclevine/spec"

"github.com/paketo-buildpacks/libpak/bindings"
"github.com/paketo-buildpacks/libpak/v2/bindings"
)

func testResolve(t *testing.T, context spec.G, it spec.S) {
Expand Down
4 changes: 2 additions & 2 deletions build.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ package libpak
import (
"github.com/buildpacks/libcnb/v2"

"github.com/paketo-buildpacks/libpak/bard"
"github.com/paketo-buildpacks/libpak/internal"
"github.com/paketo-buildpacks/libpak/v2/bard"
"github.com/paketo-buildpacks/libpak/v2/internal"
)

// Build is called by the main function of a buildpack, for build.
Expand Down
4 changes: 2 additions & 2 deletions build_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@ import (
"github.com/sclevine/spec"
"github.com/stretchr/testify/mock"

"github.com/paketo-buildpacks/libpak"
"github.com/paketo-buildpacks/libpak/bard"
"github.com/paketo-buildpacks/libpak/v2"
"github.com/paketo-buildpacks/libpak/v2/bard"
)

func testBuild(t *testing.T, context spec.G, it spec.S) {
Expand Down
4 changes: 2 additions & 2 deletions buildmodule.go
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@ import (
"github.com/Masterminds/semver/v3"
"github.com/heroku/color"

"github.com/paketo-buildpacks/libpak/bard"
"github.com/paketo-buildpacks/libpak/sbom"
"github.com/paketo-buildpacks/libpak/v2/bard"
"github.com/paketo-buildpacks/libpak/v2/sbom"
)

// BuildpackConfiguration represents a build or launch configuration parameter.
Expand Down
8 changes: 4 additions & 4 deletions buildmodule_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,10 @@ import (

"github.com/sclevine/spec"

"github.com/paketo-buildpacks/libpak"
"github.com/paketo-buildpacks/libpak/bard"
"github.com/paketo-buildpacks/libpak/internal"
"github.com/paketo-buildpacks/libpak/sbom"
"github.com/paketo-buildpacks/libpak/v2"
"github.com/paketo-buildpacks/libpak/v2/bard"
"github.com/paketo-buildpacks/libpak/v2/internal"
"github.com/paketo-buildpacks/libpak/v2/sbom"
)

func testBuildpack(t *testing.T, context spec.G, it spec.S) {
Expand Down
2 changes: 1 addition & 1 deletion buildpack_plan_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import (
. "github.com/onsi/gomega"
"github.com/sclevine/spec"

"github.com/paketo-buildpacks/libpak"
"github.com/paketo-buildpacks/libpak/v2"
)

func testBuildpackPlan(t *testing.T, context spec.G, it spec.S) {
Expand Down
4 changes: 2 additions & 2 deletions carton/build_image_dependency.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ import (
"os"
"regexp"

"github.com/paketo-buildpacks/libpak/bard"
"github.com/paketo-buildpacks/libpak/internal"
"github.com/paketo-buildpacks/libpak/v2/bard"
"github.com/paketo-buildpacks/libpak/v2/internal"
)

const (
Expand Down
2 changes: 1 addition & 1 deletion carton/build_image_dependency_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ import (
"github.com/sclevine/spec"
"github.com/stretchr/testify/mock"

"github.com/paketo-buildpacks/libpak/carton"
"github.com/paketo-buildpacks/libpak/v2/carton"
)

func testBuildImageDependency(t *testing.T, context spec.G, it spec.S) {
Expand Down
4 changes: 2 additions & 2 deletions carton/buildmodule_dependency.go
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ import (
"regexp"

"github.com/BurntSushi/toml"
"github.com/paketo-buildpacks/libpak/bard"
"github.com/paketo-buildpacks/libpak/internal"
"github.com/paketo-buildpacks/libpak/v2/bard"
"github.com/paketo-buildpacks/libpak/v2/internal"
)

const (
Expand Down
4 changes: 2 additions & 2 deletions carton/buildmodule_dependency_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ import (
"github.com/sclevine/spec"
"github.com/stretchr/testify/mock"

"github.com/paketo-buildpacks/libpak/carton"
"github.com/paketo-buildpacks/libpak/internal"
"github.com/paketo-buildpacks/libpak/v2/carton"
"github.com/paketo-buildpacks/libpak/v2/internal"
)

func testBuildpackDependency(t *testing.T, context spec.G, it spec.S) {
Expand Down
2 changes: 1 addition & 1 deletion carton/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ package carton
import (
"github.com/buildpacks/libcnb/v2"

"github.com/paketo-buildpacks/libpak/effect"
"github.com/paketo-buildpacks/libpak/v2/effect"
)

//go:generate mockery --name EntryWriter --case=underscore
Expand Down
4 changes: 2 additions & 2 deletions carton/lifecycle_dependency.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ import (
"os"
"regexp"

"github.com/paketo-buildpacks/libpak/bard"
"github.com/paketo-buildpacks/libpak/internal"
"github.com/paketo-buildpacks/libpak/v2/bard"
"github.com/paketo-buildpacks/libpak/v2/internal"
)

const (
Expand Down
2 changes: 1 addition & 1 deletion carton/lifecycle_dependency_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ import (
"github.com/sclevine/spec"
"github.com/stretchr/testify/mock"

"github.com/paketo-buildpacks/libpak/carton"
"github.com/paketo-buildpacks/libpak/v2/carton"
)

func testLifecycleDependency(t *testing.T, context spec.G, it spec.S) {
Expand Down
2 changes: 1 addition & 1 deletion carton/netrc_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ import (
. "github.com/onsi/gomega"
"github.com/sclevine/spec"

"github.com/paketo-buildpacks/libpak/carton"
"github.com/paketo-buildpacks/libpak/v2/carton"
)

func testNetrc(t *testing.T, context spec.G, it spec.S) {
Expand Down
8 changes: 4 additions & 4 deletions carton/package.go
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,10 @@ import (
"github.com/buildpacks/libcnb/v2"
"github.com/heroku/color"

"github.com/paketo-buildpacks/libpak"
"github.com/paketo-buildpacks/libpak/bard"
"github.com/paketo-buildpacks/libpak/effect"
"github.com/paketo-buildpacks/libpak/internal"
"github.com/paketo-buildpacks/libpak/v2"
"github.com/paketo-buildpacks/libpak/v2/bard"
"github.com/paketo-buildpacks/libpak/v2/effect"
"github.com/paketo-buildpacks/libpak/v2/internal"
)

// Package is an object that contains the configuration for building a package.
Expand Down
4 changes: 2 additions & 2 deletions carton/package_dependency.go
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ import (
"strings"

"github.com/BurntSushi/toml"
"github.com/paketo-buildpacks/libpak/bard"
"github.com/paketo-buildpacks/libpak/internal"
"github.com/paketo-buildpacks/libpak/v2/bard"
"github.com/paketo-buildpacks/libpak/v2/internal"
)

type PackageDependency struct {
Expand Down
4 changes: 2 additions & 2 deletions carton/package_dependency_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ import (
"github.com/sclevine/spec"
"github.com/stretchr/testify/mock"

"github.com/paketo-buildpacks/libpak/carton"
"github.com/paketo-buildpacks/libpak/internal"
"github.com/paketo-buildpacks/libpak/v2/carton"
"github.com/paketo-buildpacks/libpak/v2/internal"
)

func testPackageDependency(t *testing.T, context spec.G, it spec.S) {
Expand Down
8 changes: 4 additions & 4 deletions carton/package_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,10 @@ import (
"github.com/sclevine/spec"
"github.com/stretchr/testify/mock"

"github.com/paketo-buildpacks/libpak/carton"
cMocks "github.com/paketo-buildpacks/libpak/carton/mocks"
"github.com/paketo-buildpacks/libpak/effect"
eMocks "github.com/paketo-buildpacks/libpak/effect/mocks"
"github.com/paketo-buildpacks/libpak/v2/carton"
cMocks "github.com/paketo-buildpacks/libpak/v2/carton/mocks"
"github.com/paketo-buildpacks/libpak/v2/effect"
eMocks "github.com/paketo-buildpacks/libpak/v2/effect/mocks"
)

func testPackage(t *testing.T, context spec.G, it spec.S) {
Expand Down
2 changes: 1 addition & 1 deletion cmd/create-package/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import (

"github.com/spf13/pflag"

"github.com/paketo-buildpacks/libpak/carton"
"github.com/paketo-buildpacks/libpak/v2/carton"
)

func main() {
Expand Down
2 changes: 1 addition & 1 deletion cmd/update-build-image-dependency/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import (

"github.com/spf13/pflag"

"github.com/paketo-buildpacks/libpak/carton"
"github.com/paketo-buildpacks/libpak/v2/carton"
)

func main() {
Expand Down
2 changes: 1 addition & 1 deletion cmd/update-buildmodule-dependency/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import (

"github.com/spf13/pflag"

"github.com/paketo-buildpacks/libpak/carton"
"github.com/paketo-buildpacks/libpak/v2/carton"
)

func main() {
Expand Down
2 changes: 1 addition & 1 deletion cmd/update-lifecycle-dependency/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import (

"github.com/spf13/pflag"

"github.com/paketo-buildpacks/libpak/carton"
"github.com/paketo-buildpacks/libpak/v2/carton"
)

func main() {
Expand Down
2 changes: 1 addition & 1 deletion cmd/update-package-dependency/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import (

"github.com/spf13/pflag"

"github.com/paketo-buildpacks/libpak/carton"
"github.com/paketo-buildpacks/libpak/v2/carton"
)

func main() {
Expand Down
2 changes: 1 addition & 1 deletion crush/crush_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ import (
. "github.com/onsi/gomega"
"github.com/sclevine/spec"

"github.com/paketo-buildpacks/libpak/crush"
"github.com/paketo-buildpacks/libpak/v2/crush"
)

func testCrush(t *testing.T, context spec.G, it spec.S) {
Expand Down
4 changes: 2 additions & 2 deletions dependency_cache.go
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,8 @@ import (
"github.com/buildpacks/libcnb/v2"
"github.com/heroku/color"

"github.com/paketo-buildpacks/libpak/bard"
"github.com/paketo-buildpacks/libpak/sherpa"
"github.com/paketo-buildpacks/libpak/v2/bard"
"github.com/paketo-buildpacks/libpak/v2/sherpa"
)

type HttpClientTimeouts struct {
Expand Down
2 changes: 1 addition & 1 deletion dependency_cache_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ import (
"github.com/onsi/gomega/ghttp"
"github.com/sclevine/spec"

"github.com/paketo-buildpacks/libpak"
"github.com/paketo-buildpacks/libpak/v2"
)

func testDependencyCache(t *testing.T, context spec.G, it spec.S) {
Expand Down
4 changes: 2 additions & 2 deletions detect.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ package libpak
import (
"github.com/buildpacks/libcnb/v2"

"github.com/paketo-buildpacks/libpak/bard"
"github.com/paketo-buildpacks/libpak/internal"
"github.com/paketo-buildpacks/libpak/v2/bard"
"github.com/paketo-buildpacks/libpak/v2/internal"
)

// Detect is called by the main function of a buildpack, for detection.
Expand Down
4 changes: 2 additions & 2 deletions detect_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@ import (
"github.com/sclevine/spec"
"github.com/stretchr/testify/mock"

"github.com/paketo-buildpacks/libpak"
"github.com/paketo-buildpacks/libpak/bard"
"github.com/paketo-buildpacks/libpak/v2"
"github.com/paketo-buildpacks/libpak/v2/bard"
)

func testDetect(t *testing.T, context spec.G, it spec.S) {
Expand Down
2 changes: 1 addition & 1 deletion effect/mocks/executor.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion formatter_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import (
"testing"

. "github.com/onsi/gomega"
"github.com/paketo-buildpacks/libpak"
"github.com/paketo-buildpacks/libpak/v2"
"github.com/sclevine/spec"
)

Expand Down
4 changes: 2 additions & 2 deletions generate.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ package libpak
import (
"github.com/buildpacks/libcnb/v2"

"github.com/paketo-buildpacks/libpak/bard"
"github.com/paketo-buildpacks/libpak/internal"
"github.com/paketo-buildpacks/libpak/v2/bard"
"github.com/paketo-buildpacks/libpak/v2/internal"
)

// Generate is called by the main function of an extension, for generation.
Expand Down
4 changes: 2 additions & 2 deletions generate_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@ import (
"github.com/sclevine/spec"
"github.com/stretchr/testify/mock"

"github.com/paketo-buildpacks/libpak"
"github.com/paketo-buildpacks/libpak/bard"
"github.com/paketo-buildpacks/libpak/v2"
"github.com/paketo-buildpacks/libpak/v2/bard"
)

func testGenerate(t *testing.T, context spec.G, it spec.S) {
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/libpak
module github.com/paketo-buildpacks/libpak/v2

go 1.20

Expand Down
2 changes: 1 addition & 1 deletion internal/entry_writer_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import (
. "github.com/onsi/gomega"
"github.com/sclevine/spec"

"github.com/paketo-buildpacks/libpak/internal"
"github.com/paketo-buildpacks/libpak/v2/internal"
)

func testEntryWriter(t *testing.T, context spec.G, it spec.S) {
Expand Down
2 changes: 1 addition & 1 deletion internal/environment_writer.go
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import (
"path/filepath"
"sort"

"github.com/paketo-buildpacks/libpak/bard"
"github.com/paketo-buildpacks/libpak/v2/bard"
)

// EnvironmentWriter is an implementation of the libcnb.EnvironmentWriter interface.
Expand Down
4 changes: 2 additions & 2 deletions internal/environment_writer_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ import (
. "github.com/onsi/gomega"
"github.com/sclevine/spec"

"github.com/paketo-buildpacks/libpak/bard"
"github.com/paketo-buildpacks/libpak/internal"
"github.com/paketo-buildpacks/libpak/v2/bard"
"github.com/paketo-buildpacks/libpak/v2/internal"
)

func testEnvironmentWriter(t *testing.T, context spec.G, it spec.S) {
Expand Down
Loading

0 comments on commit 35ae3e3

Please sign in to comment.