pull/search options: tls verify -> skip

Change the logic in the options from tls-verify to skipping
verification.  It require a constant brain yoga to translate
from doing verification (CLI logic) to skipping it (c/image logic).
As the code is using c/image, let's make it consistent.

Signed-off-by: Valentin Rothberg <rothberg@redhat.com>

1 files changed, 5 insertions, 6 deletions

diff --git a/cmd/podman/images/pull.go b/cmd/podman/images/pull.go
index f996d0681..fead5f7ed 100644
--- a/cmd/podman/images/pull.go
+++ b/cmd/podman/images/pull.go
@@ -93,23 +93,22 @@ func pullFlags(flags *pflag.FlagSet) {
 
 // imagePull is implement the command for pulling images.
 func imagePull(cmd *cobra.Command, args []string) error {
-	pullOptsAPI := pullOptions.ImagePullOptions
 	// TLS verification in c/image is controlled via a `types.OptionalBool`
 	// which allows for distinguishing among set-true, set-false, unspecified
 	// which is important to implement a sane way of dealing with defaults of
 	// boolean CLI flags.
 	if cmd.Flags().Changed("tls-verify") {
-		pullOptsAPI.TLSVerify = types.NewOptionalBool(pullOptions.TLSVerifyCLI)
+		pullOptions.SkipTLSVerify = types.NewOptionalBool(!pullOptions.TLSVerifyCLI)
 	}
-	if pullOptsAPI.Authfile != "" {
-		if _, err := os.Stat(pullOptsAPI.Authfile); err != nil {
-			return errors.Wrapf(err, "error getting authfile %s", pullOptsAPI.Authfile)
+	if pullOptions.Authfile != "" {
+		if _, err := os.Stat(pullOptions.Authfile); err != nil {
+			return errors.Wrapf(err, "error getting authfile %s", pullOptions.Authfile)
 		}
 	}
 
 	// Let's do all the remaining Yoga in the API to prevent us from
 	// scattering logic across (too) many parts of the code.
-	pullReport, err := registry.ImageEngine().Pull(registry.GetContext(), args[0], pullOptsAPI)
+	pullReport, err := registry.ImageEngine().Pull(registry.GetContext(), args[0], pullOptions.ImagePullOptions)
 	if err != nil {
 		return err
 	}