Skip to content

Commit 16837ff

Browse files
pohanhuangpohanhuang
committed
fix: fix shadow error linter issue
Signed-off-by: pohanhuangtw <pohan.huang@suse.com>
1 parent 2affb5d commit 16837ff

17 files changed

Lines changed: 154 additions & 137 deletions

File tree

‎cmd/controller/main.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -207,17 +207,17 @@ func main() {
207207

208208
// +kubebuilder:scaffold:builder
209209

210-
if err := mgr.AddHealthzCheck("healthz", healthz.Ping); err != nil {
210+
if err = mgr.AddHealthzCheck("healthz", healthz.Ping); err != nil {
211211
setupLog.Error(err, "unable to set up health check")
212212
os.Exit(1)
213213
}
214-
if err := mgr.AddReadyzCheck("readyz", healthz.Ping); err != nil {
214+
if err = mgr.AddReadyzCheck("readyz", healthz.Ping); err != nil {
215215
setupLog.Error(err, "unable to set up ready check")
216216
os.Exit(1)
217217
}
218218

219219
setupLog.Info("starting manager")
220-
if err := mgr.Start(ctrl.SetupSignalHandler()); err != nil {
220+
if err = mgr.Start(ctrl.SetupSignalHandler()); err != nil {
221221
setupLog.Error(err, "problem running manager")
222222
os.Exit(1)
223223
}

‎cmd/storage/server/start.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -231,7 +231,7 @@ func (o *WardleServerOptions) RunWardleServer(ctx context.Context) error {
231231
return fmt.Errorf("error creating server: %w", err)
232232
}
233233

234-
if err := server.GenericAPIServer.PrepareRun().RunWithContext(ctx); err != nil {
234+
if err = server.GenericAPIServer.PrepareRun().RunWithContext(ctx); err != nil {
235235
return fmt.Errorf("error while running server: %w", err)
236236
}
237237

‎cmd/worker/main.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,11 +54,11 @@ func main() {
5454

5555
config := ctrl.GetConfigOrDie()
5656
scheme := scheme.Scheme
57-
if err := v1alpha1.AddToScheme(scheme); err != nil {
57+
if err = v1alpha1.AddToScheme(scheme); err != nil {
5858
logger.Error("Error adding v1alpha1 to scheme", "error", err)
5959
os.Exit(1)
6060
}
61-
if err := storagev1alpha1.AddToScheme(scheme); err != nil {
61+
if err = storagev1alpha1.AddToScheme(scheme); err != nil {
6262
logger.Error("Error adding storagev1alpha1 to scheme", "error", err)
6363
os.Exit(1)
6464
}

‎internal/apiserver/apiserver.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ func (c completedConfig) New(db *sqlx.DB, logger *slog.Logger) (*WardleServer, e
134134
v1alpha1storage["vulnerabilityreports"] = vulnerabilityReportStore
135135
apiGroupInfo.VersionedResourcesStorageMap["v1alpha1"] = v1alpha1storage
136136

137-
if err := s.GenericAPIServer.InstallAPIGroup(&apiGroupInfo); err != nil {
137+
if err = s.GenericAPIServer.InstallAPIGroup(&apiGroupInfo); err != nil {
138138
return nil, fmt.Errorf("error installing API group: %w", err)
139139
}
140140

‎internal/controller/image_controller.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ func (r *ImageReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl
6565
ImageNamespace: image.Namespace,
6666
}
6767

68-
if err := r.Publisher.Publish(&msg); err != nil {
68+
if err = r.Publisher.Publish(&msg); err != nil {
6969
return ctrl.Result{}, fmt.Errorf("unable to publish CreateSBOM message: %w", err)
7070
}
7171
} else {

‎internal/controller/registry_controller.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,8 +80,8 @@ func (r *RegistryReconciler) Reconcile(ctx context.Context, req ctrl.Request) (c
8080
Reason: v1alpha1.RegistryFailedToRequestDiscoveryReason,
8181
Message: "Failed to communicate with the workers",
8282
})
83-
if err := r.Status().Update(ctx, &registry); err != nil {
84-
return ctrl.Result{}, fmt.Errorf("unable to set status condition: %w", err)
83+
if updateErr := r.Status().Update(ctx, &registry); updateErr != nil {
84+
return ctrl.Result{}, fmt.Errorf("unable to set status condition: %w", updateErr)
8585
}
8686

8787
return ctrl.Result{}, fmt.Errorf("failed to publish CreateCatalog message: %w", err)

‎internal/controller/sbom_controller.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ func (r *SBOMReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.
9797
)
9898

9999
var registry v1alpha1.Registry
100-
err := r.Get(ctx, client.ObjectKey{
100+
err = r.Get(ctx, client.ObjectKey{
101101
Name: sbom.GetImageMetadata().Registry,
102102
Namespace: req.Namespace,
103103
}, &registry)
@@ -121,7 +121,7 @@ func (r *SBOMReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.
121121
Info("Updating Registry last discovered timestamp", "name", registry.Name, "namespace", registry.Namespace)
122122

123123
registry.Annotations[v1alpha1.RegistryLastDiscoveredAtAnnotation] = time.Now().Format(time.RFC3339)
124-
if err := r.Update(ctx, &registry); err != nil {
124+
if err = r.Update(ctx, &registry); err != nil {
125125
return ctrl.Result{}, fmt.Errorf("unable to update Registry LastScannedAt: %w", err)
126126
}
127127
}

‎internal/handlers/create_catalog.go‎

Lines changed: 39 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -93,15 +93,15 @@ func (h *CreateCatalogHandler) Handle(message messaging.Message) error {
9393

9494
discoveredImageNames := sets.Set[string]{}
9595
for _, repository := range repositories {
96-
repoImages, err := h.discoverImages(ctx, registryClient, repository)
97-
if err != nil {
98-
return fmt.Errorf("cannot discover images in registry %s: %w", registry.Name, err)
96+
repoImages, discoverImagesErr := h.discoverImages(ctx, registryClient, repository)
97+
if discoverImagesErr != nil {
98+
return fmt.Errorf("cannot discover images in registry %s: %w", registry.Name, discoverImagesErr)
9999
}
100100
discoveredImageNames.Insert(repoImages...)
101101
}
102102

103103
existingImageList := &storagev1alpha1.ImageList{}
104-
if err := h.k8sClient.List(ctx, existingImageList, client.InNamespace(registry.Namespace), client.MatchingLabels{"registry": registry.Name}); err != nil {
104+
if err = h.k8sClient.List(ctx, existingImageList, client.InNamespace(registry.Namespace), client.MatchingLabels{"registry": registry.Name}); err != nil {
105105
return fmt.Errorf("cannot list existing images in registry %s: %w", registry.Name, err)
106106
}
107107
existingImageNames := sets.Set[string]{}
@@ -110,14 +110,14 @@ func (h *CreateCatalogHandler) Handle(message messaging.Message) error {
110110
}
111111

112112
for newImageName := range discoveredImageNames {
113-
ref, err := name.ParseReference(newImageName)
114-
if err != nil {
115-
return fmt.Errorf("cannot parse reference %s: %w", newImageName, err)
113+
ref, parseErr := name.ParseReference(newImageName)
114+
if parseErr != nil {
115+
return fmt.Errorf("cannot parse reference %s: %w", newImageName, parseErr)
116116
}
117117

118-
images, err := h.refToImages(registryClient, ref, registry)
119-
if err != nil {
120-
h.logger.Info("cannot get images", "reference", ref.String(), "error", err)
118+
images, refToImagesErr := h.refToImages(registryClient, ref, registry)
119+
if refToImagesErr != nil {
120+
h.logger.Info("cannot get images", "reference", ref.String(), "error", refToImagesErr)
121121
// Avoid blocking other images to be cataloged
122122
continue
123123
}
@@ -127,13 +127,13 @@ func (h *CreateCatalogHandler) Handle(message messaging.Message) error {
127127
continue
128128
}
129129

130-
if err := h.k8sClient.Create(ctx, &image); err != nil {
131-
return fmt.Errorf("cannot create image %s: %w", image.Name, err)
130+
if createErr := h.k8sClient.Create(ctx, &image); createErr != nil {
131+
return fmt.Errorf("cannot create image %s: %w", image.Name, createErr)
132132
}
133133
}
134134
}
135135

136-
if err := h.deleteObsoleteImages(ctx, existingImageNames, discoveredImageNames, registry.Namespace); err != nil {
136+
if err = h.deleteObsoleteImages(ctx, existingImageNames, discoveredImageNames, registry.Namespace); err != nil {
137137
return fmt.Errorf("cannot delete obsolete images in registry %s: %w", registry.Name, err)
138138
}
139139

@@ -159,9 +159,9 @@ func (h *CreateCatalogHandler) discoverRepositories(
159159
// If the registry doesn't have any repositories defined, it means we need to catalog all of them.
160160
// In this case, we need to discover all the repositories in the registry.
161161
if len(registry.Spec.Repositories) == 0 {
162-
allRepositories, err := registryClient.Catalog(ctx, reg)
163-
if err != nil {
164-
return []string{}, fmt.Errorf("cannot discover repositories: %w", err)
162+
allRepositories, catalogErr := registryClient.Catalog(ctx, reg)
163+
if catalogErr != nil {
164+
return []string{}, fmt.Errorf("cannot discover repositories: %w", catalogErr)
165165
}
166166

167167
return allRepositories, nil
@@ -212,25 +212,39 @@ func (h *CreateCatalogHandler) refToImages(
212212
images := []storagev1alpha1.Image{}
213213

214214
for _, platform := range platforms {
215-
imageDetails, err := registryClient.GetImageDetails(ref, platform)
216-
if err != nil {
215+
imageDetails, getImageDetailsErr := registryClient.GetImageDetails(ref, platform)
216+
if getImageDetailsErr != nil {
217217
platformStr := "default"
218218
if platform != nil {
219219
platformStr = platform.String()
220220
}
221-
h.logger.Info("cannot get image details", "reference", ref.Name(), "platform", platformStr, "error", err)
221+
h.logger.Info(
222+
"cannot get image details",
223+
"reference",
224+
ref.Name(),
225+
"platform",
226+
platformStr,
227+
"error",
228+
getImageDetailsErr,
229+
)
222230
// Avoid blocking other images to be cataloged
223231
continue
224232
}
225233

226-
image, err := imageDetailsToImage(ref, imageDetails, registry)
227-
if err != nil {
228-
h.logger.Info("cannot convert image details to image", "reference", ref.Name(), "error", err)
234+
image, imageDetailsToImageErr := imageDetailsToImage(ref, imageDetails, registry)
235+
if imageDetailsToImageErr != nil {
236+
h.logger.Info(
237+
"cannot convert image details to image",
238+
"reference",
239+
ref.Name(),
240+
"error",
241+
imageDetailsToImageErr,
242+
)
229243
// Avoid blocking other images to be cataloged
230244
continue
231245
}
232246

233-
if err := controllerutil.SetControllerReference(registry, &image, h.scheme); err != nil {
247+
if err = controllerutil.SetControllerReference(registry, &image, h.scheme); err != nil {
234248
h.logger.Info("cannot set owner reference", "reference", ref.Name(), "error", err)
235249
// Avoid blocking other images to be cataloged
236250
continue
@@ -290,8 +304,8 @@ func (h *CreateCatalogHandler) transportFromRegistry(registry *v1alpha1.Registry
290304
rootCAs = x509.NewCertPool()
291305
}
292306

293-
ok := rootCAs.AppendCertsFromPEM([]byte(registry.Spec.CABundle))
294-
if ok {
307+
certsAppended := rootCAs.AppendCertsFromPEM([]byte(registry.Spec.CABundle))
308+
if certsAppended {
295309
transport.TLSClientConfig.RootCAs = rootCAs
296310
} else {
297311
h.logger.Info("cannot load the given CA bundle",

‎internal/handlers/create_catalog_test.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -312,15 +312,15 @@ func TestImageDetailsToImage(t *testing.T) {
312312

313313
assert.Len(t, image.Spec.Layers, numberOfLayers)
314314
for i := range numberOfLayers {
315-
expectedDigest, expectedDiffID, err := fakeDigestAndDiffID(i)
316-
require.NoError(t, err)
315+
expectedDigest, expectedDiffID, digestErr := fakeDigestAndDiffID(i)
316+
require.NoError(t, digestErr)
317317

318318
layer := image.Spec.Layers[i]
319319
assert.Equal(t, expectedDigest.String(), layer.Digest)
320320
assert.Equal(t, expectedDiffID.String(), layer.DiffID)
321321

322-
command, err := base64.StdEncoding.DecodeString(layer.Command)
323-
require.NoError(t, err)
322+
command, decodeErr := base64.StdEncoding.DecodeString(layer.Command)
323+
require.NoError(t, decodeErr)
324324
assert.Equal(t, fmt.Sprintf("command-%d", i), string(command))
325325
}
326326
}

‎internal/handlers/generate_sbom.go‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -77,12 +77,12 @@ func (h *GenerateSBOMHandler) Handle(message messaging.Message) error {
7777
return fmt.Errorf("failed to create temporary SBOM file: %w", err)
7878
}
7979
defer func() {
80-
if err := sbomFile.Close(); err != nil {
81-
h.logger.Error("failed to close temporary SBOM file", "error", err)
80+
if closeErr := sbomFile.Close(); closeErr != nil {
81+
h.logger.Error("failed to close temporary SBOM file", "error", closeErr)
8282
}
8383

84-
if err := os.Remove(sbomFile.Name()); err != nil {
85-
h.logger.Error("failed to remove temporary SBOM file", "error", err)
84+
if removeErr := os.Remove(sbomFile.Name()); removeErr != nil {
85+
h.logger.Error("failed to remove temporary SBOM file", "error", removeErr)
8686
}
8787
}()
8888

@@ -102,8 +102,8 @@ func (h *GenerateSBOMHandler) Handle(message messaging.Message) error {
102102
),
103103
})
104104

105-
if err := app.ExecuteContext(ctx); err != nil {
106-
return fmt.Errorf("failed to execute trivy: %w", err)
105+
if executeErr := app.ExecuteContext(ctx); executeErr != nil {
106+
return fmt.Errorf("failed to execute trivy: %w", executeErr)
107107
}
108108

109109
h.logger.Debug("SBOM generated",
@@ -126,11 +126,11 @@ func (h *GenerateSBOMHandler) Handle(message messaging.Message) error {
126126
SPDX: runtime.RawExtension{Raw: spdxBytes},
127127
},
128128
}
129-
if err := controllerutil.SetControllerReference(image, sbom, h.scheme); err != nil {
129+
if err = controllerutil.SetControllerReference(image, sbom, h.scheme); err != nil {
130130
return fmt.Errorf("failed to set owner reference: %w", err)
131131
}
132132

133-
if err := h.k8sClient.Create(ctx, sbom); err != nil {
133+
if err = h.k8sClient.Create(ctx, sbom); err != nil {
134134
if !apierrors.IsAlreadyExists(err) {
135135
return fmt.Errorf("failed to create SBOM: %w", err)
136136
}

0 commit comments

Comments
 (0)