Skip to content

Commit

Permalink
[Code style] Fix snake case import package "latest_v1" to "latestV1" (#…
Browse files Browse the repository at this point in the history 
…5799)

* [Code style] Fix snake case import package "latest_v1" to "latestV1"

* Add import back

* Add a new line

Co-authored-by: Tejal Desai <tejaldesai@google.com>
Co-authored-by: Tejal Desai <tejal29@gmail.com>
  • Loading branch information
@yuwenma @tejal29
3 people committed May 7, 2021
1 parent 01feff8 commit fb9c352
Show file tree
Hide file tree
Showing 252 changed files with 2,957 additions and 2,957 deletions.
4 changes: 2 additions & 2 deletions cmd/skaffold/app/cmd/apply.go
View file
Expand Up @@ -27,7 +27,7 @@ import (

"github.com/GoogleContainerTools/skaffold/pkg/skaffold/kubernetes"
"github.com/GoogleContainerTools/skaffold/pkg/skaffold/runner"
latest_v1 "github.com/GoogleContainerTools/skaffold/pkg/skaffold/schema/latest/v1"
latestV1 "github.com/GoogleContainerTools/skaffold/pkg/skaffold/schema/latest/v1"
)

// NewCmdApply describes the CLI command to apply manifests to a cluster.
Expand All @@ -53,7 +53,7 @@ func doApply(ctx context.Context, out io.Writer, args []string) error {
if err := validateManifests(args); err != nil {
return err
}
return withRunner(ctx, out, func(r runner.Runner, configs []*latest_v1.SkaffoldConfig) error {
return withRunner(ctx, out, func(r runner.Runner, configs []*latestV1.SkaffoldConfig) error {
return r.Apply(ctx, out)
})
}
Expand Down
8 changes: 4 additions & 4 deletions cmd/skaffold/app/cmd/build.go
View file
Expand Up @@ -28,7 +28,7 @@ import (
"github.com/GoogleContainerTools/skaffold/cmd/skaffold/app/flags"
"github.com/GoogleContainerTools/skaffold/pkg/skaffold/config"
"github.com/GoogleContainerTools/skaffold/pkg/skaffold/runner"
latest_v1 "github.com/GoogleContainerTools/skaffold/pkg/skaffold/schema/latest/v1"
latestV1 "github.com/GoogleContainerTools/skaffold/pkg/skaffold/schema/latest/v1"
)

var (
Expand Down Expand Up @@ -67,7 +67,7 @@ func doBuild(ctx context.Context, out io.Writer) error {
buildOut = ioutil.Discard
}

return withRunner(ctx, out, func(r runner.Runner, configs []*latest_v1.SkaffoldConfig) error {
return withRunner(ctx, out, func(r runner.Runner, configs []*latestV1.SkaffoldConfig) error {
bRes, err := r.Build(ctx, buildOut, targetArtifacts(opts, configs))

if quietFlag || buildOutputFlag != "" {
Expand All @@ -94,8 +94,8 @@ func doBuild(ctx context.Context, out io.Writer) error {
})
}

func targetArtifacts(opts config.SkaffoldOptions, configs []*latest_v1.SkaffoldConfig) []*latest_v1.Artifact {
var targetArtifacts []*latest_v1.Artifact
func targetArtifacts(opts config.SkaffoldOptions, configs []*latestV1.SkaffoldConfig) []*latestV1.Artifact {
var targetArtifacts []*latestV1.Artifact
for _, cfg := range configs {
for _, artifact := range cfg.Build.Artifacts {
if opts.IsTargetImage(artifact) {
Expand Down
24 changes: 12 additions & 12 deletions cmd/skaffold/app/cmd/build_test.go
View file
Expand Up @@ -29,15 +29,15 @@ import (
"github.com/GoogleContainerTools/skaffold/pkg/skaffold/graph"
"github.com/GoogleContainerTools/skaffold/pkg/skaffold/runner"
"github.com/GoogleContainerTools/skaffold/pkg/skaffold/runner/runcontext"
latest_v1 "github.com/GoogleContainerTools/skaffold/pkg/skaffold/schema/latest/v1"
latestV1 "github.com/GoogleContainerTools/skaffold/pkg/skaffold/schema/latest/v1"
"github.com/GoogleContainerTools/skaffold/testutil"
)

type mockRunner struct {
runner.Runner
}

func (r *mockRunner) Build(ctx context.Context, out io.Writer, artifacts []*latest_v1.Artifact) ([]graph.Artifact, error) {
func (r *mockRunner) Build(ctx context.Context, out io.Writer, artifacts []*latestV1.Artifact) ([]graph.Artifact, error) {
out.Write([]byte("Build Completed"))
return []graph.Artifact{{
ImageName: "gcr.io/skaffold/example",
Expand All @@ -50,8 +50,8 @@ func (r *mockRunner) Stop() error {
}

func TestTagFlag(t *testing.T) {
mockCreateRunner := func(io.Writer, config.SkaffoldOptions) (runner.Runner, []*latest_v1.SkaffoldConfig, *runcontext.RunContext, error) {
return &mockRunner{}, []*latest_v1.SkaffoldConfig{{}}, nil, nil
mockCreateRunner := func(io.Writer, config.SkaffoldOptions) (runner.Runner, []*latestV1.SkaffoldConfig, *runcontext.RunContext, error) {
return &mockRunner{}, []*latestV1.SkaffoldConfig{{}}, nil, nil
}

testutil.Run(t, "override tag with argument", func(t *testutil.T) {
Expand All @@ -69,8 +69,8 @@ func TestTagFlag(t *testing.T) {
}

func TestQuietFlag(t *testing.T) {
mockCreateRunner := func(io.Writer, config.SkaffoldOptions) (runner.Runner, []*latest_v1.SkaffoldConfig, *runcontext.RunContext, error) {
return &mockRunner{}, []*latest_v1.SkaffoldConfig{{}}, nil, nil
mockCreateRunner := func(io.Writer, config.SkaffoldOptions) (runner.Runner, []*latestV1.SkaffoldConfig, *runcontext.RunContext, error) {
return &mockRunner{}, []*latestV1.SkaffoldConfig{{}}, nil, nil
}

tests := []struct {
Expand Down Expand Up @@ -115,8 +115,8 @@ func TestQuietFlag(t *testing.T) {
}

func TestFileOutputFlag(t *testing.T) {
mockCreateRunner := func(io.Writer, config.SkaffoldOptions) (runner.Runner, []*latest_v1.SkaffoldConfig, *runcontext.RunContext, error) {
return &mockRunner{}, []*latest_v1.SkaffoldConfig{{}}, nil, nil
mockCreateRunner := func(io.Writer, config.SkaffoldOptions) (runner.Runner, []*latestV1.SkaffoldConfig, *runcontext.RunContext, error) {
return &mockRunner{}, []*latestV1.SkaffoldConfig{{}}, nil, nil
}

tests := []struct {
Expand Down Expand Up @@ -178,16 +178,16 @@ func TestFileOutputFlag(t *testing.T) {
}

func TestRunBuild(t *testing.T) {
errRunner := func(io.Writer, config.SkaffoldOptions) (runner.Runner, []*latest_v1.SkaffoldConfig, *runcontext.RunContext, error) {
errRunner := func(io.Writer, config.SkaffoldOptions) (runner.Runner, []*latestV1.SkaffoldConfig, *runcontext.RunContext, error) {
return nil, nil, nil, errors.New("some error")
}
mockCreateRunner := func(io.Writer, config.SkaffoldOptions) (runner.Runner, []*latest_v1.SkaffoldConfig, *runcontext.RunContext, error) {
return &mockRunner{}, []*latest_v1.SkaffoldConfig{{}}, nil, nil
mockCreateRunner := func(io.Writer, config.SkaffoldOptions) (runner.Runner, []*latestV1.SkaffoldConfig, *runcontext.RunContext, error) {
return &mockRunner{}, []*latestV1.SkaffoldConfig{{}}, nil, nil
}

tests := []struct {
description string
mock func(io.Writer, config.SkaffoldOptions) (runner.Runner, []*latest_v1.SkaffoldConfig, *runcontext.RunContext, error)
mock func(io.Writer, config.SkaffoldOptions) (runner.Runner, []*latestV1.SkaffoldConfig, *runcontext.RunContext, error)
shouldErr bool
}{
{
Expand Down
6 changes: 3 additions & 3 deletions cmd/skaffold/app/cmd/debug_test.go
View file
Expand Up @@ -24,7 +24,7 @@ import (
"github.com/GoogleContainerTools/skaffold/pkg/skaffold/config"
"github.com/GoogleContainerTools/skaffold/pkg/skaffold/runner"
"github.com/GoogleContainerTools/skaffold/pkg/skaffold/runner/runcontext"
latest_v1 "github.com/GoogleContainerTools/skaffold/pkg/skaffold/schema/latest/v1"
latestV1 "github.com/GoogleContainerTools/skaffold/pkg/skaffold/schema/latest/v1"
"github.com/GoogleContainerTools/skaffold/testutil"
)

Expand All @@ -49,8 +49,8 @@ func TestNewCmdDebug(t *testing.T) {
func TestDebugIndependentFromDev(t *testing.T) {
mockRunner := &mockDevRunner{}
testutil.Run(t, "DevDebug", func(t *testutil.T) {
t.Override(&createRunner, func(io.Writer, config.SkaffoldOptions) (runner.Runner, []*latest_v1.SkaffoldConfig, *runcontext.RunContext, error) {
return mockRunner, []*latest_v1.SkaffoldConfig{{}}, nil, nil
t.Override(&createRunner, func(io.Writer, config.SkaffoldOptions) (runner.Runner, []*latestV1.SkaffoldConfig, *runcontext.RunContext, error) {
return mockRunner, []*latestV1.SkaffoldConfig{{}}, nil, nil
})
t.Override(&opts, config.SkaffoldOptions{})
t.Override(&doDev, func(context.Context, io.Writer) error {
Expand Down
4 changes: 2 additions & 2 deletions cmd/skaffold/app/cmd/delete.go
View file
Expand Up @@ -23,7 +23,7 @@ import (
"github.com/spf13/cobra"

"github.com/GoogleContainerTools/skaffold/pkg/skaffold/runner"
latest_v1 "github.com/GoogleContainerTools/skaffold/pkg/skaffold/schema/latest/v1"
latestV1 "github.com/GoogleContainerTools/skaffold/pkg/skaffold/schema/latest/v1"
)

// NewCmdDelete describes the CLI command to delete deployed resources.
Expand All @@ -35,7 +35,7 @@ func NewCmdDelete() *cobra.Command {
}

func doDelete(ctx context.Context, out io.Writer) error {
return withRunner(ctx, out, func(r runner.Runner, _ []*latest_v1.SkaffoldConfig) error {
return withRunner(ctx, out, func(r runner.Runner, _ []*latestV1.SkaffoldConfig) error {
return r.Cleanup(ctx, out)
})
}
6 changes: 3 additions & 3 deletions cmd/skaffold/app/cmd/deploy.go
View file
Expand Up @@ -26,7 +26,7 @@ import (
"github.com/GoogleContainerTools/skaffold/cmd/skaffold/app/tips"
"github.com/GoogleContainerTools/skaffold/pkg/skaffold/graph"
"github.com/GoogleContainerTools/skaffold/pkg/skaffold/runner"
latest_v1 "github.com/GoogleContainerTools/skaffold/pkg/skaffold/schema/latest/v1"
latestV1 "github.com/GoogleContainerTools/skaffold/pkg/skaffold/schema/latest/v1"
)

var (
Expand All @@ -51,11 +51,11 @@ func NewCmdDeploy() *cobra.Command {
}

func doDeploy(ctx context.Context, out io.Writer) error {
return withRunner(ctx, out, func(r runner.Runner, configs []*latest_v1.SkaffoldConfig) error {
return withRunner(ctx, out, func(r runner.Runner, configs []*latestV1.SkaffoldConfig) error {
if opts.SkipRender {
return r.DeployAndLog(ctx, out, []graph.Artifact{})
}
var artifacts []*latest_v1.Artifact
var artifacts []*latestV1.Artifact
for _, cfg := range configs {
artifacts = append(artifacts, cfg.Build.Artifacts...)
}
Expand Down
6 changes: 3 additions & 3 deletions cmd/skaffold/app/cmd/dev.go
View file
Expand Up @@ -25,7 +25,7 @@ import (
"github.com/spf13/cobra"

"github.com/GoogleContainerTools/skaffold/pkg/skaffold/runner"
latest_v1 "github.com/GoogleContainerTools/skaffold/pkg/skaffold/schema/latest/v1"
latestV1 "github.com/GoogleContainerTools/skaffold/pkg/skaffold/schema/latest/v1"
)

// for testing
Expand Down Expand Up @@ -60,8 +60,8 @@ func runDev(ctx context.Context, out io.Writer) error {
case <-ctx.Done():
return nil
default:
err := withRunner(ctx, out, func(r runner.Runner, configs []*latest_v1.SkaffoldConfig) error {
var artifacts []*latest_v1.Artifact
err := withRunner(ctx, out, func(r runner.Runner, configs []*latestV1.SkaffoldConfig) error {
var artifacts []*latestV1.Artifact
for _, cfg := range configs {
artifacts = append(artifacts, cfg.Build.Artifacts...)
}
Expand Down
14 changes: 7 additions & 7 deletions cmd/skaffold/app/cmd/dev_test.go
View file
Expand Up @@ -25,7 +25,7 @@ import (
"github.com/GoogleContainerTools/skaffold/pkg/skaffold/config"
"github.com/GoogleContainerTools/skaffold/pkg/skaffold/runner"
"github.com/GoogleContainerTools/skaffold/pkg/skaffold/runner/runcontext"
latest_v1 "github.com/GoogleContainerTools/skaffold/pkg/skaffold/schema/latest/v1"
latestV1 "github.com/GoogleContainerTools/skaffold/pkg/skaffold/schema/latest/v1"
"github.com/GoogleContainerTools/skaffold/testutil"
)

Expand All @@ -37,7 +37,7 @@ type mockDevRunner struct {
calls []string
}

func (r *mockDevRunner) Dev(context.Context, io.Writer, []*latest_v1.Artifact) error {
func (r *mockDevRunner) Dev(context.Context, io.Writer, []*latestV1.Artifact) error {
r.calls = append(r.calls, "Dev")
return r.errDev
}
Expand Down Expand Up @@ -96,8 +96,8 @@ func TestDoDev(t *testing.T) {
hasDeployed: test.hasDeployed,
errDev: context.Canceled,
}
t.Override(&createRunner, func(io.Writer, config.SkaffoldOptions) (runner.Runner, []*latest_v1.SkaffoldConfig, *runcontext.RunContext, error) {
return mockRunner, []*latest_v1.SkaffoldConfig{{}}, nil, nil
t.Override(&createRunner, func(io.Writer, config.SkaffoldOptions) (runner.Runner, []*latestV1.SkaffoldConfig, *runcontext.RunContext, error) {
return mockRunner, []*latestV1.SkaffoldConfig{{}}, nil, nil
})
t.Override(&opts, config.SkaffoldOptions{
Cleanup: true,
Expand All @@ -117,7 +117,7 @@ type mockConfigChangeRunner struct {
cycles int
}

func (m *mockConfigChangeRunner) Dev(context.Context, io.Writer, []*latest_v1.Artifact) error {
func (m *mockConfigChangeRunner) Dev(context.Context, io.Writer, []*latestV1.Artifact) error {
m.cycles++
if m.cycles == 1 {
// pass through the first cycle with a config reload
Expand Down Expand Up @@ -146,8 +146,8 @@ func TestDevConfigChange(t *testing.T) {
testutil.Run(t, "test config change", func(t *testutil.T) {
mockRunner := &mockConfigChangeRunner{}

t.Override(&createRunner, func(io.Writer, config.SkaffoldOptions) (runner.Runner, []*latest_v1.SkaffoldConfig, *runcontext.RunContext, error) {
return mockRunner, []*latest_v1.SkaffoldConfig{{}}, nil, nil
t.Override(&createRunner, func(io.Writer, config.SkaffoldOptions) (runner.Runner, []*latestV1.SkaffoldConfig, *runcontext.RunContext, error) {
return mockRunner, []*latestV1.SkaffoldConfig{{}}, nil, nil
})
t.Override(&opts, config.SkaffoldOptions{
Cleanup: true,
Expand Down
4 changes: 2 additions & 2 deletions cmd/skaffold/app/cmd/diagnose.go
View file
Expand Up @@ -27,7 +27,7 @@ import (
"github.com/GoogleContainerTools/skaffold/pkg/skaffold/diagnose"
"github.com/GoogleContainerTools/skaffold/pkg/skaffold/parser"
"github.com/GoogleContainerTools/skaffold/pkg/skaffold/runner/runcontext"
latest_v1 "github.com/GoogleContainerTools/skaffold/pkg/skaffold/schema/latest/v1"
latestV1 "github.com/GoogleContainerTools/skaffold/pkg/skaffold/schema/latest/v1"
"github.com/GoogleContainerTools/skaffold/pkg/skaffold/version"
"github.com/GoogleContainerTools/skaffold/pkg/skaffold/yaml"
)
Expand Down Expand Up @@ -76,7 +76,7 @@ func doDiagnose(ctx context.Context, out io.Writer) error {
return nil
}

func printArtifactDiagnostics(ctx context.Context, out io.Writer, configs []*latest_v1.SkaffoldConfig) error {
func printArtifactDiagnostics(ctx context.Context, out io.Writer, configs []*latestV1.SkaffoldConfig) error {
runCtx, err := getRunContext(opts, configs)
if err != nil {
return fmt.Errorf("getting run context: %w", err)
Expand Down
12 changes: 6 additions & 6 deletions cmd/skaffold/app/cmd/diagnose_test.go
View file
Expand Up @@ -24,7 +24,7 @@ import (

"github.com/GoogleContainerTools/skaffold/pkg/skaffold/config"
"github.com/GoogleContainerTools/skaffold/pkg/skaffold/runner/runcontext"
latest_v1 "github.com/GoogleContainerTools/skaffold/pkg/skaffold/schema/latest/v1"
latestV1 "github.com/GoogleContainerTools/skaffold/pkg/skaffold/schema/latest/v1"
"github.com/GoogleContainerTools/skaffold/testutil"
)

Expand Down Expand Up @@ -57,23 +57,23 @@ metadata:

for _, test := range tests {
testutil.Run(t, test.description, func(t *testutil.T) {
t.Override(&getRunContext, func(config.SkaffoldOptions, []*latest_v1.SkaffoldConfig) (*runcontext.RunContext, error) {
t.Override(&getRunContext, func(config.SkaffoldOptions, []*latestV1.SkaffoldConfig) (*runcontext.RunContext, error) {
return nil, fmt.Errorf("cannot get the runtime context")
})
t.Override(&yamlOnly, test.yamlOnly)
t.Override(&getCfgs, func(opts config.SkaffoldOptions) ([]*latest_v1.SkaffoldConfig, error) {
return []*latest_v1.SkaffoldConfig{
t.Override(&getCfgs, func(opts config.SkaffoldOptions) ([]*latestV1.SkaffoldConfig, error) {
return []*latestV1.SkaffoldConfig{
{
APIVersion: "testVersion",
Kind: "Config",
Metadata: latest_v1.Metadata{
Metadata: latestV1.Metadata{
Name: "config1",
},
},
{
APIVersion: "testVersion",
Kind: "Config",
Metadata: latest_v1.Metadata{
Metadata: latestV1.Metadata{
Name: "config2",
},
},
Expand Down
6 changes: 3 additions & 3 deletions cmd/skaffold/app/cmd/filter.go
View file
Expand Up @@ -30,7 +30,7 @@ import (
"github.com/GoogleContainerTools/skaffold/pkg/skaffold/graph"
"github.com/GoogleContainerTools/skaffold/pkg/skaffold/kubernetes/manifest"
"github.com/GoogleContainerTools/skaffold/pkg/skaffold/runner"
latest_v1 "github.com/GoogleContainerTools/skaffold/pkg/skaffold/schema/latest/v1"
latestV1 "github.com/GoogleContainerTools/skaffold/pkg/skaffold/schema/latest/v1"
)

// for tests
Expand Down Expand Up @@ -58,7 +58,7 @@ func NewCmdFilter() *cobra.Command {
// runFilter loads the Kubernetes manifests from stdin and applies the debug transformations.
// Unlike `skaffold debug`, this filtering affects all images and not just the built artifacts.
func runFilter(ctx context.Context, out io.Writer, debuggingFilters bool, buildArtifacts []graph.Artifact) error {
return withRunner(ctx, out, func(r runner.Runner, configs []*latest_v1.SkaffoldConfig) error {
return withRunner(ctx, out, func(r runner.Runner, configs []*latestV1.SkaffoldConfig) error {
manifestList, err := manifest.Load(os.Stdin)
if err != nil {
return fmt.Errorf("loading manifests: %w", err)
Expand Down Expand Up @@ -87,7 +87,7 @@ func runFilter(ctx context.Context, out io.Writer, debuggingFilters bool, buildA
})
}

func getInsecureRegistries(opts config.SkaffoldOptions, configs []*latest_v1.SkaffoldConfig) (map[string]bool, error) {
func getInsecureRegistries(opts config.SkaffoldOptions, configs []*latestV1.SkaffoldConfig) (map[string]bool, error) {
cfgRegistries, err := config.GetInsecureRegistries(opts.GlobalConfig)
if err != nil {
return nil, err
Expand Down
4 changes: 2 additions & 2 deletions cmd/skaffold/app/cmd/find_configs.go
View file
Expand Up @@ -27,7 +27,7 @@ import (

"github.com/GoogleContainerTools/skaffold/pkg/skaffold/color"
"github.com/GoogleContainerTools/skaffold/pkg/skaffold/schema"
latest_v1 "github.com/GoogleContainerTools/skaffold/pkg/skaffold/schema/latest/v1"
latestV1 "github.com/GoogleContainerTools/skaffold/pkg/skaffold/schema/latest/v1"
"github.com/GoogleContainerTools/skaffold/pkg/skaffold/walk"
)

Expand Down Expand Up @@ -66,7 +66,7 @@ func doFindConfigs(_ context.Context, out io.Writer) error {
pathOutLen, versionOutLen := 70, 30
for p, v := range pathToVersion {
c := color.Default
if v != latest_v1.Version {
if v != latestV1.Version {
c = color.Green
}
c.Fprintf(out, fmt.Sprintf("%%-%ds\t%%-%ds\n", pathOutLen, versionOutLen), p, v)
Expand Down
10 changes: 5 additions & 5 deletions cmd/skaffold/app/cmd/find_configs_test.go
View file
Expand Up @@ -20,7 +20,7 @@ import (
"fmt"
"testing"

latest_v1 "github.com/GoogleContainerTools/skaffold/pkg/skaffold/schema/latest/v1"
latestV1 "github.com/GoogleContainerTools/skaffold/pkg/skaffold/schema/latest/v1"
"github.com/GoogleContainerTools/skaffold/pkg/skaffold/schema/v1beta7"
"github.com/GoogleContainerTools/skaffold/testutil"
)
Expand All @@ -32,22 +32,22 @@ func TestFindConfigs(t *testing.T) {
}{
{
files: map[string]string{
"valid.yml": validYaml(latest_v1.Version),
"valid.yml": validYaml(latestV1.Version),
"upgradeable.yaml": validYaml(v1beta7.Version),
"invalid.yaml": invalidYaml(),
},
expected: map[string]string{
"valid.yml": latest_v1.Version,
"valid.yml": latestV1.Version,
"upgradeable.yaml": v1beta7.Version,
},
},
{
files: map[string]string{
"valid.yaml": validYaml(latest_v1.Version),
"valid.yaml": validYaml(latestV1.Version),
"invalid.yaml": invalidYaml(),
},
expected: map[string]string{
"valid.yaml": latest_v1.Version,
"valid.yaml": latestV1.Version,
},
},
}
Expand Down

0 comments on commit fb9c352

Please sign in to comment.