mirror of
https://github.com/containers/podman.git
synced 2025-06-21 09:28:09 +08:00
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>
This commit is contained in:
@ -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
|
||||
}
|
||||
|
@ -103,16 +103,15 @@ func imageSearch(cmd *cobra.Command, args []string) error {
|
||||
return errors.Errorf("search requires exactly one argument")
|
||||
}
|
||||
|
||||
sarchOptsAPI := searchOptions.ImageSearchOptions
|
||||
// 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") {
|
||||
sarchOptsAPI.TLSVerify = types.NewOptionalBool(pullOptions.TLSVerifyCLI)
|
||||
searchOptions.SkipTLSVerify = types.NewOptionalBool(!pullOptions.TLSVerifyCLI)
|
||||
}
|
||||
|
||||
searchReport, err := registry.ImageEngine().Search(registry.GetContext(), searchTerm, sarchOptsAPI)
|
||||
searchReport, err := registry.ImageEngine().Search(registry.GetContext(), searchTerm, searchOptions.ImageSearchOptions)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
@ -273,9 +273,10 @@ func Pull(ctx context.Context, rawImage string, options entities.ImagePullOption
|
||||
params.Set("credentials", options.Credentials)
|
||||
params.Set("overrideArch", options.OverrideArch)
|
||||
params.Set("overrideOS", options.OverrideOS)
|
||||
if options.TLSVerify != types.OptionalBoolUndefined {
|
||||
val := bool(options.TLSVerify == types.OptionalBoolTrue)
|
||||
params.Set("tlsVerify", strconv.FormatBool(val))
|
||||
if options.SkipTLSVerify != types.OptionalBoolUndefined {
|
||||
// Note: we have to verify if skipped is false.
|
||||
verifyTLS := bool(options.SkipTLSVerify == types.OptionalBoolFalse)
|
||||
params.Set("tlsVerify", strconv.FormatBool(verifyTLS))
|
||||
}
|
||||
params.Set("allTags", strconv.FormatBool(options.AllTags))
|
||||
|
||||
@ -334,9 +335,10 @@ func Search(ctx context.Context, term string, opts entities.ImageSearchOptions)
|
||||
params.Set("filters", f)
|
||||
}
|
||||
|
||||
if opts.TLSVerify != types.OptionalBoolUndefined {
|
||||
val := bool(opts.TLSVerify == types.OptionalBoolTrue)
|
||||
params.Set("tlsVerify", strconv.FormatBool(val))
|
||||
if opts.SkipTLSVerify != types.OptionalBoolUndefined {
|
||||
// Note: we have to verify if skipped is false.
|
||||
verifyTLS := bool(opts.SkipTLSVerify == types.OptionalBoolFalse)
|
||||
params.Set("tlsVerify", strconv.FormatBool(verifyTLS))
|
||||
}
|
||||
|
||||
response, err := conn.DoRequest(nil, http.MethodGet, "/images/search", params)
|
||||
|
@ -141,8 +141,8 @@ type ImagePullOptions struct {
|
||||
Quiet bool
|
||||
// SignaturePolicy to use when pulling. Ignored for remote calls.
|
||||
SignaturePolicy string
|
||||
// TLSVerify to enable/disable HTTPS and certificate verification.
|
||||
TLSVerify types.OptionalBool
|
||||
// SkipTLSVerify to skip HTTPS and certificate verification.
|
||||
SkipTLSVerify types.OptionalBool
|
||||
}
|
||||
|
||||
// ImagePullReport is the response from pulling one or more images.
|
||||
@ -198,8 +198,8 @@ type ImageSearchOptions struct {
|
||||
Limit int
|
||||
// NoTrunc will not truncate the output.
|
||||
NoTrunc bool
|
||||
// TLSVerify to enable/disable HTTPS and certificate verification.
|
||||
TLSVerify types.OptionalBool
|
||||
// SkipTLSVerify to skip HTTPS and certificate verification.
|
||||
SkipTLSVerify types.OptionalBool
|
||||
}
|
||||
|
||||
// ImageSearchReport is the response from searching images.
|
||||
|
@ -118,7 +118,7 @@ func (ir *ImageEngine) Pull(ctx context.Context, rawImage string, options entiti
|
||||
DockerCertPath: options.CertDir,
|
||||
OSChoice: options.OverrideOS,
|
||||
ArchitectureChoice: options.OverrideArch,
|
||||
DockerInsecureSkipTLSVerify: options.TLSVerify,
|
||||
DockerInsecureSkipTLSVerify: options.SkipTLSVerify,
|
||||
}
|
||||
|
||||
if !options.AllTags {
|
||||
@ -370,7 +370,7 @@ func (ir *ImageEngine) Search(ctx context.Context, term string, opts entities.Im
|
||||
Filter: *filter,
|
||||
Limit: opts.Limit,
|
||||
NoTrunc: opts.NoTrunc,
|
||||
InsecureSkipTLSVerify: opts.TLSVerify,
|
||||
InsecureSkipTLSVerify: opts.SkipTLSVerify,
|
||||
}
|
||||
|
||||
searchResults, err := image.SearchImages(term, searchOpts)
|
||||
|
Reference in New Issue
Block a user