Skip to content

Commit 530e9cd

Browse files
authored
Merge pull request #1009 from alexander-demicev/improvements
🌱 Multiple code improvements
2 parents 26b08b4 + b59b299 commit 530e9cd

20 files changed

+1206
-75
lines changed

cmd/plugin/cmd/delete.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -299,16 +299,16 @@ func deleteProviders(ctx context.Context, client ctrlclient.Client, providerList
299299
if err := client.List(ctx, providerList, selector); meta.IsNoMatchError(err) || apierrors.IsNotFound(err) {
300300
return true, nil
301301
} else if err != nil {
302-
log.Error(err, fmt.Sprintf("Unable to list providers to delete, %#v", err))
302+
log.Error(err, "Unable to list providers to delete")
303303
return false, err
304304
}
305305

306306
for _, provider := range providerList.GetItems() {
307-
log.Info(fmt.Sprintf("Deleting %s %s/%s", provider.GetType(), provider.GetName(), provider.GetNamespace()))
307+
log.Info("Deleting provider", "type", provider.GetType(), "name", provider.GetName(), "namespace", provider.GetNamespace())
308308

309309
provider, ok := provider.(genericProvider)
310310
if !ok {
311-
log.Info(fmt.Sprintf("Expected to get GenericProvider for %s", gvk))
311+
log.Info("Expected to get GenericProvider", "gvk", gvk)
312312
continue
313313
}
314314

@@ -318,7 +318,7 @@ func deleteProviders(ctx context.Context, client ctrlclient.Client, providerList
318318

319319
if deleteOpts.includeNamespace {
320320
if strings.HasPrefix(provider.GetNamespace(), "kube-") || provider.GetNamespace() == "default" {
321-
log.Info(fmt.Sprintf("Skipping system namespace %s", provider.GetNamespace()))
321+
log.Info("Skipping system namespace", "namespace", provider.GetNamespace())
322322
continue
323323
}
324324

@@ -330,7 +330,7 @@ func deleteProviders(ctx context.Context, client ctrlclient.Client, providerList
330330
}
331331

332332
if len(providerList.GetItems()) > 0 {
333-
log.Info(fmt.Sprintf("%d items remaning...", len(providerList.GetItems())))
333+
log.Info("Items remaining", "count", len(providerList.GetItems()))
334334
return false, nil
335335
}
336336

0 commit comments

Comments
 (0)