Fix golint errors (#845)

v2/internal/pkg/archive/image-blob-gatherer_test.go

@@ -27,8 +27,8 @@ func TestImageBlobGatherer_GatherBlobs(t *testing.T) {
 	destFlags, destOpts := mirror.ImageDestFlags(global, sharedOpts, deprecatedTLSVerifyOpt, "dest-", "dcreds")
 	_, retryOpts := mirror.RetryFlags()
 
-	srcFlags.Set("src-tls-verify", "false")
-	destFlags.Set("dest-tls-verify", "false")
+	_ = srcFlags.Set("src-tls-verify", "false")
+	_ = destFlags.Set("dest-tls-verify", "false")
 
 	opts := mirror.CopyOptions{
 		Global:              global,
@@ -119,8 +119,8 @@ func TestImageBlobGatherer_SrcContextError(t *testing.T) {
 	destFlags, destOpts := mirror.ImageDestFlags(global, sharedOpts, deprecatedTLSVerifyOpt, "dest-", "dcreds")
 	_, retryOpts := mirror.RetryFlags()
 
-	srcFlags.Set("src-tls-verify", "false")
-	destFlags.Set("dest-tls-verify", "false")
+	_ = srcFlags.Set("src-tls-verify", "false")
+	_ = destFlags.Set("dest-tls-verify", "false")
 
 	opts := mirror.CopyOptions{
 		Global:              global,
@@ -152,8 +152,8 @@ func TestImageBlobGatherer_ImageSourceError(t *testing.T) {
 	destFlags, destOpts := mirror.ImageDestFlags(global, sharedOpts, deprecatedTLSVerifyOpt, "dest-", "dcreds")
 	_, retryOpts := mirror.RetryFlags()
 
-	srcFlags.Set("src-tls-verify", "false")
-	destFlags.Set("dest-tls-verify", "false")
+	_ = srcFlags.Set("src-tls-verify", "false")
+	_ = destFlags.Set("dest-tls-verify", "false")
 
 	opts := mirror.CopyOptions{
 		Global:              global,

v2/internal/pkg/cli/delete.go

@@ -191,6 +191,7 @@ func (o *ExecutorSchema) CompleteDelete(args []string) error {
 		// fake a diskToMirror Mode
 		o.Opts.Mode = mirror.DiskToMirror
 		o.Opts.RemoveSignatures = true
+		// nolint: errcheck
 		o.srcFlagSet.Set("src-tls-verify", "false")
 	}
 
@@ -337,6 +338,9 @@ func (o *ExecutorSchema) RunDelete(cmd *cobra.Command) error {
 		}
 	}
 
+	if !o.Opts.Global.DeleteGenerate {
+		o.Log.Info("📝 Rememeber to execute a garbage collect (or similar) on your remote repository")
+	}
 	o.Log.Info("👋 Goodbye, thank you for using oc-mirror")
 
 	return nil

v2/internal/pkg/cli/executor.go

@@ -336,11 +336,13 @@ func (o *ExecutorSchema) Complete(args []string) error {
 		rootDir = strings.TrimPrefix(args[0], fileProtocol)
 		o.Log.Debug("destination %s ", rootDir)
 		// destination is the local cache, which is HTTP
+		// nolint: errcheck
 		o.destFlagSet.Set("dest-tls-verify", "false")
 	} else if strings.Contains(args[0], dockerProtocol) && o.Opts.Global.From != "" {
 		rootDir = strings.TrimPrefix(o.Opts.Global.From, fileProtocol)
 		o.Opts.Mode = mirror.DiskToMirror
 		// source is the local cache, which is HTTP
+		// nolint: errcheck
 		o.srcFlagSet.Set("src-tls-verify", "false")
 	} else if strings.Contains(args[0], dockerProtocol) && o.Opts.Global.From == "" {
 		o.Opts.Mode = mirror.MirrorToMirror

v2/internal/pkg/imagebuilder/builder_test.go

@@ -41,8 +41,8 @@ func TestImageBuilder(t *testing.T) {
 	destFlags, destOpts := mirror.ImageDestFlags(global, sharedOpts, deprecatedTLSVerifyOpt, "dest-", "dcreds")
 	_, retryOpts := mirror.RetryFlags()
 
-	srcFlags.Set("src-tls-verify", "false")
-	destFlags.Set("dest-tls-verify", "false")
+	_ = srcFlags.Set("src-tls-verify", "false")
+	_ = destFlags.Set("dest-tls-verify", "false")
 
 	opts := mirror.CopyOptions{
 		Global:              global,
@@ -59,8 +59,8 @@ func TestImageBuilder(t *testing.T) {
 	t.Run("Testing NewImageBuilder : should pass", func(t *testing.T) {
 
 		_ = NewBuilder(log, opts)
-		srcFlags.Set("src-tls-verify", "true")
-		destFlags.Set("dest-tls-verify", "true")
+		_ = srcFlags.Set("src-tls-verify", "true")
+		_ = destFlags.Set("dest-tls-verify", "true")
 		_ = NewBuilder(log, opts)
 
 		e := ErrInvalidReference{image: "broken"}
@@ -78,8 +78,8 @@ func TestImageBuilder(t *testing.T) {
 			t.Fatal(err)
 		}
 
-		srcFlags.Set("src-tls-verify", "false")
-		destFlags.Set("dest-tls-verify", "false")
+		_ = srcFlags.Set("src-tls-verify", "false")
+		_ = destFlags.Set("dest-tls-verify", "false")
 		ex := NewBuilder(log, opts)
 		ctx := context.Background()
 
@@ -163,8 +163,8 @@ func TestProcessImageIndex(t *testing.T) {
 		destFlags, destOpts := mirror.ImageDestFlags(global, sharedOpts, deprecatedTLSVerifyOpt, "dest-", "dcreds")
 		_, retryOpts := mirror.RetryFlags()
 
-		srcFlags.Set("src-tls-verify", "false")
-		destFlags.Set("dest-tls-verify", "false")
+		_ = srcFlags.Set("src-tls-verify", "false")
+		_ = destFlags.Set("dest-tls-verify", "false")
 
 		opts := mirror.CopyOptions{
 			Global:              global,

v2/internal/pkg/mirror/mirror_test.go

@@ -109,8 +109,9 @@ func TestMirrorCheck(t *testing.T) {
 	srcFlags, srcOpts := ImageSrcFlags(global, sharedOpts, deprecatedTLSVerifyOpt, "src-", "screds")
 	dstFlags, destOpts := ImageDestFlags(global, sharedOpts, deprecatedTLSVerifyOpt, "dest-", "dcreds")
 	_, retryOpts := RetryFlags()
-	srcFlags.Set("src-tls-verify", "false")
-	dstFlags.Set("dest-tls-verify", "false")
+
+	_ = srcFlags.Set("src-tls-verify", "false")
+	_ = dstFlags.Set("dest-tls-verify", "false")
 	opts := CopyOptions{
 		Global:              global,
 		DeprecatedTLSVerify: deprecatedTLSVerifyOpt,
@@ -172,8 +173,8 @@ func TestMirrorDelete(t *testing.T) {
 	dstFlags, destOpts := ImageDestFlags(global, sharedOpts, deprecatedTLSVerifyOpt, "dest-", "dcreds")
 	_, retryOpts := RetryFlags()
 
-	srcFlags.Set("src-tls-verify", "false")
-	dstFlags.Set("dest-tls-verify", "false")
+	_ = srcFlags.Set("src-tls-verify", "false")
+	_ = dstFlags.Set("dest-tls-verify", "false")
 
 	opts := CopyOptions{
 		Global:              global,

v2/internal/pkg/operator/local_stored_collector_test.go

@@ -73,6 +73,7 @@ var (
 			},
 		},
 	}
+	// nolint: unused
 	nominalConfigD2MWithTargetCatalogTag = v2alpha1.ImageSetConfiguration{
 		ImageSetConfigurationSpec: v2alpha1.ImageSetConfigurationSpec{
 			Mirror: v2alpha1.Mirror{

v2/internal/pkg/version/version.go

@@ -78,9 +78,11 @@ func NewVersionCommand(log clog.PluggableLoggerInterface) *cobra.Command {
 
 	fs := cmd.Flags()
 	fs.BoolVar(&o.Short, "short", o.Short, "Print just the version number")
+	// nolint: errcheck
 	fs.MarkDeprecated("short", "and will be removed in a future release. Use oc-mirror version instead.")
 	fs.StringVar(&o.Output, "output", o.Output, "One of 'yaml' or 'json'.")
 	fs.BoolVar(&o.V2, "v2", o.V2, "Redirect the flow to oc-mirror v2 - V2 is still under development and it is not production ready.")
+	// nolint: errcheck
 	fs.MarkHidden("v2")
 	cmd.PersistentFlags()