Skip to content

Commit

Permalink
Fix imports
Browse files Browse the repository at this point in the history 
Signed-off-by: Natalie Arellano <[email protected]>
  • Loading branch information
@natalieparellano
natalieparellano committed Sep 22, 2023
1 parent adbe2cc commit c411df3
Show file tree
Hide file tree
Showing 28 changed files with 44 additions and 48 deletions.
2 changes: 1 addition & 1 deletion acceptance/restorer_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@ import (
"github.com/sclevine/spec"
"github.com/sclevine/spec/report"

"github.com/buildpacks/lifecycle"
"github.com/buildpacks/lifecycle/api"
"github.com/buildpacks/lifecycle/cmd"
"github.com/buildpacks/lifecycle/lifecycle"
h "github.com/buildpacks/lifecycle/testhelpers"
)

Expand Down
2 changes: 1 addition & 1 deletion buildpack/build_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,9 @@ import (
"github.com/buildpacks/lifecycle/env"
"github.com/buildpacks/lifecycle/launch"
"github.com/buildpacks/lifecycle/layers"
"github.com/buildpacks/lifecycle/lifecycle/testmock"
llog "github.com/buildpacks/lifecycle/log"
h "github.com/buildpacks/lifecycle/testhelpers"
"github.com/buildpacks/lifecycle/testmock"
)

//go:generate mockgen -package testmock -destination testmock/env.go github.com/buildpacks/lifecycle BuildEnv
Expand Down
2 changes: 1 addition & 1 deletion buildpack/generate_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@ import (

"github.com/buildpacks/lifecycle/api"
"github.com/buildpacks/lifecycle/buildpack"
"github.com/buildpacks/lifecycle/lifecycle/testmock"
llog "github.com/buildpacks/lifecycle/log"
h "github.com/buildpacks/lifecycle/testhelpers"
"github.com/buildpacks/lifecycle/testmock"
)

