Enable extra rules and goimports

denik · denik · commit 9e750b3200b9 · 2024-12-12T09:54:31.000+01:00
diff --git a/.golangci.yaml b/.golangci.yaml
@@ -10,7 +10,7 @@ linters:
     - unused
     - gofmt
     - gofumpt
-    #- goimports
+    - goimports
 linters-settings:
   govet:
     enable-all: true
@@ -31,10 +31,8 @@ linters-settings:
       - (*github.com/spf13/pflag.FlagSet).MarkHidden
   gofumpt:
     module-path: github.com/databricks/cli
-    # Choose whether to use the extra rules.
-    # Default: false
-    #extra-rules: true
-  goimports:
-    local-prefixes: github.com/databricks/cli
+    extra-rules: true
+  #goimports:
+  #  local-prefixes: github.com/databricks/cli
 issues:
   exclude-dirs-use-default: false  # recommended by docs https://golangci-lint.run/usage/false-positives/
diff --git a/bundle/config/mutator/initialize_urls.go b/bundle/config/mutator/initialize_urls.go
@@ -38,7 +38,7 @@ func (m *initializeURLs) Apply(ctx context.Context, b *bundle.Bundle) diag.Diagn
 	return nil
 }
 
-func initializeForWorkspace(b *bundle.Bundle, orgId string, host string) error {
+func initializeForWorkspace(b *bundle.Bundle, orgId, host string) error {
 	baseURL, err := url.Parse(host)
 	if err != nil {
 		return err
diff --git a/bundle/config/mutator/python/python_mutator.go b/bundle/config/mutator/python/python_mutator.go
@@ -150,7 +150,7 @@ func createCacheDir(ctx context.Context) (string, error) {
 	return os.MkdirTemp("", "-pydabs")
 }
 
-func (m *pythonMutator) runPythonMutator(ctx context.Context, cacheDir string, rootPath string, pythonPath string, root dyn.Value) (dyn.Value, diag.Diagnostics) {
+func (m *pythonMutator) runPythonMutator(ctx context.Context, cacheDir, rootPath, pythonPath string, root dyn.Value) (dyn.Value, diag.Diagnostics) {
 	inputPath := filepath.Join(cacheDir, "input.json")
 	outputPath := filepath.Join(cacheDir, "output.json")
 	diagnosticsPath := filepath.Join(cacheDir, "diagnostics.json")
@@ -264,7 +264,7 @@ func writeInputFile(inputPath string, input dyn.Value) error {
 	return os.WriteFile(inputPath, rootConfigJson, 0o600)
 }
 
-func loadOutputFile(rootPath string, outputPath string) (dyn.Value, diag.Diagnostics) {
+func loadOutputFile(rootPath, outputPath string) (dyn.Value, diag.Diagnostics) {
 	outputFile, err := os.Open(outputPath)
 	if err != nil {
 		return dyn.InvalidValue, diag.FromErr(fmt.Errorf("failed to open output file: %w", err))
@@ -379,7 +379,7 @@ func createLoadOverrideVisitor(ctx context.Context) merge.OverrideVisitor {
 
 			return right, nil
 		},
-		VisitUpdate: func(valuePath dyn.Path, left dyn.Value, right dyn.Value) (dyn.Value, error) {
+		VisitUpdate: func(valuePath dyn.Path, left, right dyn.Value) (dyn.Value, error) {
 			return dyn.InvalidValue, fmt.Errorf("unexpected change at %q (update)", valuePath.String())
 		},
 	}
@@ -428,7 +428,7 @@ func createInitOverrideVisitor(ctx context.Context) merge.OverrideVisitor {
 
 			return right, nil
 		},
-		VisitUpdate: func(valuePath dyn.Path, left dyn.Value, right dyn.Value) (dyn.Value, error) {
+		VisitUpdate: func(valuePath dyn.Path, left, right dyn.Value) (dyn.Value, error) {
 			if !valuePath.HasPrefix(jobsPath) {
 				return dyn.InvalidValue, fmt.Errorf("unexpected change at %q (update)", valuePath.String())
 			}
diff --git a/bundle/config/mutator/python/python_mutator_test.go b/bundle/config/mutator/python/python_mutator_test.go
@@ -587,7 +587,7 @@ or activate the environment before running CLI commands:
 	assert.Equal(t, expected, out)
 }
 
-func withProcessStub(t *testing.T, args []string, output string, diagnostics string) context.Context {
+func withProcessStub(t *testing.T, args []string, output, diagnostics string) context.Context {
 	ctx := context.Background()
 	ctx, stub := process.WithStub(ctx)
 
@@ -625,7 +625,7 @@ func withProcessStub(t *testing.T, args []string, output string, diagnostics str
 	return ctx
 }
 
-func loadYaml(name string, content string) *bundle.Bundle {
+func loadYaml(name, content string) *bundle.Bundle {
 	v, diag := config.LoadFromBytes(name, []byte(content))
 
 	if diag.Error() != nil {
diff --git a/bundle/config/mutator/run_as.go b/bundle/config/mutator/run_as.go
@@ -29,7 +29,7 @@ func (m *setRunAs) Name() string {
 	return "SetRunAs"
 }
 
-func reportRunAsNotSupported(resourceType string, location dyn.Location, currentUser string, runAsUser string) diag.Diagnostics {
+func reportRunAsNotSupported(resourceType string, location dyn.Location, currentUser, runAsUser string) diag.Diagnostics {
 	return diag.Diagnostics{{
 		Summary: fmt.Sprintf("%s do not support a setting a run_as user that is different from the owner.\n"+
 			"Current identity: %s. Run as identity: %s.\n"+
diff --git a/bundle/config/mutator/sync_infer_root.go b/bundle/config/mutator/sync_infer_root.go
@@ -35,7 +35,7 @@ func (m *syncInferRoot) Name() string {
 // If the path does not exist, it returns an empty string.
 //
 // See "sync_infer_root_internal_test.go" for examples.
-func (m *syncInferRoot) computeRoot(path string, root string) string {
+func (m *syncInferRoot) computeRoot(path, root string) string {
 	for !filepath.IsLocal(path) {
 		// Break if we have reached the root of the filesystem.
 		dir := filepath.Dir(root)
diff --git a/bundle/deferred.go b/bundle/deferred.go
@@ -15,7 +15,7 @@ func (d *DeferredMutator) Name() string {
 	return "deferred"
 }
 
-func Defer(mutator Mutator, finally Mutator) Mutator {
+func Defer(mutator, finally Mutator) Mutator {
 	return &DeferredMutator{
 		mutator: mutator,
 		finally: finally,
diff --git a/bundle/deploy/state.go b/bundle/deploy/state.go
@@ -134,7 +134,7 @@ func (f Filelist) ToSlice(root vfs.Path) []fileset.File {
 	return files
 }
 
-func isLocalStateStale(local io.Reader, remote io.Reader) bool {
+func isLocalStateStale(local, remote io.Reader) bool {
 	localState, err := loadState(local)
 	if err != nil {
 		return true
diff --git a/bundle/deploy/terraform/init.go b/bundle/deploy/terraform/init.go
@@ -145,7 +145,7 @@ func inheritEnvVars(ctx context.Context, environ map[string]string) error {
 // This function is used for env vars set by the Databricks VSCode extension. The variables are intended to be used by the CLI
 // bundled with the Databricks VSCode extension, but users can use different CLI versions in the VSCode terminals, in which case we want to ignore
 // the variables if that CLI uses different versions of the dependencies.
-func getEnvVarWithMatchingVersion(ctx context.Context, envVarName string, versionVarName string, currentVersion string) (string, error) {
+func getEnvVarWithMatchingVersion(ctx context.Context, envVarName, versionVarName, currentVersion string) (string, error) {
 	envValue := env.Get(ctx, envVarName)
 	versionValue := env.Get(ctx, versionVarName)
 
diff --git a/bundle/deploy/terraform/init_test.go b/bundle/deploy/terraform/init_test.go
@@ -400,7 +400,7 @@ func TestFindExecPathFromEnvironmentWithCorrectVersionAndBinary(t *testing.T) {
 	require.Equal(t, tmpBinPath, b.Config.Bundle.Terraform.ExecPath)
 }
 
-func createTempFile(t *testing.T, dest string, name string, executable bool) string {
+func createTempFile(t *testing.T, dest, name string, executable bool) string {
 	binPath := filepath.Join(dest, name)
 	f, err := os.Create(binPath)
 	require.NoError(t, err)
diff --git a/bundle/deploy/terraform/pkg_test.go b/bundle/deploy/terraform/pkg_test.go
@@ -14,7 +14,7 @@ import (
 	"github.com/stretchr/testify/require"
 )
 
-func downloadAndChecksum(t *testing.T, url string, expectedChecksum string) {
+func downloadAndChecksum(t *testing.T, url, expectedChecksum string) {
 	resp, err := http.Get(url)
 	require.NoError(t, err)
 	defer resp.Body.Close()
diff --git a/bundle/deploy/terraform/tfdyn/convert_dashboard.go b/bundle/deploy/terraform/tfdyn/convert_dashboard.go
@@ -17,7 +17,7 @@ const (
 )
 
 // Marshal "serialized_dashboard" as JSON if it is set in the input but not in the output.
-func marshalSerializedDashboard(vin dyn.Value, vout dyn.Value) (dyn.Value, error) {
+func marshalSerializedDashboard(vin, vout dyn.Value) (dyn.Value, error) {
 	// Skip if the "serialized_dashboard" field is already set.
 	if v := vout.Get(serializedDashboardFieldName); v.IsValid() {
 		return vout, nil
diff --git a/bundle/deploy/terraform/unbind.go b/bundle/deploy/terraform/unbind.go
@@ -37,6 +37,6 @@ func (*unbind) Name() string {
 	return "terraform.Unbind"
 }
 
-func Unbind(resourceType string, resourceKey string) bundle.Mutator {
+func Unbind(resourceType, resourceKey string) bundle.Mutator {
 	return &unbind{resourceType: resourceType, resourceKey: resourceKey}
 }
diff --git a/bundle/permissions/workspace_path_permissions.go b/bundle/permissions/workspace_path_permissions.go
@@ -52,7 +52,7 @@ func (p WorkspacePathPermissions) Compare(perms []resources.Permission) diag.Dia
 }
 
 // containsAll checks if permA contains all permissions in permB.
-func containsAll(permA []resources.Permission, permB []resources.Permission) (bool, []resources.Permission) {
+func containsAll(permA, permB []resources.Permission) (bool, []resources.Permission) {
 	missing := make([]resources.Permission, 0)
 	for _, a := range permA {
 		found := false
diff --git a/bundle/phases/bind.go b/bundle/phases/bind.go
@@ -25,7 +25,7 @@ func Bind(opts *terraform.BindOptions) bundle.Mutator {
 	)
 }
 
-func Unbind(resourceType string, resourceKey string) bundle.Mutator {
+func Unbind(resourceType, resourceKey string) bundle.Mutator {
 	return newPhase(
 		"unbind",
 		[]bundle.Mutator{
diff --git a/bundle/run/pipeline.go b/bundle/run/pipeline.go
@@ -41,7 +41,7 @@ func (r *pipelineRunner) logEvent(ctx context.Context, event pipelines.PipelineE
 	}
 }
 
-func (r *pipelineRunner) logErrorEvent(ctx context.Context, pipelineId string, updateId string) error {
+func (r *pipelineRunner) logErrorEvent(ctx context.Context, pipelineId, updateId string) error {
 	w := r.bundle.WorkspaceClient()
 
 	// Note: For a 100 percent correct and complete solution we should use the
diff --git a/bundle/run/progress/pipeline.go b/bundle/run/progress/pipeline.go
@@ -51,7 +51,7 @@ type UpdateTracker struct {
 	w                    *databricks.WorkspaceClient
 }
 
-func NewUpdateTracker(pipelineId string, updateId string, w *databricks.WorkspaceClient) *UpdateTracker {
+func NewUpdateTracker(pipelineId, updateId string, w *databricks.WorkspaceClient) *UpdateTracker {
 	return &UpdateTracker{
 		w:                    w,
 		PipelineId:           pipelineId,
diff --git a/cmd/bundle/generate/utils.go b/cmd/bundle/generate/utils.go
@@ -134,7 +134,7 @@ func (n *downloader) FlushToDisk(ctx context.Context, force bool) error {
 	return errs.Wait()
 }
 
-func newDownloader(w *databricks.WorkspaceClient, sourceDir string, configDir string) *downloader {
+func newDownloader(w *databricks.WorkspaceClient, sourceDir, configDir string) *downloader {
 	return &downloader{
 		files:     make(map[string]string),
 		w:         w,
diff --git a/cmd/configure/configure_test.go b/cmd/configure/configure_test.go
@@ -31,7 +31,7 @@ func setup(t *testing.T) string {
 	return tempHomeDir
 }
 
-func getTempFileWithContent(t *testing.T, tempHomeDir string, content string) *os.File {
+func getTempFileWithContent(t *testing.T, tempHomeDir, content string) *os.File {
 	inp, err := os.CreateTemp(tempHomeDir, "input")
 	assert.NoError(t, err)
 	_, err = inp.WriteString(content)
diff --git a/internal/bundle/helpers.go b/internal/bundle/helpers.go
@@ -107,7 +107,7 @@ func deployBundleWithFlags(t *testing.T, ctx context.Context, path string, flags
 	return err
 }
 
-func runResource(t *testing.T, ctx context.Context, path string, key string) (string, error) {
+func runResource(t *testing.T, ctx context.Context, path, key string) (string, error) {
 	ctx = env.Set(ctx, "BUNDLE_ROOT", path)
 	ctx = cmdio.NewContext(ctx, cmdio.Default())
 
@@ -116,7 +116,7 @@ func runResource(t *testing.T, ctx context.Context, path string, key string) (st
 	return stdout.String(), err
 }
 
-func runResourceWithParams(t *testing.T, ctx context.Context, path string, key string, params ...string) (string, error) {
+func runResourceWithParams(t *testing.T, ctx context.Context, path, key string, params ...string) (string, error) {
 	ctx = env.Set(ctx, "BUNDLE_ROOT", path)
 	ctx = cmdio.NewContext(ctx, cmdio.Default())
 
@@ -143,7 +143,7 @@ func getBundleRemoteRootPath(w *databricks.WorkspaceClient, t *testing.T, unique
 	return root
 }
 
-func blackBoxRun(t *testing.T, root string, args ...string) (stdout string, stderr string) {
+func blackBoxRun(t *testing.T, root string, args ...string) (stdout, stderr string) {
 	gitRoot, err := folders.FindDirWithLeaf(".", ".git")
 	require.NoError(t, err)
 
diff --git a/internal/bundle/python_wheel_test.go b/internal/bundle/python_wheel_test.go
@@ -11,7 +11,7 @@ import (
 	"github.com/stretchr/testify/require"
 )
 
-func runPythonWheelTest(t *testing.T, templateName string, sparkVersion string, pythonWheelWrapper bool) {
+func runPythonWheelTest(t *testing.T, templateName, sparkVersion string, pythonWheelWrapper bool) {
 	ctx, _ := acc.WorkspaceTest(t)
 
 	nodeTypeId := internal.GetNodeTypeId(env.Get(ctx, "CLOUD_ENV"))
diff --git a/internal/bundle/spark_jar_test.go b/internal/bundle/spark_jar_test.go
@@ -12,7 +12,7 @@ import (
 	"github.com/stretchr/testify/require"
 )
 
-func runSparkJarTestCommon(t *testing.T, ctx context.Context, sparkVersion string, artifactPath string) {
+func runSparkJarTestCommon(t *testing.T, ctx context.Context, sparkVersion, artifactPath string) {
 	cloudEnv := internal.GetEnvOrSkipTest(t, "CLOUD_ENV")
 	nodeTypeId := internal.GetNodeTypeId(cloudEnv)
 	tmpDir := t.TempDir()
diff --git a/internal/dashboard_assumptions_test.go b/internal/dashboard_assumptions_test.go
@@ -98,7 +98,7 @@ func TestAccDashboardAssumptions_WorkspaceImport(t *testing.T) {
 				assert.Fail(t, "unexpected insert operation")
 				return right, nil
 			},
-			VisitUpdate: func(basePath dyn.Path, left dyn.Value, right dyn.Value) (dyn.Value, error) {
+			VisitUpdate: func(basePath dyn.Path, left, right dyn.Value) (dyn.Value, error) {
 				updatedFieldPaths = append(updatedFieldPaths, basePath.String())
 				return right, nil
 			},
diff --git a/internal/filer_test.go b/internal/filer_test.go
@@ -22,7 +22,7 @@ type filerTest struct {
 	filer.Filer
 }
 
-func (f filerTest) assertContents(ctx context.Context, name string, contents string) {
+func (f filerTest) assertContents(ctx context.Context, name, contents string) {
 	reader, err := f.Read(ctx, name)
 	if !assert.NoError(f, err) {
 		return
@@ -39,7 +39,7 @@ func (f filerTest) assertContents(ctx context.Context, name string, contents str
 	assert.Equal(f, contents, body.String())
 }
 
-func (f filerTest) assertContentsJupyter(ctx context.Context, name string, language string) {
+func (f filerTest) assertContentsJupyter(ctx context.Context, name, language string) {
 	reader, err := f.Read(ctx, name)
 	if !assert.NoError(f, err) {
 		return
diff --git a/internal/helpers.go b/internal/helpers.go
@@ -279,7 +279,7 @@ func (t *cobraTestRunner) Run() (bytes.Buffer, bytes.Buffer, error) {
 }
 
 // Like [require.Eventually] but errors if the underlying command has failed.
-func (c *cobraTestRunner) Eventually(condition func() bool, waitFor time.Duration, tick time.Duration, msgAndArgs ...any) {
+func (c *cobraTestRunner) Eventually(condition func() bool, waitFor, tick time.Duration, msgAndArgs ...any) {
 	ch := make(chan bool, 1)
 
 	timer := time.NewTimer(waitFor)
@@ -362,7 +362,7 @@ func readFile(t *testing.T, name string) string {
 	return string(b)
 }
 
-func writeFile(t *testing.T, name string, body string) string {
+func writeFile(t *testing.T, name, body string) string {
 	f, err := os.Create(filepath.Join(t.TempDir(), name))
 	require.NoError(t, err)
 	_, err = f.WriteString(body)
diff --git a/internal/sync_test.go b/internal/sync_test.go
@@ -145,7 +145,7 @@ func (a *syncTest) remoteDirContent(ctx context.Context, relativeDir string, exp
 	}
 }
 
-func (a *syncTest) remoteFileContent(ctx context.Context, relativePath string, expectedContent string) {
+func (a *syncTest) remoteFileContent(ctx context.Context, relativePath, expectedContent string) {
 	filePath := path.Join(a.remoteRoot, relativePath)
 
 	// Remove leading "/" so we can use it in the URL.
@@ -181,7 +181,7 @@ func (a *syncTest) touchFile(ctx context.Context, path string) {
 	require.NoError(a.t, err)
 }
 
-func (a *syncTest) objectType(ctx context.Context, relativePath string, expected string) {
+func (a *syncTest) objectType(ctx context.Context, relativePath, expected string) {
 	path := path.Join(a.remoteRoot, relativePath)
 
 	a.c.Eventually(func() bool {
@@ -193,7 +193,7 @@ func (a *syncTest) objectType(ctx context.Context, relativePath string, expected
 	}, 30*time.Second, 5*time.Second)
 }
 
-func (a *syncTest) language(ctx context.Context, relativePath string, expected string) {
+func (a *syncTest) language(ctx context.Context, relativePath, expected string) {
 	path := path.Join(a.remoteRoot, relativePath)
 
 	a.c.Eventually(func() bool {
diff --git a/internal/workspace_test.go b/internal/workspace_test.go
@@ -71,14 +71,14 @@ func setupWorkspaceImportExportTest(t *testing.T) (context.Context, filer.Filer,
 	return ctx, f, tmpdir
 }
 
-func assertLocalFileContents(t *testing.T, path string, content string) {
+func assertLocalFileContents(t *testing.T, path, content string) {
 	require.FileExists(t, path)
 	b, err := os.ReadFile(path)
 	require.NoError(t, err)
 	assert.Contains(t, string(b), content)
 }
 
-func assertFilerFileContents(t *testing.T, ctx context.Context, f filer.Filer, path string, content string) {
+func assertFilerFileContents(t *testing.T, ctx context.Context, f filer.Filer, path, content string) {
 	r, err := f.Read(ctx, path)
 	require.NoError(t, err)
 	b, err := io.ReadAll(r)
diff --git a/libs/cmdio/io.go b/libs/cmdio/io.go
@@ -31,7 +31,7 @@ type cmdIO struct {
 	err            io.Writer
 }
 
-func NewIO(outputFormat flags.Output, in io.Reader, out io.Writer, err io.Writer, headerTemplate, template string) *cmdIO {
+func NewIO(outputFormat flags.Output, in io.Reader, out, err io.Writer, headerTemplate, template string) *cmdIO {
 	// The check below is similar to color.NoColor but uses the specified err writer.
 	dumb := os.Getenv("NO_COLOR") != "" || os.Getenv("TERM") == "dumb"
 	if f, ok := err.(*os.File); ok && !dumb {
diff --git a/libs/cmdio/logger.go b/libs/cmdio/logger.go
@@ -151,7 +151,7 @@ func (l *Logger) AskSelect(question string, choices []string) (string, error) {
 	return ans, nil
 }
 
-func (l *Logger) Ask(question string, defaultVal string) (string, error) {
+func (l *Logger) Ask(question, defaultVal string) (string, error) {
 	if l.Mode == flags.ModeJson {
 		return "", fmt.Errorf("question prompts are not supported in json mode")
 	}
diff --git a/libs/dyn/dynassert/assert.go b/libs/dyn/dynassert/assert.go
diff --git a/libs/dyn/mapping.go b/libs/dyn/mapping.go
diff --git a/libs/dyn/merge/override.go b/libs/dyn/merge/override.go
diff --git a/libs/dyn/merge/override_test.go b/libs/dyn/merge/override_test.go
diff --git a/libs/exec/shell.go b/libs/exec/shell.go
diff --git a/libs/filer/workspace_files_extensions_client_test.go b/libs/filer/workspace_files_extensions_client_test.go
diff --git a/libs/folders/folders.go b/libs/folders/folders.go
diff --git a/libs/git/repository_test.go b/libs/git/repository_test.go
diff --git a/libs/locker/locker.go b/libs/locker/locker.go
diff --git a/libs/sync/diff.go b/libs/sync/diff.go
diff --git a/libs/sync/event.go b/libs/sync/event.go
diff --git a/libs/template/renderer_test.go b/libs/template/renderer_test.go

Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,7 @@ func (m initializeURLs) Apply(ctx context.Context, b bundle.Bundle) diag.Diagn`
`38`	`38`	`return nil`
`39`	`39`	`}`
`40`	`40`
`41`		`-func initializeForWorkspace(b *bundle.Bundle, orgId string, host string) error {`
	`41`	`+func initializeForWorkspace(b *bundle.Bundle, orgId, host string) error {`
`42`	`42`	`baseURL, err := url.Parse(host)`
`43`	`43`	`if err != nil {`
`44`	`44`	`return err`
Original file line number	Diff line number	Diff line change
`@@ -587,7 +587,7 @@ or activate the environment before running CLI commands:`
`587`	`587`	`assert.Equal(t, expected, out)`
`588`	`588`	`}`
`589`	`589`
`590`		`-func withProcessStub(t *testing.T, args []string, output string, diagnostics string) context.Context {`
	`590`	`+func withProcessStub(t *testing.T, args []string, output, diagnostics string) context.Context {`
`591`	`591`	`ctx := context.Background()`
`592`	`592`	`ctx, stub := process.WithStub(ctx)`
`593`	`593`
`@@ -625,7 +625,7 @@ func withProcessStub(t *testing.T, args []string, output string, diagnostics str`
`625`	`625`	`return ctx`
`626`	`626`	`}`
`627`	`627`
`628`		`-func loadYaml(name string, content string) *bundle.Bundle {`
	`628`	`+func loadYaml(name, content string) *bundle.Bundle {`
`629`	`629`	`v, diag := config.LoadFromBytes(name, []byte(content))`
`630`	`630`
`631`	`631`	`if diag.Error() != nil {`
Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ func (m *setRunAs) Name() string {`
`29`	`29`	`return "SetRunAs"`
`30`	`30`	`}`
`31`	`31`
`32`		`-func reportRunAsNotSupported(resourceType string, location dyn.Location, currentUser string, runAsUser string) diag.Diagnostics {`
	`32`	`+func reportRunAsNotSupported(resourceType string, location dyn.Location, currentUser, runAsUser string) diag.Diagnostics {`
`33`	`33`	`return diag.Diagnostics{{`
`34`	`34`	`Summary: fmt.Sprintf("%s do not support a setting a run_as user that is different from the owner.\n"+`
`35`	`35`	`"Current identity: %s. Run as identity: %s.\n"+`
Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ func (d *DeferredMutator) Name() string {`
`15`	`15`	`return "deferred"`
`16`	`16`	`}`
`17`	`17`
`18`		`-func Defer(mutator Mutator, finally Mutator) Mutator {`
	`18`	`+func Defer(mutator, finally Mutator) Mutator {`
`19`	`19`	`return &DeferredMutator{`
`20`	`20`	`mutator: mutator,`
`21`	`21`	`finally: finally,`
Original file line number	Diff line number	Diff line change
`@@ -134,7 +134,7 @@ func (f Filelist) ToSlice(root vfs.Path) []fileset.File {`
`134`	`134`	`return files`
`135`	`135`	`}`
`136`	`136`
`137`		`-func isLocalStateStale(local io.Reader, remote io.Reader) bool {`
	`137`	`+func isLocalStateStale(local, remote io.Reader) bool {`
`138`	`138`	`localState, err := loadState(local)`
`139`	`139`	`if err != nil {`
`140`	`140`	`return true`
Original file line number	Diff line number	Diff line change
`@@ -400,7 +400,7 @@ func TestFindExecPathFromEnvironmentWithCorrectVersionAndBinary(t *testing.T) {`
`400`	`400`	`require.Equal(t, tmpBinPath, b.Config.Bundle.Terraform.ExecPath)`
`401`	`401`	`}`
`402`	`402`
`403`		`-func createTempFile(t *testing.T, dest string, name string, executable bool) string {`
	`403`	`+func createTempFile(t *testing.T, dest, name string, executable bool) string {`
`404`	`404`	`binPath := filepath.Join(dest, name)`
`405`	`405`	`f, err := os.Create(binPath)`
`406`	`406`	`require.NoError(t, err)`