fix lint

Author: tejal29

cmd/skaffold/app/cmd/diagnose.go

@@ -48,8 +48,8 @@ func NewCmdDiagnose() *cobra.Command {
 		WithExample("Search for configuration issues and print the effective configuration", "diagnose").
 		WithExample("Print the effective skaffold.yaml configuration for given profile", "diagnose --yaml-only --profile PROFILE").
 		WithCommonFlags().
-			WithFlags([]*Flag{
-				{Value: &yamlOnly, Name: "yaml-only", DefValue: false, Usage: "Only prints the effective skaffold.yaml configuration"}}).
+		WithFlags([]*Flag{
+			{Value: &yamlOnly, Name: "yaml-only", DefValue: false, Usage: "Only prints the effective skaffold.yaml configuration"}}).
 		NoArgs(doDiagnose)
 }
 

pkg/skaffold/deploy/helm/helm_test.go

@@ -409,21 +409,21 @@ func TestKubectlWaitForDeletions(t *testing.T) {
 		tmpDir := t.NewTempDir().Write("deployment-web.yaml", DeploymentWebYAML)
 
 		t.Override(&util.DefaultExecCommand, testutil.
-				CmdRunInputOut("kubectl --context kubecontext get -f - --ignore-not-found -ojson", DeploymentWebYAMLv1, `{
+			CmdRunInputOut("kubectl --context kubecontext get -f - --ignore-not-found -ojson", DeploymentWebYAMLv1, `{
 				"items":[
 					{"metadata":{"deletionTimestamp":"2020-07-24T12:40:32Z","name":"leeroy-web"}},
 					{"metadata":{"deletionTimestamp":"2020-07-24T12:40:32Z","name":"leeroy-app"}},
 					{"metadata":{"name":"leeroy-front"}}
 				]
 			}`).
-				AndRunInputOut("kubectl --context kubecontext get -f - --ignore-not-found -ojson", DeploymentWebYAMLv1, `{
+			AndRunInputOut("kubectl --context kubecontext get -f - --ignore-not-found -ojson", DeploymentWebYAMLv1, `{
 				"items":[
 					{"metadata":{"deletionTimestamp":"2020-07-24T12:40:32Z","name":"leeroy-web"}},
 					{"metadata":{"deletionTimestamp":"2020-07-24T12:40:32Z","name":"leeroy-app"}},
 					{"metadata":{"name":"leeroy-front"}}
 				]
 			}`).
-				AndRunInputOut("kubectl --context kubecontext get -f - --ignore-not-found -ojson", DeploymentWebYAMLv1, `{
+			AndRunInputOut("kubectl --context kubecontext get -f - --ignore-not-found -ojson", DeploymentWebYAMLv1, `{
 				"items":[
 					{"metadata":{"deletionTimestamp":"2020-07-24T12:40:32Z","name":"leeroy-web"}},
 					{"metadata":{"name":"leeroy-front"}}
@@ -464,7 +464,7 @@ func TestKubectlWaitForDeletionsFails(t *testing.T) {
 
 		t.Override(&client.Client, deployutil.MockK8sClient)
 		t.Override(&util.DefaultExecCommand, testutil.
-				CmdRunInputOut("kubectl --context kubecontext get -f - --ignore-not-found -ojson", DeploymentWebYAMLv1, `{
+			CmdRunInputOut("kubectl --context kubecontext get -f - --ignore-not-found -ojson", DeploymentWebYAMLv1, `{
 				"items":[
 					{"metadata":{"deletionTimestamp":"2020-07-24T12:40:32Z","name":"leeroy-web"}},
 					{"metadata":{"deletionTimestamp":"2020-07-24T12:40:32Z","name":"leeroy-app"}}

pkg/skaffold/deploy/kubectl/kubectl_test.go

@@ -91,11 +91,11 @@ func TestGetDockerfilesLintResults(t *testing.T) {
 						StartColumn: 1,
 						EndColumn:   0,
 						Explanation: `Found docker 'COPY' command where the source directory "." has over 1000 files.  This has the potential ` +
-								`to dramatically slow 'skaffold dev' down as skaffold watches all sources files referenced in dockerfile COPY directives ` +
-								`for changes. If you notice skaffold rebuilding images unnecessarily when non-image-critical files are modified, consider ` +
-								`changing this to 'COPY $REQUIRED_SOURCE_FILE(s) /' for each required source file instead of or adding a .dockerignore file ` +
-								`(https://docs.docker.com/engine/reference/builder/#dockerignore-file) ignoring non-image-critical files.  skaffold respects ` +
-								`files ignored via the .dockerignore`,
+							`to dramatically slow 'skaffold dev' down as skaffold watches all sources files referenced in dockerfile COPY directives ` +
+							`for changes. If you notice skaffold rebuilding images unnecessarily when non-image-critical files are modified, consider ` +
+							`changing this to 'COPY $REQUIRED_SOURCE_FILE(s) /' for each required source file instead of or adding a .dockerignore file ` +
+							`(https://docs.docker.com/engine/reference/builder/#dockerignore-file) ignoring non-image-critical files.  skaffold respects ` +
+							`files ignored via the .dockerignore`,
 					},
 				},
 			},
@@ -130,11 +130,11 @@ func TestGetDockerfilesLintResults(t *testing.T) {
 						StartColumn: 1,
 						EndColumn:   0,
 						Explanation: `Found docker 'COPY' command where the source directory "." contains a '.git' directory at .git.  This has the potential ` +
-								`to dramatically slow 'skaffold dev' down as skaffold will watch all of the files in the .git directory as skaffold watches all sources ` +
-								`files referenced in dockerfile COPY directives for changes. skaffold will likely rebuild images unnecessarily when non-image-critical ` +
-								`files are modified during any git related operation. Consider adding a .dockerignore file ` +
-								`(https://docs.docker.com/engine/reference/builder/#dockerignore-file) ignoring the '.git' directory. skaffold respects files ignored ` +
-								`via the .dockerignore`,
+							`to dramatically slow 'skaffold dev' down as skaffold will watch all of the files in the .git directory as skaffold watches all sources ` +
+							`files referenced in dockerfile COPY directives for changes. skaffold will likely rebuild images unnecessarily when non-image-critical ` +
+							`files are modified during any git related operation. Consider adding a .dockerignore file ` +
+							`(https://docs.docker.com/engine/reference/builder/#dockerignore-file) ignoring the '.git' directory. skaffold respects files ignored ` +
+							`via the .dockerignore`,
 					},
 				},
 			},

pkg/skaffold/lint/dockerfiles_test.go

@@ -246,7 +246,7 @@ func sendDiagnostics(ctx context.Context, diags map[string][]protocol.Diagnostic
 }
 
 func validateFiles(ctx context.Context,
-		opts config.SkaffoldOptions, req jsonrpc2.Request) (map[string][]protocol.Diagnostic, error) {
+	opts config.SkaffoldOptions, req jsonrpc2.Request) (map[string][]protocol.Diagnostic, error) {
 	// TODO(aaron-prindle) currently lint checks only filesystem, instead need to check VFS w/ documentManager info (validation uses VFS currently NOT lint)
 
 	// TODO(aaron-prindle) if invalid yaml and parser fails, need to handle that as well as a validation error vs server erroring
@@ -285,7 +285,7 @@ func validateFiles(ctx context.Context,
 }
 
 func lintFiles(ctx context.Context, runCtx docker.Config,
-		opts config.SkaffoldOptions, req jsonrpc2.Request) (map[string][]protocol.Diagnostic, error) {
+	opts config.SkaffoldOptions, req jsonrpc2.Request) (map[string][]protocol.Diagnostic, error) {
 	// TODO(aaron-prindle) currently lint checks only filesystem, instead need to check VFS w/ documentManager info
 	// need to make sure something like k8a-manifest.yaml comes from afero VFS and not os FS always
 	results, err := lint.GetAllLintResults(ctx, lint.Options{

pkg/skaffold/lsp/handler.go

@@ -180,8 +180,8 @@ pipeline:
 			t.Override(&util.DefaultExecCommand,
 				testutil.CmdRun(fmt.Sprintf("kpt fn render %v",
 					filepath.Join(tmpDirObj.Root(), ".kpt-pipeline"))).
-						AndRunOut(fmt.Sprintf("kpt fn source %v -o unwrap",
-							filepath.Join(tmpDirObj.Root(), ".kpt-pipeline")), ""))
+					AndRunOut(fmt.Sprintf("kpt fn source %v -o unwrap",
+						filepath.Join(tmpDirObj.Root(), ".kpt-pipeline")), ""))
 			var b bytes.Buffer
 			_, err = r.Render(context.Background(), &b, []graph.Artifact{{ImageName: "leeroy-web", Tag: "leeroy-web:v1"}},
 				false)
@@ -251,8 +251,8 @@ inventory:
 			t.Override(&util.DefaultExecCommand,
 				testutil.CmdRun(fmt.Sprintf("kpt fn render %v",
 					filepath.Join(tmpDirObj.Root(), ".kpt-pipeline"))).
-						AndRunOut(fmt.Sprintf("kpt fn source %v -o unwrap",
-							filepath.Join(tmpDirObj.Root(), ".kpt-pipeline")), ""))
+					AndRunOut(fmt.Sprintf("kpt fn source %v -o unwrap",
+						filepath.Join(tmpDirObj.Root(), ".kpt-pipeline")), ""))
 			var b bytes.Buffer
 			_, err = r.Render(context.Background(), &b, []graph.Artifact{},
 				true)

pkg/skaffold/render/renderer/kpt/kpt_test.go

@@ -96,7 +96,7 @@ func GetDeployer(ctx context.Context, runCtx *runcontext.RunContext, labeller *l
 			if nonHelmDeployFound || len(helmNamespaces) > 0 {
 				// Cloud Run doesn't support multiple deployers in the config.
 				return nil, errors.New("skaffold apply called with both Cloud Run and Kubernetes deployers. Mixing deployment targets is not allowed" +
-						" when using the Cloud Run deployer")
+					" when using the Cloud Run deployer")
 			}
 			return getCloudRunDeployer(runCtx, labeller, pipelines.Deployers(), "")
 		}