Skip to content

Commit a54cbed

Browse files
tejal29tejal29
committed
remove v1 interfaces and simplify code
1 parent fb6b62e commit a54cbed

Some content is hidden

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

59 files changed

+219
-248
lines changed

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ import (
2828
"github.com/GoogleContainerTools/skaffold/pkg/skaffold/config"
2929
"github.com/GoogleContainerTools/skaffold/pkg/skaffold/graph"
3030
"github.com/GoogleContainerTools/skaffold/pkg/skaffold/runner"
31-
runcontext "github.com/GoogleContainerTools/skaffold/pkg/skaffold/runner/runcontext/v2"
31+
"github.com/GoogleContainerTools/skaffold/pkg/skaffold/runner/runcontext"
3232
"github.com/GoogleContainerTools/skaffold/pkg/skaffold/schema/latest"
3333
"github.com/GoogleContainerTools/skaffold/pkg/skaffold/schema/util"
3434
"github.com/GoogleContainerTools/skaffold/testutil"

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ import (
3636
kubectx "github.com/GoogleContainerTools/skaffold/pkg/skaffold/kubernetes/context"
3737
"github.com/GoogleContainerTools/skaffold/pkg/skaffold/output"
3838
"github.com/GoogleContainerTools/skaffold/pkg/skaffold/output/log"
39-
runcontext "github.com/GoogleContainerTools/skaffold/pkg/skaffold/runner/runcontext/v2"
39+
"github.com/GoogleContainerTools/skaffold/pkg/skaffold/runner/runcontext"
4040
"github.com/GoogleContainerTools/skaffold/pkg/skaffold/server"
4141
"github.com/GoogleContainerTools/skaffold/pkg/skaffold/survey"
4242
"github.com/GoogleContainerTools/skaffold/pkg/skaffold/update"

‎cmd/skaffold/app/cmd/debug_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ import (
2323

2424
"github.com/GoogleContainerTools/skaffold/pkg/skaffold/config"
2525
"github.com/GoogleContainerTools/skaffold/pkg/skaffold/runner"
26-
runcontext "github.com/GoogleContainerTools/skaffold/pkg/skaffold/runner/runcontext/v2"
26+
"github.com/GoogleContainerTools/skaffold/pkg/skaffold/runner/runcontext"
2727
"github.com/GoogleContainerTools/skaffold/pkg/skaffold/schema/latest"
2828
"github.com/GoogleContainerTools/skaffold/pkg/skaffold/schema/util"
2929
"github.com/GoogleContainerTools/skaffold/testutil"

‎cmd/skaffold/app/cmd/dev_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ import (
2525
"github.com/GoogleContainerTools/skaffold/pkg/skaffold/graph"
2626
"github.com/GoogleContainerTools/skaffold/pkg/skaffold/kubernetes/manifest"
2727
"github.com/GoogleContainerTools/skaffold/pkg/skaffold/runner"
28-
runcontext "github.com/GoogleContainerTools/skaffold/pkg/skaffold/runner/runcontext/v2"
28+
"github.com/GoogleContainerTools/skaffold/pkg/skaffold/runner/runcontext"
2929
"github.com/GoogleContainerTools/skaffold/pkg/skaffold/schema/latest"
3030
"github.com/GoogleContainerTools/skaffold/pkg/skaffold/schema/util"
3131
"github.com/GoogleContainerTools/skaffold/testutil"

‎cmd/skaffold/app/cmd/diagnose.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ import (
2626
"github.com/GoogleContainerTools/skaffold/pkg/skaffold/diagnose"
2727
"github.com/GoogleContainerTools/skaffold/pkg/skaffold/output"
2828
"github.com/GoogleContainerTools/skaffold/pkg/skaffold/parser"
29-
runcontext "github.com/GoogleContainerTools/skaffold/pkg/skaffold/runner/runcontext/v2"
29+
"github.com/GoogleContainerTools/skaffold/pkg/skaffold/runner/runcontext"
3030
"github.com/GoogleContainerTools/skaffold/pkg/skaffold/schema/latest"
3131
schemaUtil "github.com/GoogleContainerTools/skaffold/pkg/skaffold/schema/util"
3232
"github.com/GoogleContainerTools/skaffold/pkg/skaffold/util"
@@ -48,8 +48,8 @@ func NewCmdDiagnose() *cobra.Command {
4848
WithExample("Search for configuration issues and print the effective configuration", "diagnose").
4949
WithExample("Print the effective skaffold.yaml configuration for given profile", "diagnose --yaml-only --profile PROFILE").
5050
WithCommonFlags().
51-
WithFlags([]*Flag{
52-
{Value: &yamlOnly, Name: "yaml-only", DefValue: false, Usage: "Only prints the effective skaffold.yaml configuration"}}).
51+
WithFlags([]*Flag{
52+
{Value: &yamlOnly, Name: "yaml-only", DefValue: false, Usage: "Only prints the effective skaffold.yaml configuration"}}).
5353
NoArgs(doDiagnose)
5454
}
5555

‎cmd/skaffold/app/cmd/diagnose_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ import (
2323
"testing"
2424

2525
"github.com/GoogleContainerTools/skaffold/pkg/skaffold/config"
26-
runcontext "github.com/GoogleContainerTools/skaffold/pkg/skaffold/runner/runcontext/v2"
26+
"github.com/GoogleContainerTools/skaffold/pkg/skaffold/runner/runcontext"
2727
"github.com/GoogleContainerTools/skaffold/pkg/skaffold/schema/latest"
2828
"github.com/GoogleContainerTools/skaffold/pkg/skaffold/schema/util"
2929
"github.com/GoogleContainerTools/skaffold/testutil"

‎cmd/skaffold/app/cmd/filter_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ import (
2525
"github.com/GoogleContainerTools/skaffold/pkg/skaffold/config"
2626
"github.com/GoogleContainerTools/skaffold/pkg/skaffold/graph"
2727
"github.com/GoogleContainerTools/skaffold/pkg/skaffold/runner"
28-
runcontext "github.com/GoogleContainerTools/skaffold/pkg/skaffold/runner/runcontext/v2"
28+
"github.com/GoogleContainerTools/skaffold/pkg/skaffold/runner/runcontext"
2929
"github.com/GoogleContainerTools/skaffold/pkg/skaffold/schema/latest"
3030
"github.com/GoogleContainerTools/skaffold/pkg/skaffold/schema/util"
3131
"github.com/GoogleContainerTools/skaffold/testutil"

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ import (
2525
"github.com/GoogleContainerTools/skaffold/pkg/skaffold/graph"
2626
"github.com/GoogleContainerTools/skaffold/pkg/skaffold/kubernetes/manifest"
2727
"github.com/GoogleContainerTools/skaffold/pkg/skaffold/runner"
28-
runcontext "github.com/GoogleContainerTools/skaffold/pkg/skaffold/runner/runcontext/v2"
28+
"github.com/GoogleContainerTools/skaffold/pkg/skaffold/runner/runcontext"
2929
"github.com/GoogleContainerTools/skaffold/pkg/skaffold/schema/latest"
3030
"github.com/GoogleContainerTools/skaffold/pkg/skaffold/schema/util"
3131
"github.com/GoogleContainerTools/skaffold/testutil"

‎cmd/skaffold/app/cmd/runner.go

+2-3
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,7 @@ import (
3333
"github.com/GoogleContainerTools/skaffold/pkg/skaffold/output/log"
3434
"github.com/GoogleContainerTools/skaffold/pkg/skaffold/parser"
3535
"github.com/GoogleContainerTools/skaffold/pkg/skaffold/runner"
36-
runcontext "github.com/GoogleContainerTools/skaffold/pkg/skaffold/runner/runcontext/v2"
37-
v2 "github.com/GoogleContainerTools/skaffold/pkg/skaffold/runner/v2"
36+
"github.com/GoogleContainerTools/skaffold/pkg/skaffold/runner/runcontext"
3837
"github.com/GoogleContainerTools/skaffold/pkg/skaffold/schema/defaults"
3938
"github.com/GoogleContainerTools/skaffold/pkg/skaffold/schema/latest"
4039
"github.com/GoogleContainerTools/skaffold/pkg/skaffold/schema/util"
@@ -70,7 +69,7 @@ func createNewRunner(ctx context.Context, out io.Writer, opts config.SkaffoldOpt
7069
}
7170
instrumentation.Init(v2Configs, opts.User, runCtx.GetKubeContext())
7271
hooks.SetupStaticEnvOptions(runCtx)
73-
runner, err := v2.NewForConfig(ctx, runCtx)
72+
runner, err := runner.NewForConfig(ctx, runCtx)
7473
if err != nil {
7574
event.InititializationFailed(err)
7675
return nil, nil, nil, fmt.Errorf("creating runner: %w", err)

‎integration/build_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ import (
3030
"github.com/GoogleContainerTools/skaffold/pkg/skaffold/build/jib"
3131
"github.com/GoogleContainerTools/skaffold/pkg/skaffold/docker"
3232
kubectx "github.com/GoogleContainerTools/skaffold/pkg/skaffold/kubernetes/context"
33-
runcontext "github.com/GoogleContainerTools/skaffold/pkg/skaffold/runner/runcontext/v2"
33+
"github.com/GoogleContainerTools/skaffold/pkg/skaffold/runner/runcontext"
3434
"github.com/GoogleContainerTools/skaffold/pkg/skaffold/util"
3535
)
3636

‎integration/port_forward_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ import (
2626
kubectx "github.com/GoogleContainerTools/skaffold/pkg/skaffold/kubernetes/context"
2727
"github.com/GoogleContainerTools/skaffold/pkg/skaffold/kubernetes/portforward"
2828
"github.com/GoogleContainerTools/skaffold/pkg/skaffold/output/log"
29-
runcontext "github.com/GoogleContainerTools/skaffold/pkg/skaffold/runner/runcontext/v2"
29+
"github.com/GoogleContainerTools/skaffold/pkg/skaffold/runner/runcontext"
3030
)
3131

3232
func TestPortForward(t *testing.T) {

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ import (
3030
"github.com/GoogleContainerTools/skaffold/pkg/skaffold/docker"
3131
"github.com/GoogleContainerTools/skaffold/pkg/skaffold/graph"
3232
"github.com/GoogleContainerTools/skaffold/pkg/skaffold/platform"
33-
runcontext "github.com/GoogleContainerTools/skaffold/pkg/skaffold/runner/runcontext/v2"
33+
"github.com/GoogleContainerTools/skaffold/pkg/skaffold/runner/runcontext"
3434
"github.com/GoogleContainerTools/skaffold/pkg/skaffold/schema/latest"
3535
"github.com/GoogleContainerTools/skaffold/pkg/skaffold/tag"
3636
"github.com/GoogleContainerTools/skaffold/testutil"

‎pkg/skaffold/build/cluster/types_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ import (
2222

2323
"github.com/GoogleContainerTools/skaffold/pkg/skaffold/build"
2424
"github.com/GoogleContainerTools/skaffold/pkg/skaffold/config"
25-
runcontext "github.com/GoogleContainerTools/skaffold/pkg/skaffold/runner/runcontext/v2"
25+
"github.com/GoogleContainerTools/skaffold/pkg/skaffold/runner/runcontext"
2626
"github.com/GoogleContainerTools/skaffold/pkg/skaffold/schema/latest"
2727
"github.com/GoogleContainerTools/skaffold/testutil"
2828
)

‎pkg/skaffold/build/gcb/spec_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ import (
2323
"github.com/GoogleContainerTools/skaffold/pkg/skaffold/build"
2424
"github.com/GoogleContainerTools/skaffold/pkg/skaffold/graph"
2525
"github.com/GoogleContainerTools/skaffold/pkg/skaffold/platform"
26-
runcontext "github.com/GoogleContainerTools/skaffold/pkg/skaffold/runner/runcontext/v2"
26+
"github.com/GoogleContainerTools/skaffold/pkg/skaffold/runner/runcontext"
2727
"github.com/GoogleContainerTools/skaffold/pkg/skaffold/schema/latest"
2828
"github.com/GoogleContainerTools/skaffold/testutil"
2929
)

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ import (
3636
"github.com/GoogleContainerTools/skaffold/pkg/skaffold/docker"
3737
"github.com/GoogleContainerTools/skaffold/pkg/skaffold/graph"
3838
"github.com/GoogleContainerTools/skaffold/pkg/skaffold/platform"
39-
runcontext "github.com/GoogleContainerTools/skaffold/pkg/skaffold/runner/runcontext/v2"
39+
"github.com/GoogleContainerTools/skaffold/pkg/skaffold/runner/runcontext"
4040
"github.com/GoogleContainerTools/skaffold/pkg/skaffold/schema/latest"
4141
"github.com/GoogleContainerTools/skaffold/pkg/skaffold/util"
4242
"github.com/GoogleContainerTools/skaffold/pkg/skaffold/warnings"

‎pkg/skaffold/debug/apply_transforms.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ import (
2424
"github.com/GoogleContainerTools/skaffold/pkg/skaffold/docker"
2525
"github.com/GoogleContainerTools/skaffold/pkg/skaffold/graph"
2626
"github.com/GoogleContainerTools/skaffold/pkg/skaffold/output/log"
27-
runcontext "github.com/GoogleContainerTools/skaffold/pkg/skaffold/runner/runcontext/v2"
27+
"github.com/GoogleContainerTools/skaffold/pkg/skaffold/runner/runcontext"
2828
)
2929

3030
var ConfigRetriever = func(ctx context.Context, image string, builds []graph.Artifact, registries map[string]bool) (ImageConfiguration, error) {

‎pkg/skaffold/deploy/cloudrun/deploy_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ import (
3333
sErrors "github.com/GoogleContainerTools/skaffold/pkg/skaffold/errors"
3434
"github.com/GoogleContainerTools/skaffold/pkg/skaffold/graph"
3535
"github.com/GoogleContainerTools/skaffold/pkg/skaffold/kubernetes/manifest"
36-
runcontext "github.com/GoogleContainerTools/skaffold/pkg/skaffold/runner/runcontext/v2"
36+
"github.com/GoogleContainerTools/skaffold/pkg/skaffold/runner/runcontext"
3737
"github.com/GoogleContainerTools/skaffold/pkg/skaffold/schema/latest"
3838
"github.com/GoogleContainerTools/skaffold/proto/v1"
3939
"github.com/GoogleContainerTools/skaffold/testutil"

0 commit comments

Comments
 (0)