From 583f6f2ac1f22c6b66048130f1ab4800be113d28 Mon Sep 17 00:00:00 2001 From: Denis Bilenko Date: Mon, 9 Dec 2024 13:12:03 +0100 Subject: [PATCH] clean up --- bundle/config/mutator/initialize_urls.go | 3 ++- .../config/mutator/resolve_resource_references.go | 5 +---- bundle/render/render_text_output.go | 6 ++++-- cmd/auth/describe.go | 3 ++- cmd/bundle/debug/terraform.go | 10 ++-------- cmd/bundle/run.go | 6 ++++-- cmd/root/auth.go | 4 +--- cmd/root/bundle.go | 12 +++--------- cmd/root/logger.go | 5 +++-- cmd/root/progress_logger.go | 8 ++------ libs/process/stub.go | 13 ++++++++----- libs/sync/output.go | 15 +++------------ 12 files changed, 35 insertions(+), 55 deletions(-) diff --git a/bundle/config/mutator/initialize_urls.go b/bundle/config/mutator/initialize_urls.go index d6a92da4c..4cf7ed72c 100644 --- a/bundle/config/mutator/initialize_urls.go +++ b/bundle/config/mutator/initialize_urls.go @@ -32,7 +32,8 @@ func (m *initializeURLs) Apply(ctx context.Context, b *bundle.Bundle) diag.Diagn } orgId := strconv.FormatInt(workspaceId, 10) host := b.WorkspaceClient().Config.CanonicalHostName() - if err := initializeForWorkspace(b, orgId, host); err != nil { + err = initializeForWorkspace(b, orgId, host) + if err != nil { return diag.FromErr(err) } return nil diff --git a/bundle/config/mutator/resolve_resource_references.go b/bundle/config/mutator/resolve_resource_references.go index cb4c8223c..bf902f928 100644 --- a/bundle/config/mutator/resolve_resource_references.go +++ b/bundle/config/mutator/resolve_resource_references.go @@ -36,10 +36,7 @@ func (m *resolveResourceReferences) Apply(ctx context.Context, b *bundle.Bundle) return fmt.Errorf("failed to resolve %s, err: %w", v.Lookup, err) } - if err := v.Set(id); err != nil { - return err - } - return nil + return v.Set(id) }) } diff --git a/bundle/render/render_text_output.go b/bundle/render/render_text_output.go index af437d9be..bf7c9a53a 100644 --- a/bundle/render/render_text_output.go +++ b/bundle/render/render_text_output.go @@ -171,12 +171,14 @@ func RenderDiagnostics(out io.Writer, b *bundle.Bundle, diags diag.Diagnostics, if err != nil { return fmt.Errorf("failed to render summary: %w", err) } - if _, err := io.WriteString(out, "\n"); err != nil { + _, err = io.WriteString(out, "\n") + if err != nil { return err } } trailer := buildTrailer(diags) - if _, err := io.WriteString(out, trailer); err != nil { + _, err = io.WriteString(out, trailer) + if err != nil { return err } } diff --git a/cmd/auth/describe.go b/cmd/auth/describe.go index 16c5fe466..c5fa8d26b 100644 --- a/cmd/auth/describe.go +++ b/cmd/auth/describe.go @@ -141,7 +141,8 @@ func render(ctx context.Context, cmd *cobra.Command, status *authStatus, templat if err != nil { return err } - if _, err := cmd.OutOrStdout().Write(buf); err != nil { + _, err = cmd.OutOrStdout().Write(buf) + if err != nil { return err } default: diff --git a/cmd/bundle/debug/terraform.go b/cmd/bundle/debug/terraform.go index c2b4e8f7a..c7d49ebb2 100644 --- a/cmd/bundle/debug/terraform.go +++ b/cmd/bundle/debug/terraform.go @@ -60,19 +60,13 @@ For more information about filesystem mirrors, see the Terraform documentation: } switch root.OutputType(cmd) { case flags.OutputText: - err := cmdio.Render(cmd.Context(), dependencies.Terraform) - if err != nil { - return err - } + _ = cmdio.Render(cmd.Context(), dependencies.Terraform) case flags.OutputJSON: buf, err := json.MarshalIndent(dependencies, "", " ") if err != nil { return err } - _, err = cmd.OutOrStdout().Write(buf) - if err != nil { - return err - } + _, _ = cmd.OutOrStdout().Write(buf) default: return fmt.Errorf("unknown output type %s", root.OutputType(cmd)) } diff --git a/cmd/bundle/run.go b/cmd/bundle/run.go index 41068ef52..3bcebddd5 100644 --- a/cmd/bundle/run.go +++ b/cmd/bundle/run.go @@ -159,7 +159,8 @@ task or a Python wheel task, the second example applies. if err != nil { return err } - if _, err := cmd.OutOrStdout().Write([]byte(resultString)); err != nil { + _, err = cmd.OutOrStdout().Write([]byte(resultString)) + if err != nil { return err } case flags.OutputJSON: @@ -167,7 +168,8 @@ task or a Python wheel task, the second example applies. if err != nil { return err } - if _, err := cmd.OutOrStdout().Write(b); err != nil { + _, err = cmd.OutOrStdout().Write(b) + if err != nil { return err } default: diff --git a/cmd/root/auth.go b/cmd/root/auth.go index 4a5a9eb88..a39ab15e1 100644 --- a/cmd/root/auth.go +++ b/cmd/root/auth.go @@ -37,9 +37,7 @@ func (e ErrNoAccountProfiles) Error() string { func initProfileFlag(cmd *cobra.Command) { cmd.PersistentFlags().StringP("profile", "p", "", "~/.databrickscfg profile") - if err := cmd.RegisterFlagCompletionFunc("profile", profile.ProfileCompletion); err != nil { - panic(err) - } + _ = cmd.RegisterFlagCompletionFunc("profile", profile.ProfileCompletion) } func profileFlagValue(cmd *cobra.Command) (string, bool) { diff --git a/cmd/root/bundle.go b/cmd/root/bundle.go index ec72e3b67..5d7e8909e 100644 --- a/cmd/root/bundle.go +++ b/cmd/root/bundle.go @@ -146,19 +146,13 @@ func targetCompletion(cmd *cobra.Command, args []string, toComplete string) ([]s func initTargetFlag(cmd *cobra.Command) { // To operate in the context of a bundle, all commands must take an "target" parameter. cmd.PersistentFlags().StringP("target", "t", "", "bundle target to use (if applicable)") - if err := cmd.RegisterFlagCompletionFunc("target", targetCompletion); err != nil { - panic(err) - } + _ = cmd.RegisterFlagCompletionFunc("target", targetCompletion) } // DEPRECATED flag func initEnvironmentFlag(cmd *cobra.Command) { // To operate in the context of a bundle, all commands must take an "environment" parameter. cmd.PersistentFlags().StringP("environment", "e", "", "bundle target to use (if applicable)") - if err := cmd.PersistentFlags().MarkDeprecated("environment", "use --target flag instead"); err != nil { - panic(err) - } - if err := cmd.RegisterFlagCompletionFunc("environment", targetCompletion); err != nil { - panic(err) - } + _ = cmd.PersistentFlags().MarkDeprecated("environment", "use --target flag instead") + _ = cmd.RegisterFlagCompletionFunc("environment", targetCompletion) } diff --git a/cmd/root/logger.go b/cmd/root/logger.go index a2c2cc49a..7ea090bab 100644 --- a/cmd/root/logger.go +++ b/cmd/root/logger.go @@ -45,8 +45,9 @@ func (f *logFlags) makeLogHandler(opts slog.HandlerOptions) (slog.Handler, error func (f *logFlags) initializeContext(ctx context.Context) (context.Context, error) { if f.debug { - if err := f.level.Set("debug"); err != nil { - panic(err) + err := f.level.Set("debug") + if err != nil { + return nil, err } } diff --git a/cmd/root/progress_logger.go b/cmd/root/progress_logger.go index 2a749425e..3d643cadb 100644 --- a/cmd/root/progress_logger.go +++ b/cmd/root/progress_logger.go @@ -59,16 +59,12 @@ func initProgressLoggerFlag(cmd *cobra.Command, logFlags *logFlags) *progressLog // Configure defaults from environment, if applicable. // If the provided value is invalid it is ignored. if v, ok := env.Lookup(cmd.Context(), envProgressFormat); ok { - if err := f.ProgressLogFormat.Set(v); err != nil { - panic(err) - } + _ = f.ProgressLogFormat.Set(v) } flags := cmd.PersistentFlags() flags.Var(&f.ProgressLogFormat, "progress-format", "format for progress logs (append, inplace, json)") - if err := flags.MarkHidden("progress-format"); err != nil { - panic(err) - } + _ = flags.MarkHidden("progress-format") _ = cmd.RegisterFlagCompletionFunc("progress-format", f.ProgressLogFormat.Complete) return &f } diff --git a/libs/process/stub.go b/libs/process/stub.go index 422f02b22..3f80a91ba 100644 --- a/libs/process/stub.go +++ b/libs/process/stub.go @@ -148,17 +148,20 @@ func (s *processStub) run(cmd *exec.Cmd) error { if !re.MatchString(norm) { continue } + err := resp.err if resp.stdout != "" { - if _, err := cmd.Stdout.Write([]byte(resp.stdout)); err != nil { - return err + _, err1 := cmd.Stdout.Write([]byte(resp.stdout)) + if err == nil { + err = err1 } } if resp.stderr != "" { - if _, err := cmd.Stderr.Write([]byte(resp.stderr)); err != nil { - return err + _, err1 := cmd.Stderr.Write([]byte(resp.stderr)) + if err == nil { + err = err1 } } - return resp.err + return err } if s.callback != nil { return s.callback(cmd) diff --git a/libs/sync/output.go b/libs/sync/output.go index 5d41635ad..e6ac8c56c 100644 --- a/libs/sync/output.go +++ b/libs/sync/output.go @@ -43,18 +43,9 @@ func TextOutput(ctx context.Context, ch <-chan Event, w io.Writer) { // Log only if something actually happened. // Sync events produce an empty string if nothing happened. if str := e.String(); str != "" { - _, err := bw.WriteString(str) - if err != nil { - panic(err) - } - _, err = bw.WriteString("\n") - if err != nil { - panic(err) - } - err = bw.Flush() - if err != nil { - panic(err) - } + _, _ = bw.WriteString(str) + _, _ = bw.WriteString("\n") + _ = bw.Flush() } } }