Skip to content

Commit

Permalink
fix: Do not use non-constant format string with Printf
Browse files Browse the repository at this point in the history
* Fix some code style issues and make code linter more happy
  • Loading branch information
jirihnidek committed Sep 2, 2024
1 parent 1490c11 commit d79ca95
Showing 1 changed file with 18 additions and 15 deletions.
33 changes: 18 additions & 15 deletions main.go
Original file line number Diff line number Diff line change
Expand Up @@ -298,18 +298,20 @@ func connectAction(ctx *cli.Context) error {
message: fmt.Errorf("cannot connect to Red Hat Subscription Management: %w",
err)}
fmt.Printf(
uiSettings.iconError + " Cannot connect to Red Hat Subscription Management\n",
"%v Cannot connect to Red Hat Subscription Management\n",
uiSettings.iconError,
)
} else {
fmt.Printf(uiSettings.iconOK + " " + returnedMsg + "\n")
fmt.Printf("%v %v\n", uiSettings.iconOK, returnedMsg)
}
durations["rhsm"] = time.Since(start)

/* 2. Register insights-client */
if errors, exist := errorMessages["rhsm"]; exist {
if errors.level == log.LevelError {
fmt.Printf(
uiSettings.iconError + " Skipping connection to Red Hat Insights\n",
"%v Skipping connection to Red Hat Insights\n",
uiSettings.iconError,
)
}
} else {
Expand All @@ -320,9 +322,9 @@ func connectAction(ctx *cli.Context) error {
level: log.LevelError,
message: fmt.Errorf("cannot connect to Red Hat Insights: %w",
err)}
fmt.Printf(uiSettings.iconError + " Cannot connect to Red Hat Insights\n")
fmt.Printf("%v Cannot connect to Red Hat Insights\n", uiSettings.iconError)
} else {
fmt.Printf(uiSettings.iconOK + " Connected to Red Hat Insights\n")
fmt.Printf("%v Connected to Red Hat Insights\n", uiSettings.iconOK)
}
durations["insights"] = time.Since(start)
}
Expand All @@ -331,7 +333,8 @@ func connectAction(ctx *cli.Context) error {
if errors, exist := errorMessages["rhsm"]; exist {
if errors.level == log.LevelError {
fmt.Printf(
uiSettings.iconError+" Skipping activation of %v service\n",
"%v Skipping activation of %v service\n",
uiSettings.iconError,
ServiceName,
)
}
Expand All @@ -344,9 +347,9 @@ func connectAction(ctx *cli.Context) error {
level: log.LevelError,
message: fmt.Errorf("cannot activate %s service: %w",
ServiceName, err)}
fmt.Printf(uiSettings.iconError+" Cannot activate the %v service\n", ServiceName)
fmt.Printf("%v Cannot activate the %v service\n", uiSettings.iconError, ServiceName)
} else {
fmt.Printf(uiSettings.iconOK+" Activated the %v service\n", ServiceName)
fmt.Printf("%v Activated the %v service\n", uiSettings.iconOK, ServiceName)
}
durations[ServiceName] = time.Since(start)
}
Expand Down Expand Up @@ -379,7 +382,7 @@ func connectAction(ctx *cli.Context) error {
message: fmt.Errorf("cannot get the user profile: %w",
err)}
} else {
fmt.Printf(uiSettings.iconInfo + " Enabled console.redhat.com services: ")
fmt.Printf("%v Enabled console.redhat.com services: ", uiSettings.iconInfo)
showConfProfile(&profile)
fmt.Printf("\n")
}
Expand Down Expand Up @@ -520,10 +523,10 @@ func disconnectAction(ctx *cli.Context) error {
message: fmt.Errorf(errMsg)}

Check failure on line 523 in main.go

View workflow job for this annotation

GitHub Actions / Lint code

printf: non-constant format string in call to fmt.Errorf (govet)
disconnectResult.YggdrasilStopped = false
disconnectResult.YggdrasilStoppedError = errMsg
interactivePrintf(uiSettings.iconError + " " + errMsg + "\n")
interactivePrintf("%v %v\n", uiSettings.iconError, errMsg)
} else {
disconnectResult.YggdrasilStopped = true
interactivePrintf(uiSettings.iconOK+" Deactivated the %v service\n", ServiceName)
interactivePrintf("%v Deactivated the %v service\n", uiSettings.iconOK, ServiceName)
}
durations[ServiceName] = time.Since(start)

Expand All @@ -537,10 +540,10 @@ func disconnectAction(ctx *cli.Context) error {
message: fmt.Errorf(errMsg)}

Check failure on line 540 in main.go

View workflow job for this annotation

GitHub Actions / Lint code

printf: non-constant format string in call to fmt.Errorf (govet)
disconnectResult.InsightsDisconnected = false
disconnectResult.InsightsDisconnectedError = errMsg
interactivePrintf(uiSettings.iconError + " " + errMsg + "\n")
interactivePrintf("%v %v\n", uiSettings.iconError, errMsg)
} else {
disconnectResult.InsightsDisconnected = true
interactivePrintf(uiSettings.iconOK + " Disconnected from Red Hat Insights\n")
interactivePrintf("%v Disconnected from Red Hat Insights\n", uiSettings.iconOK)
}
durations["insights"] = time.Since(start)

Expand All @@ -556,10 +559,10 @@ func disconnectAction(ctx *cli.Context) error {

disconnectResult.RHSMDisconnected = false
disconnectResult.RHSMDisconnectedError = errMsg
interactivePrintf(uiSettings.iconError + " " + errMsg + "\n")
interactivePrintf("%v %v\n", uiSettings.iconError, errMsg)
} else {
disconnectResult.RHSMDisconnected = true
interactivePrintf(uiSettings.iconOK + " Disconnected from Red Hat Subscription Management\n")
interactivePrintf("%v Disconnected from Red Hat Subscription Management\n", uiSettings.iconOK)
}
durations["rhsm"] = time.Since(start)

Expand Down

0 comments on commit d79ca95

Please sign in to comment.