From 96e4380f0c7483f36a9d401c6b7420c59f7c002f Mon Sep 17 00:00:00 2001
From: Uwe Krueger <uwe.krueger@sap.com>
Date: Mon, 28 Nov 2022 23:45:30 +0100
Subject: [PATCH 1/2] file option + fix various close leaks + fix makefiles

---
 .../common/options/fileoption/option.go       | 82 +++++++++++++++++++
 .../common/options/signoption/option.go       |  4 +-
 cmds/ocm/commands/ocmcmds/common/resources.go | 24 +++++-
 .../ocmcmds/componentarchive/create/cmd.go    | 23 +++---
 .../ocmcmds/components/transfer/cmd.go        |  3 +-
 .../ocmcmds/components/transfer/cmd_test.go   |  9 +-
 .../components/transfer/upload_test.go        |  6 +-
 .../commands/ocmcmds/references/add/cmd.go    | 11 +--
 .../ocmcmds/references/add/cmd_test.go        | 18 ++--
 .../ocm/commands/ocmcmds/resources/add/cmd.go | 13 ++-
 .../ocmcmds/resources/add/cmd_test.go         | 40 ++++++---
 cmds/ocm/commands/ocmcmds/sources/add/cmd.go  | 12 +--
 .../commands/ocmcmds/sources/add/cmd_test.go  |  8 +-
 components/demoplugin/Makefile                | 13 +--
 components/helmdemo/Makefile                  | 16 ++--
 components/helminstaller/Dockerfile           |  3 +-
 components/helminstaller/Makefile             | 20 +++--
 components/ocmcli/Makefile                    |  3 +-
 docs/reference/ocm_add_references.md          |  5 +-
 docs/reference/ocm_add_resources.md           |  7 +-
 docs/reference/ocm_add_sources.md             |  9 +-
 docs/reference/ocm_create_componentarchive.md |  6 ++
 examples/make/Makefile                        |  2 +-
 go.mod                                        | 12 +--
 go.sum                                        | 18 ++++
 .../artifactset/artifactset_test.go           | 38 ++++-----
 .../generic/ocirepo/blobhandler.go            |  1 +
 pkg/contexts/ocm/session.go                   |  1 +
 28 files changed, 280 insertions(+), 127 deletions(-)
 create mode 100644 cmds/ocm/commands/ocmcmds/common/options/fileoption/option.go

