From 333ce2af3859ac39b2d2574f6ab845ad900f99b3 Mon Sep 17 00:00:00 2001 From: inspirit941 Date: Thu, 27 Apr 2023 10:20:21 +0900 Subject: [PATCH] chore --- acceptance/acceptance_test.go | 3 ++- internal/build/fakes/cache.go | 1 + internal/build/lifecycle_execution.go | 3 ++- internal/build/lifecycle_execution_test.go | 3 ++- internal/build/lifecycle_executor.go | 3 ++- internal/commands/build.go | 3 ++- pkg/cache/image_cache_test.go | 3 ++- pkg/cache/volume_cache_test.go | 3 ++- pkg/client/build.go | 3 ++- 9 files changed, 17 insertions(+), 8 deletions(-) diff --git a/acceptance/acceptance_test.go b/acceptance/acceptance_test.go index 245b2c6451..ee6d06554c 100644 --- a/acceptance/acceptance_test.go +++ b/acceptance/acceptance_test.go @@ -10,7 +10,6 @@ import ( "encoding/hex" "encoding/json" "fmt" - "github.com/buildpacks/pack/pkg/cache" "math/rand" "os" "path/filepath" @@ -20,6 +19,8 @@ import ( "testing" "time" + "github.com/buildpacks/pack/pkg/cache" + dockertypes "github.com/docker/docker/api/types" "github.com/docker/docker/client" "github.com/ghodss/yaml" diff --git a/internal/build/fakes/cache.go b/internal/build/fakes/cache.go index 8d910b50e3..c6df3a8e56 100644 --- a/internal/build/fakes/cache.go +++ b/internal/build/fakes/cache.go @@ -2,6 +2,7 @@ package fakes import ( "context" + "github.com/buildpacks/pack/pkg/cache" ) diff --git a/internal/build/lifecycle_execution.go b/internal/build/lifecycle_execution.go index f84b4f58f0..036e0de1ba 100644 --- a/internal/build/lifecycle_execution.go +++ b/internal/build/lifecycle_execution.go @@ -3,12 +3,13 @@ package build import ( "context" "fmt" - "github.com/buildpacks/pack/pkg/cache" "math/rand" "os" "path/filepath" "strconv" + "github.com/buildpacks/pack/pkg/cache" + "github.com/BurntSushi/toml" "github.com/buildpacks/lifecycle/api" "github.com/buildpacks/lifecycle/auth" diff --git a/internal/build/lifecycle_execution_test.go b/internal/build/lifecycle_execution_test.go index fba32d9cff..be4353e2c8 100644 --- a/internal/build/lifecycle_execution_test.go +++ b/internal/build/lifecycle_execution_test.go @@ -4,7 +4,6 @@ import ( "bytes" "context" "fmt" - "github.com/buildpacks/pack/pkg/cache" "io" "math/rand" "os" @@ -13,6 +12,8 @@ import ( "testing" "time" + "github.com/buildpacks/pack/pkg/cache" + "github.com/BurntSushi/toml" "github.com/apex/log" ifakes "github.com/buildpacks/imgutil/fakes" diff --git a/internal/build/lifecycle_executor.go b/internal/build/lifecycle_executor.go index a8b6096a68..126b0a241f 100644 --- a/internal/build/lifecycle_executor.go +++ b/internal/build/lifecycle_executor.go @@ -2,12 +2,13 @@ package build import ( "context" - "github.com/buildpacks/pack/pkg/cache" "io" "math/rand" "os" "time" + "github.com/buildpacks/pack/pkg/cache" + "github.com/buildpacks/imgutil" "github.com/buildpacks/lifecycle/api" "github.com/buildpacks/lifecycle/platform" diff --git a/internal/commands/build.go b/internal/commands/build.go index e1034f1b88..d93a61c1b1 100644 --- a/internal/commands/build.go +++ b/internal/commands/build.go @@ -1,13 +1,14 @@ package commands import ( - "github.com/buildpacks/pack/pkg/cache" "os" "path/filepath" "strconv" "strings" "time" + "github.com/buildpacks/pack/pkg/cache" + "github.com/google/go-containerregistry/pkg/name" "github.com/pkg/errors" "github.com/spf13/cobra" diff --git a/pkg/cache/image_cache_test.go b/pkg/cache/image_cache_test.go index 74349d01c0..377376a0e8 100644 --- a/pkg/cache/image_cache_test.go +++ b/pkg/cache/image_cache_test.go @@ -2,11 +2,12 @@ package cache_test import ( "context" - "github.com/buildpacks/pack/pkg/cache" "math/rand" "testing" "time" + "github.com/buildpacks/pack/pkg/cache" + "github.com/buildpacks/imgutil/local" "github.com/docker/docker/api/types" "github.com/docker/docker/api/types/filters" diff --git a/pkg/cache/volume_cache_test.go b/pkg/cache/volume_cache_test.go index e6b9e6367f..1457b3b36a 100644 --- a/pkg/cache/volume_cache_test.go +++ b/pkg/cache/volume_cache_test.go @@ -2,12 +2,13 @@ package cache_test import ( "context" - "github.com/buildpacks/pack/pkg/cache" "math/rand" "strings" "testing" "time" + "github.com/buildpacks/pack/pkg/cache" + "github.com/docker/docker/api/types/filters" "github.com/docker/docker/api/types/volume" "github.com/docker/docker/client" diff --git a/pkg/client/build.go b/pkg/client/build.go index d1fd3c47bd..73d14f0794 100644 --- a/pkg/client/build.go +++ b/pkg/client/build.go @@ -5,7 +5,6 @@ import ( "crypto/rand" "encoding/json" "fmt" - "github.com/buildpacks/pack/pkg/cache" "os" "path/filepath" "runtime" @@ -13,6 +12,8 @@ import ( "strings" "time" + "github.com/buildpacks/pack/pkg/cache" + "github.com/Masterminds/semver" "github.com/buildpacks/imgutil" "github.com/buildpacks/imgutil/layout"