Implement --tls-details for (buildah source ...)

Signed-off-by: Miloslav Trmač <mitr@redhat.com>

Author: mtrmac

cmd/buildah/source.go

@@ -5,8 +5,19 @@ import (
 
 	"github.com/containers/buildah/internal/source"
 	"github.com/spf13/cobra"
+	"go.podman.io/image/v5/pkg/cli/basetls/tlsdetails"
 )
 
+type sourcePullOptions struct {
+	source.PullOptions
+	tlsDetails string
+}
+
+type sourcePushOptions struct {
+	source.PushOptions
+	tlsDetails string
+}
+
 var (
 	// buildah source
 	sourceDescription = `  Create, push, pull and manage source images and associated source artifacts.  A source image contains all source artifacts an ordinary OCI image has been built with.  Those artifacts can be any kind of source artifact, such as source RPMs, an entire source tree or text files.
@@ -57,7 +68,7 @@ var (
 	}
 
 	// buildah source pull
-	sourcePullOptions     = source.PullOptions{}
+	sourcePullOpts        = sourcePullOptions{}
 	sourcePullDescription = `  Pull a source image from a registry to a specified path.  The pull operation will fail if the image does not comply with a source-image OCI artifact.
 
   Note that the buildah-source command and all its subcommands are experimental and may be subject to future changes.
@@ -68,13 +79,13 @@ var (
 		Short:   "Pull a source image from a registry to a specified path",
 		Long:    sourcePullDescription,
 		Example: "buildah source pull quay.io/sourceimage/example:latest /tmp/sourceimage:latest",
-		RunE: func(_ *cobra.Command, args []string) error {
-			return source.Pull(context.Background(), args[0], args[1], sourcePullOptions)
+		RunE: func(c *cobra.Command, args []string) error {
+			return sourcePullCmd(c, args, sourcePullOpts)
 		},
 	}
 
 	// buildah source push
-	sourcePushOptions     = source.PushOptions{}
+	sourcePushOpts        = sourcePushOptions{}
 	sourcePushDescription = `  Push a source image from a specified path to a registry.
 
   Note that the buildah-source command and all its subcommands are experimental and may be subject to future changes.
@@ -85,12 +96,30 @@ var (
 		Short:   "Push a source image from a specified path to a registry",
 		Long:    sourcePushDescription,
 		Example: "buildah source push /tmp/sourceimage:latest quay.io/sourceimage/example:latest",
-		RunE: func(_ *cobra.Command, args []string) error {
-			return source.Push(context.Background(), args[0], args[1], sourcePushOptions)
+		RunE: func(c *cobra.Command, args []string) error {
+			return sourcePushCmd(c, args, sourcePushOpts)
 		},
 	}
 )
 
+func sourcePullCmd(_ *cobra.Command, args []string, opts sourcePullOptions) error {
+	baseTLSConfig, err := tlsdetails.BaseTLSFromOptionalFile(opts.tlsDetails)
+	if err != nil {
+		return err
+	}
+	opts.PullOptions.BaseTLSConfig = baseTLSConfig.TLSConfig()
+	return source.Pull(context.Background(), args[0], args[1], opts.PullOptions)
+}
+
+func sourcePushCmd(_ *cobra.Command, args []string, opts sourcePushOptions) error {
+	baseTLSConfig, err := tlsdetails.BaseTLSFromOptionalFile(opts.tlsDetails)
+	if err != nil {
+		return err
+	}
+	opts.PushOptions.BaseTLSConfig = baseTLSConfig.TLSConfig()
+	return source.Push(context.Background(), args[0], args[1], opts.PushOptions)
+}
+
 func init() {
 	// buildah source
 	sourceCommand.SetUsageTemplate(UsageTemplate())
@@ -113,16 +142,18 @@ func init() {
 	sourcePullCommand.SetUsageTemplate(UsageTemplate())
 	sourceCommand.AddCommand(sourcePullCommand)
 	sourcePullFlags := sourcePullCommand.Flags()
-	sourcePullFlags.StringVar(&sourcePullOptions.Credentials, "creds", "", "use `[username[:password]]` for accessing the registry")
-	sourcePullFlags.BoolVar(&sourcePullOptions.TLSVerify, "tls-verify", true, "require HTTPS and verify certificates when accessing the registry")
-	sourcePullFlags.BoolVarP(&sourcePullOptions.Quiet, "quiet", "q", false, "don't output pull progress information")
+	sourcePullFlags.StringVar(&sourcePullOpts.PullOptions.Credentials, "creds", "", "use `[username[:password]]` for accessing the registry")
+	sourcePullFlags.StringVar(&sourcePullOpts.tlsDetails, "tls-details", "", "path to a containers-tls-details.yaml file")
+	sourcePullFlags.BoolVar(&sourcePullOpts.PullOptions.TLSVerify, "tls-verify", true, "require HTTPS and verify certificates when accessing the registry")
+	sourcePullFlags.BoolVarP(&sourcePullOpts.PullOptions.Quiet, "quiet", "q", false, "don't output pull progress information")
 
 	// buildah source push
 	sourcePushCommand.SetUsageTemplate(UsageTemplate())
 	sourceCommand.AddCommand(sourcePushCommand)
 	sourcePushFlags := sourcePushCommand.Flags()
-	sourcePushFlags.StringVar(&sourcePushOptions.Credentials, "creds", "", "use `[username[:password]]` for accessing the registry")
-	sourcePushFlags.StringVar(&sourcePushOptions.DigestFile, "digestfile", "", "after copying the artifact, write the digest of the resulting image to the file")
-	sourcePushFlags.BoolVar(&sourcePushOptions.TLSVerify, "tls-verify", true, "require HTTPS and verify certificates when accessing the registry")
-	sourcePushFlags.BoolVarP(&sourcePushOptions.Quiet, "quiet", "q", false, "don't output push progress information")
+	sourcePushFlags.StringVar(&sourcePushOpts.PushOptions.Credentials, "creds", "", "use `[username[:password]]` for accessing the registry")
+	sourcePushFlags.StringVar(&sourcePushOpts.PushOptions.DigestFile, "digestfile", "", "after copying the artifact, write the digest of the resulting image to the file")
+	sourcePushFlags.StringVar(&sourcePushOpts.tlsDetails, "tls-details", "", "path to a containers-tls-details.yaml file")
+	sourcePushFlags.BoolVar(&sourcePushOpts.PushOptions.TLSVerify, "tls-verify", true, "require HTTPS and verify certificates when accessing the registry")
+	sourcePushFlags.BoolVarP(&sourcePushOpts.PushOptions.Quiet, "quiet", "q", false, "don't output push progress information")
 }

docs/buildah-source-pull.1.md

@@ -25,6 +25,15 @@ value can be entered.  The password is entered without echo.
 
 Suppress the progress output when pulling a source image.
 
+**--tls-details** *path*
+
+Path to a `containers-tls-details.yaml(5)` file, affecting TLS behavior throughout the program.
+
+If not set, defaults to a reasonable default that may change over time (depending on system’s global policy,
+version of the program, version of the Go language, and the like).
+
+Users should generally not use this option unless they have a process to ensure that the configuration will be kept up to date.
+
 **--tls-verify** *bool-value*
 
 Require HTTPS and verification of certificates when talking to container

docs/buildah-source-push.1.md

@@ -28,6 +28,15 @@ After copying the image, write the digest of the resulting image to the file.
 
 Suppress the progress output when pushing a source image.
 
+**--tls-details** *path*
+
+Path to a `containers-tls-details.yaml(5)` file, affecting TLS behavior throughout the program.
+
+If not set, defaults to a reasonable default that may change over time (depending on system’s global policy,
+version of the program, version of the Go language, and the like).
+
+Users should generally not use this option unless they have a process to ensure that the configuration will be kept up to date.
+
 **--tls-verify** *bool-value*
 
 Require HTTPS and verification of certificates when talking to container