Skip to content

Commit 48271e8

Browse files
Additional fixes in the code
Signed-off-by: Furkat Gofurov <furkat.gofurov@suse.com>
1 parent 787ad05 commit 48271e8

File tree

5 files changed

+16
-16
lines changed

5 files changed

+16
-16
lines changed

cmd/plugin/cmd/upgrade_plan.go

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -178,10 +178,14 @@ func runUpgradePlan() error {
178178

179179
w := tabwriter.NewWriter(os.Stdout, 10, 4, 3, ' ', 0)
180180

181-
fmt.Fprintln(w, "NAME\tNAMESPACE\tTYPE\tCURRENT VERSION\tNEXT VERSION")
181+
if _, err := fmt.Fprintln(w, "NAME\tNAMESPACE\tTYPE\tCURRENT VERSION\tNEXT VERSION"); err != nil {
182+
return err
183+
}
182184

183185
for _, upgradeItem := range upgradePlan.Providers {
184-
fmt.Fprintf(w, "%s\t%s\t%s\t%s\t%s\n", upgradeItem.Name, upgradeItem.Namespace, upgradeItem.Type, upgradeItem.CurrentVersion, prettifyTargetVersion(upgradeItem.NextVersion))
186+
if _, err := fmt.Fprintf(w, "%s\t%s\t%s\t%s\t%s\n", upgradeItem.Name, upgradeItem.Namespace, upgradeItem.Type, upgradeItem.CurrentVersion, prettifyTargetVersion(upgradeItem.NextVersion)); err != nil {
187+
return err
188+
}
185189

186190
if upgradeItem.NextVersion != "" {
187191
upgradeAvailable = true

internal/controller/component_customizer.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,8 @@ func customizeDeployment(dSpec *operatorv1.DeploymentSpec, mSpec *operatorv1.Man
145145

146146
func customizeDeploymentSpec(dSpec operatorv1.DeploymentSpec, d *appsv1.Deployment) {
147147
if dSpec.Replicas != nil {
148-
d.Spec.Replicas = ptr.To(int32(*dSpec.Replicas))
148+
replicas := int32(*dSpec.Replicas) //nolint:gosec
149+
d.Spec.Replicas = ptr.To(replicas)
149150
}
150151

151152
if dSpec.Affinity != nil {

internal/controller/genericprovider_controller.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,7 @@ func (r *GenericProviderReconciler) reconcile(ctx context.Context, provider gene
182182
if err != nil {
183183
var pe *PhaseError
184184
if errors.As(err, &pe) {
185-
conditions.Set(provider, conditions.FalseCondition(pe.Type, pe.Reason, pe.Severity, err.Error()))
185+
conditions.Set(provider, conditions.FalseCondition(pe.Type, pe.Reason, pe.Severity, "%s", err.Error()))
186186
}
187187
}
188188

@@ -214,7 +214,7 @@ func (r *GenericProviderReconciler) reconcileDelete(ctx context.Context, provide
214214
if err != nil {
215215
var pe *PhaseError
216216
if errors.As(err, &pe) {
217-
conditions.Set(provider, conditions.FalseCondition(pe.Type, pe.Reason, pe.Severity, err.Error()))
217+
conditions.Set(provider, conditions.FalseCondition(pe.Type, pe.Reason, pe.Severity, "%s", err.Error()))
218218
}
219219
}
220220

internal/controller/oci_source.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ func (m mapStore) Exists(ctx context.Context, target ocispec.Descriptor) (bool,
125125

126126
// Fetch implements oras.Target.
127127
func (m mapStore) Fetch(ctx context.Context, target ocispec.Descriptor) (io.ReadCloser, error) {
128-
return nil, nil
128+
return nil, nil //nolint:nilnil
129129
}
130130

131131
// Push implements oras.Target.

internal/controller/preflight_checks.go

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -45,10 +45,6 @@ var (
4545
moreThanOneCoreProviderInstanceExistsMessage = "CoreProvider already exists in the cluster. Only one is allowed."
4646
moreThanOneProviderInstanceExistsMessage = "There is already a %s with name %s in the cluster. Only one is allowed."
4747
capiVersionIncompatibilityMessage = "CAPI operator is only compatible with %s providers, detected %s for provider %s."
48-
invalidGithubTokenMessage = "Invalid github token, please check your github token value and its permissions" //nolint:gosec
49-
waitingForCoreProviderReadyMessage = "Waiting for the core provider to be installed."
50-
incorrectCoreProviderNameMessage = "Incorrect CoreProvider name: %s. It should be %s"
51-
unsupportedProviderDowngradeMessage = "Downgrade is not supported for provider %s"
5248
)
5349

5450
// preflightChecks performs preflight checks before installing provider.
@@ -73,7 +69,7 @@ func preflightChecks(ctx context.Context, c client.Client, provider genericprovi
7369
operatorv1.PreflightCheckCondition,
7470
operatorv1.IncorrectCoreProviderNameReason,
7571
clusterv1.ConditionSeverityError,
76-
fmt.Sprintf(incorrectCoreProviderNameMessage, provider.GetName(), configclient.ClusterAPIProviderName),
72+
"Incorrect CoreProvider name",
7773
))
7874

7975
return ctrl.Result{}, fmt.Errorf("incorrect CoreProvider name: %s, it should be %s", provider.GetName(), configclient.ClusterAPIProviderName)
@@ -129,7 +125,7 @@ func preflightChecks(ctx context.Context, c client.Client, provider genericprovi
129125
operatorv1.PreflightCheckCondition,
130126
operatorv1.InvalidGithubTokenReason,
131127
clusterv1.ConditionSeverityError,
132-
invalidGithubTokenMessage,
128+
"Invalid github token, please check your github token value and its permissions",
133129
))
134130

135131
return ctrl.Result{}, fmt.Errorf("failed to validate provided github token: %w", err)
@@ -182,12 +178,11 @@ func preflightChecks(ctx context.Context, c client.Client, provider genericprovi
182178
}
183179

184180
if !ready {
185-
log.Info(waitingForCoreProviderReadyMessage)
186181
conditions.Set(provider, conditions.FalseCondition(
187182
operatorv1.PreflightCheckCondition,
188183
operatorv1.WaitingForCoreProviderReadyReason,
189184
clusterv1.ConditionSeverityInfo,
190-
waitingForCoreProviderReadyMessage,
185+
"Waiting for the core provider to be installed.",
191186
))
192187

193188
return ctrl.Result{RequeueAfter: preflightFailedRequeueAfter}, nil
@@ -213,7 +208,7 @@ func checkProviderVersion(ctx context.Context, providerVersion string, provider
213208
operatorv1.PreflightCheckCondition,
214209
operatorv1.IncorrectVersionFormatReason,
215210
clusterv1.ConditionSeverityError,
216-
err.Error(),
211+
"%s", err.Error(),
217212
))
218213

219214
return fmt.Errorf("version contains invalid value for provider %q", provider.GetName())
@@ -231,7 +226,7 @@ func checkProviderVersion(ctx context.Context, providerVersion string, provider
231226
operatorv1.PreflightCheckCondition,
232227
operatorv1.UnsupportedProviderDowngradeReason,
233228
clusterv1.ConditionSeverityError,
234-
fmt.Sprintf(unsupportedProviderDowngradeMessage, provider.GetName()),
229+
"Downgrade is not supported for provider",
235230
))
236231

237232
return fmt.Errorf("downgrade is not supported for provider %q", provider.GetName())

0 commit comments

Comments
 (0)