fix: add plain-http option for login cmd (#28)

Signed-off-by: chlins <[email protected]>

Author: chlins

cmd/login.go

@@ -40,8 +40,8 @@ var loginCmd = &cobra.Command{
 # login to docker hub:
 modctl login -u foo registry-1.docker.io
 
-# login to insecure register:
-modctl login -u foo --insecure registry-insecure.io 
+# login to registry served over http:
+modctl login -u foo --plain-http registry-insecure.io
 `,
 	Args:               cobra.ExactArgs(1),
 	DisableAutoGenTag:  true,
@@ -62,7 +62,7 @@ func init() {
 	flags.StringVarP(&loginConfig.Username, "username", "u", "", "Username for login")
 	flags.StringVarP(&loginConfig.Password, "password", "p", "", "Password for login")
 	flags.BoolVar(&loginConfig.PasswordStdin, "password-stdin", true, "Take the password from stdin by default")
-	flags.BoolVar(&loginConfig.Insecure, "insecure", false, "Allow insecure connections to registry")
+	flags.BoolVar(&loginConfig.PlainHTTP, "plain-http", false, "Allow http connections to registry")
 
 	if err := viper.BindPFlags(flags); err != nil {
 		panic(fmt.Errorf("bind cache login flags to viper: %w", err))
@@ -88,7 +88,13 @@ func runLogin(ctx context.Context, registry string) error {
 	}
 
 	fmt.Println("\nLogging In...")
-	if err := b.Login(ctx, registry, loginConfig.Username, loginConfig.Password, loginConfig.Insecure); err != nil {
+
+	opts := []backend.Option{}
+	if loginConfig.PlainHTTP {
+		opts = append(opts, backend.WithPlainHTTP())
+	}
+
+	if err := b.Login(ctx, registry, loginConfig.Username, loginConfig.Password, opts...); err != nil {
 		return err
 	}
 

pkg/backend/backend.go

@@ -25,7 +25,7 @@ import (
 // Backend is the interface to represent the backend.
 type Backend interface {
 	// Login logs into a registry.
-	Login(ctx context.Context, registry, username, password string, insecure bool) error
+	Login(ctx context.Context, registry, username, password string, opts ...Option) error
 
 	// Logout logs out from a registry.
 	Logout(ctx context.Context, registry string) error

pkg/backend/login.go

@@ -18,13 +18,19 @@ package backend
 
 import (
 	"context"
+
 	"oras.land/oras-go/v2/registry/remote"
 	"oras.land/oras-go/v2/registry/remote/auth"
 	"oras.land/oras-go/v2/registry/remote/credentials"
 )
 
 // Login logs into a registry.
-func (b *backend) Login(ctx context.Context, registry, username, password string, insecure bool) error {
+func (b *backend) Login(ctx context.Context, registry, username, password string, opts ...Option) error {
+	// apply options.
+	options := &Options{}
+	for _, opt := range opts {
+		opt(options)
+	}
 	// read credentials from docker store.
 	store, err := credentials.NewStoreFromDocker(credentials.StoreOptions{AllowPlaintextPut: true})
 	if err != nil {
@@ -35,7 +41,10 @@ func (b *backend) Login(ctx context.Context, registry, username, password string
 	if err != nil {
 		return err
 	}
-	reg.PlainHTTP = insecure
+
+	if options.plainHTTP {
+		reg.PlainHTTP = true
+	}
 
 	cred := auth.Credential{
 		Username: username,

pkg/config/login.go

@@ -22,15 +22,15 @@ type Login struct {
 	Username      string
 	Password      string
 	PasswordStdin bool
-	Insecure      bool
+	PlainHTTP     bool
 }
 
 func NewLogin() *Login {
 	return &Login{
 		Username:      "",
 		Password:      "",
 		PasswordStdin: true,
-		Insecure:      false,
+		PlainHTTP:     false,
 	}
 }