From bd89a9f8b84f90d38ab65fcf628c342c396534d7 Mon Sep 17 00:00:00 2001 From: Yadong Ding Date: Thu, 14 Dec 2023 16:20:42 +0800 Subject: [PATCH 1/3] action: upgrade golangci-lint to v1.54.2 We have some golang lint error in nydusify. Signed-off-by: Yadong Ding --- .github/workflows/benchmark.yml | 2 +- .github/workflows/convert.yml | 2 +- .github/workflows/smoke.yml | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/benchmark.yml b/.github/workflows/benchmark.yml index 22fef2b3aed..4e05c6d694d 100644 --- a/.github/workflows/benchmark.yml +++ b/.github/workflows/benchmark.yml @@ -25,7 +25,7 @@ jobs: cache-dependency-path: "**/*.sum" - name: Build Contrib run: | - curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sudo sh -s -- -b /usr/local/bin v1.51.2 + curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sudo sh -s -- -b /usr/local/bin v1.54.2 make -e DOCKER=false nydusify-release - name: Upload Nydusify uses: actions/upload-artifact@master diff --git a/.github/workflows/convert.yml b/.github/workflows/convert.yml index 30ff3be5765..d5575c8dae5 100644 --- a/.github/workflows/convert.yml +++ b/.github/workflows/convert.yml @@ -26,7 +26,7 @@ jobs: cache-dependency-path: "**/*.sum" - name: Build Contrib run: | - curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sudo sh -s -- -b /usr/local/bin v1.51.2 + curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sudo sh -s -- -b /usr/local/bin v1.54.2 make -e DOCKER=false nydusify-release - name: Upload Nydusify uses: actions/upload-artifact@master diff --git a/.github/workflows/smoke.yml b/.github/workflows/smoke.yml index d91603b709e..83ecf91bb02 100644 --- a/.github/workflows/smoke.yml +++ b/.github/workflows/smoke.yml @@ -30,7 +30,7 @@ jobs: cache-dependency-path: "**/*.sum" - name: Build Contrib run: | - curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sudo sh -s -- -b /usr/bin v1.51.2 + curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sudo sh -s -- -b /usr/bin v1.54.2 make -e DOCKER=false nydusify-release make -e DOCKER=false contrib-test - name: Upload Nydusify @@ -147,7 +147,7 @@ jobs: export NYDUS_NYDUSIFY_$version_export=/usr/bin/nydus-$version/nydusify done - curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sudo sh -s -- -b /usr/bin v1.51.2 + curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sudo sh -s -- -b /usr/bin v1.54.2 sudo -E make smoke-only nydus-unit-test: From 743b31fa478966fe5cd880ae9ac3bce2ee8e0a6b Mon Sep 17 00:00:00 2001 From: Yadong Ding Date: Thu, 14 Dec 2023 16:21:11 +0800 Subject: [PATCH 2/3] nydusify: fix errors found by golangci-lint Signed-off-by: Yadong Ding --- contrib/nydusify/pkg/backend/oss.go | 2 +- contrib/nydusify/pkg/backend/registry.go | 12 ++++++------ contrib/nydusify/pkg/checker/rule/filesystem.go | 6 +----- contrib/nydusify/pkg/checker/tool/builder.go | 6 +----- contrib/nydusify/pkg/converter/provider/provider.go | 2 +- contrib/nydusify/pkg/hook/hook.go | 2 +- contrib/nydusify/pkg/packer/pusher_test.go | 6 +++--- contrib/nydusify/pkg/provider/logger.go | 2 +- contrib/nydusify/pkg/provider/source.go | 6 +++--- contrib/nydusify/pkg/utils/utils.go | 2 -- contrib/nydusify/plugin/main.go | 4 ++-- 11 files changed, 20 insertions(+), 30 deletions(-) diff --git a/contrib/nydusify/pkg/backend/oss.go b/contrib/nydusify/pkg/backend/oss.go index 8496fef5cc0..1c02d9099d0 100644 --- a/contrib/nydusify/pkg/backend/oss.go +++ b/contrib/nydusify/pkg/backend/oss.go @@ -109,7 +109,7 @@ func calcCrc64ECMA(path string) (uint64, error) { // Upload blob as image layer to oss backend and verify // integrity by calculate CRC64. -func (b *OSSBackend) Upload(ctx context.Context, blobID, blobPath string, size int64, forcePush bool) (*ocispec.Descriptor, error) { +func (b *OSSBackend) Upload(_ context.Context, blobID, blobPath string, size int64, forcePush bool) (*ocispec.Descriptor, error) { blobObjectKey := b.objectPrefix + blobID desc := blobDesc(size, blobID) diff --git a/contrib/nydusify/pkg/backend/registry.go b/contrib/nydusify/pkg/backend/registry.go index 674a6e42131..d3d6c1e01a9 100644 --- a/contrib/nydusify/pkg/backend/registry.go +++ b/contrib/nydusify/pkg/backend/registry.go @@ -15,7 +15,7 @@ type Registry struct { } func (r *Registry) Upload( - ctx context.Context, blobID, blobPath string, size int64, forcePush bool, + ctx context.Context, blobID, blobPath string, size int64, _ bool, ) (*ocispec.Descriptor, error) { // The `forcePush` option is useless for registry backend, because // the blob existed in registry can't be pushed again. @@ -35,11 +35,11 @@ func (r *Registry) Upload( return &desc, nil } -func (r *Registry) Finalize(cancel bool) error { +func (r *Registry) Finalize(_ bool) error { return nil } -func (r *Registry) Check(blobID string) (bool, error) { +func (r *Registry) Check(_ string) (bool, error) { return true, nil } @@ -47,14 +47,14 @@ func (r *Registry) Type() Type { return RegistryBackend } -func (r *Registry) Reader(blobID string) (io.ReadCloser, error) { +func (r *Registry) Reader(_ string) (io.ReadCloser, error) { panic("not implemented") } -func (r *Registry) Size(blobID string) (int64, error) { +func (r *Registry) Size(_ string) (int64, error) { panic("not implemented") } -func newRegistryBackend(rawConfig []byte, remote *remote.Remote) (Backend, error) { +func newRegistryBackend(_ []byte, remote *remote.Remote) (Backend, error) { return &Registry{remote: remote}, nil } diff --git a/contrib/nydusify/pkg/checker/rule/filesystem.go b/contrib/nydusify/pkg/checker/rule/filesystem.go index 5985e0184c8..c08db124db0 100644 --- a/contrib/nydusify/pkg/checker/rule/filesystem.go +++ b/contrib/nydusify/pkg/checker/rule/filesystem.go @@ -368,9 +368,5 @@ func (rule *FilesystemRule) Validate() error { } defer nydusd.Umount(false) - if err := rule.verify(); err != nil { - return err - } - - return nil + return rule.verify() } diff --git a/contrib/nydusify/pkg/checker/tool/builder.go b/contrib/nydusify/pkg/checker/tool/builder.go index eae2cedda4c..50dca87d1cc 100644 --- a/contrib/nydusify/pkg/checker/tool/builder.go +++ b/contrib/nydusify/pkg/checker/tool/builder.go @@ -46,9 +46,5 @@ func (builder *Builder) Check(option BuilderOption) error { cmd.Stdout = builder.stdout cmd.Stderr = builder.stderr - if err := cmd.Run(); err != nil { - return err - } - - return nil + return cmd.Run() } diff --git a/contrib/nydusify/pkg/converter/provider/provider.go b/contrib/nydusify/pkg/converter/provider/provider.go index 1485778efe9..d2f0463c5f7 100644 --- a/contrib/nydusify/pkg/converter/provider/provider.go +++ b/contrib/nydusify/pkg/converter/provider/provider.go @@ -152,7 +152,7 @@ func (pvd *Provider) Push(ctx context.Context, desc ocispec.Descriptor, ref stri return push(ctx, pvd.store, rc, desc, ref) } -func (pvd *Provider) Image(ctx context.Context, ref string) (*ocispec.Descriptor, error) { +func (pvd *Provider) Image(_ context.Context, ref string) (*ocispec.Descriptor, error) { pvd.mutex.Lock() defer pvd.mutex.Unlock() if desc, ok := pvd.images[ref]; ok { diff --git a/contrib/nydusify/pkg/hook/hook.go b/contrib/nydusify/pkg/hook/hook.go index 51ea82ff359..e7fc4737a56 100644 --- a/contrib/nydusify/pkg/hook/hook.go +++ b/contrib/nydusify/pkg/hook/hook.go @@ -83,7 +83,7 @@ func (p *Plugin) Server(*plugin.MuxBroker) (interface{}, error) { return &RPCServer{Impl: p.Impl}, nil } -func (Plugin) Client(b *plugin.MuxBroker, c *rpc.Client) (interface{}, error) { +func (Plugin) Client(_ *plugin.MuxBroker, c *rpc.Client) (interface{}, error) { return &RPC{client: c}, nil } diff --git a/contrib/nydusify/pkg/packer/pusher_test.go b/contrib/nydusify/pkg/packer/pusher_test.go index 178dd179d18..e3ef7655a80 100644 --- a/contrib/nydusify/pkg/packer/pusher_test.go +++ b/contrib/nydusify/pkg/packer/pusher_test.go @@ -24,7 +24,7 @@ func (m *mockBackend) Upload(ctx context.Context, blobID, blobPath string, blobS return desc.(*ocispec.Descriptor), nil } -func (m *mockBackend) Finalize(cancel bool) error { +func (m *mockBackend) Finalize(_ bool) error { return nil } @@ -36,11 +36,11 @@ func (m *mockBackend) Type() backend.Type { return backend.OssBackend } -func (m *mockBackend) Reader(blobID string) (io.ReadCloser, error) { +func (m *mockBackend) Reader(_ string) (io.ReadCloser, error) { panic("not implemented") } -func (m *mockBackend) Size(blobID string) (int64, error) { +func (m *mockBackend) Size(_ string) (int64, error) { panic("not implemented") } diff --git a/contrib/nydusify/pkg/provider/logger.go b/contrib/nydusify/pkg/provider/logger.go index f242ea3b4ac..a640f3119cd 100644 --- a/contrib/nydusify/pkg/provider/logger.go +++ b/contrib/nydusify/pkg/provider/logger.go @@ -21,7 +21,7 @@ type ProgressLogger interface { type defaultLogger struct{} -func (logger *defaultLogger) Log(ctx context.Context, msg string, fields LoggerFields) func(err error) error { +func (logger *defaultLogger) Log(_ context.Context, msg string, fields LoggerFields) func(err error) error { if fields == nil { fields = make(LoggerFields) } diff --git a/contrib/nydusify/pkg/provider/source.go b/contrib/nydusify/pkg/provider/source.go index de99350410c..86d594500e3 100644 --- a/contrib/nydusify/pkg/provider/source.go +++ b/contrib/nydusify/pkg/provider/source.go @@ -60,15 +60,15 @@ type defaultSourceLayer struct { parentChainID *digest.Digest } -func (sp *defaultSourceProvider) Manifest(ctx context.Context) (*ocispec.Descriptor, error) { +func (sp *defaultSourceProvider) Manifest(_ context.Context) (*ocispec.Descriptor, error) { return &sp.image.Desc, nil } -func (sp *defaultSourceProvider) Config(ctx context.Context) (*ocispec.Image, error) { +func (sp *defaultSourceProvider) Config(_ context.Context) (*ocispec.Image, error) { return &sp.image.Config, nil } -func (sp *defaultSourceProvider) Layers(ctx context.Context) ([]SourceLayer, error) { +func (sp *defaultSourceProvider) Layers(_ context.Context) ([]SourceLayer, error) { layers := sp.image.Manifest.Layers diffIDs := sp.image.Config.RootFS.DiffIDs if len(layers) != len(diffIDs) { diff --git a/contrib/nydusify/pkg/utils/utils.go b/contrib/nydusify/pkg/utils/utils.go index e720bfb287e..33242b77783 100644 --- a/contrib/nydusify/pkg/utils/utils.go +++ b/contrib/nydusify/pkg/utils/utils.go @@ -163,8 +163,6 @@ func UnpackFile(reader io.Reader, source, target string) error { if err != nil { if err == io.EOF { break - } else { - return err } } if hdr.Name == source { diff --git a/contrib/nydusify/plugin/main.go b/contrib/nydusify/plugin/main.go index 4a231494609..96201ac44b9 100644 --- a/contrib/nydusify/plugin/main.go +++ b/contrib/nydusify/plugin/main.go @@ -7,11 +7,11 @@ import ( type LocalHook struct { } -func (h *LocalHook) BeforePushManifest(info *hook.Info) error { +func (h *LocalHook) BeforePushManifest(_ *hook.Info) error { return nil } -func (h *LocalHook) AfterPushManifest(info *hook.Info) error { +func (h *LocalHook) AfterPushManifest(_ *hook.Info) error { return nil } From 14bf7112542926c2d69e248fe1b3ec70dfa24b24 Mon Sep 17 00:00:00 2001 From: Yadong Ding Date: Thu, 14 Dec 2023 16:28:37 +0800 Subject: [PATCH 3/3] smoke: use golangci-lint to improve code quality Signed-off-by: Yadong Ding --- smoke/Makefile | 1 + smoke/tests/api_test.go | 2 +- smoke/tests/benchmark_test.go | 11 +++++------ smoke/tests/blobcache_test.go | 2 +- smoke/tests/performance_test.go | 6 +++--- smoke/tests/tool/container.go | 24 ++++++++++++------------ smoke/tests/tool/context.go | 2 +- smoke/tests/tool/iterator.go | 5 ++--- smoke/tests/tool/layer.go | 4 ++-- smoke/tests/tool/verify.go | 2 +- 10 files changed, 29 insertions(+), 30 deletions(-) diff --git a/smoke/Makefile b/smoke/Makefile index 29e5635eeaa..a83a56ca95f 100644 --- a/smoke/Makefile +++ b/smoke/Makefile @@ -15,6 +15,7 @@ build: # NYDUS_NYDUSIFY=/path/to/latest/nydusify \ # make test test: build + golangci-lint run sudo -E ./smoke.test -test.v -test.timeout 10m -test.parallel=16 -test.run=$(TESTS) # PERFORMANCE_TEST_MODE=fs-version-5 \ diff --git a/smoke/tests/api_test.go b/smoke/tests/api_test.go index a48a8b9f50e..35f31d654dd 100644 --- a/smoke/tests/api_test.go +++ b/smoke/tests/api_test.go @@ -13,7 +13,7 @@ import ( "testing" "time" - "github.com/containerd/containerd/log" + "github.com/containerd/log" "github.com/containerd/nydus-snapshotter/pkg/converter" "github.com/stretchr/testify/require" diff --git a/smoke/tests/benchmark_test.go b/smoke/tests/benchmark_test.go index 319b5d66e8a..86d102f88d2 100644 --- a/smoke/tests/benchmark_test.go +++ b/smoke/tests/benchmark_test.go @@ -18,7 +18,7 @@ import ( // Environment Requirement: Containerd, nerdctl >= 0.22, nydus-snapshotter, nydusd, nydus-image and nydusify. // Prepare: setup nydus for containerd, reference: https://github.com/dragonflyoss/nydus/blob/master/docs/containerd-env-setup.md. -// TestBenchmark will dump json file(benchmark.json) which inlcudes container e2e time, image size, read-amount and read-cout. +// TestBenchmark will dump json file(benchmark.json) which includes container e2e time, image size, read-amount and read-cout. // Example: // { // e2e_time: 2747131 @@ -68,7 +68,7 @@ func (b *BenchmarkTestSuite) TestBenchmark(t *testing.T) { b.t.Fatalf("Benchmark don't support image " + image) } } - targetImageSize, conversionElapsed := b.prepareImage(b.t, ctx, mode, image) + targetImageSize, conversionElapsed := b.prepareImage(b.t, ctx, image) // run contaienr b.testContainerName = uuid.NewString() @@ -86,7 +86,7 @@ func (b *BenchmarkTestSuite) TestBenchmark(t *testing.T) { t.Logf(fmt.Sprintf("Metric: E2ETime %d ConversionElapsed %s ReadCount %d ReadAmount %d ImageSize %d", b.metric.E2ETime, b.metric.ConversionElapsed, b.metric.ReadCount, b.metric.ReadAmountTotal, b.metric.ImageSize)) } -func (b *BenchmarkTestSuite) prepareImage(t *testing.T, ctx *tool.Context, mode string, image string) (int64, int64) { +func (b *BenchmarkTestSuite) prepareImage(t *testing.T, ctx *tool.Context, image string) (int64, int64) { if b.testImage != "" { return 0, 0 } @@ -129,10 +129,9 @@ func (b *BenchmarkTestSuite) prepareImage(t *testing.T, ctx *tool.Context, mode if b.snapshotter == "nydus" { b.testImage = target return convertMetirc["TargetImageSize"], convertMetirc["ConversionElapsed"] - } else { - b.testImage = source - return convertMetirc["SourceImageSize"], 0 } + b.testImage = source + return convertMetirc["SourceImageSize"], 0 } func (b *BenchmarkTestSuite) dumpMetric() { diff --git a/smoke/tests/blobcache_test.go b/smoke/tests/blobcache_test.go index b45eb039bbb..219a929c74a 100644 --- a/smoke/tests/blobcache_test.go +++ b/smoke/tests/blobcache_test.go @@ -8,7 +8,7 @@ import ( "path/filepath" "testing" - "github.com/containerd/containerd/log" + "github.com/containerd/log" "github.com/dragonflyoss/image-service/smoke/tests/texture" "github.com/dragonflyoss/image-service/smoke/tests/tool" "github.com/dragonflyoss/image-service/smoke/tests/tool/test" diff --git a/smoke/tests/performance_test.go b/smoke/tests/performance_test.go index e1b6b2fc9ed..45a66cc8b6c 100644 --- a/smoke/tests/performance_test.go +++ b/smoke/tests/performance_test.go @@ -23,7 +23,7 @@ type PerformanceTestSuite struct { testContainerName string } -func (p *PerformanceTestSuite) TestPerformance(t *testing.T) { +func (p *PerformanceTestSuite) TestPerformance(_ *testing.T) { ctx := tool.DefaultContext(p.t) // choose test mode mode := os.Getenv("PERFORMANCE_TEST_MODE") @@ -51,14 +51,14 @@ func (p *PerformanceTestSuite) TestPerformance(t *testing.T) { } } // prepare test image - p.prepareTestImage(p.t, ctx, mode, image) + p.prepareTestImage(p.t, ctx, image) // run Contaienr p.testContainerName = uuid.NewString() tool.RunContainerWithBaseline(p.t, p.testImage, p.testContainerName, mode) } -func (p *PerformanceTestSuite) prepareTestImage(t *testing.T, ctx *tool.Context, mode string, image string) { +func (p *PerformanceTestSuite) prepareTestImage(t *testing.T, ctx *tool.Context, image string) { if p.testImage != "" { return } diff --git a/smoke/tests/tool/container.go b/smoke/tests/tool/container.go index b67540720a8..72394743d0e 100644 --- a/smoke/tests/tool/container.go +++ b/smoke/tests/tool/container.go @@ -40,7 +40,7 @@ type mountPath struct { target string } -var URL_WAIT = map[string]RunArgs{ +var urlWait = map[string]RunArgs{ "wordpress": { WaitURL: "http://localhost:80", BaselineReadCount: map[string]uint64{ @@ -64,7 +64,7 @@ var URL_WAIT = map[string]RunArgs{ }, } -var CMD_STDOUT = map[string]RunArgs{ +var cmdStdout = map[string]RunArgs{ "golang": { Mount: mountPath{ source: "tests/texture/golang", @@ -93,13 +93,13 @@ var CMD_STDOUT = map[string]RunArgs{ // SupportContainerImage help to check if we support the image or not func SupportContainerImage(image string) bool { - _, existsInUrlWait := URL_WAIT[image] - _, existsInCmdStdout := CMD_STDOUT[image] - return existsInUrlWait || existsInCmdStdout + _, existsInURLWait := urlWait[image] + _, existsInCmdStdout := cmdStdout[image] + return existsInURLWait || existsInCmdStdout } -// runUrlWaitContainer run container util geting http response from WaitUrl -func runUrlWaitContainer(t *testing.T, image string, snapshotter string, containerName string, runArgs RunArgs) { +// runURLWaitContainer run container util getting http response from WaitUrl +func runURLWaitContainer(t *testing.T, image string, snapshotter string, containerName string, runArgs RunArgs) { cmd := fmt.Sprintf("sudo nerdctl --insecure-registry --snapshotter %s run -d --net=host", snapshotter) if runArgs.Mount.source != "" { currentDir, err := os.Getwd() @@ -137,9 +137,9 @@ func runCmdStdoutContainer(t *testing.T, image string, snapshotter string, conta // RunContainerWithBaseline and get metrics from api socket. // Test will fail if performance below baseline. func RunContainerWithBaseline(t *testing.T, image string, containerName string, mode string) { - args, ok := URL_WAIT[ImageRepo(t, image)] + args, ok := urlWait[ImageRepo(t, image)] if ok { - runUrlWaitContainer(t, image, "nydus", containerName, args) + runURLWaitContainer(t, image, "nydus", containerName, args) defer clearContainer(t, image, "nydus", containerName) } else { t.Fatalf(fmt.Sprintf("%s is not in URL_WAIT", image)) @@ -161,11 +161,11 @@ func RunContainer(t *testing.T, image string, snapshotter string, containerName startTime := time.Now() // runContainer - args, ok := URL_WAIT[ImageRepo(t, image)] + args, ok := urlWait[ImageRepo(t, image)] if ok { - runUrlWaitContainer(t, image, snapshotter, containerName, args) + runURLWaitContainer(t, image, snapshotter, containerName, args) defer clearContainer(t, image, snapshotter, containerName) - } else if args, ok := CMD_STDOUT[ImageRepo(t, image)]; ok { + } else if args, ok := cmdStdout[ImageRepo(t, image)]; ok { runCmdStdoutContainer(t, image, snapshotter, containerName, args) defer clearContainer(t, image, snapshotter, containerName) } diff --git a/smoke/tests/tool/context.go b/smoke/tests/tool/context.go index 7d409d3b996..2d74ac02e97 100644 --- a/smoke/tests/tool/context.go +++ b/smoke/tests/tool/context.go @@ -106,6 +106,6 @@ func (ctx *Context) PrepareWorkDir(t *testing.T) { } } -func (ctx *Context) Destroy(t *testing.T) { +func (ctx *Context) Destroy(_ *testing.T) { os.RemoveAll(ctx.Env.WorkDir) } diff --git a/smoke/tests/tool/iterator.go b/smoke/tests/tool/iterator.go index bf49e32ef1e..b5bc0099770 100644 --- a/smoke/tests/tool/iterator.go +++ b/smoke/tests/tool/iterator.go @@ -129,10 +129,9 @@ func (c *DescartesIterator) calNext() { carried = true cursors[idx]++ break - } else { - carried = false - cursors[idx] = 0 } + carried = false + cursors[idx] = 0 } if !carried { c.noNext() diff --git a/smoke/tests/tool/layer.go b/smoke/tests/tool/layer.go index 0c0956ffec2..a6f1290ac08 100644 --- a/smoke/tests/tool/layer.go +++ b/smoke/tests/tool/layer.go @@ -190,7 +190,7 @@ func (l *Layer) PackRef(t *testing.T, ctx Context, blobDir string, compress bool return ociBlobDigest, rafsBlobDigest } -func (l *Layer) Overlay(t *testing.T, upper *Layer) *Layer { +func (l *Layer) Overlay(_ *testing.T, upper *Layer) *Layer { // Handle whiteout/opaque files for upperName := range upper.FileTree { name := filepath.Base(upperName) @@ -237,7 +237,7 @@ func (l *Layer) recordFileTree(t *testing.T) { }) } -func (l *Layer) ToOCITar(t *testing.T) io.ReadCloser { +func (l *Layer) ToOCITar(_ *testing.T) io.ReadCloser { return archive.Diff(context.Background(), "", l.workDir) } diff --git a/smoke/tests/tool/verify.go b/smoke/tests/tool/verify.go index d2d4ad277d2..e78c49ebe35 100644 --- a/smoke/tests/tool/verify.go +++ b/smoke/tests/tool/verify.go @@ -10,7 +10,7 @@ import ( "path/filepath" "testing" - "github.com/containerd/containerd/log" + "github.com/containerd/log" "github.com/stretchr/testify/require" )