func TestGenerate(t *testing.T) {
Expand Down
7 changes: 3 additions & 4 deletions cache/image_cache_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,6 @@ import (
"path/filepath"
"testing"

cacheMock "github.com/buildpacks/lifecycle/testmock/cache"

"github.com/golang/mock/gomock"

"github.com/buildpacks/imgutil/fakes"
Expand All @@ -19,6 +17,7 @@ import (
"github.com/buildpacks/lifecycle/buildpack"
"github.com/buildpacks/lifecycle/cache"
"github.com/buildpacks/lifecycle/cmd"
testmockcache "github.com/buildpacks/lifecycle/lifecycle/testmock/cache"
"github.com/buildpacks/lifecycle/log"
"github.com/buildpacks/lifecycle/platform"
h "github.com/buildpacks/lifecycle/testhelpers"
Expand Down Expand Up @@ -48,8 +47,8 @@ func testImageCache(t *testing.T, when spec.G, it spec.S) {
fakeOriginalImage = fakes.NewImage("fake-image", "", local.IDIdentifier{ImageID: "fakeOriginalImage"})
fakeNewImage = fakes.NewImage("fake-image", "", local.IDIdentifier{ImageID: "fakeImage"})
mockController := gomock.NewController(t)
fakeImageDeleter := cacheMock.NewMockImageDeleter(mockController)
fakeImageComparer := cacheMock.NewMockImageComparer(mockController)
fakeImageDeleter := testmockcache.NewMockImageDeleter(mockController)
fakeImageComparer := testmockcache.NewMockImageComparer(mockController)
fakeImageComparer.EXPECT().ImagesEq(gomock.Any(), gomock.Any()).AnyTimes().Return(false, nil)
fakeImageDeleter.EXPECT().DeleteOrigImageIfDifferentFromNewImage(gomock.Any(), gomock.Any()).AnyTimes()
testLogger = cmd.DefaultLogger
Expand Down
2 changes: 1 addition & 1 deletion cache/image_deleter_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@ import (
"github.com/sclevine/spec/report"

"github.com/buildpacks/lifecycle/cmd"
cacheMock "github.com/buildpacks/lifecycle/lifecycle/testmock/cache"
"github.com/buildpacks/lifecycle/log"
h "github.com/buildpacks/lifecycle/testhelpers"
cacheMock "github.com/buildpacks/lifecycle/testmock/cache"
)

func TestImageDeleter(t *testing.T) {
Expand Down
7 changes: 3 additions & 4 deletions cmd/lifecycle/analyzer.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,15 @@ package main
import (
"fmt"

"github.com/buildpacks/lifecycle/image"
"github.com/buildpacks/lifecycle/internal/encoding"

"github.com/docker/docker/client"
"github.com/google/go-containerregistry/pkg/authn"

"github.com/buildpacks/lifecycle"
"github.com/buildpacks/lifecycle/auth"
"github.com/buildpacks/lifecycle/cmd"
"github.com/buildpacks/lifecycle/cmd/lifecycle/cli"
"github.com/buildpacks/lifecycle/image"
"github.com/buildpacks/lifecycle/internal/encoding"
"github.com/buildpacks/lifecycle/lifecycle"
"github.com/buildpacks/lifecycle/platform"
"github.com/buildpacks/lifecycle/priv"
)
Expand Down
2 changes: 1 addition & 1 deletion cmd/lifecycle/builder.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@ import (

"github.com/BurntSushi/toml"

"github.com/buildpacks/lifecycle"
"github.com/buildpacks/lifecycle/buildpack"
"github.com/buildpacks/lifecycle/cmd"
"github.com/buildpacks/lifecycle/cmd/lifecycle/cli"
"github.com/buildpacks/lifecycle/internal/encoding"
"github.com/buildpacks/lifecycle/launch"
"github.com/buildpacks/lifecycle/lifecycle"
"github.com/buildpacks/lifecycle/platform"
"github.com/buildpacks/lifecycle/platform/files"
"github.com/buildpacks/lifecycle/priv"
Expand Down
7 changes: 3 additions & 4 deletions cmd/lifecycle/creator.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,19 +5,18 @@ import (
"fmt"
"time"

"github.com/buildpacks/lifecycle/image"
"github.com/buildpacks/lifecycle/platform/files"

"github.com/docker/docker/client"
"github.com/google/go-containerregistry/pkg/authn"
"github.com/pkg/errors"

"github.com/buildpacks/lifecycle"
"github.com/buildpacks/lifecycle/auth"
"github.com/buildpacks/lifecycle/buildpack"
"github.com/buildpacks/lifecycle/cmd"
"github.com/buildpacks/lifecycle/cmd/lifecycle/cli"
"github.com/buildpacks/lifecycle/image"
"github.com/buildpacks/lifecycle/lifecycle"
"github.com/buildpacks/lifecycle/platform"
"github.com/buildpacks/lifecycle/platform/files"
"github.com/buildpacks/lifecycle/priv"
)

Expand Down
2 changes: 1 addition & 1 deletion cmd/lifecycle/detector.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@ package main
import (
"errors"

"github.com/buildpacks/lifecycle"
"github.com/buildpacks/lifecycle/buildpack"
"github.com/buildpacks/lifecycle/cmd"
"github.com/buildpacks/lifecycle/cmd/lifecycle/cli"
"github.com/buildpacks/lifecycle/internal/encoding"
"github.com/buildpacks/lifecycle/lifecycle"
"github.com/buildpacks/lifecycle/platform"
"github.com/buildpacks/lifecycle/platform/files"
"github.com/buildpacks/lifecycle/priv"
Expand Down
2 changes: 1 addition & 1 deletion cmd/lifecycle/exporter.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ import (
v1 "github.com/google/go-containerregistry/pkg/v1"
"github.com/pkg/errors"

"github.com/buildpacks/lifecycle"
"github.com/buildpacks/lifecycle/auth"
"github.com/buildpacks/lifecycle/buildpack"
"github.com/buildpacks/lifecycle/cache"
Expand All @@ -29,6 +28,7 @@ import (
"github.com/buildpacks/lifecycle/image"
"github.com/buildpacks/lifecycle/internal/encoding"
"github.com/buildpacks/lifecycle/layers"
"github.com/buildpacks/lifecycle/lifecycle"
"github.com/buildpacks/lifecycle/platform"
"github.com/buildpacks/lifecycle/platform/files"
"github.com/buildpacks/lifecycle/priv"
Expand Down
2 changes: 1 addition & 1 deletion cmd/lifecycle/extender.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@ import (
"errors"
"fmt"

"github.com/buildpacks/lifecycle"
"github.com/buildpacks/lifecycle/buildpack"
"github.com/buildpacks/lifecycle/cmd"
"github.com/buildpacks/lifecycle/cmd/lifecycle/cli"
"github.com/buildpacks/lifecycle/internal/extend/kaniko"
"github.com/buildpacks/lifecycle/lifecycle"
"github.com/buildpacks/lifecycle/platform"
"github.com/buildpacks/lifecycle/priv"
)
Expand Down
2 changes: 1 addition & 1 deletion cmd/lifecycle/main.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@ import (
"github.com/google/go-containerregistry/pkg/authn"
"github.com/pkg/errors"

"github.com/buildpacks/lifecycle"
"github.com/buildpacks/lifecycle/buildpack"
"github.com/buildpacks/lifecycle/cache"
"github.com/buildpacks/lifecycle/cmd"
"github.com/buildpacks/lifecycle/cmd/lifecycle/cli"
"github.com/buildpacks/lifecycle/lifecycle"
"github.com/buildpacks/lifecycle/platform"
)

Expand Down
2 changes: 1 addition & 1 deletion cmd/lifecycle/rebaser.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,12 @@ import (
"github.com/google/go-containerregistry/pkg/name"
"github.com/pkg/errors"

"github.com/buildpacks/lifecycle"
"github.com/buildpacks/lifecycle/auth"
"github.com/buildpacks/lifecycle/cmd"
"github.com/buildpacks/lifecycle/cmd/lifecycle/cli"
"github.com/buildpacks/lifecycle/image"
"github.com/buildpacks/lifecycle/internal/encoding"
"github.com/buildpacks/lifecycle/lifecycle"
"github.com/buildpacks/lifecycle/platform"
"github.com/buildpacks/lifecycle/platform/files"
"github.com/buildpacks/lifecycle/priv"
Expand Down
2 changes: 1 addition & 1 deletion cmd/lifecycle/restorer.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 +13,14 @@ import (
"github.com/docker/docker/client"
"github.com/google/go-containerregistry/pkg/authn"

"github.com/buildpacks/lifecycle"
"github.com/buildpacks/lifecycle/auth"
"github.com/buildpacks/lifecycle/buildpack"
"github.com/buildpacks/lifecycle/cmd"
"github.com/buildpacks/lifecycle/cmd/lifecycle/cli"
"github.com/buildpacks/lifecycle/image"
"github.com/buildpacks/lifecycle/internal/encoding"
"github.com/buildpacks/lifecycle/internal/layer"
"github.com/buildpacks/lifecycle/lifecycle"
"github.com/buildpacks/lifecycle/platform"
"github.com/buildpacks/lifecycle/platform/files"
"github.com/buildpacks/lifecycle/priv"
Expand Down
2 changes: 1 addition & 1 deletion image/handler_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ import (
"github.com/sclevine/spec"
"github.com/sclevine/spec/report"

testmockauth "github.com/buildpacks/lifecycle/lifecycle/testmock/auth"
h "github.com/buildpacks/lifecycle/testhelpers"
testmockauth "github.com/buildpacks/lifecycle/testmock/auth"
)

//go:generate mockgen -package testmockauth -destination ../testmock/auth/mock_keychain.go github.com/google/go-containerregistry/pkg/authn Keychain
Expand Down
2 changes: 1 addition & 1 deletion internal/layer/sbom_restorer_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,13 @@ import (
"github.com/sclevine/spec"
"github.com/sclevine/spec/report"

"github.com/buildpacks/lifecycle"
"github.com/buildpacks/lifecycle/api"
"github.com/buildpacks/lifecycle/buildpack"
"github.com/buildpacks/lifecycle/cache"
"github.com/buildpacks/lifecycle/internal/layer"
"github.com/buildpacks/lifecycle/launch"
"github.com/buildpacks/lifecycle/layers"
"github.com/buildpacks/lifecycle/lifecycle"
"github.com/buildpacks/lifecycle/platform"
"github.com/buildpacks/lifecycle/platform/files"
h "github.com/buildpacks/lifecycle/testhelpers"
Expand Down
9 changes: 4 additions & 5 deletions lifecycle/analyzer_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,17 +15,16 @@ import (
"github.com/sclevine/spec"
"github.com/sclevine/spec/report"

"github.com/buildpacks/lifecycle/image"
"github.com/buildpacks/lifecycle/platform/files"

"github.com/buildpacks/lifecycle"
"github.com/buildpacks/lifecycle/api"
"github.com/buildpacks/lifecycle/cache"
"github.com/buildpacks/lifecycle/cmd"
"github.com/buildpacks/lifecycle/image"
"github.com/buildpacks/lifecycle/internal/layer"
"github.com/buildpacks/lifecycle/lifecycle"
"github.com/buildpacks/lifecycle/lifecycle/testmock"
"github.com/buildpacks/lifecycle/platform"
"github.com/buildpacks/lifecycle/platform/files"
h "github.com/buildpacks/lifecycle/testhelpers"
"github.com/buildpacks/lifecycle/testmock"
)

func TestAnalyzer(t *testing.T) {
Expand Down
4 changes: 2 additions & 2 deletions lifecycle/builder_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,16 +17,16 @@ import (
"github.com/sclevine/spec"
"github.com/sclevine/spec/report"

"github.com/buildpacks/lifecycle"
"github.com/buildpacks/lifecycle/api"
"github.com/buildpacks/lifecycle/buildpack"
"github.com/buildpacks/lifecycle/env"
"github.com/buildpacks/lifecycle/launch"
"github.com/buildpacks/lifecycle/layers"
"github.com/buildpacks/lifecycle/lifecycle"
"github.com/buildpacks/lifecycle/lifecycle/testmock"
llog "github.com/buildpacks/lifecycle/log"
"github.com/buildpacks/lifecycle/platform/files"
h "github.com/buildpacks/lifecycle/testhelpers"
"github.com/buildpacks/lifecycle/testmock"
)

func TestBuilder(t *testing.T) {
Expand Down
4 changes: 2 additions & 2 deletions lifecycle/cache_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,13 @@ import (
"github.com/sclevine/spec"
"github.com/sclevine/spec/report"

"github.com/buildpacks/lifecycle"
"github.com/buildpacks/lifecycle/api"
"github.com/buildpacks/lifecycle/buildpack"
"github.com/buildpacks/lifecycle/cache"
"github.com/buildpacks/lifecycle/layers"
"github.com/buildpacks/lifecycle/lifecycle"
"github.com/buildpacks/lifecycle/lifecycle/testmock"
h "github.com/buildpacks/lifecycle/testhelpers"
"github.com/buildpacks/lifecycle/testmock"
)

func TestCache(t *testing.T) {
Expand Down
4 changes: 2 additions & 2 deletions lifecycle/detector_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,13 @@ import (
"github.com/sclevine/spec"
"github.com/sclevine/spec/report"

"github.com/buildpacks/lifecycle"
"github.com/buildpacks/lifecycle/api"
"github.com/buildpacks/lifecycle/buildpack"
"github.com/buildpacks/lifecycle/lifecycle"
"github.com/buildpacks/lifecycle/lifecycle/testmock"
"github.com/buildpacks/lifecycle/log"
"github.com/buildpacks/lifecycle/platform/files"
h "github.com/buildpacks/lifecycle/testhelpers"
"github.com/buildpacks/lifecycle/testmock"
)

func TestDetector(t *testing.T) {
Expand Down
4 changes: 2 additions & 2 deletions lifecycle/exporter_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,15 +20,15 @@ import (
"github.com/sclevine/spec"
specreport "github.com/sclevine/spec/report"

"github.com/buildpacks/lifecycle"
"github.com/buildpacks/lifecycle/api"
"github.com/buildpacks/lifecycle/buildpack"
"github.com/buildpacks/lifecycle/internal/path"
"github.com/buildpacks/lifecycle/launch"
"github.com/buildpacks/lifecycle/layers"
"github.com/buildpacks/lifecycle/lifecycle"
"github.com/buildpacks/lifecycle/lifecycle/testmock"
"github.com/buildpacks/lifecycle/platform/files"
h "github.com/buildpacks/lifecycle/testhelpers"
"github.com/buildpacks/lifecycle/testmock"
)

func TestExporter(t *testing.T) {
Expand Down
4 changes: 2 additions & 2 deletions lifecycle/extender_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,14 +19,14 @@ import (
"github.com/sclevine/spec"
"github.com/sclevine/spec/report"

"github.com/buildpacks/lifecycle"
"github.com/buildpacks/lifecycle/api"
"github.com/buildpacks/lifecycle/buildpack"
"github.com/buildpacks/lifecycle/internal/extend"
"github.com/buildpacks/lifecycle/lifecycle"
"github.com/buildpacks/lifecycle/lifecycle/testmock"
llog "github.com/buildpacks/lifecycle/log"
"github.com/buildpacks/lifecycle/platform/files"
h "github.com/buildpacks/lifecycle/testhelpers"
"github.com/buildpacks/lifecycle/testmock"
)

func TestExtender(t *testing.T) {
Expand Down
4 changes: 2 additions & 2 deletions lifecycle/generator_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,13 @@ import (
"github.com/sclevine/spec"
"github.com/sclevine/spec/report"

"github.com/buildpacks/lifecycle"
"github.com/buildpacks/lifecycle/api"
"github.com/buildpacks/lifecycle/buildpack"
"github.com/buildpacks/lifecycle/lifecycle"
"github.com/buildpacks/lifecycle/lifecycle/testmock"
llog "github.com/buildpacks/lifecycle/log"
"github.com/buildpacks/lifecycle/platform/files"
h "github.com/buildpacks/lifecycle/testhelpers"
"github.com/buildpacks/lifecycle/testmock"
)

func TestGenerator(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion lifecycle/handlers_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ import (
"github.com/sclevine/spec"
"github.com/sclevine/spec/report"

"github.com/buildpacks/lifecycle"
"github.com/buildpacks/lifecycle/buildpack"
"github.com/buildpacks/lifecycle/lifecycle"
h "github.com/buildpacks/lifecycle/testhelpers"
)

Expand Down
2 changes: 1 addition & 1 deletion lifecycle/rebaser_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@ import (
"github.com/sclevine/spec"
"github.com/sclevine/spec/report"

"github.com/buildpacks/lifecycle"
"github.com/buildpacks/lifecycle/api"
"github.com/buildpacks/lifecycle/image"
"github.com/buildpacks/lifecycle/lifecycle"
"github.com/buildpacks/lifecycle/platform"
"github.com/buildpacks/lifecycle/platform/files"
h "github.com/buildpacks/lifecycle/testhelpers"
Expand Down
Loading

0 comments on commit c411df3

Please sign in to comment.