From c4f74ffb6e579b108e41a56c90707860b5f9668c Mon Sep 17 00:00:00 2001 From: Angel Montero Date: Wed, 22 Jan 2025 17:34:17 +0000 Subject: [PATCH] fix lint --- pkg/skaffold/graph/dependencies.go | 4 ++-- pkg/skaffold/graph/dependencies_test.go | 4 ---- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/pkg/skaffold/graph/dependencies.go b/pkg/skaffold/graph/dependencies.go index 8fb10a8bc11..eb84edf2aad 100644 --- a/pkg/skaffold/graph/dependencies.go +++ b/pkg/skaffold/graph/dependencies.go @@ -137,8 +137,8 @@ func sourceDependenciesForArtifact(ctx context.Context, a *latest.Artifact, cfg // For `dev` it will succeed on the first dev loop and list any additional dependencies found from the base artifact's ONBUILD instructions as a file added instead of modified (see `filemon.Events`) deps := docker.ResolveDependencyImages(a.Dependencies, r, false) - envTags, err := EnvTags(tag) - if err != nil { + envTags, evalErr := EnvTags(tag) + if evalErr != nil { return nil, fmt.Errorf("unable to create build args: %w", err) } diff --git a/pkg/skaffold/graph/dependencies_test.go b/pkg/skaffold/graph/dependencies_test.go index 4e7d5c98a8f..cbbea68fde6 100644 --- a/pkg/skaffold/graph/dependencies_test.go +++ b/pkg/skaffold/graph/dependencies_test.go @@ -126,9 +126,7 @@ COPY $IMAGE_TAG.go . } for _, test := range tests { testutil.Run(t, test.description, func(t *testutil.T) { - t.Override(&docker.RetrieveImage, docker.NewFakeImageFetcher()) - d := docker.NewSimpleStubArtifactResolver() tmpDir.Write("Dockerfile", test.dockerFileContents) if test.dockerBuildArgs != nil { @@ -138,10 +136,8 @@ COPY $IMAGE_TAG.go . } test.artifact.DockerArtifact.BuildArgs = args } - paths, err := sourceDependenciesForArtifact(context.Background(), test.artifact, test.dockerConfig, d, test.tag) t.CheckNoError(err) - t.CheckDeepEqual(test.expectedPaths, paths, cmpopts.SortSlices(func(x, y string) bool { return x < y })) })