diff --git a/cmds/ocm/commands/ocmcmds/common/options/fileoption/option.go b/cmds/ocm/commands/ocmcmds/common/options/fileoption/option.go
new file mode 100644
index 000000000..bdf360c79
--- /dev/null
+++ b/cmds/ocm/commands/ocmcmds/common/options/fileoption/option.go
@@ -0,0 +1,82 @@
+// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors.
+//
+// SPDX-License-Identifier: Apache-2.0
+
+package fileoption
+
+import (
+	"archive/tar"
+	"fmt"
+
+	"github.com/mandelsoft/vfs/pkg/vfs"
+	"github.com/spf13/pflag"
+
+	"github.com/open-component-model/ocm/cmds/ocm/pkg/options"
+	"github.com/open-component-model/ocm/pkg/common/accessio"
+	"github.com/open-component-model/ocm/pkg/common/compression"
+)
+
+func From(o options.OptionSetProvider) *Option {
+	var opt *Option
+	o.AsOptionSet().Get(&opt)
+	return opt
+}
+
+func NewCompArch() *Option {
+	return New("component-archive")
+}
+
+func New(def string, us ...interface{}) *Option {
+	usage := fmt.Sprint(us...)
+	if usage == "" {
+		usage = "target file/directory"
+	}
+	return &Option{def: def, usage: usage}
+}
+
+type Option struct {
+	flag  *pflag.Flag
+	def   string
+	usage string
+	Path  string
+}
+
+func (o *Option) AddFlags(fs *pflag.FlagSet) {
+	o.flag = fs.StringVarPF(&o.Path, "file", "F", o.def, o.usage)
+}
+
+func (o *Option) IsSet() bool {
+	return o.flag.Changed
+}
+
+// GetPath return a path depending on the option setting and the first argument.
+// if the option is not set and the first argument denotes a path to a directory or tar file,
+// the first argument if chosen as path.
+func (o *Option) GetPath(args []string, fss ...vfs.FileSystem) (string, []string) {
+	if o.IsSet() || len(args) == 0 {
+		return o.Path, args
+	}
+
+	fs := accessio.FileSystem(fss...)
+	if ok, err := vfs.Exists(fs, args[0]); !ok || err != nil {
+		return o.Path, args
+	}
+	if ok, _ := vfs.IsDir(fs, args[0]); ok {
+		return args[0], args[1:]
+	}
+
+	file, err := fs.Open(args[0])
+	if err != nil {
+		return o.Path, args
+	}
+	defer file.Close()
+	r, _, err := compression.AutoDecompress(file)
+	if err != nil {
+		return o.Path, args
+	}
+	_, err = tar.NewReader(r).Next()
+	if err != nil {
+		return o.Path, args
+	}
+	return args[0], args[1:]
+}
diff --git a/cmds/ocm/commands/ocmcmds/common/options/signoption/option.go b/cmds/ocm/commands/ocmcmds/common/options/signoption/option.go
index 79ab1cfaf..d306e7aa5 100644
--- a/cmds/ocm/commands/ocmcmds/common/options/signoption/option.go
+++ b/cmds/ocm/commands/ocmcmds/common/options/signoption/option.go
@@ -152,7 +152,7 @@ func (o *Option) Complete(ctx clictx.Context) error {
 }
 
 func (o *Option) handleKeys(ctx clictx.Context, desc string, keys []string, add func(string, interface{})) error {
-	for i, k := range keys {
+	for _, k := range keys {
 		name := ""
 		if len(o.SignatureNames) > 0 {
 			name = o.SignatureNames[0]
@@ -161,7 +161,7 @@ func (o *Option) handleKeys(ctx clictx.Context, desc string, keys []string, add
 		sep := strings.Index(k, "=")
 		if sep >= 0 {
 			name = k[:sep]
-			file = k[i+1:]
+			file = k[sep+1:]
 		}
 		if len(file) == 0 {
 			return errors.Newf("empty file name")
diff --git a/cmds/ocm/commands/ocmcmds/common/resources.go b/cmds/ocm/commands/ocmcmds/common/resources.go
index b8e6f6fe3..75dd6674c 100644
--- a/cmds/ocm/commands/ocmcmds/common/resources.go
+++ b/cmds/ocm/commands/ocmcmds/common/resources.go
@@ -20,6 +20,8 @@ import (
 	"k8s.io/apimachinery/pkg/util/validation/field"
 
 	"github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/common/inputs"
+	"github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/common/options/fileoption"
+	"github.com/open-component-model/ocm/cmds/ocm/pkg/options"
 	"github.com/open-component-model/ocm/cmds/ocm/pkg/template"
 	"github.com/open-component-model/ocm/cmds/ocm/pkg/utils"
 	"github.com/open-component-model/ocm/pkg/cobrautils/flagsets"
@@ -379,12 +381,21 @@ type ResourceAdderCommand struct {
 	Templating template.Options
 	Adder      ResourceSpecificationsProvider
 
-	Archive   string
 	Resources []ResourceSpecifications
 	Envs      []string
+
+	Archive string
+}
+
+func NewResourceAdderCommand(ctx clictx.Context, provider ResourceSpecificationsProvider, opts ...options.Options) ResourceAdderCommand {
+	return ResourceAdderCommand{
+		BaseCommand: utils.NewBaseCommand(ctx, append(opts, fileoption.NewCompArch())...),
+		Adder:       provider,
+	}
 }
 
 func (o *ResourceAdderCommand) AddFlags(fs *pflag.FlagSet) {
+	o.BaseCommand.AddFlags(fs)
 	fs.StringArrayVarP(&o.Envs, "settings", "s", nil, "settings file with variable settings (yaml)")
 	o.Templating.AddFlags(fs)
 	if o.Adder != nil {
@@ -393,7 +404,12 @@ func (o *ResourceAdderCommand) AddFlags(fs *pflag.FlagSet) {
 }
 
 func (o *ResourceAdderCommand) Complete(args []string) error {
-	o.Archive = args[0]
+	err := o.OptionSet.ProcessOnOptions(options.CompleteOptionsWithCLIContext(o.Context))
+	if err != nil {
+		return err
+	}
+
+	o.Archive, args = fileoption.From(o).GetPath(args, o.Context.FileSystem())
 	o.Templating.Complete(o.Context.FileSystem())
 
 	if o.Adder != nil {
@@ -409,12 +425,12 @@ func (o *ResourceAdderCommand) Complete(args []string) error {
 		o.Resources = append(o.Resources, rsc...)
 	}
 
-	err := o.Templating.ParseSettings(o.Context.FileSystem(), o.Envs...)
+	err = o.Templating.ParseSettings(o.Context.FileSystem(), o.Envs...)
 	if err != nil {
 		return err
 	}
 
-	paths := o.Templating.FilterSettings(args[1:]...)
+	paths := o.Templating.FilterSettings(args...)
 	for _, p := range paths {
 		o.Resources = append(o.Resources, NewResourceSpecificationsFile(p, o.FileSystem()))
 	}
diff --git a/cmds/ocm/commands/ocmcmds/componentarchive/create/cmd.go b/cmds/ocm/commands/ocmcmds/componentarchive/create/cmd.go
index b3afe2d0d..a7dab97f2 100644
--- a/cmds/ocm/commands/ocmcmds/componentarchive/create/cmd.go
+++ b/cmds/ocm/commands/ocmcmds/componentarchive/create/cmd.go
@@ -14,6 +14,7 @@ import (
 
 	"github.com/open-component-model/ocm/cmds/ocm/commands/common/options/formatoption"
 	"github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/common"
+	"github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/common/options/fileoption"
 	"github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/common/options/schemaoption"
 	"github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/names"
 	"github.com/open-component-model/ocm/cmds/ocm/commands/verbs"
@@ -39,7 +40,6 @@ type Command struct {
 
 	Handler comparch.FormatHandler
 	Force   bool
-	Path    string
 	Format  string
 
 	Component      string
@@ -51,7 +51,7 @@ type Command struct {
 
 // NewCommand creates a new ctf command.
 func NewCommand(ctx clictx.Context, names ...string) *cobra.Command {
-	return utils.SetupCommand(&Command{BaseCommand: utils.NewBaseCommand(ctx, formatoption.New(comparch.GetFormats()...), schemaoption.New(compdesc.DefaultSchemeVersion))}, utils.Names(Names, names...)...)
+	return utils.SetupCommand(&Command{BaseCommand: utils.NewBaseCommand(ctx, formatoption.New(comparch.GetFormats()...), fileoption.NewCompArch(), schemaoption.New(compdesc.DefaultSchemeVersion))}, utils.Names(Names, names...)...)
 }
 
 func (o *Command) ForName(name string) *cobra.Command {
@@ -59,6 +59,9 @@ func (o *Command) ForName(name string) *cobra.Command {
 		Use:   "[<options>] <component> <version> --provider <provider-name> {--provider <label>=<value>} {<label>=<value>}",
 		Args:  cobra.MinimumNArgs(2),
 		Short: "create new component archive",
+		Example: `
+$ ocm create componentarchive --file myfirst --provider acme.org --provider email=alice@acme.org amcme.org/demo 1.0
+`,
 		Long: `
 Create a new component archive. This might be either a directory prepared
 to host component version content or a tar/tgz file (see option --type).
@@ -72,7 +75,6 @@ func (o *Command) AddFlags(fs *pflag.FlagSet) {
 	o.BaseCommand.AddFlags(fs)
 	fs.BoolVarP(&o.Force, "force", "f", false, "remove existing content")
 	fs.StringArrayVarP(&o.providerattrs, "provider", "p", nil, "provider attribute")
-	fs.StringVarP(&o.Path, "file", "F", "component-archive", "target file/directory")
 }
 
 func (o *Command) Complete(args []string) error {
@@ -115,20 +117,21 @@ func (o *Command) Complete(args []string) error {
 func (o *Command) Run() error {
 	mode := formatoption.From(o).Mode()
 	fs := o.Context.FileSystem()
-	if ok, err := vfs.Exists(fs, o.Path); ok || err != nil {
+	fp := fileoption.From(o).Path
+	if ok, err := vfs.Exists(fs, fp); ok || err != nil {
 		if err != nil {
 			return err
 		}
 		if o.Force {
-			err = fs.RemoveAll(o.Path)
+			err = fs.RemoveAll(fp)
 			if err != nil {
-				return errors.Wrapf(err, "cannot remove old %q", o.Path)
+				return errors.Wrapf(err, "cannot remove old %q", fp)
 			}
 		}
 	}
-	obj, err := comparch.Create(o.Context.OCMContext(), accessobj.ACC_CREATE, o.Path, mode, o.Handler, fs)
+	obj, err := comparch.Create(o.Context.OCMContext(), accessobj.ACC_CREATE, fp, mode, o.Handler, fs)
 	if err != nil {
-		fs.RemoveAll(o.Path)
+		fs.RemoveAll(fp)
 		return err
 	}
 	desc := obj.GetDescriptor()
@@ -142,12 +145,12 @@ func (o *Command) Run() error {
 	err = compdesc.Validate(desc)
 	if err != nil {
 		obj.Close()
-		fs.RemoveAll(o.Path)
+		fs.RemoveAll(fp)
 		return errors.Newf("invalid component info: %s", err)
 	}
 	err = obj.Close()
 	if err != nil {
-		fs.RemoveAll(o.Path)
+		fs.RemoveAll(fp)
 	}
 	return err
 }
diff --git a/cmds/ocm/commands/ocmcmds/components/transfer/cmd.go b/cmds/ocm/commands/ocmcmds/components/transfer/cmd.go
index 8fbda015c..52055a348 100644
--- a/cmds/ocm/commands/ocmcmds/components/transfer/cmd.go
+++ b/cmds/ocm/commands/ocmcmds/components/transfer/cmd.go
@@ -89,7 +89,8 @@ func (o *Command) Complete(args []string) error {
 func (o *Command) Run() error {
 	session := ocm.NewSession(nil)
 	defer session.Close()
-
+	session.Finalize(o.OCMContext())
+	
 	err := o.ProcessOnOptions(ocmcommon.CompleteOptionsWithSession(o, session))
 	if err != nil {
 		return err
diff --git a/cmds/ocm/commands/ocmcmds/components/transfer/cmd_test.go b/cmds/ocm/commands/ocmcmds/components/transfer/cmd_test.go
index 53d2921fa..6b744f733 100644
--- a/cmds/ocm/commands/ocmcmds/components/transfer/cmd_test.go
+++ b/cmds/ocm/commands/ocmcmds/components/transfer/cmd_test.go
@@ -40,7 +40,7 @@ const OCIHOST = "alias"
 func Check(env *TestEnv, ldesc *artdesc.Descriptor, out string) {
 	tgt, err := ctfocm.Open(env.OCMContext(), accessobj.ACC_READONLY, out, 0, accessio.PathFileSystem(env.FileSystem()))
 	Expect(err).To(Succeed())
-	defer tgt.Close()
+	defer Close(tgt, "ctf")
 
 	list, err := tgt.ComponentLister().GetComponents("", true)
 	Expect(err).To(Succeed())
@@ -51,6 +51,7 @@ func Check(env *TestEnv, ldesc *artdesc.Descriptor, out string) {
 func CheckComponent(env *TestEnv, ldesc *artdesc.Descriptor, tgt ocm.Repository) {
 	comp, err := tgt.LookupComponentVersion(COMPONENT, VERSION)
 	Expect(err).To(Succeed())
+	defer Close(comp, "comvers")
 	Expect(len(comp.GetDescriptor().Resources)).To(Equal(3))
 
 	data, err := json.Marshal(comp.GetDescriptor().Resources[2].Access)
@@ -74,6 +75,7 @@ func CheckComponent(env *TestEnv, ldesc *artdesc.Descriptor, tgt ocm.Repository)
 
 	blob, err := set.GetBlob(ldesc.Digest)
 	Expect(err).To(Succeed())
+	defer Close(blob, "blob")
 	data, err = blob.Get()
 	Expect(err).To(Succeed())
 	Expect(string(data)).To(Equal("manifestlayer"))
@@ -165,14 +167,13 @@ transferring version "github.com/mandelsoft/test2:v1"...
 		Expect(env.DirExists(OUT)).To(BeTrue())
 		tgt, err := ctfocm.Open(env.OCMContext(), accessobj.ACC_READONLY, OUT, 0, accessio.PathFileSystem(env.FileSystem()))
 		Expect(err).To(Succeed())
-		defer tgt.Close()
+		defer Close(tgt, "ctf")
 
 		list, err := tgt.ComponentLister().GetComponents("", true)
 		Expect(err).To(Succeed())
 		Expect(list).To(ContainElements([]string{COMPONENT2, COMPONENT}))
 
-		_, err = tgt.LookupComponentVersion(COMPONENT2, VERSION)
-		Expect(err).To(Succeed())
+		Expect(tgt.ExistsComponentVersion(COMPONENT2, VERSION)).To(BeTrue())
 
 		CheckComponent(env, ldesc, tgt)
 	})
diff --git a/cmds/ocm/commands/ocmcmds/components/transfer/upload_test.go b/cmds/ocm/commands/ocmcmds/components/transfer/upload_test.go
index 929e3eb8c..609dc3ee5 100644
--- a/cmds/ocm/commands/ocmcmds/components/transfer/upload_test.go
+++ b/cmds/ocm/commands/ocmcmds/components/transfer/upload_test.go
@@ -112,13 +112,11 @@ transferring version "github.com/compa:1.0.0"...
 `))
 
 		copy := Must(ctfocm.Open(ctx, accessobj.ACC_READONLY, COPY, 0700, env))
-		ocopy := accessio.OnceCloser(copy)
-		defer Close(ocopy)
+		defer Close(copy)
 
 		// check type
 		cv2 := Must(copy.LookupComponentVersion(COMP, VERS))
-		ocv2 := accessio.OnceCloser(cv2)
-		defer Close(ocv2)
+		defer Close(cv2)
 		ra := Must(cv2.GetResourceByIndex(0))
 		acc := Must(ra.Access())
 		Expect(acc.GetKind()).To(Equal(ociartifact.Type))
diff --git a/cmds/ocm/commands/ocmcmds/references/add/cmd.go b/cmds/ocm/commands/ocmcmds/references/add/cmd.go
index 5efcc223e..0dc268460 100644
--- a/cmds/ocm/commands/ocmcmds/references/add/cmd.go
+++ b/cmds/ocm/commands/ocmcmds/references/add/cmd.go
@@ -28,10 +28,7 @@ type Command struct {
 func NewCommand(ctx clictx.Context, names ...string) *cobra.Command {
 	return utils.SetupCommand(
 		&Command{
-			common.ResourceAdderCommand{
-				BaseCommand: utils.NewBaseCommand(ctx),
-				Adder:       NewReferenceSpecificatonProvider(),
-			},
+			common.NewResourceAdderCommand(ctx, NewReferenceSpecificatonProvider()),
 		},
 		utils.Names(Names, names...)...,
 	)
@@ -39,8 +36,8 @@ func NewCommand(ctx clictx.Context, names ...string) *cobra.Command {
 
 func (o *Command) ForName(name string) *cobra.Command {
 	return &cobra.Command{
-		Use:   "[<options>] <target> {<referencefile> | <var>=<value>}",
-		Args:  cobra.MinimumNArgs(1),
+		Use:   "[<options>] [<target>] {<referencefile> | <var>=<value>}",
+		Args:  cobra.MinimumNArgs(0),
 		Short: "add aggregation information to a component version",
 		Long: `
 Add aggregation information specified in a reference file to a component version.
@@ -53,7 +50,7 @@ description scheme of the component descriptor.
 		Example: `
 Add a reference directly by options
 <pre>
-$ ocm add references path/to/ca --name myref --component github.com/my/component --version ${VERSION}
+$ ocm add references --file path/to/ca --name myref --component github.com/my/component --version ${VERSION}
 </pre>
 
 Add a reference by a description file:
diff --git a/cmds/ocm/commands/ocmcmds/references/add/cmd_test.go b/cmds/ocm/commands/ocmcmds/references/add/cmd_test.go
index abc3829e4..e0b6ca3a1 100644
--- a/cmds/ocm/commands/ocmcmds/references/add/cmd_test.go
+++ b/cmds/ocm/commands/ocmcmds/references/add/cmd_test.go
@@ -46,7 +46,7 @@ var _ = Describe("Add references", func() {
 	})
 
 	It("adds simple ref", func() {
-		Expect(env.Execute("add", "references", ARCH, "/testdata/references.yaml")).To(Succeed())
+		Expect(env.Execute("add", "references", "--file", ARCH, "/testdata/references.yaml")).To(Succeed())
 		data, err := env.ReadFile(env.Join(ARCH, comparch.ComponentDescriptorFileName))
 		Expect(err).To(Succeed())
 		cd, err := compdesc.Decode(data)
@@ -57,7 +57,7 @@ var _ = Describe("Add references", func() {
 	})
 
 	It("adds simple ref wth extra identity", func() {
-		Expect(env.Execute("add", "references", ARCH, "/testdata/referenceswithid.yaml")).To(Succeed())
+		Expect(env.Execute("add", "references", "--file", ARCH, "/testdata/referenceswithid.yaml")).To(Succeed())
 		data, err := env.ReadFile(env.Join(ARCH, comparch.ComponentDescriptorFileName))
 		Expect(err).To(Succeed())
 		cd, err := compdesc.Decode(data)
@@ -70,7 +70,7 @@ var _ = Describe("Add references", func() {
 	})
 
 	It("adds simple ref by cli env file", func() {
-		Expect(env.Execute("add", "references", ARCH, "--settings", "/testdata/settings", "/testdata/references.tmpl")).To(Succeed())
+		Expect(env.Execute("add", "references", "--file", ARCH, "--settings", "/testdata/settings", "/testdata/references.tmpl")).To(Succeed())
 		data, err := env.ReadFile(env.Join(ARCH, comparch.ComponentDescriptorFileName))
 		Expect(err).To(Succeed())
 		cd, err := compdesc.Decode(data)
@@ -81,7 +81,7 @@ var _ = Describe("Add references", func() {
 	})
 
 	It("adds simple ref by cli variable", func() {
-		Expect(env.Execute("add", "references", ARCH, "VERSION=v1.1.1", "/testdata/references.tmpl")).To(Succeed())
+		Expect(env.Execute("add", "references", "--file", ARCH, "VERSION=v1.1.1", "/testdata/references.tmpl")).To(Succeed())
 		data, err := env.ReadFile(env.Join(ARCH, comparch.ComponentDescriptorFileName))
 		Expect(err).To(Succeed())
 		cd, err := compdesc.Decode(data)
@@ -93,7 +93,7 @@ var _ = Describe("Add references", func() {
 
 	Context("reference by options", func() {
 		It("adds simple ref", func() {
-			Expect(env.Execute("add", "references", ARCH, "--name", "testdata", "--component", REF, "--version", VERSION)).To(Succeed())
+			Expect(env.Execute("add", "references", "--file", ARCH, "--name", "testdata", "--component", REF, "--version", VERSION)).To(Succeed())
 			data, err := env.ReadFile(env.Join(ARCH, comparch.ComponentDescriptorFileName))
 			Expect(err).To(Succeed())
 			cd, err := compdesc.Decode(data)
@@ -109,7 +109,7 @@ labels:
 - name: test
   value: value
 `
-			Expect(env.Execute("add", "references", ARCH, "--name", "testdata", "--component", REF, "--version", VERSION, "--reference", spec)).To(Succeed())
+			Expect(env.Execute("add", "references", "--file", ARCH, "--name", "testdata", "--component", REF, "--version", VERSION, "--reference", spec)).To(Succeed())
 			data, err := env.ReadFile(env.Join(ARCH, comparch.ComponentDescriptorFileName))
 			Expect(err).To(Succeed())
 			cd, err := compdesc.Decode(data)
@@ -130,7 +130,7 @@ labels:
 - name: test
   value: value
 `
-			Expect(env.Execute("add", "references", ARCH, "--name", "testdata", "--component", REF, "--version", VERSION, "--reference", spec)).To(Succeed())
+			Expect(env.Execute("add", "references", "--file", ARCH, "--name", "testdata", "--component", REF, "--version", VERSION, "--reference", spec)).To(Succeed())
 			data, err := env.ReadFile(env.Join(ARCH, comparch.ComponentDescriptorFileName))
 			Expect(err).To(Succeed())
 			cd, err := compdesc.Decode(data)
@@ -145,7 +145,7 @@ labels:
 		})
 
 		It("completely specified by options with extra identity", func() {
-			Expect(env.Execute("add", "references", ARCH, "--name", "testdata", "--component", REF, "--version", VERSION, "--extra", "purpose=test", "--extra", "label=local")).To(Succeed())
+			Expect(env.Execute("add", "references", "--file", ARCH, "--name", "testdata", "--component", REF, "--version", VERSION, "--extra", "purpose=test", "--extra", "label=local")).To(Succeed())
 			data, err := env.ReadFile(env.Join(ARCH, comparch.ComponentDescriptorFileName))
 			Expect(err).To(Succeed())
 			cd, err := compdesc.Decode(data)
@@ -160,7 +160,7 @@ labels:
 		})
 
 		It("completely specified by options with labels", func() {
-			Expect(env.Execute("add", "references", ARCH, "--name", "testdata", "--component", REF, "--version", VERSION, "--label", "*purpose=test", "--label", `label@v1={"local": true}`)).To(Succeed())
+			Expect(env.Execute("add", "references", "--file", ARCH, "--name", "testdata", "--component", REF, "--version", VERSION, "--label", "*purpose=test", "--label", `label@v1={"local": true}`)).To(Succeed())
 			data, err := env.ReadFile(env.Join(ARCH, comparch.ComponentDescriptorFileName))
 			Expect(err).To(Succeed())
 			cd, err := compdesc.Decode(data)
diff --git a/cmds/ocm/commands/ocmcmds/resources/add/cmd.go b/cmds/ocm/commands/ocmcmds/resources/add/cmd.go
index 87bdb06e8..c425ab0ca 100644
--- a/cmds/ocm/commands/ocmcmds/resources/add/cmd.go
+++ b/cmds/ocm/commands/ocmcmds/resources/add/cmd.go
@@ -30,10 +30,7 @@ type Command struct {
 func NewCommand(ctx clictx.Context, names ...string) *cobra.Command {
 	return utils.SetupCommand(
 		&Command{
-			common.ResourceAdderCommand{
-				BaseCommand: utils.NewBaseCommand(ctx),
-				Adder:       NewResourceSpecificationsProvider(ctx, ""),
-			},
+			common.NewResourceAdderCommand(ctx, NewResourceSpecificationsProvider(ctx, "")),
 		},
 		utils.Names(Names, names...)...,
 	)
@@ -41,13 +38,13 @@ func NewCommand(ctx clictx.Context, names ...string) *cobra.Command {
 
 func (o *Command) ForName(name string) *cobra.Command {
 	return &cobra.Command{
-		Use:   "[<options>] <target> {<resourcefile> | <var>=<value>}",
-		Args:  cobra.MinimumNArgs(1),
+		Use:   "[<options>] [<target>] {<resourcefile> | <var>=<value>}",
+		Args:  cobra.MinimumNArgs(0),
 		Short: "add resources to a component version",
 		Example: `
 Add a resource directly by options
 <pre>
-$ ocm add resources path/to/ca --name myresource --type PlainText --input '{ "type": "file", "path": "testdata/testcontent", "mediaType": "text/plain" }'
+$ ocm add resources --file path/to/ca --name myresource --type PlainText --input '{ "type": "file", "path": "testdata/testcontent", "mediaType": "text/plain" }'
 </pre>
 
 Add a resource by a description file:
@@ -64,7 +61,7 @@ input:
   mediaType: text/plain
 </pre>
 <pre>
-$ ocm add resources  path/to/ca  resources.yaml VERSION=1.0.0
+$ ocm add resources --file path/to/ca  resources.yaml VERSION=1.0.0
 </pre>
 `,
 	}
diff --git a/cmds/ocm/commands/ocmcmds/resources/add/cmd_test.go b/cmds/ocm/commands/ocmcmds/resources/add/cmd_test.go
index d83446eb3..36332fe16 100644
--- a/cmds/ocm/commands/ocmcmds/resources/add/cmd_test.go
+++ b/cmds/ocm/commands/ocmcmds/resources/add/cmd_test.go
@@ -11,6 +11,7 @@ import (
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 	. "github.com/open-component-model/ocm/cmds/ocm/testhelper"
+	. "github.com/open-component-model/ocm/pkg/testutils"
 
 	"github.com/mandelsoft/vfs/pkg/vfs"
 	"github.com/opencontainers/go-digest"
@@ -97,6 +98,17 @@ var _ = Describe("Add resources", func() {
 	})
 
 	It("adds simple text blob", func() {
+		Expect(env.Execute("add", "resources", "--file", ARCH, "/testdata/resources.yaml")).To(Succeed())
+		data, err := env.ReadFile(env.Join(ARCH, comparch.ComponentDescriptorFileName))
+		Expect(err).To(Succeed())
+		cd, err := compdesc.Decode(data)
+		Expect(err).To(Succeed())
+		Expect(len(cd.Resources)).To(Equal(1))
+
+		CheckTextResource(env, cd, "testdata")
+	})
+
+	It("adds simple text blob with direct archive file", func() {
 		Expect(env.Execute("add", "resources", ARCH, "/testdata/resources.yaml")).To(Succeed())
 		data, err := env.ReadFile(env.Join(ARCH, comparch.ComponentDescriptorFileName))
 		Expect(err).To(Succeed())
@@ -108,7 +120,7 @@ var _ = Describe("Add resources", func() {
 	})
 
 	It("adds simple text blob by cli env file", func() {
-		Expect(env.Execute("add", "resources", ARCH, "--settings", "/testdata/settings", "/testdata/resources.tmpl")).To(Succeed())
+		Expect(env.Execute("add", "resources", "--file", ARCH, "--settings", "/testdata/settings", "/testdata/resources.tmpl")).To(Succeed())
 		data, err := env.ReadFile(env.Join(ARCH, comparch.ComponentDescriptorFileName))
 		Expect(err).To(Succeed())
 		cd, err := compdesc.Decode(data)
@@ -119,7 +131,7 @@ var _ = Describe("Add resources", func() {
 	})
 
 	It("adds simple text blob by cli variable", func() {
-		Expect(env.Execute("add", "resources", ARCH, "CONTENT=testcontent", "/testdata/resources.tmpl")).To(Succeed())
+		Expect(env.Execute("add", "resources", "--file", ARCH, "CONTENT=testcontent", "/testdata/resources.tmpl")).To(Succeed())
 		data, err := env.ReadFile(env.Join(ARCH, comparch.ComponentDescriptorFileName))
 		Expect(err).To(Succeed())
 		cd, err := compdesc.Decode(data)
@@ -130,7 +142,7 @@ var _ = Describe("Add resources", func() {
 	})
 
 	It("adds helm chart", func() {
-		Expect(env.Execute("add", "resources", ARCH, "/testdata/helm.yaml")).To(Succeed())
+		Expect(env.Execute("add", "resources", "--file", ARCH, "/testdata/helm.yaml")).To(Succeed())
 		data, err := env.ReadFile(env.Join(ARCH, comparch.ComponentDescriptorFileName))
 		Expect(err).To(Succeed())
 		cd, err := compdesc.Decode(data)
@@ -154,23 +166,25 @@ var _ = Describe("Add resources", func() {
 
 		set, err := artifactset.OpenFromBlob(accessobj.ACC_READONLY, blob)
 		Expect(err).To(Succeed())
-		defer set.Close()
+		defer Close(set, "artefactset")
 		art, err := set.GetArtifact(set.GetMain().String())
 		Expect(err).To(Succeed())
+		defer Close(art, "artefact")
 		m := art.ManifestAccess().GetDescriptor()
 		Expect(len(m.Layers)).To(Equal(1))
 
 		blob, err = set.GetBlob(m.Layers[0].Digest)
 		Expect(err).To(Succeed())
+		defer Close(blob, "blob")
 		reader, err := blob.Reader()
 		Expect(err).To(Succeed())
-
+		defer reader.Close()
 		_, err = loader.LoadArchive(reader)
 		Expect(err).To(Succeed())
 	})
 
 	It("adds external image", func() {
-		Expect(env.Execute("add", "resources", ARCH, "/testdata/image.yaml")).To(Succeed())
+		Expect(env.Execute("add", "resources", "--file", ARCH, "/testdata/image.yaml")).To(Succeed())
 		data, err := env.ReadFile(env.Join(ARCH, comparch.ComponentDescriptorFileName))
 		Expect(err).To(Succeed())
 		cd, err := compdesc.Decode(data)
@@ -202,7 +216,7 @@ type: file
 path: testdata/testcontent
 mediaType: text/plain
 `
-			Expect(env.Execute("add", "resources", ARCH, "--resource", meta, "--input", input)).To(Succeed())
+			Expect(env.Execute("add", "resources", "--file", ARCH, "--resource", meta, "--input", input)).To(Succeed())
 			data, err := env.ReadFile(env.Join(ARCH, comparch.ComponentDescriptorFileName))
 			Expect(err).To(Succeed())
 			cd, err := compdesc.Decode(data)
@@ -222,7 +236,7 @@ type: file
 path: ${CONTENT}
 mediaType: text/plain
 `
-			Expect(env.Execute("add", "resources", ARCH, "CONTENT=testdata/testcontent", "--resource", meta, "--input", input)).To(Succeed())
+			Expect(env.Execute("add", "resources", "--file", ARCH, "CONTENT=testdata/testcontent", "--resource", meta, "--input", input)).To(Succeed())
 			data, err := env.ReadFile(env.Join(ARCH, comparch.ComponentDescriptorFileName))
 			Expect(err).To(Succeed())
 			cd, err := compdesc.Decode(data)
@@ -243,7 +257,7 @@ relation: external
 type: ociArtifact
 imageReference: ghcr.io/mandelsoft/pause:v0.1.0
 `
-			Expect(env.Execute("add", "resources", ARCH, "--resource", meta, "--access", access)).To(Succeed())
+			Expect(env.Execute("add", "resources", "--file", ARCH, "--resource", meta, "--access", access)).To(Succeed())
 			data, err := env.ReadFile(env.Join(ARCH, comparch.ComponentDescriptorFileName))
 			Expect(err).To(Succeed())
 			cd, err := compdesc.Decode(data)
@@ -268,7 +282,7 @@ imageReference: ghcr.io/mandelsoft/pause:v0.1.0
 			input := `
 { "type": "file", "path": "testdata/testcontent", "mediaType": "text/plain" }
 `
-			Expect(env.Execute("add", "resources", ARCH, "--name", "testdata", "--type", "PlainText", "--input", input)).To(Succeed())
+			Expect(env.Execute("add", "resources", "--file", ARCH, "--name", "testdata", "--type", "PlainText", "--input", input)).To(Succeed())
 			data, err := env.ReadFile(env.Join(ARCH, comparch.ComponentDescriptorFileName))
 			Expect(err).To(Succeed())
 			cd, err := compdesc.Decode(data)
@@ -283,7 +297,7 @@ imageReference: ghcr.io/mandelsoft/pause:v0.1.0
 name: testdata
 type: PlainText
 `
-			Expect(env.Execute("add", "resources", ARCH, "--resource", meta, "--inputType", "file", "--inputPath", "testdata/testcontent", "--"+options.MediatypeOption.GetName(), "text/plain")).To(Succeed())
+			Expect(env.Execute("add", "resources", "--file", ARCH, "--resource", meta, "--inputType", "file", "--inputPath", "testdata/testcontent", "--"+options.MediatypeOption.GetName(), "text/plain")).To(Succeed())
 			data, err := env.ReadFile(env.Join(ARCH, comparch.ComponentDescriptorFileName))
 			Expect(err).To(Succeed())
 			cd, err := compdesc.Decode(data)
@@ -298,7 +312,7 @@ type: PlainText
 name: testdata
 type: PlainText
 `
-			Expect(env.Execute("add", "resources", ARCH, "--resource", meta, "--inputType", "spiff", "--inputPath", "testdata/spiffcontent", "--"+options.MediatypeOption.GetName(), "text/plain", "IMAGE=test")).To(Succeed())
+			Expect(env.Execute("add", "resources", "--file", ARCH, "--resource", meta, "--inputType", "spiff", "--inputPath", "testdata/spiffcontent", "--"+options.MediatypeOption.GetName(), "text/plain", "IMAGE=test")).To(Succeed())
 			data, err := env.ReadFile(env.Join(ARCH, comparch.ComponentDescriptorFileName))
 			Expect(err).To(Succeed())
 			cd, err := compdesc.Decode(data)
@@ -309,7 +323,7 @@ type: PlainText
 		})
 
 		It("adds external image by options", func() {
-			Expect(env.Execute("add", "resources", ARCH,
+			Expect(env.Execute("add", "resources", "--file", ARCH,
 				"--type", "ociImage",
 				"--name", "image",
 				"--version", "v0.1.0",
diff --git a/cmds/ocm/commands/ocmcmds/sources/add/cmd.go b/cmds/ocm/commands/ocmcmds/sources/add/cmd.go
index c27b43e40..6d41fe1d2 100644
--- a/cmds/ocm/commands/ocmcmds/sources/add/cmd.go
+++ b/cmds/ocm/commands/ocmcmds/sources/add/cmd.go
@@ -30,10 +30,7 @@ type Command struct {
 func NewCommand(ctx clictx.Context, names ...string) *cobra.Command {
 	return utils.SetupCommand(
 		&Command{
-			common.ResourceAdderCommand{
-				BaseCommand: utils.NewBaseCommand(ctx),
-				Adder:       common.NewContentResourceSpecificationProvider(ctx, "source", nil, ""),
-			},
+			common.NewResourceAdderCommand(ctx, common.NewContentResourceSpecificationProvider(ctx, "source", nil, "")),
 		},
 		utils.Names(Names, names...)...,
 	)
@@ -41,9 +38,12 @@ func NewCommand(ctx clictx.Context, names ...string) *cobra.Command {
 
 func (o *Command) ForName(name string) *cobra.Command {
 	return &cobra.Command{
-		Use:   "[<options>] <target> {<resourcefile> | <var>=<value>}",
-		Args:  cobra.MinimumNArgs(1),
+		Use:   "[<options>] [<target>] {<resourcefile> | <var>=<value>}",
+		Args:  cobra.MinimumNArgs(0),
 		Short: "add source information to a component version",
+		Example: `
+$ ocm add sources --file path/to/cafile sources.yaml
+`,
 	}
 }
 
diff --git a/cmds/ocm/commands/ocmcmds/sources/add/cmd_test.go b/cmds/ocm/commands/ocmcmds/sources/add/cmd_test.go
index c291b7d9e..5b48065bb 100644
--- a/cmds/ocm/commands/ocmcmds/sources/add/cmd_test.go
+++ b/cmds/ocm/commands/ocmcmds/sources/add/cmd_test.go
@@ -101,7 +101,7 @@ var _ = Describe("Add sources", func() {
 	})
 
 	It("adds simple text blob", func() {
-		Expect(env.Execute("add", "sources", ARCH, "/testdata/sources.yaml")).To(Succeed())
+		Expect(env.Execute("add", "sources", "--file", ARCH, "/testdata/sources.yaml")).To(Succeed())
 		data, err := env.ReadFile(env.Join(ARCH, comparch.ComponentDescriptorFileName))
 		Expect(err).To(Succeed())
 		cd, err := compdesc.Decode(data)
@@ -113,7 +113,7 @@ var _ = Describe("Add sources", func() {
 	})
 
 	It("adds simple text blob by cli env file", func() {
-		Expect(env.Execute("add", "sources", ARCH, "--settings", "/testdata/settings", "/testdata/sources.tmpl")).To(Succeed())
+		Expect(env.Execute("add", "sources", "--file", ARCH, "--settings", "/testdata/settings", "/testdata/sources.tmpl")).To(Succeed())
 		data, err := env.ReadFile(env.Join(ARCH, comparch.ComponentDescriptorFileName))
 		Expect(err).To(Succeed())
 		cd, err := compdesc.Decode(data)
@@ -124,7 +124,7 @@ var _ = Describe("Add sources", func() {
 	})
 
 	It("adds simple text blob by cli variable", func() {
-		Expect(env.Execute("add", "sources", ARCH, "CONTENT=testcontent", "/testdata/sources.tmpl")).To(Succeed())
+		Expect(env.Execute("add", "sources", "--file", ARCH, "CONTENT=testcontent", "/testdata/sources.tmpl")).To(Succeed())
 		data, err := env.ReadFile(env.Join(ARCH, comparch.ComponentDescriptorFileName))
 		Expect(err).To(Succeed())
 		cd, err := compdesc.Decode(data)
@@ -145,7 +145,7 @@ type: file
 path: testdata/testcontent
 mediaType: text/plain
 `
-			Expect(env.Execute("add", "sources", ARCH, "--source", meta, "--input", input)).To(Succeed())
+			Expect(env.Execute("add", "sources", "--file", ARCH, "--source", meta, "--input", input)).To(Succeed())
 			data, err := env.ReadFile(env.Join(ARCH, comparch.ComponentDescriptorFileName))
 			Expect(err).To(Succeed())
 			cd, err := compdesc.Decode(data)
diff --git a/components/demoplugin/Makefile b/components/demoplugin/Makefile
index 38e3d1546..6f14c1151 100644
--- a/components/demoplugin/Makefile
+++ b/components/demoplugin/Makefile
@@ -1,13 +1,15 @@
 NAME      = demoplugin
-PROVIDER  ?= mandelsoft
-COMPONENT = github.com/$(PROVIDER)/ocm$(NAME)
-OCMREPO   ?= ghcr.io/$(PROVIDER)/cnudie
+PROVIDER  ?= ocm.software
+GITHUBORG  ?= open-component-model
+COMPONENT = $(PROVIDER)/plugins/$(NAME)
+OCMREPO   ?= ghcr.io/$(GITHUBORG)/ocm
 PLATFORMS = linux/amd64 linux/arm64
 
 REPO_ROOT                                      := $(shell dirname $(realpath $(lastword $(MAKEFILE_LIST))))/../..
 VERSION                                        = $(shell git describe --tags --exact-match 2>/dev/null|| echo "$$(cat $(REPO_ROOT)/VERSION)-dev")
 COMMIT                                         = $(shell git rev-parse HEAD)
 EFFECTIVE_VERSION                              = $(VERSION)-$(COMMIT)
+GIT_TREE_STATE                                 := $(shell [ -z "$(git status --porcelain 2>/dev/null)" ] && echo clean || echo dirty)
 
 CMDSRCS=$(shell find $(REPO_ROOT)/cmds/$(NAME) -type f)
 OCMSRCS=$(shell find $(REPO_ROOT)/pkg -type f) $(REPO_ROOT)/go.*
@@ -39,8 +41,9 @@ $(GEN)/build: $(CMDSRCS) $(OCMSRCS)
 ctf: $(GEN)/ctf
 
 $(GEN)/ctf: $(GEN)/ca.done
+	@rm -rf "$(GEN)/ctf"
 	$(OCM) transfer ca $(GEN)/ca $(GEN)/ctf
-	touch $(GEN)/ctf
+	touch "$(GEN)/ctf"
 
 .PHONY: version
 version:
@@ -51,7 +54,7 @@ ca: $(GEN)/ca.done
 
 $(GEN)/ca.done: $(GEN)/.exists $(GEN)/build resources.yaml $(CHARTSRCS)
 	$(OCM) create ca -f $(COMPONENT) "$(VERSION)" --provider $(PROVIDER) --file $(GEN)/ca
-	$(OCM) add resources --templater=spiff $(GEN)/ca NAME="$(NAME)" VERSION="$(VERSION)" COMMIT="$(COMMIT)" GEN="$(GEN)" PLATFORMS="$(PLATFORMS)" resources.yaml
+	$(OCM) add resources --templater=spiff --file $(GEN)/ca NAME="$(NAME)" VERSION="$(VERSION)" COMMIT="$(COMMIT)" GEN="$(GEN)" PLATFORMS="$(PLATFORMS)" resources.yaml
 	@touch $(GEN)/ca.done
 
 .PHONY: push
diff --git a/components/helmdemo/Makefile b/components/helmdemo/Makefile
index 9aa8b5cd0..4a99d0c08 100644
--- a/components/helmdemo/Makefile
+++ b/components/helmdemo/Makefile
@@ -1,13 +1,14 @@
 NAME      = helmdemo
-PROVIDER  ?= mandelsoft
-IMAGE     = ocm$(NAME)
-COMPONENT = github.com/$(PROVIDER)/ocm$(NAME)
-OCMREPO   ?= ghcr.io/$(PROVIDER)/cnudie
+PROVIDER  ?= ocm.software
+GITHUBORG  ?= open-component-model
+IMAGE     = $(NAME)
+COMPONENT = $(PROVIDER)/toi/demo/$(NAME)
+OCMREPO   ?= ghcr.io/$(GITHUBORG)/ocm
 
-HELMINSTCOMP = github.com/$(PROVIDER)/ocmhelminstaller
+HELMINSTCOMP = $(PROVIDER)/toi/installers/helminstaller
 
 REPO_ROOT                                      := $(shell dirname $(realpath $(lastword $(MAKEFILE_LIST))))/../..
-VERSION                                        = $(shell git describe --tags --exact-match 2>/dev/null|| echo "$$(cat $(REPO_ROOT)/VERSION)-dev")
+VERSION                                        = $(shell git describe --tags --exact-match 2>/dev/null|| echo "$$(cat $(REPO_ROOT)/VERSION)")
 COMMIT                                         = $(shell git rev-parse HEAD)
 EFFECTIVE_VERSION                              = $(VERSION)-$(COMMIT)
 
@@ -20,6 +21,7 @@ CHARTSRCS=$(shell find echoserver -type f)
 ctf: $(GEN)/ctf
 
 $(GEN)/ctf: $(GEN)/ca
+	@rm -f $(GEN)/ctf
 	$(OCM) transfer ca $(GEN)/ca $(GEN)/ctf
 	touch $(GEN)/ctf
 
@@ -34,7 +36,7 @@ $(GEN)/ca: $(GEN)/.exists sources.yaml resources.yaml references.yaml $(CHARTSRC
 	$(OCM) create ca -f $(COMPONENT) "$(VERSION)" --provider $(PROVIDER) --file $(GEN)/ca
 	$(OCM) add sources $(GEN)/ca VERSION="$(VERSION)" COMMIT="$(COMMIT)" IMAGE="$(IMAGE):$(VERSION)" sources.yaml
 	$(OCM) add resources $(GEN)/ca VERSION="$(VERSION)" COMMIT="$(COMMIT)" IMAGE="$(IMAGE):$(VERSION)" resources.yaml
-	$(OCM) add references $(GEN)/ca VERSION="$(VERSION)" COMMIT="$(COMMIT)" IMAGE="$(IMAGE):$(VERSION)" HELMINSTCOMP=$(HELMINSTCOMP) references.yaml
+	$(OCM) add references  $(GEN)/ca VERSION="$(VERSION)" COMMIT="$(COMMIT)" IMAGE="$(IMAGE):$(VERSION)" HELMINSTCOMP=$(HELMINSTCOMP) references.yaml
 	@touch $(GEN)/ca
 
 .PHONY: push
diff --git a/components/helminstaller/Dockerfile b/components/helminstaller/Dockerfile
index 984ad4e39..444534ccc 100644
--- a/components/helminstaller/Dockerfile
+++ b/components/helminstaller/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.17 AS builder
+FROM golang:1.19 AS builder
 ARG COMMIT
 ARG EFFECTIVE_VERSION
 ARG GIT_TREE_STATE
@@ -7,6 +7,7 @@ WORKDIR /go/src/github.com/open-component-model/ocm/
 COPY go.* ./
 COPY pkg pkg
 COPY cmds cmds
+COPY hack/generate-docs hack/generate-docs
 #COPY go/pkg pkg
 RUN --mount=type=cache,target=/root/.cache/go-build go get -d ./...
 RUN --mount=type=cache,target=/root/.cache/go-build CGO_ENABLED=0 go build -o /main -ldflags "-s -w \
diff --git a/components/helminstaller/Makefile b/components/helminstaller/Makefile
index 0116797a6..aae592984 100644
--- a/components/helminstaller/Makefile
+++ b/components/helminstaller/Makefile
@@ -1,16 +1,18 @@
 NAME      = helminstaller
-PROVIDER  ?= mandelsoft
-IMAGE     = ocm$(NAME)
-COMPONENT = github.com/$(PROVIDER)/ocm$(NAME)
-OCMREPO   ?= ghcr.io/$(PROVIDER)/cnudie
+PROVIDER  ?= ocm.software
+GITHUBORG  ?= open-component-model
+IMAGE     = $(NAME)
+COMPONENT = $(PROVIDER)/toi/installers/$(NAME)
+OCMREPO   ?= ghcr.io/$(GITHUBORG)/ocm
 MULTI     ?= true
 PLATFORMS = linux/amd64 linux/arm64
 
 REPO_ROOT                                      := $(shell dirname $(realpath $(lastword $(MAKEFILE_LIST))))/../..
-VERSION                                        := $(shell git describe --tags --exact-match 2>/dev/null|| echo "$$(cat $(REPO_ROOT)/VERSION)-dev")
+VERSION                                        := $(shell git describe --tags --exact-match 2>/dev/null|| echo "$$(cat $(REPO_ROOT)/VERSION)")
 COMMIT                                         := $(shell git rev-parse --verify HEAD)
 EFFECTIVE_VERSION                              := $(VERSION)-$(COMMIT)
-GIT_TREE_STATE                                 := $(shell [ -z git status --porcelain 2>/dev/null ] && echo clean || echo dirty)
+GIT_TREE_STATE                                 := $(shell [ -z "$(git status --porcelain 2>/dev/null)" ] && echo clean || echo dirty)
+
 
 GEN = $(REPO_ROOT)/gen/$(NAME)
 OCM = go run $(REPO_ROOT)/cmds/ocm
@@ -26,6 +28,7 @@ endif
 ctf: $(GEN)/ctf
 
 $(GEN)/ctf: $(GEN)/ca
+	@rm -rf "$(GEN)/ctf"
 	$(OCM) transfer ca $(GEN)/ca $(GEN)/ctf
 	touch $(GEN)/ctf
 
@@ -69,6 +72,7 @@ multi: $(GEN)/image.$(NAME).multi
 $(GEN)/image.$(NAME).multi: $(GEN)/.exists Dockerfile $(CMDSRCS) $(OCMSRCS)
 	for i in $(PLATFORMS); do \
 	tag=$$(echo $$i | sed -e s:/:-:g); \
+        echo building platform $$i; \
 	docker buildx build -t $(IMAGE):$(VERSION)-$$tag --platform $$i --file Dockerfile $(REPO_ROOT) \
           --build-arg COMMIT=$(COMMIT) \
           --build-arg EFFECTIVE_VERSION=$(EFFECTIVE_VERSION) \
@@ -112,6 +116,10 @@ describe: $(GEN)/ctf
 descriptor: $(GEN)/ctf
 	ocm get component -S v3alpha1 -o yaml $(GEN)/ctf
 
+.PHONY: setup
+setup:
+	docker run --userns=host --privileged --rm docker/binfmt:a7996909642ee92942dcd6cff44b9b95f08dad64
+
 .PHONY: clean
 clean:
 	rm -rf $(GEN)
diff --git a/components/ocmcli/Makefile b/components/ocmcli/Makefile
index 62633f2f5..51acf842f 100644
--- a/components/ocmcli/Makefile
+++ b/components/ocmcli/Makefile
@@ -41,6 +41,7 @@ $(GEN)/build: $(CMDSRCS) $(OCMSRCS)
 ctf: $(GEN)/ctf
 
 $(GEN)/ctf: $(GEN)/ca.done
+	@rm -rf "$(GEN)/ctf"
 	$(OCM) transfer ca $(GEN)/ca $(GEN)/ctf
 	touch $(GEN)/ctf
 
@@ -53,7 +54,7 @@ ca: $(GEN)/ca.done
 
 $(GEN)/ca.done: $(GEN)/.exists $(GEN)/build resources.yaml $(CHARTSRCS)
 	$(OCM) create ca -f $(COMPONENT) "$(VERSION)" --provider $(PROVIDER) --file $(GEN)/ca
-	$(OCM) add resources --templater=spiff $(GEN)/ca VERSION="$(VERSION)" NAME="$(NAME)" COMMIT="$(COMMIT)" GEN="$(GEN)" PLATFORMS="$(PLATFORMS)" resources.yaml
+	$(OCM) add resources --templater=spiff --file $(GEN)/ca VERSION="$(VERSION)" NAME="$(NAME)" COMMIT="$(COMMIT)" GEN="$(GEN)" PLATFORMS="$(PLATFORMS)" resources.yaml
 	@touch $(GEN)/ca.done
 
 .PHONY: push
diff --git a/docs/reference/ocm_add_references.md b/docs/reference/ocm_add_references.md
index edf4f2be8..0fe96a253 100644
--- a/docs/reference/ocm_add_references.md
+++ b/docs/reference/ocm_add_references.md
@@ -3,13 +3,14 @@
 ### Synopsis
 
 ```
-ocm add references [<options>] <target> {<referencefile> | <var>=<value>}
+ocm add references [<options>] [<target>] {<referencefile> | <var>=<value>}
 ```
 
 ### Options
 
 ```
       --addenv                 access environment for templating
+  -F, --file string            target file/directory (default "component-archive")
   -h, --help                   help for references
   -s, --settings stringArray   settings file with variable settings (yaml)
       --templater string       templater to use (subst, spiff, go) (default "subst")
@@ -101,7 +102,7 @@ There are several templaters that can be selected by the <code>--templater</code
 Add a reference directly by options
 
 <pre>
-$ ocm add references path/to/ca &dash;&dash;name myref &dash;&dash;component github.com/my/component &dash;&dash;version ${VERSION}
+$ ocm add references &dash;&dash;file path/to/ca &dash;&dash;name myref &dash;&dash;component github.com/my/component &dash;&dash;version ${VERSION}
 </pre>
 
 
diff --git a/docs/reference/ocm_add_resources.md b/docs/reference/ocm_add_resources.md
index 5b477c392..aa74e6dc4 100644
--- a/docs/reference/ocm_add_resources.md
+++ b/docs/reference/ocm_add_resources.md
@@ -3,13 +3,14 @@
 ### Synopsis
 
 ```
-ocm add resources [<options>] <target> {<resourcefile> | <var>=<value>}
+ocm add resources [<options>] [<target>] {<resourcefile> | <var>=<value>}
 ```
 
 ### Options
 
 ```
       --addenv                       access environment for templating
+  -F, --file string                  target file/directory (default "component-archive")
   -h, --help                         help for resources
   -s, --settings stringArray         settings file with variable settings (yaml)
       --templater string             templater to use (subst, spiff, go) (default "subst")
@@ -514,7 +515,7 @@ shown below.
 Add a resource directly by options
 
 <pre>
-$ ocm add resources path/to/ca &dash;&dash;name myresource &dash;&dash;type PlainText &dash;&dash;input '{ "type": "file", "path": "testdata/testcontent", "mediaType": "text/plain" }'
+$ ocm add resources &dash;&dash;file path/to/ca &dash;&dash;name myresource &dash;&dash;type PlainText &dash;&dash;input '{ "type": "file", "path": "testdata/testcontent", "mediaType": "text/plain" }'
 </pre>
 
 
@@ -535,7 +536,7 @@ input:
 
 
 <pre>
-$ ocm add resources  path/to/ca  resources.yaml VERSION=1.0.0
+$ ocm add resources &dash;&dash;file path/to/ca  resources.yaml VERSION=1.0.0
 </pre>
 
 
diff --git a/docs/reference/ocm_add_sources.md b/docs/reference/ocm_add_sources.md
index d192f4009..1986146ad 100644
--- a/docs/reference/ocm_add_sources.md
+++ b/docs/reference/ocm_add_sources.md
@@ -3,13 +3,14 @@
 ### Synopsis
 
 ```
-ocm add sources [<options>] <target> {<resourcefile> | <var>=<value>}
+ocm add sources [<options>] [<target>] {<resourcefile> | <var>=<value>}
 ```
 
 ### Options
 
 ```
       --addenv                       access environment for templating
+  -F, --file string                  target file/directory (default "component-archive")
   -h, --help                         help for sources
   -s, --settings stringArray         settings file with variable settings (yaml)
       --templater string             templater to use (subst, spiff, go) (default "subst")
@@ -505,6 +506,12 @@ shown below.
   
 
 
+### Examples
+
+```
+$ ocm add sources --file path/to/cafile sources.yaml
+```
+
 ### SEE ALSO
 
 ##### Parents
diff --git a/docs/reference/ocm_create_componentarchive.md b/docs/reference/ocm_create_componentarchive.md
index cf59be3c7..c1a6469f0 100644
--- a/docs/reference/ocm_create_componentarchive.md
+++ b/docs/reference/ocm_create_componentarchive.md
@@ -39,6 +39,12 @@ The following schema versions are supported:
   - <code>v2</code> (default): 
 
 
+### Examples
+
+```
+$ ocm create componentarchive --file myfirst --provider acme.org --provider email=alice@acme.org amcme.org/demo 1.0
+```
+
 ### SEE ALSO
 
 ##### Parents
diff --git a/examples/make/Makefile b/examples/make/Makefile
index d3f341286..c94aac4fd 100644
--- a/examples/make/Makefile
+++ b/examples/make/Makefile
@@ -13,7 +13,7 @@ ctf: ca ## Create CTF from component archive
 .PHONY: ca
 ca: gen releasenotes ## Create component archive
 	ocm create ca -f $(COMPONENT) "$(VERSION)" mandelsoft gen/ca
-	ocm add resources gen/ca VERSION="$(VERSION)" COMMIT="$(COMMIT)" resources.yaml
+	ocm add resources --file gen/ca VERSION="$(VERSION)" COMMIT="$(COMMIT)" resources.yaml
 
 .PHONY: dummy
 dummy: commit ca ## Commit and create component archive
diff --git a/go.mod b/go.mod
index edc5aef5a..63b7ef497 100644
--- a/go.mod
+++ b/go.mod
@@ -23,7 +23,7 @@ require (
 	github.com/spf13/cobra v1.6.1
 	github.com/xeipuuv/gojsonschema v1.2.0
 	golang.org/x/net v0.0.0-20220722155237-a158d28d115b
-	golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f // indirect
+	golang.org/x/sys v0.0.0-20221013171732-95e765b1cc43 // indirect
 	gotest.tools/v3 v3.1.0 // indirect
 	k8s.io/apimachinery v0.24.3
 	sigs.k8s.io/yaml v1.3.0
@@ -54,7 +54,7 @@ require (
 	github.com/onsi/ginkgo/v2 v2.2.0
 	github.com/pkg/errors v0.9.1
 	github.com/spf13/pflag v1.0.5
-	github.com/stretchr/testify v1.7.2
+	github.com/stretchr/testify v1.8.0
 	github.com/tonglil/buflogr v1.0.1
 	github.com/ulikunitz/xz v0.5.10
 	golang.org/x/lint v0.0.0-20210508222113-6edffad5e616
@@ -107,7 +107,7 @@ require (
 	github.com/fsnotify/fsnotify v1.5.1 // indirect
 	github.com/fvbommel/sortorder v1.0.1 // indirect
 	github.com/go-errors/errors v1.0.1 // indirect
-	github.com/go-gorp/gorp/v3 v3.0.2 // indirect
+	github.com/go-gorp/gorp/v3 v3.1.0 // indirect
 	github.com/go-openapi/jsonpointer v0.19.5 // indirect
 	github.com/go-openapi/jsonreference v0.19.5 // indirect
 	github.com/go-openapi/swag v0.19.14 // indirect
@@ -135,11 +135,11 @@ require (
 	github.com/json-iterator/go v1.1.12 // indirect
 	github.com/lann/builder v0.0.0-20180802200727-47ae307949d0 // indirect
 	github.com/lann/ps v0.0.0-20150810152359-62de8c46ede0 // indirect
-	github.com/lib/pq v1.10.6 // indirect
+	github.com/lib/pq v1.10.7 // indirect
 	github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de // indirect
 	github.com/mailru/easyjson v0.7.6 // indirect
-	github.com/mattn/go-colorable v0.1.12 // indirect
-	github.com/mattn/go-isatty v0.0.14 // indirect
+	github.com/mattn/go-colorable v0.1.13 // indirect
+	github.com/mattn/go-isatty v0.0.16 // indirect
 	github.com/mattn/go-runewidth v0.0.13 // indirect
 	github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 // indirect
 	github.com/miekg/pkcs11 v1.1.1 // indirect
diff --git a/go.sum b/go.sum
index 08a942567..b721ae5f0 100644
--- a/go.sum
+++ b/go.sum
@@ -481,6 +481,8 @@ github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod h1:tQ2
 github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8=
 github.com/go-gorp/gorp/v3 v3.0.2 h1:ULqJXIekoqMx29FI5ekXXFoH1dT2Vc8UhnRzBg+Emz4=
 github.com/go-gorp/gorp/v3 v3.0.2/go.mod h1:BJ3q1ejpV8cVALtcXvXaXyTOlMmJhWDxTmncaR6rwBY=
+github.com/go-gorp/gorp/v3 v3.1.0 h1:ItKF/Vbuj31dmV4jxA1qblpSwkl9g1typ24xoe70IGs=
+github.com/go-gorp/gorp/v3 v3.1.0/go.mod h1:dLEjIyyRNiXvNZ8PSmzpt1GsWAUK8kjVhEpjH8TixEw=
 github.com/go-ini/ini v1.25.4/go.mod h1:ByCAeIL28uOIIG0E3PJtZPDL8WnHpFKFOtgjp+3Ies8=
 github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
 github.com/go-kit/kit v0.9.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
@@ -780,6 +782,7 @@ github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORN
 github.com/kr/pretty v0.2.0/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI=
 github.com/kr/pretty v0.2.1 h1:Fmg33tUaq4/8ym9TJN1x7sLJnHVwhP33CNkpYV/7rwI=
 github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI=
+github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=
 github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
 github.com/kr/pty v1.1.5/go.mod h1:9r2w37qlBe7rQ6e1fg1S/9xpWHSnaqNdHD3WcMdbPDA=
 github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
@@ -796,6 +799,8 @@ github.com/lib/pq v1.2.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo=
 github.com/lib/pq v1.10.0/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o=
 github.com/lib/pq v1.10.6 h1:jbk+ZieJ0D7EVGJYpL9QTz7/YW6UHbmdnZWYyK5cdBs=
 github.com/lib/pq v1.10.6/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o=
+github.com/lib/pq v1.10.7 h1:p7ZhMD+KsSRozJr34udlUrhboJwWAgCg34+/ZZNvZZw=
+github.com/lib/pq v1.10.7/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o=
 github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de h1:9TO3cAIGXtEhnIaL+V+BEER86oLrvS+kWobKpbJuye0=
 github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de/go.mod h1:zAbeS9B/r2mtpb6U+EI2rYA5OAXxsYw6wTamcNW+zcE=
 github.com/linuxkit/virtsock v0.0.0-20201010232012-f8cee7dfc7a3/go.mod h1:3r6x7q95whyfWQpmGZTu3gk3v2YkMi05HEzl7Tf7YEo=
@@ -840,11 +845,15 @@ github.com/mattn/go-colorable v0.1.8/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope
 github.com/mattn/go-colorable v0.1.9/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc=
 github.com/mattn/go-colorable v0.1.12 h1:jF+Du6AlPIjs2BiUiQlKOX0rt3SujHxPnksPKZbaA40=
 github.com/mattn/go-colorable v0.1.12/go.mod h1:u5H1YNBxpqRaxsYJYSkiCWKzEfiAb1Gb520KVy5xxl4=
+github.com/mattn/go-colorable v0.1.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxecdEvA=
+github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovkB8vQcUbaXHg=
 github.com/mattn/go-isatty v0.0.3/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4=
 github.com/mattn/go-isatty v0.0.4/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4=
 github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU=
 github.com/mattn/go-isatty v0.0.14 h1:yVuAays6BHfxijgZPzw+3Zlu5yQgKGP2/hcQbHb7S9Y=
 github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27kJ6hsGG94=
+github.com/mattn/go-isatty v0.0.16 h1:bq3VjFmv/sOjHtdEhmkEV4x1AJtvUvOJ2PFAZ5+peKQ=
+github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM=
 github.com/mattn/go-oci8 v0.1.1/go.mod h1:wjDx6Xm9q7dFtHJvIlrI99JytznLw5wQ4R+9mNXJwGI=
 github.com/mattn/go-runewidth v0.0.2/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzpuz5H//U1FU=
 github.com/mattn/go-runewidth v0.0.7/go.mod h1:H031xJmbD/WCDINGzjvQ9THkh0rPKHF+m2gUSrubnMI=
@@ -858,6 +867,7 @@ github.com/mattn/go-sqlite3 v1.6.0/go.mod h1:FPy6KqzDD04eiIsT53CuJW3U88zkxoIYsOq
 github.com/mattn/go-sqlite3 v1.11.0/go.mod h1:FPy6KqzDD04eiIsT53CuJW3U88zkxoIYsOqkbpncsNc=
 github.com/mattn/go-sqlite3 v1.14.6 h1:dNPt6NO46WmLVt2DLNpwczCmdV5boIZ6g/tlDrlRUbg=
 github.com/mattn/go-sqlite3 v1.14.6/go.mod h1:NyWgC/yNuGj7Q9rpYnZvas74GogHl5/Z4A/KQRfk6bU=
+github.com/mattn/go-sqlite3 v1.14.15 h1:vfoHhTN1af61xCRSWzFIWzx2YskyMTwHLrExkBOjvxI=
 github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0=
 github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 h1:I0XW9+e1XWDxdcEniV4rQAIOPUGDq67JSCiRCgGCZLI=
 github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369/go.mod h1:BSXmuO+STAnVfrANrmjBb36TMTDstsz7MSK+HVaYKv4=
@@ -1015,6 +1025,7 @@ github.com/pointlander/peg v0.0.0-20160608205303-1d0268dfff9b/go.mod h1:WJTMcgeW
 github.com/posener/complete v1.1.1/go.mod h1:em0nMJCgc9GFtwrmVmEMR/ZL6WyhyjMBndrE9hABlRI=
 github.com/poy/onpar v0.0.0-20190519213022-ee068f8ea4d1 h1:oL4IBbcqwhhNWh31bjOX8C/OCy0zs9906d/VUru+bqg=
 github.com/poy/onpar v0.0.0-20190519213022-ee068f8ea4d1/go.mod h1:nSbFQvMj97ZyhFRSJYtut+msi4sOY6zJDGCdSc+/rZU=
+github.com/poy/onpar v1.1.2 h1:QaNrNiZx0+Nar5dLgTVp5mXkyoVFIbepjyEoGSnhbAY=
 github.com/pquerna/cachecontrol v0.0.0-20171018203845-0dec1b30a021/go.mod h1:prYjPmNq4d1NPVmpShWobRqXY3q7Vp+80DqgxxUrUIA=
 github.com/proglottis/gpgme v0.1.1/go.mod h1:fPbW/EZ0LvwQtH8Hy7eixhp1eF3G39dtx7GUN+0Gmy0=
 github.com/prometheus/client_golang v0.0.0-20180209125602-c332b6f63c06/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw=
@@ -1124,6 +1135,7 @@ github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+
 github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/objx v0.2.0 h1:Hbg2NidpLE8veEBkEZTL3CvlkUIVzuU9jDplZO54c48=
 github.com/stretchr/objx v0.2.0/go.mod h1:qt09Ya8vawLte6SNmTgCsAVtYtaKzEcn8ATUoHMkEqE=
+github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
 github.com/stretchr/testify v0.0.0-20180303142811-b89eecf5ca5d/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
 github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
 github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
@@ -1131,8 +1143,11 @@ github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81P
 github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA=
 github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
+github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/stretchr/testify v1.7.2 h1:4jaiDzPyXQvSd7D0EjG45355tLlV3VOECpq10pLC+8s=
 github.com/stretchr/testify v1.7.2/go.mod h1:R6va5+xMeoiuVRoj+gSkQ7d3FALtqAAGI1FQKckRals=
+github.com/stretchr/testify v1.8.0 h1:pSgiaMZlXftHpm5L7V1+rVB+AZJydKsMxsQBIJw4PKk=
+github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
 github.com/subosito/gotenv v1.2.0 h1:Slr1R9HxAlEKefgq5jn9U+DnETlIUa6HfgEzj0g5d7s=
 github.com/subosito/gotenv v1.2.0/go.mod h1:N0PQaV/YGNqwC0u51sEeR/aUtSLEXKX9iv69rRypqCw=
 github.com/sylabs/release-tools v0.1.0/go.mod h1:pqP/z/11/rYMQ0OM/Nn7TxGijw7KfZwW9UolD/J1TUo=
@@ -1507,6 +1522,9 @@ golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBc
 golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f h1:v4INt8xihDGvnrfjMDVXGxw9wrfxYyCjk0KbXjhR55s=
 golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20221013171732-95e765b1cc43 h1:OK7RB6t2WQX54srQQYSXMW8dF5C6/8+oA/s5QBmmto4=
+golang.org/x/sys v0.0.0-20221013171732-95e765b1cc43/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 h1:JGgROgKl9N8DuW20oFS5gxc+lE67/N3FcwmBPMe7ArY=
diff --git a/pkg/contexts/oci/repositories/artifactset/artifactset_test.go b/pkg/contexts/oci/repositories/artifactset/artifactset_test.go
index b49190baa..927bb3191 100644
--- a/pkg/contexts/oci/repositories/artifactset/artifactset_test.go
+++ b/pkg/contexts/oci/repositories/artifactset/artifactset_test.go
@@ -13,6 +13,7 @@ import (
 	. "github.com/onsi/gomega"
 	. "github.com/open-component-model/ocm/pkg/contexts/oci/repositories/artifactset/testhelper"
 	. "github.com/open-component-model/ocm/pkg/contexts/oci/repositories/ctf/testhelper"
+	. "github.com/open-component-model/ocm/pkg/testutils"
 
 	"github.com/mandelsoft/vfs/pkg/osfs"
 	"github.com/mandelsoft/vfs/pkg/vfs"
@@ -191,46 +192,39 @@ var _ = Describe("artifact management", func() {
 
 	Context("manifest", func() {
 		TestForAllFormats("read from filesystem artifact", func(format string) {
-			opts, err := accessio.AccessOptions(&artifactset.Options{}, opts, artifactset.StructureFormat(format))
-			Expect(err).To(Succeed())
+			opts := Must(accessio.AccessOptions(&artifactset.Options{}, opts, artifactset.StructureFormat(format)))
 
-			a, err := artifactset.FormatDirectory.Create("test", opts, 0700)
-			Expect(err).To(Succeed())
+			a := Must(artifactset.FormatDirectory.Create("test", opts, 0700))
 			Expect(vfs.DirExists(tempfs, "test/"+artifactset.BlobsDirectoryName)).To(BeTrue())
 			defaultManifestFill(a)
 			Expect(a.Close()).To(Succeed())
 
-			a, err = artifactset.FormatDirectory.Open(accessobj.ACC_READONLY, "test", opts)
-			Expect(err).To(Succeed())
-			defer a.Close()
+			a = Must(artifactset.FormatDirectory.Open(accessobj.ACC_READONLY, "test", opts))
+			defer Close(a, "artefactset")
 			Expect(len(a.GetIndex().Manifests)).To(Equal(1))
-			art, err := a.GetArtifact(a.GetIndex().Manifests[0].Digest.String())
-			Expect(err).To(Succeed())
+			art := Must(a.GetArtifact(a.GetIndex().Manifests[0].Digest.String()))
+			defer Close(art, "artefact")
 			Expect(art.IsManifest()).To(BeTrue())
-			blob, err := art.GetBlob("sha256:810ff2fb242a5dee4220f2cb0e6a519891fb67f2f828a6cab4ef8894633b1f50")
-			Expect(err).To(Succeed())
+			blob := Must(art.GetBlob("sha256:810ff2fb242a5dee4220f2cb0e6a519891fb67f2f828a6cab4ef8894633b1f50"))
 			Expect(blob.Get()).To(Equal([]byte("testdata")))
 			Expect(blob.MimeType()).To(Equal(mime.MIME_OCTET))
 		})
 
 		TestForAllFormats("read from tgz artifact", func(format string) {
-			opts, err := accessio.AccessOptions(&artifactset.Options{}, opts, artifactset.StructureFormat(format))
-			Expect(err).To(Succeed())
+			opts := Must(accessio.AccessOptions(&artifactset.Options{}, opts, artifactset.StructureFormat(format)))
 
-			a, err := artifactset.FormatTGZ.Create("test.tgz", opts, 0700)
-			Expect(err).To(Succeed())
+			a := Must(artifactset.FormatTGZ.Create("test.tgz", opts, 0700))
 			defaultManifestFill(a)
 			Expect(a.Close()).To(Succeed())
 
-			a, err = artifactset.Open(accessobj.ACC_READONLY, "test.tgz", 0, opts)
-			Expect(err).To(Succeed())
-			defer a.Close()
+			a = Must(artifactset.Open(accessobj.ACC_READONLY, "test.tgz", 0, opts))
+			defer Close(a, "artefactset")
 			Expect(len(a.GetIndex().Manifests)).To(Equal(1))
-			art, err := a.GetArtifact(a.GetIndex().Manifests[0].Digest.String())
-			Expect(err).To(Succeed())
+			art := Must(a.GetArtifact(a.GetIndex().Manifests[0].Digest.String()))
+			defer Close(art, "artefact")
 			Expect(art.IsManifest()).To(BeTrue())
-			blob, err := art.GetBlob("sha256:810ff2fb242a5dee4220f2cb0e6a519891fb67f2f828a6cab4ef8894633b1f50")
-			Expect(err).To(Succeed())
+			blob := Must(art.GetBlob("sha256:810ff2fb242a5dee4220f2cb0e6a519891fb67f2f828a6cab4ef8894633b1f50"))
+			defer Close(blob, "blob")
 			Expect(blob.Get()).To(Equal([]byte("testdata")))
 			Expect(blob.MimeType()).To(Equal(mime.MIME_OCTET))
 		})
diff --git a/pkg/contexts/ocm/blobhandler/generic/ocirepo/blobhandler.go b/pkg/contexts/ocm/blobhandler/generic/ocirepo/blobhandler.go
index 59ecef52c..023ca9599 100644
--- a/pkg/contexts/ocm/blobhandler/generic/ocirepo/blobhandler.go
+++ b/pkg/contexts/ocm/blobhandler/generic/ocirepo/blobhandler.go
@@ -112,6 +112,7 @@ func (b *artifactHandler) StoreBlob(blob cpi.BlobAccess, artType, hint string, g
 	if err != nil {
 		return nil, err
 	}
+	defer art.Close()
 
 	err = artifactset.TransferArtifact(art, namespace, oci.AsTags(tag)...)
 	if err != nil {
diff --git a/pkg/contexts/ocm/session.go b/pkg/contexts/ocm/session.go
index ff97b1337..cc5d14339 100644
--- a/pkg/contexts/ocm/session.go
+++ b/pkg/contexts/ocm/session.go
@@ -30,6 +30,7 @@ type EvaluationResult struct {
 type Session interface {
 	datacontext.Session
 
+	Finalize(Finalizer)
 	LookupRepository(Context, RepositorySpec) (Repository, error)
 	LookupComponent(ComponentContainer, string) (ComponentAccess, error)
 	LookupComponentVersion(r Repository, comp, vers string) (ComponentVersionAccess, error)

From 37b34a5f05ef17cc9e151819d338301122c2da65 Mon Sep 17 00:00:00 2001
From: Uwe Krueger <uwe.krueger@sap.com>
Date: Tue, 29 Nov 2022 14:53:50 +0100
Subject: [PATCH 2/2] more close leaks

---
 .gitignore                                    |   1 +
 .../ocm/accessmethods/github/method_test.go   |   1 +
 .../ocm/accessmethods/ociartifact/method.go   |   1 +
 .../transferhandler/standard/handler.go       |   8 +-
 pkg/signing/handlers/rsa/format.go            |   6 +-
 pkg/test/json_orig/json_orig_test.go          | 108 ------------------
 pkg/test/json_orig/json_test.go               |  93 ---------------
 pkg/test/json_orig/suite_test.go              |  17 ---
 pkg/utils/utils.go                            |   5 +-
 pkg/utils/utils_test.go                       |   1 +
 10 files changed, 19 insertions(+), 222 deletions(-)
 delete mode 100644 pkg/test/json_orig/json_orig_test.go
 delete mode 100644 pkg/test/json_orig/json_test.go
 delete mode 100644 pkg/test/json_orig/suite_test.go

diff --git a/.gitignore b/.gitignore
index 8632d57b7..15025d998 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,5 @@
 /cmds/test
+/pkg/test
 .idea
 *.sw[pqo]
 main
diff --git a/pkg/contexts/ocm/accessmethods/github/method_test.go b/pkg/contexts/ocm/accessmethods/github/method_test.go
index f19f0481e..f180a71ae 100644
--- a/pkg/contexts/ocm/accessmethods/github/method_test.go
+++ b/pkg/contexts/ocm/accessmethods/github/method_test.go
@@ -213,6 +213,7 @@ var _ = Describe("Method", func() {
 			Expect(err).ToNot(HaveOccurred())
 			_, err = m.Get()
 			Expect(err).ToNot(HaveOccurred())
+			m.Close()
 			Expect(called).To(BeTrue())
 		})
 	})
diff --git a/pkg/contexts/ocm/accessmethods/ociartifact/method.go b/pkg/contexts/ocm/accessmethods/ociartifact/method.go
index 12dad71b5..6b7de1ebd 100644
--- a/pkg/contexts/ocm/accessmethods/ociartifact/method.go
+++ b/pkg/contexts/ocm/accessmethods/ociartifact/method.go
@@ -246,5 +246,6 @@ func (m *accessMethod) getBlob() (artifactset.ArtifactBlob, error) {
 	if err != nil {
 		return nil, err
 	}
+	m.finalizer.Close(m.blob)
 	return m.blob, nil
 }
diff --git a/pkg/contexts/ocm/transfer/transferhandler/standard/handler.go b/pkg/contexts/ocm/transfer/transferhandler/standard/handler.go
index 5b280a116..1a534154f 100644
--- a/pkg/contexts/ocm/transfer/transferhandler/standard/handler.go
+++ b/pkg/contexts/ocm/transfer/transferhandler/standard/handler.go
@@ -53,9 +53,13 @@ func (h *Handler) TransferSource(src ocm.ComponentVersionAccess, a ocm.AccessSpe
 }
 
 func (h *Handler) HandleTransferResource(r ocm.ResourceAccess, m ocm.AccessMethod, hint string, t ocm.ComponentVersionAccess) error {
-	return t.SetResourceBlob(r.Meta(), accessio.BlobAccessForDataAccess("", -1, m.MimeType(), m), hint, nil)
+	blob := accessio.BlobAccessForDataAccess("", -1, m.MimeType(), m)
+	defer blob.Close()
+	return t.SetResourceBlob(r.Meta(), blob, hint, nil)
 }
 
 func (h *Handler) HandleTransferSource(r ocm.SourceAccess, m ocm.AccessMethod, hint string, t ocm.ComponentVersionAccess) error {
-	return t.SetSourceBlob(r.Meta(), accessio.BlobAccessForDataAccess("", -1, m.MimeType(), m), hint, nil)
+	blob := accessio.BlobAccessForDataAccess("", -1, m.MimeType(), m)
+	defer blob.Close()
+	return t.SetSourceBlob(r.Meta(), blob, hint, nil)
 }
diff --git a/pkg/signing/handlers/rsa/format.go b/pkg/signing/handlers/rsa/format.go
index aa1b1786f..dfcc4d972 100644
--- a/pkg/signing/handlers/rsa/format.go
+++ b/pkg/signing/handlers/rsa/format.go
@@ -30,7 +30,11 @@ func GetPublicKey(key interface{}) (*rsa.PublicKey, []string, error) {
 		return &k.PublicKey, nil, nil
 	case *x509.Certificate:
 		if p, ok := k.PublicKey.(*rsa.PublicKey); ok {
-			return p, k.DNSNames, nil
+			names := append(k.DNSNames[:0:0], k.DNSNames...) //nolint: gocritic // yes
+			if k.Issuer.CommonName != "" {
+				names = append(names, k.Issuer.CommonName)
+			}
+			return p, names, nil
 		}
 		return nil, nil, fmt.Errorf("unknown key public key %T in certificate", k)
 	default:
diff --git a/pkg/test/json_orig/json_orig_test.go b/pkg/test/json_orig/json_orig_test.go
deleted file mode 100644
index 2eee530c4..000000000
--- a/pkg/test/json_orig/json_orig_test.go
+++ /dev/null
@@ -1,108 +0,0 @@
-// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors.
-//
-// SPDX-License-Identifier: Apache-2.0
-
-package test_test
-
-import (
-	//"github.com/open-component-model/ocm/pkg/json"
-	"encoding/json"
-	"reflect"
-
-	. "github.com/onsi/ginkgo/v2"
-	. "github.com/onsi/gomega"
-
-	"github.com/open-component-model/ocm/pkg/runtime"
-)
-
-var _ = Describe("json", func() {
-
-	Context("what the fuck", func() {
-		It("derived marshal", func() {
-			d := &DerivedMarshal{
-				Field: "value",
-			}
-			data, err := json.Marshal(d)
-			Expect(err).To(Succeed())
-			Expect(string(data)).To(Equal("{\"Test\":\"test\"}")) // !!!! Field is not marshalled
-		})
-
-		It("derived fake marshal", func() {
-			var marshaler json.Marshaler
-
-			d := &DerivedFakeMarshal{
-				Field: "value",
-			}
-
-			ok := reflect.TypeOf(d).Implements(reflect.TypeOf(&marshaler).Elem())
-			Expect(ok).To(BeFalse())
-
-			data, err := json.Marshal(d)
-			Expect(err).To(Succeed())
-			Expect(string(data)).To(Equal("{\"Field\":\"value\"}")) // !!!! Base type not marshaled at all
-		})
-
-		It("using hidden marshal", func() {
-			var marshaler json.Marshaler
-
-			d := &UsingHidden{
-				DerivedFakeMarshal: DerivedFakeMarshal{
-					Marshal: Marshal{},
-					Field:   "value",
-				},
-				Using: "using",
-			}
-
-			ok := reflect.TypeOf(d).Implements(reflect.TypeOf(&marshaler).Elem())
-			Expect(ok).To(BeFalse())
-
-			data, err := json.Marshal(d)
-			Expect(err).To(Succeed())
-			Expect(string(data)).To(Equal("{\"Field\":\"value\",\"Using\":\"using\"}")) // !!!! Base type not marshaled at all
-		})
-
-		It("wrapping unstructured map", func() {
-			d := &WrappingUnstructured{
-				Unstructured: Unstructured{
-					runtime.ATTR_TYPE: "test",
-				},
-				Field: "value",
-			}
-			data, err := json.Marshal(d)
-			Expect(err).To(Succeed())
-			Expect(string(data)).To(Equal("{\"Unstructured\":{\"type\":\"test\"},\"Field\":\"value\"}")) // not inlined, why ?
-		})
-
-		It("wrapping unstructured map with inline tag", func() {
-			d := &WrappingUnstructuredInlined{
-				Unstructured: Unstructured{
-					runtime.ATTR_TYPE: "test",
-				},
-				Field: "value",
-			}
-			data, err := json.Marshal(d)
-			Expect(err).To(Succeed())
-			Expect(string(data)).To(Equal("{\"Unstructured\":{\"type\":\"test\"},\"Field\":\"value\"}")) // not inlined, why
-		})
-
-		// inline of named field does not work
-		It("non anonymous", func() {
-			un := &NonAnonymous{
-				ObjectType: runtime.ObjectType{"test"},
-				X:          "value",
-			}
-			data, err := json.Marshal(un)
-			Expect(err).To(Succeed())
-			Expect(string(data)).To(Equal("{\"ObjectType\":{\"type\":\"test\"},\"TTT\":\"value\"}")) // !!!!!
-		})
-		It("anonymous", func() {
-			un := &Anonymous{
-				ObjectType: runtime.ObjectType{"test"},
-				X:          "value",
-			}
-			data, err := json.Marshal(un)
-			Expect(err).To(Succeed())
-			Expect(string(data)).To(Equal("{\"type\":\"test\",\"TTT\":\"value\"}")) // !!!!!
-		})
-	})
-})
diff --git a/pkg/test/json_orig/json_test.go b/pkg/test/json_orig/json_test.go
deleted file mode 100644
index b492f47aa..000000000
--- a/pkg/test/json_orig/json_test.go
+++ /dev/null
@@ -1,93 +0,0 @@
-// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors.
-//
-// SPDX-License-Identifier: Apache-2.0
-
-package test_test
-
-import (
-	"encoding/json"
-	"reflect"
-
-	"github.com/sirupsen/logrus"
-
-	"github.com/open-component-model/ocm/pkg/runtime"
-)
-
-func InOut(in runtime.TypedObject, encoding runtime.Encoding) (runtime.TypedObject, string, error) {
-	t := reflect.TypeOf(in)
-	logrus.Infof("in: %s\n", t)
-	for t.Kind() == reflect.Ptr {
-		t = t.Elem()
-	}
-
-	var p reflect.Value
-
-	if t.Kind() == reflect.Map {
-		p = reflect.New(t)
-		m := reflect.MakeMap(t)
-		logrus.Infof("pointer: %s\n", p.Type())
-		p.Elem().Set(m)
-	} else {
-		p = reflect.New(t)
-	}
-	out := p.Interface().(runtime.TypedObject)
-
-	logrus.Infof("out: %T\n", out)
-	data, err := encoding.Marshal(in)
-	if err != nil {
-		return nil, "", err
-	}
-	err = encoding.Unmarshal(data, out)
-	return out, string(data), err
-}
-
-type NonAnonymous struct {
-	ObjectType runtime.ObjectType `json:",inline"`
-	X          string             `json:"TTT"`
-}
-
-type Anonymous struct {
-	runtime.ObjectType `json:",inline"`
-	X                  string `json:"TTT"`
-}
-
-type Marshal struct{}
-
-func (m *Marshal) MarshalJSON() ([]byte, error) {
-	return json.Marshal(struct {
-		Test string
-	}{
-		Test: "test",
-	})
-}
-
-type DerivedMarshal struct {
-	Marshal
-	Field string
-}
-
-var _ json.Marshaler = &DerivedMarshal{}
-
-type DerivedFakeMarshal struct {
-	Marshal
-	Field string
-}
-
-func (m *DerivedFakeMarshal) MarshalJSON() {}
-
-type UsingHidden struct {
-	DerivedFakeMarshal
-	Using string
-}
-
-type Unstructured map[string]interface{}
-
-type WrappingUnstructured struct {
-	Unstructured
-	Field string
-}
-
-type WrappingUnstructuredInlined struct {
-	Unstructured `json:",inline"`
-	Field        string
-}
diff --git a/pkg/test/json_orig/suite_test.go b/pkg/test/json_orig/suite_test.go
deleted file mode 100644
index 1316e06e6..000000000
--- a/pkg/test/json_orig/suite_test.go
+++ /dev/null
@@ -1,17 +0,0 @@
-// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors.
-//
-// SPDX-License-Identifier: Apache-2.0
-
-package test_test
-
-import (
-	"testing"
-
-	. "github.com/onsi/ginkgo/v2"
-	. "github.com/onsi/gomega"
-)
-
-func TestConfig(t *testing.T) {
-	RegisterFailHandler(Fail)
-	RunSpecs(t, "CTF Test Suite")
-}
diff --git a/pkg/utils/utils.go b/pkg/utils/utils.go
index a78444c21..1a6bd8f20 100644
--- a/pkg/utils/utils.go
+++ b/pkg/utils/utils.go
@@ -187,7 +187,10 @@ func WriteFileToTARArchive(filename string, contentReader io.Reader, archiveWrit
 	if err != nil {
 		return fmt.Errorf("unable to create tempfile: %w", err)
 	}
-	defer tempfile.Close()
+	defer func() {
+		tempfile.Close()
+		os.Remove(tempfile.Name())
+	}()
 
 	fsize, err := io.Copy(tempfile, contentReader)
 	if err != nil {
diff --git a/pkg/utils/utils_test.go b/pkg/utils/utils_test.go
index e838a9e81..ee9c85b2c 100644
--- a/pkg/utils/utils_test.go
+++ b/pkg/utils/utils_test.go
@@ -41,6 +41,7 @@ var _ = Describe("utils", func() {
 
 			_, err = tr.Next()
 			Expect(err).To(Equal(io.EOF))
+
 		})
 
 		It("should write empty file", func() {