Skip to content

Commit 36284dd

Browse files
dgageotdgageot
authored
Remove duplication (#4759)
Signed-off-by: David Gageot <[email protected]>
1 parent 4b3ca59 commit 36284dd

File tree

11 files changed

+57
-19
lines changed

11 files changed

+57
-19
lines changed

‎pkg/skaffold/build/bazel/build_test.go

+8-5
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,8 @@ func TestBuildBazel(t *testing.T) {
3333
t.Override(&util.DefaultExecCommand, testutil.CmdRun("bazel build //:app.tar").AndRunOut("bazel info bazel-bin", "bin"))
3434
testutil.CreateFakeImageTar("bazel:app", "bin/app.tar")
3535

36-
localDocker := docker.NewLocalDaemon(&testutil.FakeAPIClient{}, nil, false, nil)
36+
builder := NewArtifactBuilder(fakeLocalDaemon(), nil, false)
37+
3738
artifact := &latest.Artifact{
3839
Workspace: ".",
3940
ArtifactType: latest.ArtifactType{
@@ -42,8 +43,6 @@ func TestBuildBazel(t *testing.T) {
4243
},
4344
},
4445
}
45-
46-
builder := NewArtifactBuilder(localDocker, nil, false)
4746
_, err := builder.Build(context.Background(), ioutil.Discard, artifact, "img:tag")
4847

4948
t.CheckNoError(err)
@@ -52,15 +51,15 @@ func TestBuildBazel(t *testing.T) {
5251

5352
func TestBuildBazelFailInvalidTarget(t *testing.T) {
5453
testutil.Run(t, "", func(t *testutil.T) {
54+
builder := NewArtifactBuilder(nil, nil, false)
55+
5556
artifact := &latest.Artifact{
5657
ArtifactType: latest.ArtifactType{
5758
BazelArtifact: &latest.BazelArtifact{
5859
BuildTarget: "//:invalid-target",
5960
},
6061
},
6162
}
62-
63-
builder := NewArtifactBuilder(nil, nil, false)
6463
_, err := builder.Build(context.Background(), ioutil.Discard, artifact, "img:tag")
6564

6665
t.CheckErrorContains("the bazel build target should end with .tar", err)
@@ -98,3 +97,7 @@ func TestBuildImageTag(t *testing.T) {
9897

9998
testutil.CheckDeepEqual(t, "bazel:skaffold_example", imageTag)
10099
}
100+
101+
func fakeLocalDaemon() docker.LocalDaemon {
102+
return docker.NewLocalDaemon(&testutil.FakeAPIClient{}, nil, false, nil)
103+
}

‎pkg/skaffold/build/buildpacks/build_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -258,7 +258,7 @@ value = "VALUE2"
258258
Add(test.artifact.BuildpackArtifact.Builder, "builderImageID").
259259
Add(test.artifact.BuildpackArtifact.RunImage, "runImageID").
260260
Add("img:latest", "builtImageID")
261-
localDocker := docker.NewLocalDaemon(test.api, nil, false, nil)
261+
localDocker := fakeLocalDaemon(test.api)
262262

263263
builder := NewArtifactBuilder(localDocker, test.pushImages, test.mode)
264264
_, err := builder.Build(context.Background(), ioutil.Discard, test.artifact, test.tag)

‎pkg/skaffold/build/buildpacks/fetcher_test.go

+7-1
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,8 @@ import (
2121
"context"
2222
"testing"
2323

24+
"github.com/docker/docker/client"
25+
2426
"github.com/GoogleContainerTools/skaffold/pkg/skaffold/docker"
2527
"github.com/GoogleContainerTools/skaffold/testutil"
2628
)
@@ -45,7 +47,7 @@ func TestFetcher(t *testing.T) {
4547
for _, test := range tests {
4648
testutil.Run(t, test.description, func(t *testutil.T) {
4749
api := &testutil.FakeAPIClient{}
48-
docker := docker.NewLocalDaemon(api, nil, false, nil)
50+
docker := fakeLocalDaemon(api)
4951

5052
var out bytes.Buffer
5153

@@ -56,3 +58,7 @@ func TestFetcher(t *testing.T) {
5658
})
5759
}
5860
}
61+
62+
func fakeLocalDaemon(api client.CommonAPIClient) docker.LocalDaemon {
63+
return docker.NewLocalDaemon(api, nil, false, nil)
64+
}

‎pkg/skaffold/build/cache/lookup_test.go

+8-2
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,8 @@ import (
2222
"reflect"
2323
"testing"
2424

25+
"github.com/docker/docker/client"
26+
2527
"github.com/GoogleContainerTools/skaffold/pkg/skaffold/docker"
2628
"github.com/GoogleContainerTools/skaffold/pkg/skaffold/schema/latest"
2729
"github.com/GoogleContainerTools/skaffold/testutil"
@@ -106,7 +108,7 @@ func TestLookupLocal(t *testing.T) {
106108
cache := &cache{
107109
imagesAreLocal: true,
108110
artifactCache: test.cache,
109-
client: docker.NewLocalDaemon(test.api, nil, false, nil),
111+
client: fakeLocalDaemon(test.api),
110112
hashForArtifact: test.hasher,
111113
}
112114
details := cache.lookupArtifacts(context.Background(), map[string]string{"artifact": "tag"}, []*latest.Artifact{{
@@ -190,7 +192,7 @@ func TestLookupRemote(t *testing.T) {
190192
cache := &cache{
191193
imagesAreLocal: false,
192194
artifactCache: test.cache,
193-
client: docker.NewLocalDaemon(test.api, nil, false, nil),
195+
client: fakeLocalDaemon(test.api),
194196
hashForArtifact: test.hasher,
195197
}
196198
details := cache.lookupArtifacts(context.Background(), map[string]string{"artifact": "tag"}, []*latest.Artifact{{
@@ -216,3 +218,7 @@ func failingHasher(errMessage string) func(context.Context, *latest.Artifact) (s
216218
return "", errors.New(errMessage)
217219
}
218220
}
221+
222+
func fakeLocalDaemon(api client.CommonAPIClient) docker.LocalDaemon {
223+
return docker.NewLocalDaemon(api, nil, false, nil)
224+
}

‎pkg/skaffold/build/cache/retrieve_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ func TestCacheBuildLocal(t *testing.T) {
111111

112112
// Mock Docker
113113
t.Override(&docker.DefaultAuthHelper, stubAuth{})
114-
dockerDaemon := docker.NewLocalDaemon(&testutil.FakeAPIClient{}, nil, false, nil)
114+
dockerDaemon := fakeLocalDaemon(&testutil.FakeAPIClient{})
115115
t.Override(&docker.NewAPIClient, func(docker.Config) (docker.LocalDaemon, error) {
116116
return dockerDaemon, nil
117117
})
@@ -195,7 +195,7 @@ func TestCacheBuildRemote(t *testing.T) {
195195
})
196196

197197
// Mock Docker
198-
dockerDaemon := docker.NewLocalDaemon(&testutil.FakeAPIClient{}, nil, false, nil)
198+
dockerDaemon := fakeLocalDaemon(&testutil.FakeAPIClient{})
199199
t.Override(&docker.NewAPIClient, func(docker.Config) (docker.LocalDaemon, error) {
200200
return dockerDaemon, nil
201201
})

‎pkg/skaffold/build/jib/gradle_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ func TestBuildJibGradleToDocker(t *testing.T) {
7373
t.Override(&gradleBuildArgsFunc, getGradleBuildArgsFuncFake(t, MinimumJibGradleVersion))
7474
t.Override(&util.DefaultExecCommand, test.commands)
7575
api := (&testutil.FakeAPIClient{}).Add("img:tag", "imageID")
76-
localDocker := docker.NewLocalDaemon(api, nil, false, nil)
76+
localDocker := fakeLocalDaemon(api)
7777

7878
builder := NewArtifactBuilder(localDocker, nil, false, false)
7979
result, err := builder.Build(context.Background(), ioutil.Discard, &latest.Artifact{
@@ -137,7 +137,7 @@ func TestBuildJibGradleToRegistry(t *testing.T) {
137137
}
138138
return "", errors.New("unknown remote tag")
139139
})
140-
localDocker := docker.NewLocalDaemon(&testutil.FakeAPIClient{}, nil, false, nil)
140+
localDocker := fakeLocalDaemon(&testutil.FakeAPIClient{})
141141

142142
builder := NewArtifactBuilder(localDocker, nil, true, false)
143143
result, err := builder.Build(context.Background(), ioutil.Discard, &latest.Artifact{

‎pkg/skaffold/build/jib/jib_test.go

+7
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,9 @@ import (
2222
"path/filepath"
2323
"testing"
2424

25+
"github.com/docker/docker/client"
26+
27+
"github.com/GoogleContainerTools/skaffold/pkg/skaffold/docker"
2528
"github.com/GoogleContainerTools/skaffold/pkg/skaffold/schema/latest"
2629
"github.com/GoogleContainerTools/skaffold/pkg/skaffold/util"
2730
"github.com/GoogleContainerTools/skaffold/testutil"
@@ -218,3 +221,7 @@ func TestGetProjectKey(t *testing.T) {
218221
testutil.CheckDeepEqual(t, test.expected, projectKey)
219222
}
220223
}
224+
225+
func fakeLocalDaemon(api client.CommonAPIClient) docker.LocalDaemon {
226+
return docker.NewLocalDaemon(api, nil, false, nil)
227+
}

‎pkg/skaffold/build/jib/maven_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ func TestBuildJibMavenToDocker(t *testing.T) {
7373
t.NewTempDir().Touch("pom.xml").Chdir()
7474
t.Override(&util.DefaultExecCommand, test.commands)
7575
api := (&testutil.FakeAPIClient{}).Add("img:tag", "imageID")
76-
localDocker := docker.NewLocalDaemon(api, nil, false, nil)
76+
localDocker := fakeLocalDaemon(api)
7777

7878
builder := NewArtifactBuilder(localDocker, nil, false, false)
7979
result, err := builder.Build(context.Background(), ioutil.Discard, &latest.Artifact{
@@ -133,7 +133,7 @@ func TestBuildJibMavenToRegistry(t *testing.T) {
133133
}
134134
return "", errors.New("unknown remote tag")
135135
})
136-
localDocker := docker.NewLocalDaemon(&testutil.FakeAPIClient{}, nil, false, nil)
136+
localDocker := fakeLocalDaemon(&testutil.FakeAPIClient{})
137137

138138
builder := NewArtifactBuilder(localDocker, nil, true, false)
139139
result, err := builder.Build(context.Background(), ioutil.Discard, &latest.Artifact{

‎pkg/skaffold/build/local/docker_test.go

+11-1
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,8 @@ import (
2323
"path/filepath"
2424
"testing"
2525

26+
"github.com/docker/docker/client"
27+
2628
"github.com/GoogleContainerTools/skaffold/pkg/skaffold/cluster"
2729
"github.com/GoogleContainerTools/skaffold/pkg/skaffold/config"
2830
"github.com/GoogleContainerTools/skaffold/pkg/skaffold/docker"
@@ -86,7 +88,7 @@ func TestDockerCLIBuild(t *testing.T) {
8688
t.Override(&cluster.GetClient, func() cluster.Client { return fakeMinikubeClient{} })
8789
t.Override(&util.OSEnviron, func() []string { return []string{"KEY=VALUE"} })
8890
t.Override(&docker.NewAPIClient, func(docker.Config) (docker.LocalDaemon, error) {
89-
return docker.NewLocalDaemon(&testutil.FakeAPIClient{}, test.extraEnv, false, nil), nil
91+
return fakeLocalDaemonWithExtraEnv(test.extraEnv), nil
9092
})
9193

9294
builder, err := NewBuilder(&mockConfig{
@@ -109,6 +111,14 @@ func TestDockerCLIBuild(t *testing.T) {
109111
}
110112
}
111113

114+
func fakeLocalDaemon(api client.CommonAPIClient) docker.LocalDaemon {
115+
return docker.NewLocalDaemon(api, nil, false, nil)
116+
}
117+
118+
func fakeLocalDaemonWithExtraEnv(extraEnv []string) docker.LocalDaemon {
119+
return docker.NewLocalDaemon(&testutil.FakeAPIClient{}, extraEnv, false, nil)
120+
}
121+
112122
type fakeMinikubeClient struct{}
113123

114124
func (fakeMinikubeClient) IsMinikube(kubeContext string) bool { return false }

‎pkg/skaffold/build/local/local_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -233,7 +233,7 @@ func TestLocalRun(t *testing.T) {
233233
fakeWarner := &warnings.Collect{}
234234
t.Override(&warnings.Printf, fakeWarner.Warnf)
235235
t.Override(&docker.NewAPIClient, func(docker.Config) (docker.LocalDaemon, error) {
236-
return docker.NewLocalDaemon(test.api, nil, false, nil), nil
236+
return fakeLocalDaemon(test.api), nil
237237
})
238238
t.Override(&docker.EvalBuildArgs, func(mode config.RunMode, workspace string, a *latest.DockerArtifact) (map[string]*string, error) {
239239
return a.BuildArgs, nil

‎pkg/skaffold/test/test_test.go

+8-2
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,8 @@ import (
2525
"path/filepath"
2626
"testing"
2727

28+
"github.com/docker/docker/client"
29+
2830
"github.com/GoogleContainerTools/skaffold/pkg/skaffold/build"
2931
"github.com/GoogleContainerTools/skaffold/pkg/skaffold/config"
3032
"github.com/GoogleContainerTools/skaffold/pkg/skaffold/docker"
@@ -154,7 +156,7 @@ func TestTestSuccessRemoteImage(t *testing.T) {
154156
t.NewTempDir().Touch("test.yaml").Chdir()
155157
t.Override(&util.DefaultExecCommand, testutil.CmdRun("container-structure-test test -v warn --image image:tag --config test.yaml"))
156158
t.Override(&docker.NewAPIClient, func(docker.Config) (docker.LocalDaemon, error) {
157-
return docker.NewLocalDaemon(&testutil.FakeAPIClient{}, nil, false, nil), nil
159+
return fakeLocalDaemon(&testutil.FakeAPIClient{}), nil
158160
})
159161

160162
cfg := &mockConfig{
@@ -179,7 +181,7 @@ func TestTestFailureRemoteImage(t *testing.T) {
179181
t.NewTempDir().Touch("test.yaml").Chdir()
180182
t.Override(&util.DefaultExecCommand, testutil.CmdRun("container-structure-test test -v warn --image image:tag --config test.yaml"))
181183
t.Override(&docker.NewAPIClient, func(docker.Config) (docker.LocalDaemon, error) {
182-
return docker.NewLocalDaemon(&testutil.FakeAPIClient{ErrImagePull: true}, nil, false, nil), nil
184+
return fakeLocalDaemon(&testutil.FakeAPIClient{ErrImagePull: true}), nil
183185
})
184186

185187
cfg := &mockConfig{
@@ -252,6 +254,10 @@ func TestTestMuted(t *testing.T) {
252254
})
253255
}
254256

257+
func fakeLocalDaemon(api client.CommonAPIClient) docker.LocalDaemon {
258+
return docker.NewLocalDaemon(api, nil, false, nil)
259+
}
260+
255261
type mockConfig struct {
256262
runcontext.RunContext // Embedded to provide the default values.
257263
workingDir string

0 commit comments

Comments
 (0)