update: add options for oauth and plain http for pusher and puller

Signed-off-by: Lorenzo Susini <[email protected]>

Author: loresuso

internal/registry/pull/pull.go

@@ -43,6 +43,7 @@ Example - Pull artifact "myrulesfile" of type "rulesfile":
 type pullOptions struct {
 	*options.CommonOptions
 	*options.ArtifactOptions
+	*options.RegistryOptions
 	destDir string
 }
 
@@ -55,6 +56,7 @@ func NewPullCmd(ctx context.Context, opt *options.CommonOptions) *cobra.Command
 	o := pullOptions{
 		CommonOptions:   opt,
 		ArtifactOptions: &options.ArtifactOptions{},
+		RegistryOptions: &options.RegistryOptions{},
 	}
 
 	cmd := &cobra.Command{
@@ -71,6 +73,7 @@ func NewPullCmd(ctx context.Context, opt *options.CommonOptions) *cobra.Command
 		},
 	}
 	o.CommonOptions.AddFlags(cmd.Flags())
+	o.RegistryOptions.AddFlags(cmd)
 	o.Printer.CheckErr(o.ArtifactOptions.AddFlags(cmd))
 	cmd.Flags().StringVarP(&o.destDir, "dest-dir", "o", "", "destination dir where to save the artifacts(default: current directory)")
 	return cmd
@@ -86,7 +89,7 @@ func (o *pullOptions) RunPull(ctx context.Context, args []string) error {
 		return err
 	}
 
-	puller, err := utils.PullerForRegistry(ctx, registry, true, true, o.Printer)
+	puller, err := utils.PullerForRegistry(ctx, registry, o.PlainHTTP, o.Oauth, o.Printer)
 	if err != nil {
 		return fmt.Errorf("an error occurred while creating the puller for registry %s: %w", registry, err)
 	}

internal/registry/push/push.go

@@ -57,6 +57,7 @@ Example - Push artifact "myrulesfile.tar.gz" of type "rulesfile" with multiple d
 type pushOptions struct {
 	*options.CommonOptions
 	*options.ArtifactOptions
+	*options.RegistryOptions
 }
 
 func (o pushOptions) validate() error {
@@ -68,6 +69,7 @@ func NewPushCmd(ctx context.Context, opt *options.CommonOptions) *cobra.Command
 	o := pushOptions{
 		CommonOptions:   opt,
 		ArtifactOptions: &options.ArtifactOptions{},
+		RegistryOptions: &options.RegistryOptions{},
 	}
 
 	cmd := &cobra.Command{
@@ -85,6 +87,7 @@ func NewPushCmd(ctx context.Context, opt *options.CommonOptions) *cobra.Command
 		},
 	}
 	o.CommonOptions.AddFlags(cmd.Flags())
+	o.RegistryOptions.AddFlags(cmd)
 	o.Printer.CheckErr(o.ArtifactOptions.AddFlags(cmd))
 
 	return cmd
@@ -101,7 +104,7 @@ func (o *pushOptions) RunPush(ctx context.Context, args []string) error {
 		return err
 	}
 
-	pusher, err := utils.PusherForRegistry(ctx, true, true, registry, o.Printer)
+	pusher, err := utils.PusherForRegistry(ctx, o.PlainHTTP, o.Oauth, registry, o.Printer)
 	if err != nil {
 		return fmt.Errorf("an error occurred while creating the pusher for registry %s: %w", registry, err)
 	}

internal/utils/registry.go

@@ -69,6 +69,7 @@ func ClientForRegistry(ctx context.Context, registry string, oauth bool, printer
 		if err != nil {
 			return nil, fmt.Errorf("unable to retrieve credentials for registry %s: %w", registry, err)
 		}
+	}
 
 	if err := CheckRegistryConnection(ctx, &cred, registry, printer); err != nil {
 		printer.Verbosef("%s", err.Error())

pkg/oci/puller/puller.go

@@ -23,7 +23,6 @@ import (
 	v1 "github.com/opencontainers/image-spec/specs-go/v1"
 	"oras.land/oras-go/v2"
 	"oras.land/oras-go/v2/content/file"
-	"oras.land/oras-go/v2/registry/remote"
 
 	"github.com/falcosecurity/falcoctl/pkg/oci"
 	"github.com/falcosecurity/falcoctl/pkg/oci/authn"

pkg/options/registry_options.go

@@ -0,0 +1,29 @@
+// Copyright 2022 The Falco Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package options
+
+import "github.com/spf13/cobra"
+
+// RegistryOptions defines options that are common while interacting with a remote registry.
+type RegistryOptions struct {
+	Oauth     bool
+	PlainHTTP bool
+}
+
+// AddFlags registers the registry flags.
+func (r *RegistryOptions) AddFlags(cmd *cobra.Command) {
+	cmd.Flags().BoolVar(&r.Oauth, "oauth", false, "allows interacting with remote registry via OAuth authentication")
+	cmd.Flags().BoolVar(&r.PlainHTTP, "plain-http", false, "allows interacting with remote registry via plain http requests")
+}