From 5aee81f9de8aee8a2938e06bccf259cdecd3ca93 Mon Sep 17 00:00:00 2001 From: Rob Dimsdale-Zucker Date: Thu, 17 Mar 2022 13:39:53 -0400 Subject: [PATCH] Bump packit to v2. --- build.go | 12 +++--- build_test.go | 70 +++++++++++++++++++---------------- detect.go | 2 +- detect_test.go | 2 +- fakes/dependency_manager.go | 64 ++++++++++++++++---------------- fakes/entry_resolver.go | 14 +++---- fakes/executable.go | 8 ++-- fakes/install_process.go | 6 +-- fakes/site_package_process.go | 6 +-- go.mod | 2 +- go.sum | 21 ----------- pip_install_process.go | 2 +- pip_install_process_test.go | 2 +- run/main.go | 14 +++---- site_process.go | 2 +- site_process_test.go | 2 +- 16 files changed, 108 insertions(+), 121 deletions(-) diff --git a/build.go b/build.go index db2f37ba..d74ccf41 100644 --- a/build.go +++ b/build.go @@ -7,10 +7,10 @@ import ( "strings" "time" - "github.com/paketo-buildpacks/packit" - "github.com/paketo-buildpacks/packit/chronos" - "github.com/paketo-buildpacks/packit/postal" - "github.com/paketo-buildpacks/packit/scribe" + "github.com/paketo-buildpacks/packit/v2" + "github.com/paketo-buildpacks/packit/v2/chronos" + "github.com/paketo-buildpacks/packit/v2/postal" + "github.com/paketo-buildpacks/packit/v2/scribe" ) //go:generate faux --interface EntryResolver --output fakes/entry_resolver.go @@ -29,7 +29,7 @@ type EntryResolver interface { // dependency and installing it. type DependencyManager interface { Resolve(path, id, version, stack string) (postal.Dependency, error) - Install(dependency postal.Dependency, cnbPath, destPath string) error + Deliver(dependency postal.Dependency, cnbPath, destinationPath, platformPath string) error GenerateBillOfMaterials(dependencies ...postal.Dependency) []packit.BOMEntry } @@ -118,7 +118,7 @@ func Build(installProcess InstallProcess, entries EntryResolver, dependencies De logs.Subprocess(fmt.Sprintf("Installing Pip %s", dependency.Version)) duration, err := clock.Measure(func() error { - err = dependencies.Install(dependency, context.CNBPath, pipSrcDir) + err = dependencies.Deliver(dependency, context.CNBPath, pipSrcDir, context.Platform.Path) if err != nil { return err } diff --git a/build_test.go b/build_test.go index 5684c18b..5b6555b9 100644 --- a/build_test.go +++ b/build_test.go @@ -9,10 +9,13 @@ import ( "testing" "time" - "github.com/paketo-buildpacks/packit" - "github.com/paketo-buildpacks/packit/chronos" - "github.com/paketo-buildpacks/packit/postal" - "github.com/paketo-buildpacks/packit/scribe" + "github.com/paketo-buildpacks/packit/v2" + "github.com/paketo-buildpacks/packit/v2/chronos" + + //nolint Ignore SA1019, informed usage of deprecated package + "github.com/paketo-buildpacks/packit/v2/paketosbom" + "github.com/paketo-buildpacks/packit/v2/postal" + "github.com/paketo-buildpacks/packit/v2/scribe" pip "github.com/paketo-buildpacks/pip" "github.com/paketo-buildpacks/pip/fakes" "github.com/sclevine/spec" @@ -83,9 +86,9 @@ func testBuild(t *testing.T, context spec.G, it spec.S) { dependencyManager.GenerateBillOfMaterialsCall.Returns.BOMEntrySlice = []packit.BOMEntry{ { Name: "pip", - Metadata: packit.BOMMetadata{ - Checksum: packit.BOMChecksum{ - Algorithm: packit.SHA256, + Metadata: paketosbom.BOMMetadata{ + Checksum: paketosbom.BOMChecksum{ + Algorithm: paketosbom.SHA256, Hash: "pip-dependency-sha", }, URI: "pip-dependency-uri", @@ -136,8 +139,9 @@ func testBuild(t *testing.T, context spec.G, it spec.S) { }, }, }, - Layers: packit.Layers{Path: layersDir}, - Stack: "some-stack", + Platform: packit.Platform{Path: "platform"}, + Layers: packit.Layers{Path: layersDir}, + Stack: "some-stack", }) Expect(err).NotTo(HaveOccurred()) @@ -166,9 +170,9 @@ func testBuild(t *testing.T, context spec.G, it spec.S) { BOM: []packit.BOMEntry{ { Name: "pip", - Metadata: packit.BOMMetadata{ - Checksum: packit.BOMChecksum{ - Algorithm: packit.SHA256, + Metadata: paketosbom.BOMMetadata{ + Checksum: paketosbom.BOMChecksum{ + Algorithm: paketosbom.SHA256, Hash: "pip-dependency-sha", }, URI: "pip-dependency-uri", @@ -181,9 +185,9 @@ func testBuild(t *testing.T, context spec.G, it spec.S) { BOM: []packit.BOMEntry{ { Name: "pip", - Metadata: packit.BOMMetadata{ - Checksum: packit.BOMChecksum{ - Algorithm: packit.SHA256, + Metadata: paketosbom.BOMMetadata{ + Checksum: paketosbom.BOMChecksum{ + Algorithm: paketosbom.SHA256, Hash: "pip-dependency-sha", }, URI: "pip-dependency-uri", @@ -217,7 +221,7 @@ func testBuild(t *testing.T, context spec.G, it spec.S) { Expect(dependencyManager.ResolveCall.Receives.Version).To(Equal("")) Expect(dependencyManager.ResolveCall.Receives.Stack).To(Equal("some-stack")) - Expect(dependencyManager.InstallCall.Receives.Dependency).To(Equal(postal.Dependency{ + Expect(dependencyManager.DeliverCall.Receives.Dependency).To(Equal(postal.Dependency{ ID: "pip", Name: "Pip", SHA256: "some-sha", @@ -226,10 +230,11 @@ func testBuild(t *testing.T, context spec.G, it spec.S) { Version: "21.0", })) - Expect(dependencyManager.InstallCall.Receives.CnbPath).To(Equal(cnbDir)) - Expect(dependencyManager.InstallCall.Receives.DestPath).To(ContainSubstring("pip-source")) + Expect(dependencyManager.DeliverCall.Receives.CnbPath).To(Equal(cnbDir)) + Expect(dependencyManager.DeliverCall.Receives.DestinationPath).To(ContainSubstring("pip-source")) + Expect(dependencyManager.DeliverCall.Receives.PlatformPath).To(Equal("platform")) - Expect(installProcess.ExecuteCall.Receives.SrcPath).To(Equal(dependencyManager.InstallCall.Receives.DestPath)) + Expect(installProcess.ExecuteCall.Receives.SrcPath).To(Equal(dependencyManager.DeliverCall.Receives.DestinationPath)) Expect(installProcess.ExecuteCall.Receives.TargetLayerPath).To(Equal(filepath.Join(layersDir, "pip"))) Expect(buffer.String()).To(ContainSubstring("Some Buildpack some-version")) @@ -262,8 +267,9 @@ func testBuild(t *testing.T, context spec.G, it spec.S) { }, }, }, - Layers: packit.Layers{Path: layersDir}, - Stack: "some-stack", + Platform: packit.Platform{Path: "platform"}, + Layers: packit.Layers{Path: layersDir}, + Stack: "some-stack", }) Expect(err).NotTo(HaveOccurred()) @@ -292,9 +298,9 @@ func testBuild(t *testing.T, context spec.G, it spec.S) { BOM: []packit.BOMEntry{ { Name: "pip", - Metadata: packit.BOMMetadata{ - Checksum: packit.BOMChecksum{ - Algorithm: packit.SHA256, + Metadata: paketosbom.BOMMetadata{ + Checksum: paketosbom.BOMChecksum{ + Algorithm: paketosbom.SHA256, Hash: "pip-dependency-sha", }, URI: "pip-dependency-uri", @@ -307,9 +313,9 @@ func testBuild(t *testing.T, context spec.G, it spec.S) { BOM: []packit.BOMEntry{ { Name: "pip", - Metadata: packit.BOMMetadata{ - Checksum: packit.BOMChecksum{ - Algorithm: packit.SHA256, + Metadata: paketosbom.BOMMetadata{ + Checksum: paketosbom.BOMChecksum{ + Algorithm: paketosbom.SHA256, Hash: "pip-dependency-sha", }, URI: "pip-dependency-uri", @@ -438,9 +444,9 @@ func testBuild(t *testing.T, context spec.G, it spec.S) { BOM: []packit.BOMEntry{ { Name: "pip", - Metadata: packit.BOMMetadata{ - Checksum: packit.BOMChecksum{ - Algorithm: packit.SHA256, + Metadata: paketosbom.BOMMetadata{ + Checksum: paketosbom.BOMChecksum{ + Algorithm: paketosbom.SHA256, Hash: "pip-dependency-sha", }, URI: "pip-dependency-uri", @@ -454,7 +460,7 @@ func testBuild(t *testing.T, context spec.G, it spec.S) { Expect(buffer.String()).ToNot(ContainSubstring("Executing build process")) Expect(buffer.String()).To(ContainSubstring("Reusing cached layer")) - Expect(dependencyManager.InstallCall.CallCount).To(Equal(0)) + Expect(dependencyManager.DeliverCall.CallCount).To(Equal(0)) Expect(installProcess.ExecuteCall.CallCount).To(Equal(0)) }) }) @@ -551,7 +557,7 @@ func testBuild(t *testing.T, context spec.G, it spec.S) { context("when dependency cannot be installed", func() { it.Before(func() { - dependencyManager.InstallCall.Returns.Error = errors.New("failed to install dependency") + dependencyManager.DeliverCall.Returns.Error = errors.New("failed to install dependency") }) it("returns an error", func() { _, err := build(packit.BuildContext{ diff --git a/detect.go b/detect.go index 8e67854d..3b039c24 100644 --- a/detect.go +++ b/detect.go @@ -3,7 +3,7 @@ package pip import ( "os" - "github.com/paketo-buildpacks/packit" + "github.com/paketo-buildpacks/packit/v2" ) // BuildPlanMetadata is the buildpack specific data included in build plan diff --git a/detect_test.go b/detect_test.go index 58636aed..f8451a1a 100644 --- a/detect_test.go +++ b/detect_test.go @@ -4,7 +4,7 @@ import ( "os" "testing" - "github.com/paketo-buildpacks/packit" + "github.com/paketo-buildpacks/packit/v2" "github.com/paketo-buildpacks/pip" "github.com/sclevine/spec" diff --git a/fakes/dependency_manager.go b/fakes/dependency_manager.go index 75af95b0..ea3feb52 100644 --- a/fakes/dependency_manager.go +++ b/fakes/dependency_manager.go @@ -3,37 +3,38 @@ package fakes import ( "sync" - "github.com/paketo-buildpacks/packit" - "github.com/paketo-buildpacks/packit/postal" + packit "github.com/paketo-buildpacks/packit/v2" + "github.com/paketo-buildpacks/packit/v2/postal" ) type DependencyManager struct { - GenerateBillOfMaterialsCall struct { - sync.Mutex + DeliverCall struct { + mutex sync.Mutex CallCount int Receives struct { - Dependencies []postal.Dependency + Dependency postal.Dependency + CnbPath string + DestinationPath string + PlatformPath string } Returns struct { - BOMEntrySlice []packit.BOMEntry + Error error } - Stub func(...postal.Dependency) []packit.BOMEntry + Stub func(postal.Dependency, string, string, string) error } - InstallCall struct { - sync.Mutex + GenerateBillOfMaterialsCall struct { + mutex sync.Mutex CallCount int Receives struct { - Dependency postal.Dependency - CnbPath string - DestPath string + Dependencies []postal.Dependency } Returns struct { - Error error + BOMEntrySlice []packit.BOMEntry } - Stub func(postal.Dependency, string, string) error + Stub func(...postal.Dependency) []packit.BOMEntry } ResolveCall struct { - sync.Mutex + mutex sync.Mutex CallCount int Receives struct { Path string @@ -49,9 +50,22 @@ type DependencyManager struct { } } +func (f *DependencyManager) Deliver(param1 postal.Dependency, param2 string, param3 string, param4 string) error { + f.DeliverCall.mutex.Lock() + defer f.DeliverCall.mutex.Unlock() + f.DeliverCall.CallCount++ + f.DeliverCall.Receives.Dependency = param1 + f.DeliverCall.Receives.CnbPath = param2 + f.DeliverCall.Receives.DestinationPath = param3 + f.DeliverCall.Receives.PlatformPath = param4 + if f.DeliverCall.Stub != nil { + return f.DeliverCall.Stub(param1, param2, param3, param4) + } + return f.DeliverCall.Returns.Error +} func (f *DependencyManager) GenerateBillOfMaterials(param1 ...postal.Dependency) []packit.BOMEntry { - f.GenerateBillOfMaterialsCall.Lock() - defer f.GenerateBillOfMaterialsCall.Unlock() + f.GenerateBillOfMaterialsCall.mutex.Lock() + defer f.GenerateBillOfMaterialsCall.mutex.Unlock() f.GenerateBillOfMaterialsCall.CallCount++ f.GenerateBillOfMaterialsCall.Receives.Dependencies = param1 if f.GenerateBillOfMaterialsCall.Stub != nil { @@ -59,21 +73,9 @@ func (f *DependencyManager) GenerateBillOfMaterials(param1 ...postal.Dependency) } return f.GenerateBillOfMaterialsCall.Returns.BOMEntrySlice } -func (f *DependencyManager) Install(param1 postal.Dependency, param2 string, param3 string) error { - f.InstallCall.Lock() - defer f.InstallCall.Unlock() - f.InstallCall.CallCount++ - f.InstallCall.Receives.Dependency = param1 - f.InstallCall.Receives.CnbPath = param2 - f.InstallCall.Receives.DestPath = param3 - if f.InstallCall.Stub != nil { - return f.InstallCall.Stub(param1, param2, param3) - } - return f.InstallCall.Returns.Error -} func (f *DependencyManager) Resolve(param1 string, param2 string, param3 string, param4 string) (postal.Dependency, error) { - f.ResolveCall.Lock() - defer f.ResolveCall.Unlock() + f.ResolveCall.mutex.Lock() + defer f.ResolveCall.mutex.Unlock() f.ResolveCall.CallCount++ f.ResolveCall.Receives.Path = param1 f.ResolveCall.Receives.Id = param2 diff --git a/fakes/entry_resolver.go b/fakes/entry_resolver.go index baf62b0c..991aef7f 100644 --- a/fakes/entry_resolver.go +++ b/fakes/entry_resolver.go @@ -3,12 +3,12 @@ package fakes import ( "sync" - "github.com/paketo-buildpacks/packit" + packit "github.com/paketo-buildpacks/packit/v2" ) type EntryResolver struct { MergeLayerTypesCall struct { - sync.Mutex + mutex sync.Mutex CallCount int Receives struct { String string @@ -21,7 +21,7 @@ type EntryResolver struct { Stub func(string, []packit.BuildpackPlanEntry) (bool, bool) } ResolveCall struct { - sync.Mutex + mutex sync.Mutex CallCount int Receives struct { String string @@ -39,8 +39,8 @@ type EntryResolver struct { } func (f *EntryResolver) MergeLayerTypes(param1 string, param2 []packit.BuildpackPlanEntry) (bool, bool) { - f.MergeLayerTypesCall.Lock() - defer f.MergeLayerTypesCall.Unlock() + f.MergeLayerTypesCall.mutex.Lock() + defer f.MergeLayerTypesCall.mutex.Unlock() f.MergeLayerTypesCall.CallCount++ f.MergeLayerTypesCall.Receives.String = param1 f.MergeLayerTypesCall.Receives.BuildpackPlanEntrySlice = param2 @@ -51,8 +51,8 @@ func (f *EntryResolver) MergeLayerTypes(param1 string, param2 []packit.Buildpack } func (f *EntryResolver) Resolve(param1 string, param2 []packit.BuildpackPlanEntry, param3 []interface { }) (packit.BuildpackPlanEntry, []packit.BuildpackPlanEntry) { - f.ResolveCall.Lock() - defer f.ResolveCall.Unlock() + f.ResolveCall.mutex.Lock() + defer f.ResolveCall.mutex.Unlock() f.ResolveCall.CallCount++ f.ResolveCall.Receives.String = param1 f.ResolveCall.Receives.BuildpackPlanEntrySlice = param2 diff --git a/fakes/executable.go b/fakes/executable.go index 1fe72820..5603000c 100644 --- a/fakes/executable.go +++ b/fakes/executable.go @@ -3,12 +3,12 @@ package fakes import ( "sync" - "github.com/paketo-buildpacks/packit/pexec" + "github.com/paketo-buildpacks/packit/v2/pexec" ) type Executable struct { ExecuteCall struct { - sync.Mutex + mutex sync.Mutex CallCount int Receives struct { Execution pexec.Execution @@ -21,8 +21,8 @@ type Executable struct { } func (f *Executable) Execute(param1 pexec.Execution) error { - f.ExecuteCall.Lock() - defer f.ExecuteCall.Unlock() + f.ExecuteCall.mutex.Lock() + defer f.ExecuteCall.mutex.Unlock() f.ExecuteCall.CallCount++ f.ExecuteCall.Receives.Execution = param1 if f.ExecuteCall.Stub != nil { diff --git a/fakes/install_process.go b/fakes/install_process.go index 447d4005..7e14a8ab 100644 --- a/fakes/install_process.go +++ b/fakes/install_process.go @@ -4,7 +4,7 @@ import "sync" type InstallProcess struct { ExecuteCall struct { - sync.Mutex + mutex sync.Mutex CallCount int Receives struct { SrcPath string @@ -18,8 +18,8 @@ type InstallProcess struct { } func (f *InstallProcess) Execute(param1 string, param2 string) error { - f.ExecuteCall.Lock() - defer f.ExecuteCall.Unlock() + f.ExecuteCall.mutex.Lock() + defer f.ExecuteCall.mutex.Unlock() f.ExecuteCall.CallCount++ f.ExecuteCall.Receives.SrcPath = param1 f.ExecuteCall.Receives.TargetLayerPath = param2 diff --git a/fakes/site_package_process.go b/fakes/site_package_process.go index 05cc987d..7743d958 100644 --- a/fakes/site_package_process.go +++ b/fakes/site_package_process.go @@ -4,7 +4,7 @@ import "sync" type SitePackageProcess struct { ExecuteCall struct { - sync.Mutex + mutex sync.Mutex CallCount int Receives struct { TargetLayerPath string @@ -18,8 +18,8 @@ type SitePackageProcess struct { } func (f *SitePackageProcess) Execute(param1 string) (string, error) { - f.ExecuteCall.Lock() - defer f.ExecuteCall.Unlock() + f.ExecuteCall.mutex.Lock() + defer f.ExecuteCall.mutex.Unlock() f.ExecuteCall.CallCount++ f.ExecuteCall.Receives.TargetLayerPath = param1 if f.ExecuteCall.Stub != nil { diff --git a/go.mod b/go.mod index aaa0f1c4..a957a95b 100644 --- a/go.mod +++ b/go.mod @@ -6,6 +6,6 @@ require ( github.com/BurntSushi/toml v1.0.0 github.com/onsi/gomega v1.18.1 github.com/paketo-buildpacks/occam v0.7.0 - github.com/paketo-buildpacks/packit v1.3.1 + github.com/paketo-buildpacks/packit/v2 v2.1.0 github.com/sclevine/spec v1.4.0 ) diff --git a/go.sum b/go.sum index dc9ae380..fae5d143 100644 --- a/go.sum +++ b/go.sum @@ -58,7 +58,6 @@ github.com/Azure/go-autorest/autorest/mocks v0.4.1/go.mod h1:LTp+uSrOhSkaKrUy935 github.com/Azure/go-autorest/logger v0.2.0/go.mod h1:T9E3cAhj2VqvPOtCYAvby9aBXkZmbF5NWuPV8+WeEW8= github.com/Azure/go-autorest/tracing v0.6.0/go.mod h1:+vhtPC754Xsa23ID7GlGsrdKBpUA79WCAKPPZVC2DeU= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= -github.com/BurntSushi/toml v0.4.1/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbicEuybxQ= github.com/BurntSushi/toml v1.0.0 h1:dtDWrepsVPfW9H/4y7dDgFc2MBUSeJhlaDtK13CxFlU= github.com/BurntSushi/toml v1.0.0/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbicEuybxQ= github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo= @@ -92,8 +91,6 @@ github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAE github.com/PuerkitoBio/purell v1.1.1/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbtSwDGJws/X0= github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578/go.mod h1:uGdkoq3SwY9Y+13GIhn11/XLaGBb4BfwItxLd5jeuXE= github.com/Shopify/logrus-bugsnag v0.0.0-20171204204709-577dee27f20d/go.mod h1:HI8ITrYtUY+O+ZhtlqUnD8+KwNPOyugEhfP9fdUIaEQ= -github.com/VividCortex/ewma v1.1.1 h1:MnEK4VOv6n0RSY4vtRe3h11qjxL3+t0B8yOL8iMXdcM= -github.com/VividCortex/ewma v1.1.1/go.mod h1:2Tkkvm3sRDVXaiyucHiACn4cqf7DpdyLvmxzcbUokwA= github.com/acarl005/stripansi v0.0.0-20180116102854-5a71ef0e047d/go.mod h1:asat636LX7Bqt5lYEZ27JNDcqxfjdBQuJ/MM4CN/Lzo= github.com/acobaugh/osrelease v0.1.0/go.mod h1:4bFEs0MtgHNHBrmHCt67gNisnabCRAlzdVasCEGHTWY= github.com/adrg/xdg v0.2.1/go.mod h1:ZuOshBmzV4Ta+s23hdfFZnBsdzmoR3US0d7ErpqSbTQ= @@ -144,8 +141,6 @@ github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghf github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= github.com/checkpoint-restore/go-criu/v4 v4.1.0/go.mod h1:xUQBLp4RLc5zJtWY++yjOoMoB5lihDt7fai+75m+rGw= github.com/checkpoint-restore/go-criu/v5 v5.0.0/go.mod h1:cfwC0EG7HMUenopBsUf9d89JlCLQIfgVcNsNN0t6T2M= -github.com/cheggaaa/pb/v3 v3.0.8 h1:bC8oemdChbke2FHIIGy9mn4DPJ2caZYQnfbRqwmdCoA= -github.com/cheggaaa/pb/v3 v3.0.8/go.mod h1:UICbiLec/XO6Hw6k+BHEtHeQFzzBH4i2/qk/ow1EJTA= github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI= github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI= github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU= @@ -300,7 +295,6 @@ github.com/docker/go-units v0.4.0/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDD github.com/docker/libtrust v0.0.0-20150114040149-fa567046d9b1/go.mod h1:cyGadeNEkKy96OOhEzfZl+yxihPEzKnqJwvfuSUqbZE= github.com/docker/spdystream v0.0.0-20160310174837-449fdfce4d96/go.mod h1:Qh8CwZgvJUkLughtfhJv5dyTYa91l1fOUCrgjqmcifM= github.com/docopt/docopt-go v0.0.0-20180111231733-ee0de3bc6815/go.mod h1:WwZ+bS3ebgob9U8Nd0kOddGdZWjyMGR8Wziv+TBNwSE= -github.com/dsnet/compress v0.0.1/go.mod h1:Aw8dCMJ7RioblQeTqt88akK31OvO8Dhf5JflhBbQEHo= github.com/dsnet/compress v0.0.2-0.20210315054119-f66993602bf5 h1:iFaUwBSo5Svw6L7HYpRu/0lE3e0BaElwnNO1qkNQxBY= github.com/dsnet/compress v0.0.2-0.20210315054119-f66993602bf5/go.mod h1:qssHWj60/X5sZFNxpG4HBPDHVqxNm4DfnCKgrbZOT+s= github.com/dsnet/golib v0.0.0-20171103203638-1ea166775780/go.mod h1:Lj+Z9rebOhdfkVLjJ8T6VcRQv3SXugXy999NBtR9aFY= @@ -321,8 +315,6 @@ github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7 github.com/evanphx/json-patch v4.9.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk= github.com/facebookincubator/nvdtools v0.1.4/go.mod h1:0/FIVnSEl9YHXLq3tKBPpKaI0iUceDhdSHPlIwIX44Y= github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4= -github.com/fatih/color v1.10.0 h1:s36xzo75JdqLaaWoiEHk767eHiwo0598uUxyfiPkDsg= -github.com/fatih/color v1.10.0/go.mod h1:ELkj/draVOlAH/xkhN6mQ50Qd0MPOk5AAr3maGEBuJM= github.com/fatih/set v0.2.1/go.mod h1:+RKtMCH+favT2+3YecHGxcc0b4KyVWA1QWWJUs4E0CI= github.com/form3tech-oss/jwt-go v3.2.2+incompatible/go.mod h1:pbq4aXjuKjdthFRnoDwaVPLA+WlJuPGy+QneDUgJi2k= github.com/frankban/quicktest v1.11.3/go.mod h1:wRf/ReqHper53s+kmmSZizM8NamnL3IM0I9ntUbOk+k= @@ -546,16 +538,11 @@ github.com/mailru/easyjson v0.0.0-20190626092158-b2ccc519800e/go.mod h1:C1wdFJiN github.com/mailru/easyjson v0.7.0/go.mod h1:KAzv3t3aY1NaHWoQz1+4F1ccyAH66Jk7yos7ldAVICs= github.com/marstr/guid v1.1.0/go.mod h1:74gB1z2wpxxInTG6yaqA7KrtM0NZ+RbrcqDvYHefzho= github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU= -github.com/mattn/go-colorable v0.1.8 h1:c1ghPdyEDarC70ftn0y+A/Ee++9zz8ljHG1b13eJ0s8= -github.com/mattn/go-colorable v0.1.8/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc= github.com/mattn/go-isatty v0.0.3/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4= github.com/mattn/go-isatty v0.0.4/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4= github.com/mattn/go-isatty v0.0.6/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s= -github.com/mattn/go-isatty v0.0.12 h1:wuysRhFDzyxgEmMf5xjvJ2M9dZoWAXNNr5LSBS7uHXY= -github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU= github.com/mattn/go-runewidth v0.0.2/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzpuz5H//U1FU= github.com/mattn/go-runewidth v0.0.7/go.mod h1:H031xJmbD/WCDINGzjvQ9THkh0rPKHF+m2gUSrubnMI= -github.com/mattn/go-runewidth v0.0.12 h1:Y41i/hVW3Pgwr8gV+J23B9YEY0zxjptBuCWEaxmAOow= github.com/mattn/go-runewidth v0.0.12/go.mod h1:RAqKPSqVFrSLVXbA8x7dzmKdmGzieGRCM46jaSJTDAk= github.com/mattn/go-shellwords v1.0.3/go.mod h1:3xCvwCdWdlDJUrvuMn7Wuy9eWs4pE8vqg+NOMyg4B2o= github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0= @@ -592,7 +579,6 @@ github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8m github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f/go.mod h1:ZdcZmHo+o7JKHSa8/e818NopupXU1YMK5fe1lsApnBw= github.com/ncw/swift v1.0.47/go.mod h1:23YIA4yWVnGwv2dQlN4bB7egfYX6YLn0Yo/S6zZO/ZM= -github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno= github.com/nwaples/rardecode v1.1.0/go.mod h1:5DzqNKiOdpKKBH87u8VlvAnPZMXcGRhxWkRpHbbfGS0= github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A= github.com/nxadm/tail v1.4.8/go.mod h1:+ncqLTQzXmGhMZNUePPaPqPvBxHAIsmXswZKocGu+AU= @@ -647,8 +633,6 @@ github.com/opencontainers/selinux v1.8.0/go.mod h1:RScLhm78qiWa2gbVCcGkC7tCGdgk3 github.com/opencontainers/selinux v1.8.2/go.mod h1:MUIHuUEvKB1wtJjQdOyYRgOnLD2xAPP8dBsCoU0KuF8= github.com/paketo-buildpacks/occam v0.7.0 h1:PBXJ7zLfujHw6BaLp3oTysAEekkfZ5A8BfgWGyWfUKE= github.com/paketo-buildpacks/occam v0.7.0/go.mod h1:R5vxTO4dQs0CGX2Oekk1B2MZLTuSzyp4lzLM45YzjMs= -github.com/paketo-buildpacks/packit v1.3.1 h1:DJAfqsDadRllr/OPYDONxJEOHbYUMWE1NIPPArq4b7w= -github.com/paketo-buildpacks/packit v1.3.1/go.mod h1:v0jVFr3GNcM9JDwwuIAzYNV4Le1L728uMSNhjUybXVA= github.com/paketo-buildpacks/packit/v2 v2.1.0 h1:0ecw6v216R2lMFlE3WTfuooYvJQ/KwsNRChRW8yRYbM= github.com/paketo-buildpacks/packit/v2 v2.1.0/go.mod h1:Ud1X7f9O6e4eGPZlY3pj0jnSa9oDK2L/ghvjmarTLSA= github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc= @@ -698,7 +682,6 @@ github.com/prometheus/procfs v0.2.0/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4O github.com/prometheus/procfs v0.6.0/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1xBZuNvfVA= github.com/prometheus/tsdb v0.7.1/go.mod h1:qhTCs0VvXwvX/y3TZrWD7rabWM+ijKTux40TwIPHuXU= github.com/rivo/uniseg v0.1.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc= -github.com/rivo/uniseg v0.2.0 h1:S1pD9weZBuJdFmowNwbpi7BJ8TNftyUImj/0WQi72jY= github.com/rivo/uniseg v0.2.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc= github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod h1:XWv6SoW27p1b0cqNHllgS5HIMJraePCO15w5zCzIWYg= github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ= @@ -769,7 +752,6 @@ github.com/tchap/go-patricia v2.2.6+incompatible/go.mod h1:bmLyhP68RS6kStMGxByiQ github.com/tmc/grpc-websocket-proxy v0.0.0-20170815181823-89b8d40f7ca8/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U= github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U= github.com/ugorji/go v1.1.4/go.mod h1:uQMGLiO92mf5W77hV/PUCpI3pbzQx3CRekS0kk+RGrc= -github.com/ulikunitz/xz v0.5.6/go.mod h1:2bypXElzHzzJZwzH67Y6wb67pO62Rzfn7BSiF4ABRW8= github.com/ulikunitz/xz v0.5.8/go.mod h1:nbz6k7qbPmH4IRqmfOplQw/tblSgqTqBwxkY0oWt/14= github.com/ulikunitz/xz v0.5.9/go.mod h1:nbz6k7qbPmH4IRqmfOplQw/tblSgqTqBwxkY0oWt/14= github.com/ulikunitz/xz v0.5.10 h1:t92gobL9l3HE202wg3rlk19F6X+JOxl9BBrCCMYEYd8= @@ -937,7 +919,6 @@ golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96b golang.org/x/net v0.0.0-20210428140749-89ef3d95e781/go.mod h1:OJAsFXCWl8Ukc7SiCT/9KSuxbyM7479/AVlXFRxuMCk= golang.org/x/net v0.0.0-20210503060351-7fd8e65b6420/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20210505024714-0287a6fb4125/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= -golang.org/x/net v0.0.0-20210525063256-abc453219eb5/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20211111160137-58aab5ef257a/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd h1:O7DYs+zxREGLKzKoMQrtrEacpb0ZVXA5rIwylE2Xchk= @@ -1008,7 +989,6 @@ golang.org/x/sys v0.0.0-20191210023423-ac6580df4449/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20191228213918-04cbcbbfeed8/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200106162015-b016eb3dc98e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200113162924-86b910548bc1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200120151820-655fe14d7479/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200122134326-e047566fdf82/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200124204421-9fbb57f87de9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -1294,7 +1274,6 @@ gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8 gopkg.in/check.v1 v1.0.0-20141024133853-64131543e789/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/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= -gopkg.in/check.v1 v1.0.0-20200902074654-038fdea0a05b/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q= gopkg.in/cheggaaa/pb.v1 v1.0.25/go.mod h1:V/YB90LKu/1FcN3WVnfiiE5oMCibMjukxqG/qStrOgw= diff --git a/pip_install_process.go b/pip_install_process.go index 1dc5dc3a..55518515 100644 --- a/pip_install_process.go +++ b/pip_install_process.go @@ -3,7 +3,7 @@ package pip import ( "bytes" "fmt" - "github.com/paketo-buildpacks/packit/pexec" + "github.com/paketo-buildpacks/packit/v2/pexec" "os" ) diff --git a/pip_install_process_test.go b/pip_install_process_test.go index ed5ef092..d3652235 100644 --- a/pip_install_process_test.go +++ b/pip_install_process_test.go @@ -6,7 +6,7 @@ import ( "os" "testing" - "github.com/paketo-buildpacks/packit/pexec" + "github.com/paketo-buildpacks/packit/v2/pexec" pip "github.com/paketo-buildpacks/pip" "github.com/paketo-buildpacks/pip/fakes" "github.com/sclevine/spec" diff --git a/run/main.go b/run/main.go index 939e3967..92b8be50 100644 --- a/run/main.go +++ b/run/main.go @@ -3,13 +3,13 @@ package main import ( "os" - "github.com/paketo-buildpacks/packit" - "github.com/paketo-buildpacks/packit/cargo" - "github.com/paketo-buildpacks/packit/chronos" - "github.com/paketo-buildpacks/packit/draft" - "github.com/paketo-buildpacks/packit/pexec" - "github.com/paketo-buildpacks/packit/postal" - "github.com/paketo-buildpacks/packit/scribe" + "github.com/paketo-buildpacks/packit/v2" + "github.com/paketo-buildpacks/packit/v2/cargo" + "github.com/paketo-buildpacks/packit/v2/chronos" + "github.com/paketo-buildpacks/packit/v2/draft" + "github.com/paketo-buildpacks/packit/v2/pexec" + "github.com/paketo-buildpacks/packit/v2/postal" + "github.com/paketo-buildpacks/packit/v2/scribe" "github.com/paketo-buildpacks/pip" ) diff --git a/site_process.go b/site_process.go index 1e447b16..c76cdd0e 100644 --- a/site_process.go +++ b/site_process.go @@ -5,7 +5,7 @@ import ( "fmt" "os" - "github.com/paketo-buildpacks/packit/pexec" + "github.com/paketo-buildpacks/packit/v2/pexec" ) // SiteProcess implements the Executable interface. diff --git a/site_process_test.go b/site_process_test.go index 2f64acbb..ab1aa121 100644 --- a/site_process_test.go +++ b/site_process_test.go @@ -7,7 +7,7 @@ import ( "path/filepath" "testing" - "github.com/paketo-buildpacks/packit/pexec" + "github.com/paketo-buildpacks/packit/v2/pexec" pip "github.com/paketo-buildpacks/pip" "github.com/paketo-buildpacks/pip/fakes" "github.com/sclevine/spec"