Skip to content

Commit 112b543

Browse files
committed
fix: check potential errors returned in main.go as found through static analysis
1 parent 9b05660 commit 112b543

1 file changed

Lines changed: 39 additions & 9 deletions

File tree

main.go

Lines changed: 39 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -83,11 +83,20 @@ func showTimeDuration(durations map[string]time.Duration) {
8383
if log.CurrentLevel() >= log.LevelDebug {
8484
fmt.Println()
8585
w := tabwriter.NewWriter(os.Stdout, 0, 0, 2, ' ', 0)
86-
_, _ = fmt.Fprintln(w, "STEP\tDURATION\t")
86+
_, err := fmt.Fprintln(w, "STEP\tDURATION\t")
87+
if err != nil {
88+
return
89+
}
8790
for step, duration := range durations {
88-
_, _ = fmt.Fprintf(w, "%v\t%v\t\n", step, duration.Truncate(time.Millisecond))
91+
_, err = fmt.Fprintf(w, "%v\t%v\t\n", step, duration.Truncate(time.Millisecond))
92+
if err != nil {
93+
return
94+
}
95+
}
96+
err = w.Flush()
97+
if err != nil {
98+
return
8999
}
90-
_ = w.Flush()
91100
}
92101
}
93102

@@ -97,13 +106,22 @@ func showErrorMessages(action string, errorMessages map[string]LogMessage) error
97106
fmt.Println()
98107
fmt.Printf("The following errors were encountered during %s:\n\n", action)
99108
w := tabwriter.NewWriter(os.Stdout, 0, 0, 2, ' ', 0)
100-
_, _ = fmt.Fprintln(w, "TYPE\tSTEP\tERROR\t")
109+
_, err := fmt.Fprintln(w, "TYPE\tSTEP\tERROR\t")
110+
if err != nil {
111+
return cli.Exit("", 1)
112+
}
101113
for step, logMsg := range errorMessages {
102114
if logMsg.level <= log.CurrentLevel() {
103-
_, _ = fmt.Fprintf(w, "%v\t%v\t%v\n", logMsg.level, step, logMsg.message)
115+
_, err := fmt.Fprintf(w, "%v\t%v\t%v\n", logMsg.level, step, logMsg.message)
116+
if err != nil {
117+
return cli.Exit("", 1)
118+
}
104119
}
105120
}
106-
_ = w.Flush()
121+
err = w.Flush()
122+
if err != nil {
123+
return cli.Exit("", 1)
124+
}
107125
if hasPriorityErrors(errorMessages, log.LevelError) {
108126
return cli.Exit("", 1)
109127
}
@@ -231,12 +249,21 @@ func registerRHSM(ctx *cli.Context) (string, error) {
231249
fmt.Println("Available Organizations:")
232250
writer := tabwriter.NewWriter(os.Stdout, 0, 2, 2, ' ', 0)
233251
for i, org := range orgs {
234-
_, _ = fmt.Fprintf(writer, "%v\t", org)
252+
_, err := fmt.Fprintf(writer, "%v\t", org)
253+
if err != nil {
254+
return "", fmt.Errorf("could not list organizations: %w", err)
255+
}
235256
if (i+1)%4 == 0 {
236-
_, _ = fmt.Fprint(writer, "\n")
257+
_, err := fmt.Fprint(writer, "\n")
258+
if err != nil {
259+
return "", fmt.Errorf("could not list organizations: %w", err)
260+
}
237261
}
238262
}
239-
_ = writer.Flush()
263+
err := writer.Flush()
264+
if err != nil {
265+
return "", fmt.Errorf("failed to flush writer: %w", err)
266+
}
240267
fmt.Print("\nOrganization: ")
241268
_ = scanner.Scan()
242269
organization = strings.TrimSpace(scanner.Text())
@@ -249,6 +276,9 @@ func registerRHSM(ctx *cli.Context) (string, error) {
249276

250277
// Try to register once again with given organization
251278
_, err = registerUsernamePassword(username, password, organization, contentTemplates, ctx.String("server"))
279+
if err != nil {
280+
return "", fmt.Errorf("failed to register using username/password: %w", err)
281+
}
252282
}
253283
}
254284
}

0 commit comments

Comments
 (0)