From ca82a59e5856b82fc0ebd97d0af07514c3fdbfb7 Mon Sep 17 00:00:00 2001 From: Matthias Diester Date: Tue, 18 Jan 2022 17:04:15 +0100 Subject: [PATCH] Fix `golangci-lint` findings Add error handling where required. Add error ignore for print and similar instructions. --- internal/cmd/buildrun-series.go | 12 ++++++------ internal/cmd/buildrun-single.go | 12 ++++++------ internal/cmd/buildrun-testplan.go | 2 +- internal/cmd/common.go | 9 ++++++--- 4 files changed, 19 insertions(+), 16 deletions(-) diff --git a/internal/cmd/buildrun-series.go b/internal/cmd/buildrun-series.go index 6806b772..f380eaa0 100644 --- a/internal/cmd/buildrun-series.go +++ b/internal/cmd/buildrun-series.go @@ -74,13 +74,13 @@ var buildRunSeriesCmd = &cobra.Command{ return err } - store(buildRunSeriesCmdSettings.htmlOutput, func(w io.Writer) error { - return load.CreateChartJS(results, w) - }) + if err := store(buildRunSeriesCmdSettings.htmlOutput, func(w io.Writer) error { return load.CreateChartJS(results, w) }); err != nil { + return err + } - store(buildRunSeriesCmdSettings.csvOutput, func(w io.Writer) error { - return load.CreateResultSetCSV(results, w) - }) + if err := store(buildRunSeriesCmdSettings.csvOutput, func(w io.Writer) error { return load.CreateResultSetCSV(results, w) }); err != nil { + return err + } return nil }, diff --git a/internal/cmd/buildrun-single.go b/internal/cmd/buildrun-single.go index f4aefc88..47856ccd 100644 --- a/internal/cmd/buildrun-single.go +++ b/internal/cmd/buildrun-single.go @@ -56,13 +56,13 @@ var buildRunOnceCmd = &cobra.Command{ return err } - store(buildRunOnceCmdSettings.htmlOutput, func(w io.Writer) error { - return load.CreateBuildrunResultsChartJS(buildRunResults, w) - }) + if err := store(buildRunOnceCmdSettings.htmlOutput, func(w io.Writer) error { return load.CreateBuildrunResultsChartJS(buildRunResults, w) }); err != nil { + return err + } - store(buildRunOnceCmdSettings.csvOutput, func(w io.Writer) error { - return load.CreateResultsCSV(buildRunResults, w) - }) + if err := store(buildRunOnceCmdSettings.csvOutput, func(w io.Writer) error { return load.CreateResultsCSV(buildRunResults, w) }); err != nil { + return err + } fmt.Print(load.CalculateResultSet(buildRunResults, "buildrun")) diff --git a/internal/cmd/buildrun-testplan.go b/internal/cmd/buildrun-testplan.go index e882b74c..0a43a0ae 100644 --- a/internal/cmd/buildrun-testplan.go +++ b/internal/cmd/buildrun-testplan.go @@ -102,7 +102,7 @@ func init() { buildRunTestplanCmd.Flags().BoolVar(&buildRunTestplanCmdSettings.generateServiceAccount, "generate-service-account", true, "generate service account for build") buildRunTestplanCmd.Flags().StringVar(&buildRunTestplanCmdSettings.testplanPath, "testplan", "", "testplan configuration file") - cobra.MarkFlagRequired(buildRunTestplanCmd.Flags(), "testplan") + _ = cobra.MarkFlagRequired(buildRunTestplanCmd.Flags(), "testplan") } func loadTestPlan(path string) (*load.TestPlan, error) { diff --git a/internal/cmd/common.go b/internal/cmd/common.go index ca3c5235..f410a11f 100644 --- a/internal/cmd/common.go +++ b/internal/cmd/common.go @@ -85,8 +85,8 @@ func applyBuildRunSettingsFlags(cmd *cobra.Command, buildCfg *load.BuildConfig) pf.BoolVar(&buildCfg.SkipDelete, "skip-delete", false, "skip the clean-up of resources, which means no deletion of build, buildrun, and output image") - cobra.MarkFlagRequired(pf, "source-url") - cobra.MarkFlagRequired(pf, "output-image-url") + _ = cobra.MarkFlagRequired(pf, "source-url") + _ = cobra.MarkFlagRequired(pf, "output-image-url") } func store(filename string, f func(w io.Writer) error) error { @@ -95,6 +95,9 @@ func store(filename string, f func(w io.Writer) error) error { } var buf bytes.Buffer - f(&buf) + if err := f(&buf); err != nil { + return err + } + return ioutil.WriteFile(filename, buf.Bytes(), os.FileMode(0644)) }