Skip to content

Commit 0d2a747

Browse files
MarlonGamezMarlonGamez
committed
Merge branch 'master' of https://github.com/GoogleContainerTools/skaffold into task-event
2 parents 638a6a9 + cc262b4 commit 0d2a747

File tree

109 files changed

+1053
-635
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

109 files changed

+1053
-635
lines changed

‎cmd/skaffold/app/cmd/build_test.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ import (
2525
"testing"
2626

2727
"github.com/GoogleContainerTools/skaffold/cmd/skaffold/app/flags"
28-
"github.com/GoogleContainerTools/skaffold/pkg/skaffold/build"
2928
"github.com/GoogleContainerTools/skaffold/pkg/skaffold/config"
29+
"github.com/GoogleContainerTools/skaffold/pkg/skaffold/graph"
3030
"github.com/GoogleContainerTools/skaffold/pkg/skaffold/runner"
3131
"github.com/GoogleContainerTools/skaffold/pkg/skaffold/schema/latest"
3232
"github.com/GoogleContainerTools/skaffold/testutil"
@@ -36,9 +36,9 @@ type mockRunner struct {
3636
runner.Runner
3737
}
3838

39-
func (r *mockRunner) Build(ctx context.Context, out io.Writer, artifacts []*latest.Artifact) ([]build.Artifact, error) {
39+
func (r *mockRunner) Build(ctx context.Context, out io.Writer, artifacts []*latest.Artifact) ([]graph.Artifact, error) {
4040
out.Write([]byte("Build Completed"))
41-
return []build.Artifact{{
41+
return []graph.Artifact{{
4242
ImageName: "gcr.io/skaffold/example",
4343
Tag: "test",
4444
}}, nil

‎cmd/skaffold/app/cmd/deploy.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ import (
2424

2525
"github.com/GoogleContainerTools/skaffold/cmd/skaffold/app/flags"
2626
"github.com/GoogleContainerTools/skaffold/cmd/skaffold/app/tips"
27-
"github.com/GoogleContainerTools/skaffold/pkg/skaffold/build"
27+
"github.com/GoogleContainerTools/skaffold/pkg/skaffold/graph"
2828
"github.com/GoogleContainerTools/skaffold/pkg/skaffold/runner"
2929
"github.com/GoogleContainerTools/skaffold/pkg/skaffold/schema/latest"
3030
)
@@ -53,7 +53,7 @@ func NewCmdDeploy() *cobra.Command {
5353
func doDeploy(ctx context.Context, out io.Writer) error {
5454
return withRunner(ctx, out, func(r runner.Runner, configs []*latest.SkaffoldConfig) error {
5555
if opts.SkipRender {
56-
return r.DeployAndLog(ctx, out, []build.Artifact{})
56+
return r.DeployAndLog(ctx, out, []graph.Artifact{})
5757
}
5858
var artifacts []*latest.Artifact
5959
for _, cfg := range configs {

‎cmd/skaffold/app/cmd/filter.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,9 @@ import (
2525
"github.com/spf13/cobra"
2626

2727
"github.com/GoogleContainerTools/skaffold/cmd/skaffold/app/flags"
28-
"github.com/GoogleContainerTools/skaffold/pkg/skaffold/build"
2928
"github.com/GoogleContainerTools/skaffold/pkg/skaffold/config"
3029
debugging "github.com/GoogleContainerTools/skaffold/pkg/skaffold/debug"
30+
"github.com/GoogleContainerTools/skaffold/pkg/skaffold/graph"
3131
"github.com/GoogleContainerTools/skaffold/pkg/skaffold/kubernetes/manifest"
3232
"github.com/GoogleContainerTools/skaffold/pkg/skaffold/runner"
3333
"github.com/GoogleContainerTools/skaffold/pkg/skaffold/schema/latest"
@@ -57,7 +57,7 @@ func NewCmdFilter() *cobra.Command {
5757

5858
// runFilter loads the Kubernetes manifests from stdin and applies the debug transformations.
5959
// Unlike `skaffold debug`, this filtering affects all images and not just the built artifacts.
60-
func runFilter(ctx context.Context, out io.Writer, debuggingFilters bool, buildArtifacts []build.Artifact) error {
60+
func runFilter(ctx context.Context, out io.Writer, debuggingFilters bool, buildArtifacts []graph.Artifact) error {
6161
return withRunner(ctx, out, func(r runner.Runner, configs []*latest.SkaffoldConfig) error {
6262
manifestList, err := manifest.Load(os.Stdin)
6363
if err != nil {

‎cmd/skaffold/app/cmd/render.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ import (
2525
"github.com/spf13/cobra"
2626

2727
"github.com/GoogleContainerTools/skaffold/cmd/skaffold/app/flags"
28-
"github.com/GoogleContainerTools/skaffold/pkg/skaffold/build"
28+
"github.com/GoogleContainerTools/skaffold/pkg/skaffold/graph"
2929
"github.com/GoogleContainerTools/skaffold/pkg/skaffold/runner"
3030
"github.com/GoogleContainerTools/skaffold/pkg/skaffold/schema/latest"
3131
)
@@ -61,7 +61,7 @@ func doRender(ctx context.Context, out io.Writer) error {
6161
}
6262

6363
return withRunner(ctx, out, func(r runner.Runner, configs []*latest.SkaffoldConfig) error {
64-
var bRes []build.Artifact
64+
var bRes []graph.Artifact
6565

6666
if renderFromBuildOutputFile.String() != "" {
6767
bRes = renderFromBuildOutputFile.BuildArtifacts()

‎cmd/skaffold/app/cmd/run_test.go

+6-6
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ import (
2222
"io/ioutil"
2323
"testing"
2424

25-
"github.com/GoogleContainerTools/skaffold/pkg/skaffold/build"
2625
"github.com/GoogleContainerTools/skaffold/pkg/skaffold/config"
26+
"github.com/GoogleContainerTools/skaffold/pkg/skaffold/graph"
2727
"github.com/GoogleContainerTools/skaffold/pkg/skaffold/runner"
2828
"github.com/GoogleContainerTools/skaffold/pkg/skaffold/schema/latest"
2929
"github.com/GoogleContainerTools/skaffold/testutil"
@@ -51,25 +51,25 @@ type mockRunRunner struct {
5151
artifactImageNames []string
5252
}
5353

54-
func (r *mockRunRunner) Build(_ context.Context, _ io.Writer, artifacts []*latest.Artifact) ([]build.Artifact, error) {
55-
var result []build.Artifact
54+
func (r *mockRunRunner) Build(_ context.Context, _ io.Writer, artifacts []*latest.Artifact) ([]graph.Artifact, error) {
55+
var result []graph.Artifact
5656
for _, artifact := range artifacts {
5757
imageName := artifact.ImageName
5858
r.artifactImageNames = append(r.artifactImageNames, imageName)
59-
result = append(result, build.Artifact{
59+
result = append(result, graph.Artifact{
6060
ImageName: imageName,
6161
})
6262
}
6363

6464
return result, nil
6565
}
6666

67-
func (r *mockRunRunner) Test(context.Context, io.Writer, []build.Artifact) error {
67+
func (r *mockRunRunner) Test(context.Context, io.Writer, []graph.Artifact) error {
6868
r.testRan = true
6969
return nil
7070
}
7171

72-
func (r *mockRunRunner) DeployAndLog(context.Context, io.Writer, []build.Artifact) error {
72+
func (r *mockRunRunner) DeployAndLog(context.Context, io.Writer, []graph.Artifact) error {
7373
r.deployRan = true
7474
return nil
7575
}

‎cmd/skaffold/app/cmd/util.go

+9-8
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ import (
2020
"fmt"
2121

2222
"github.com/GoogleContainerTools/skaffold/pkg/skaffold/build"
23+
"github.com/GoogleContainerTools/skaffold/pkg/skaffold/graph"
2324
"github.com/GoogleContainerTools/skaffold/pkg/skaffold/schema/latest"
2425
"github.com/GoogleContainerTools/skaffold/pkg/skaffold/tag"
2526
)
@@ -28,7 +29,7 @@ import (
2829
// no default repo is specified.
2930
type DefaultRepoFn func(string) (string, error)
3031

31-
func getBuildArtifactsAndSetTags(artifacts []*latest.Artifact, defaulterFn DefaultRepoFn) ([]build.Artifact, error) {
32+
func getBuildArtifactsAndSetTags(artifacts []*latest.Artifact, defaulterFn DefaultRepoFn) ([]graph.Artifact, error) {
3233
buildArtifacts, err := mergeBuildArtifacts(fromBuildOutputFile.BuildArtifacts(), preBuiltImages.Artifacts(), artifacts)
3334
if err != nil {
3435
return nil, err
@@ -37,7 +38,7 @@ func getBuildArtifactsAndSetTags(artifacts []*latest.Artifact, defaulterFn Defau
3738
return applyDefaultRepoToArtifacts(buildArtifacts, defaulterFn)
3839
}
3940

40-
func applyDefaultRepoToArtifacts(artifacts []build.Artifact, defaulterFn DefaultRepoFn) ([]build.Artifact, error) {
41+
func applyDefaultRepoToArtifacts(artifacts []graph.Artifact, defaulterFn DefaultRepoFn) ([]graph.Artifact, error) {
4142
for i := range artifacts {
4243
updatedTag, err := defaulterFn(artifacts[i].Tag)
4344
if err != nil {
@@ -49,10 +50,10 @@ func applyDefaultRepoToArtifacts(artifacts []build.Artifact, defaulterFn Default
4950
return artifacts, nil
5051
}
5152

52-
func mergeBuildArtifacts(fromFile, fromCLI []build.Artifact, artifacts []*latest.Artifact) ([]build.Artifact, error) {
53-
var buildArtifacts []build.Artifact
53+
func mergeBuildArtifacts(fromFile, fromCLI []graph.Artifact, artifacts []*latest.Artifact) ([]graph.Artifact, error) {
54+
var buildArtifacts []graph.Artifact
5455
for _, artifact := range artifacts {
55-
buildArtifacts = append(buildArtifacts, build.Artifact{
56+
buildArtifacts = append(buildArtifacts, graph.Artifact{
5657
ImageName: artifact.ImageName,
5758
})
5859
}
@@ -74,9 +75,9 @@ func mergeBuildArtifacts(fromFile, fromCLI []build.Artifact, artifacts []*latest
7475
return buildArtifacts, nil
7576
}
7677

77-
func applyCustomTag(artifacts []build.Artifact) ([]build.Artifact, error) {
78+
func applyCustomTag(artifacts []graph.Artifact) ([]graph.Artifact, error) {
7879
if opts.CustomTag != "" {
79-
var result []build.Artifact
80+
var result []graph.Artifact
8081
for _, artifact := range artifacts {
8182
if artifact.Tag == "" {
8283
artifact.Tag = artifact.ImageName + ":" + opts.CustomTag
@@ -94,7 +95,7 @@ func applyCustomTag(artifacts []build.Artifact) ([]build.Artifact, error) {
9495
return artifacts, nil
9596
}
9697

97-
func validateArtifactTags(artifacts []build.Artifact) error {
98+
func validateArtifactTags(artifacts []graph.Artifact) error {
9899
for _, artifact := range artifacts {
99100
if artifact.Tag == "" {
100101
return fmt.Errorf("no tag provided for image [%s]", artifact.ImageName)

‎cmd/skaffold/app/cmd/util_test.go

+35-35
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ import (
2121
"fmt"
2222
"testing"
2323

24-
"github.com/GoogleContainerTools/skaffold/pkg/skaffold/build"
24+
"github.com/GoogleContainerTools/skaffold/pkg/skaffold/graph"
2525
"github.com/GoogleContainerTools/skaffold/pkg/skaffold/schema/latest"
2626
"github.com/GoogleContainerTools/skaffold/testutil"
2727
)
@@ -30,9 +30,9 @@ func TestGetArtifacts(t *testing.T) {
3030
tests := []struct {
3131
description string
3232
artifacts []*latest.Artifact
33-
fromFile []build.Artifact
34-
fromCLI []build.Artifact
35-
expected []build.Artifact
33+
fromFile []graph.Artifact
34+
fromCLI []graph.Artifact
35+
expected []graph.Artifact
3636
customTag string
3737
shouldErr bool
3838
}{
@@ -41,41 +41,41 @@ func TestGetArtifacts(t *testing.T) {
4141
artifacts: nil,
4242
fromFile: nil,
4343
fromCLI: nil,
44-
expected: []build.Artifact(nil),
44+
expected: []graph.Artifact(nil),
4545
},
4646
{
4747
description: "from file",
4848
artifacts: []*latest.Artifact{{ImageName: "image"}},
49-
fromFile: []build.Artifact{{ImageName: "image", Tag: "image:tag"}},
49+
fromFile: []graph.Artifact{{ImageName: "image", Tag: "image:tag"}},
5050
fromCLI: nil,
51-
expected: []build.Artifact{{ImageName: "image", Tag: "image:tag"}},
51+
expected: []graph.Artifact{{ImageName: "image", Tag: "image:tag"}},
5252
},
5353
{
5454
description: "from CLI",
5555
artifacts: []*latest.Artifact{{ImageName: "image"}},
5656
fromFile: nil,
57-
fromCLI: []build.Artifact{{ImageName: "image", Tag: "image:tag"}},
58-
expected: []build.Artifact{{ImageName: "image", Tag: "image:tag"}},
57+
fromCLI: []graph.Artifact{{ImageName: "image", Tag: "image:tag"}},
58+
expected: []graph.Artifact{{ImageName: "image", Tag: "image:tag"}},
5959
},
6060
{
6161
description: "one from file, one from CLI",
6262
artifacts: []*latest.Artifact{{ImageName: "image1"}, {ImageName: "image2"}},
63-
fromFile: []build.Artifact{{ImageName: "image1", Tag: "image1:tag"}},
64-
fromCLI: []build.Artifact{{ImageName: "image2", Tag: "image2:tag"}},
65-
expected: []build.Artifact{{ImageName: "image1", Tag: "image1:tag"}, {ImageName: "image2", Tag: "image2:tag"}},
63+
fromFile: []graph.Artifact{{ImageName: "image1", Tag: "image1:tag"}},
64+
fromCLI: []graph.Artifact{{ImageName: "image2", Tag: "image2:tag"}},
65+
expected: []graph.Artifact{{ImageName: "image1", Tag: "image1:tag"}, {ImageName: "image2", Tag: "image2:tag"}},
6666
},
6767
{
6868
description: "file takes precedence on CLI",
6969
artifacts: []*latest.Artifact{{ImageName: "image1"}, {ImageName: "image2"}},
70-
fromFile: []build.Artifact{{ImageName: "image1", Tag: "image1:tag"}, {ImageName: "image2", Tag: "image2:tag"}},
71-
fromCLI: []build.Artifact{{ImageName: "image1", Tag: "image1:ignored"}},
72-
expected: []build.Artifact{{ImageName: "image1", Tag: "image1:tag"}, {ImageName: "image2", Tag: "image2:tag"}},
70+
fromFile: []graph.Artifact{{ImageName: "image1", Tag: "image1:tag"}, {ImageName: "image2", Tag: "image2:tag"}},
71+
fromCLI: []graph.Artifact{{ImageName: "image1", Tag: "image1:ignored"}},
72+
expected: []graph.Artifact{{ImageName: "image1", Tag: "image1:tag"}, {ImageName: "image2", Tag: "image2:tag"}},
7373
},
7474
{
7575
description: "provide tag for non-artifact",
7676
artifacts: []*latest.Artifact{},
77-
fromCLI: []build.Artifact{{ImageName: "busybox", Tag: "busybox:v1"}},
78-
expected: []build.Artifact{{ImageName: "busybox", Tag: "busybox:v1"}},
77+
fromCLI: []graph.Artifact{{ImageName: "busybox", Tag: "busybox:v1"}},
78+
expected: []graph.Artifact{{ImageName: "busybox", Tag: "busybox:v1"}},
7979
},
8080
{
8181
description: "missing tag",
@@ -87,25 +87,25 @@ func TestGetArtifacts(t *testing.T) {
8787
{
8888
description: "override tag",
8989
artifacts: []*latest.Artifact{{ImageName: "image1"}, {ImageName: "image2"}},
90-
fromFile: []build.Artifact{{ImageName: "image1", Tag: "image1:tag"}},
91-
fromCLI: []build.Artifact{{ImageName: "image2", Tag: "image2:tag"}},
92-
expected: []build.Artifact{{ImageName: "image1", Tag: "image1:test"}, {ImageName: "image2", Tag: "image2:test"}},
90+
fromFile: []graph.Artifact{{ImageName: "image1", Tag: "image1:tag"}},
91+
fromCLI: []graph.Artifact{{ImageName: "image2", Tag: "image2:tag"}},
92+
expected: []graph.Artifact{{ImageName: "image1", Tag: "image1:test"}, {ImageName: "image2", Tag: "image2:test"}},
9393
customTag: "test",
9494
},
9595
{
9696
description: "override missing tag",
9797
artifacts: []*latest.Artifact{{ImageName: "image1"}, {ImageName: "image2"}},
9898
fromFile: nil,
9999
fromCLI: nil,
100-
expected: []build.Artifact{{ImageName: "image1", Tag: "image1:test"}, {ImageName: "image2", Tag: "image2:test"}},
100+
expected: []graph.Artifact{{ImageName: "image1", Tag: "image1:test"}, {ImageName: "image2", Tag: "image2:test"}},
101101
customTag: "test",
102102
},
103103
{
104104
description: "apply tags to no artifacts",
105105
artifacts: []*latest.Artifact{},
106106
fromFile: nil,
107107
fromCLI: nil,
108-
expected: []build.Artifact(nil),
108+
expected: []graph.Artifact(nil),
109109
customTag: "test",
110110
},
111111
}
@@ -125,57 +125,57 @@ func TestGetArtifacts(t *testing.T) {
125125
func Test_getBuildArtifactsAndSetTags(t *testing.T) {
126126
tests := []struct {
127127
description string
128-
artifacts []build.Artifact
129-
expected []build.Artifact
128+
artifacts []graph.Artifact
129+
expected []graph.Artifact
130130
defaultRepo string
131131
shouldErr bool
132132
}{
133133
{
134134
description: "no artifact without default-repo",
135135
artifacts: nil,
136-
expected: []build.Artifact(nil),
136+
expected: []graph.Artifact(nil),
137137
},
138138
{
139139
description: "single artifact without default-repo",
140-
artifacts: []build.Artifact{{ImageName: "image", Tag: "image:tag"}},
141-
expected: []build.Artifact{{ImageName: "image", Tag: "image:tag"}},
140+
artifacts: []graph.Artifact{{ImageName: "image", Tag: "image:tag"}},
141+
expected: []graph.Artifact{{ImageName: "image", Tag: "image:tag"}},
142142
},
143143
{
144144
description: "multiple artifacts without default-repo",
145-
artifacts: []build.Artifact{
145+
artifacts: []graph.Artifact{
146146
{ImageName: "image1", Tag: "image1:tag"},
147147
{ImageName: "image1", Tag: "image1:tag"},
148148
},
149-
expected: []build.Artifact{
149+
expected: []graph.Artifact{
150150
{ImageName: "image1", Tag: "image1:tag"},
151151
{ImageName: "image1", Tag: "image1:tag"},
152152
},
153153
},
154154
{
155155
description: "single artifact with default-repo",
156-
artifacts: []build.Artifact{{ImageName: "image", Tag: "image:tag"}},
157-
expected: []build.Artifact{{ImageName: "image", Tag: "example.com/test-repo/image:tag"}},
156+
artifacts: []graph.Artifact{{ImageName: "image", Tag: "image:tag"}},
157+
expected: []graph.Artifact{{ImageName: "image", Tag: "example.com/test-repo/image:tag"}},
158158
defaultRepo: "example.com/test-repo",
159159
},
160160
{
161161
description: "multiple artifacts with default-repo",
162-
artifacts: []build.Artifact{
162+
artifacts: []graph.Artifact{
163163
{ImageName: "image1", Tag: "image1:tag"},
164164
{ImageName: "image1", Tag: "image1:tag"},
165165
},
166-
expected: []build.Artifact{
166+
expected: []graph.Artifact{
167167
{ImageName: "image1", Tag: "example.com/test-repo/image1:tag"},
168168
{ImageName: "image1", Tag: "example.com/test-repo/image1:tag"},
169169
},
170170
defaultRepo: "example.com/test-repo",
171171
},
172172
{
173173
description: "multiple artifacts with erring default-repo",
174-
artifacts: []build.Artifact{
174+
artifacts: []graph.Artifact{
175175
{ImageName: "image1", Tag: "image1:tag"},
176176
{ImageName: "image1", Tag: "image1:tag"},
177177
},
178-
expected: []build.Artifact(nil),
178+
expected: []graph.Artifact(nil),
179179
defaultRepo: "example.com/test-repo",
180180
shouldErr: true,
181181
},

‎cmd/skaffold/app/flags/build_output.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ import (
2222
"io/ioutil"
2323
"os"
2424

25-
"github.com/GoogleContainerTools/skaffold/pkg/skaffold/build"
25+
"github.com/GoogleContainerTools/skaffold/pkg/skaffold/graph"
2626
)
2727

2828
// BuildOutputFileFlag describes a flag which contains a BuildOutput.
@@ -33,7 +33,7 @@ type BuildOutputFileFlag struct {
3333

3434
// BuildOutput is the output of `skaffold build`.
3535
type BuildOutput struct {
36-
Builds []build.Artifact `json:"builds"`
36+
Builds []graph.Artifact `json:"builds"`
3737
}
3838

3939
func (t *BuildOutputFileFlag) String() string {
@@ -80,7 +80,7 @@ func (t *BuildOutputFileFlag) Type() string {
8080
}
8181

8282
// BuildArtifacts returns the Build Artifacts in the BuildOutputFileFlag
83-
func (t *BuildOutputFileFlag) BuildArtifacts() []build.Artifact {
83+
func (t *BuildOutputFileFlag) BuildArtifacts() []graph.Artifact {
8484
return t.buildOutput.Builds
8585
}
8686

0 commit comments

Comments
 (0)