Merge branch 'main' into npm/config

cmds/ocm/app/app.go

@@ -36,6 +36,7 @@ import (
 	"github.com/open-component-model/ocm/cmds/ocm/commands/toicmds"
 	"github.com/open-component-model/ocm/cmds/ocm/commands/verbs/add"
 	"github.com/open-component-model/ocm/cmds/ocm/commands/verbs/bootstrap"
+	"github.com/open-component-model/ocm/cmds/ocm/commands/verbs/check"
 	"github.com/open-component-model/ocm/cmds/ocm/commands/verbs/clean"
 	"github.com/open-component-model/ocm/cmds/ocm/commands/verbs/controller"
 	"github.com/open-component-model/ocm/cmds/ocm/commands/verbs/create"
@@ -82,7 +83,7 @@ type CLIOptions struct {
 	keyoption.Option
 
 	Completed   bool
-	Config      string
+	Config      []string
 	ConfigSets  []string
 	Credentials []string
 	Context     clictx.Context
@@ -141,7 +142,7 @@ default credential, always used if no dedicated match is found.
 For example:
 
 <center>
-    <pre>--cred :type=ociRegistry --cred :hostname=ghcr.io --cred username=mandelsoft --cred password=xyz</pre>
+    <pre>--cred :type=OCIRegistry --cred :hostname=ghcr.io --cred username=mandelsoft --cred password=xyz</pre>
 </center>
 
 With the option <code>-X</code> it is possible to pass global settings of the
@@ -231,6 +232,7 @@ func newCliCommand(opts *CLIOptions, mod ...func(clictx.Context, *cobra.Command)
 
 	cmd.AddCommand(NewVersionCommand(opts.Context))
 
+	cmd.AddCommand(check.NewCommand(opts.Context))
 	cmd.AddCommand(get.NewCommand(opts.Context))
 	cmd.AddCommand(create.NewCommand(opts.Context))
 	cmd.AddCommand(add.NewCommand(opts.Context))
@@ -306,7 +308,7 @@ func newCliCommand(opts *CLIOptions, mod ...func(clictx.Context, *cobra.Command)
 }
 
 func (o *CLIOptions) AddFlags(fs *pflag.FlagSet) {
-	fs.StringVarP(&o.Config, "config", "", "", "configuration file")
+	fs.StringArrayVarP(&o.Config, "config", "", nil, "configuration file")
 	fs.StringSliceVarP(&o.ConfigSets, "config-set", "", nil, "apply configuration set")
 	fs.StringArrayVarP(&o.Credentials, "cred", "C", nil, "credential setting")
 	fs.StringArrayVarP(&o.Settings, "attribute", "X", nil, "attribute setting")
@@ -335,9 +337,18 @@ func (o *CLIOptions) Complete() error {
 	if err != nil {
 		return err
 	}
-	_, err = utils.Configure(o.Context.OCMContext(), o.Config, vfsattr.Get(o.Context))
-	if err != nil {
-		return err
+
+	if len(o.Config) == 0 {
+		_, err = utils.Configure(o.Context.OCMContext(), "", vfsattr.Get(o.Context))
+		if err != nil {
+			return err
+		}
+	}
+	for _, config := range o.Config {
+		_, err = utils.Configure(o.Context.OCMContext(), config, vfsattr.Get(o.Context))
+		if err != nil {
+			return err
+		}
 	}
 
 	err = o.Option.Configure(o.Context)

cmds/ocm/commands/common/options/failonerroroption/option.go

@@ -5,6 +5,7 @@
 package failonerroroption
 
 import (
+	"github.com/open-component-model/ocm/pkg/errors"
 	"github.com/spf13/pflag"
 
 	"github.com/open-component-model/ocm/cmds/ocm/pkg/options"
@@ -22,10 +23,40 @@ func New() *Option {
 
 type Option struct {
 	Fail bool
+	err  error
 }
 
 func (o *Option) AddFlags(fs *pflag.FlagSet) {
-	fs.BoolVarP(&o.Fail, "fail-on-error", "", false, "fail on label validation error")
+	fs.BoolVarP(&o.Fail, "fail-on-error", "", false, "fail on validation error")
 }
 
 var _ options.Options = (*Option)(nil)
+
+func (o *Option) GetError() error {
+	return o.err
+}
+func (o *Option) SetError(err error) {
+	o.err = err
+}
+
+func (o *Option) AddError(err error) {
+	if err == nil {
+		return
+	}
+	if o.err == nil {
+		o.err = errors.ErrList().Add(err)
+	} else {
+		if l, ok := o.err.(*errors.ErrorList); ok {
+			l.Add(err)
+		} else {
+			o.err = errors.ErrList().Add(o.err, err)
+		}
+	}
+}
+
+func (o *Option) ActivatedError() error {
+	if o.Fail {
+		return o.err
+	}
+	return nil
+}

cmds/ocm/commands/misccmds/credentials/get/cmd.go

@@ -8,9 +8,6 @@ import (
 	"sort"
 	"strings"
 
-	"github.com/spf13/cobra"
-	"github.com/spf13/pflag"
-
 	"github.com/open-component-model/ocm/cmds/ocm/commands/misccmds/names"
 	"github.com/open-component-model/ocm/cmds/ocm/commands/verbs"
 	"github.com/open-component-model/ocm/cmds/ocm/pkg/output"
@@ -19,6 +16,9 @@ import (
 	"github.com/open-component-model/ocm/pkg/contexts/credentials"
 	"github.com/open-component-model/ocm/pkg/errors"
 	"github.com/open-component-model/ocm/pkg/listformat"
+	"github.com/open-component-model/ocm/pkg/out"
+	"github.com/spf13/cobra"
+	"github.com/spf13/pflag"
 )
 
 var (
@@ -32,7 +32,8 @@ type Command struct {
 	Consumer credentials.ConsumerIdentity
 	Matcher  credentials.IdentityMatcher
 
-	Type string
+	Type   string
+	Sloppy bool
 }
 
 var _ utils.OCMCommand = (*Command)(nil)
@@ -75,6 +76,7 @@ The usage of a dedicated matcher can be enforced by the option <code>--matcher</
 
 func (o *Command) AddFlags(set *pflag.FlagSet) {
 	set.StringVarP(&o.Type, "matcher", "m", "", "matcher type override")
+	set.BoolVarP(&o.Sloppy, "sloppy", "s", false, "sloppy matching of consumer type")
 }
 
 func (o *Command) Complete(args []string) error {
@@ -111,6 +113,14 @@ func (o *Command) Complete(args []string) error {
 }
 
 func (o *Command) Run() error {
+	if o.Sloppy {
+		fix := credentials.GuessConsumerType(o, o.Consumer.Type())
+		if fix != o.Consumer.Type() {
+			out.Outf(o, "Correcting consumer type to %q\n", fix)
+			o.Consumer[credentials.ID_TYPE] = fix
+		}
+	}
+
 	creds, err := credentials.RequiredCredentialsForConsumer(o.CredentialsContext(), o.Consumer, o.Matcher)
 	if err != nil {
 		return err

cmds/ocm/commands/misccmds/rsakeypair/cmd_test.go

@@ -61,12 +61,12 @@ created rsa key pair key.priv[key.pub]
 			Issuer:     ISSUER,
 		}
 		d := digest.FromBytes([]byte("digest"))
-		sig, err := rsa.Handler{}.Sign(defaultContext, d.Hex(), sctx)
+		sig, err := rsa.NewHandler().Sign(defaultContext, d.Hex(), sctx)
 		Expect(err).To(Succeed())
 		Expect(sig.Algorithm).To(Equal(rsa.Algorithm))
 		Expect(sig.MediaType).To(Equal(rsa.MediaType))
 
-		err = rsa.Handler{}.Verify(d.Hex(), sig, &signing.DefaultSigningContext{PublicKey: pub})
+		err = rsa.NewHandler().Verify(d.Hex(), sig, &signing.DefaultSigningContext{PublicKey: pub})
 		Expect(err).To(Succeed())
 	})
 
@@ -90,12 +90,12 @@ created rsa key pair key.priv[key.cert]
 			Issuer:     ISSUER,
 		}
 		d := digest.FromBytes([]byte("digest"))
-		sig, err := rsa.Handler{}.Sign(defaultContext, d.Hex(), sctx)
+		sig, err := rsa.NewHandler().Sign(defaultContext, d.Hex(), sctx)
 		Expect(err).To(Succeed())
 		Expect(sig.Algorithm).To(Equal(rsa.Algorithm))
 		Expect(sig.MediaType).To(Equal(rsa.MediaType))
 
-		err = rsa.Handler{}.Verify(d.Hex(), sig, &signing.DefaultSigningContext{PublicKey: pub})
+		err = rsa.NewHandler().Verify(d.Hex(), sig, &signing.DefaultSigningContext{PublicKey: pub})
 		Expect(err).To(Succeed())
 	})
 
@@ -137,7 +137,7 @@ created encrypted rsa key pair key.priv[key.pub][key.priv.ekey]
 				Issuer:     ISSUER,
 			}
 			d := digest.FromBytes([]byte("digest"))
-			Must(rsa.Handler{}.Sign(defaultContext, d.Hex(), sctx))
+			Must(rsa.NewHandler().Sign(defaultContext, d.Hex(), sctx))
 
 			buf.Reset()
 			Expect(env.CatchOutput(buf).Execute("create", "rsakeypair", "-e", KEYNAME, "other.priv")).To(Succeed())