duplicate detection for add commands

cmds/ocm/commands/ocmcmds/common/addhdlrs/comp/components.go

@@ -19,6 +19,19 @@ import (
 )
 
 func ProcessComponents(ctx clictx.Context, ictx inputs.Context, repo ocm.Repository, complete ocm.ComponentVersionResolver, thdlr transferhandler.TransferHandler, h *ResourceSpecHandler, elems []addhdlrs.Element) (err error) {
+	list := errors.ErrorList{}
+
+	for _, elem := range elems {
+		if r, ok := elem.Spec().(*ResourceSpec); ok {
+			list.Add(addhdlrs.ValdateElementSpecIdentities("resource", elem.Source().String(), generics.ConvertSliceTo[addhdlrs.ElementSpec](r.Resources)))
+			list.Add(addhdlrs.ValdateElementSpecIdentities("source", elem.Source().String(), generics.ConvertSliceTo[addhdlrs.ElementSpec](r.Sources)))
+			list.Add(addhdlrs.ValdateElementSpecIdentities("reference", elem.Source().String(), generics.ConvertSliceTo[addhdlrs.ElementSpec](r.References)))
+		}
+	}
+	if err := list.Result(); err != nil {
+		return err
+	}
+
 	index := generics.Set[common.NameVersion]{}
 	for _, elem := range elems {
 		if r, ok := elem.Spec().(*ResourceSpec); ok {

cmds/ocm/commands/ocmcmds/common/addhdlrs/comp/elements.go

@@ -155,6 +155,10 @@ type ResourceSpec struct {
 
 var _ addhdlrs.ElementSpec = (*ResourceSpec)(nil)
 
+func (r *ResourceSpec) GetRawIdentity() metav1.Identity {
+	return metav1.NewIdentity(r.Name, metav1.SystemIdentityVersion, r.Version)
+}
+
 func (r *ResourceSpec) Info() string {
 	return fmt.Sprintf("component %s:%s", r.Name, r.Version)
 }

cmds/ocm/commands/ocmcmds/common/addhdlrs/interface.go

@@ -10,6 +10,7 @@ import (
 
 	"github.com/open-component-model/ocm/cmds/ocm/commands/ocmcmds/common/inputs"
 	"github.com/open-component-model/ocm/pkg/contexts/clictx"
+	metav1 "github.com/open-component-model/ocm/pkg/contexts/ocm/compdesc/meta/v1"
 	"github.com/open-component-model/ocm/pkg/contexts/ocm/cpi"
 	"github.com/open-component-model/ocm/pkg/errors"
 	"github.com/open-component-model/ocm/pkg/generics"
@@ -79,6 +80,7 @@ type ElementSpec interface {
 	GetName() string
 	GetVersion() string
 	SetVersion(string)
+	GetRawIdentity() metav1.Identity
 	Info() string
 	Validate(ctx clictx.Context, input *ResourceInput) error
 }

cmds/ocm/commands/ocmcmds/common/addhdlrs/refs/elements.go

@@ -14,6 +14,7 @@ import (
 	"github.com/open-component-model/ocm/pkg/contexts/clictx"
 	"github.com/open-component-model/ocm/pkg/contexts/ocm"
 	"github.com/open-component-model/ocm/pkg/contexts/ocm/compdesc"
+	metav1 "github.com/open-component-model/ocm/pkg/contexts/ocm/compdesc/meta/v1"
 	compdescv2 "github.com/open-component-model/ocm/pkg/contexts/ocm/compdesc/versions/v2"
 	"github.com/open-component-model/ocm/pkg/runtime"
 )
@@ -70,6 +71,10 @@ type ResourceSpec struct {
 
 var _ addhdlrs.ElementSpec = (*ResourceSpec)(nil)
 
+func (r *ResourceSpec) GetRawIdentity() metav1.Identity {
+	return r.ElementMeta.GetRawIdentity()
+}
+
 func (r *ResourceSpec) Info() string {
 	return fmt.Sprintf("reference %s: %s", r.ComponentName, r.GetRawIdentity())
 }

cmds/ocm/commands/ocmcmds/common/addhdlrs/rscs/elements.go

@@ -133,6 +133,10 @@ type ResourceSpec struct {
 
 var _ addhdlrs.ElementSpec = (*ResourceSpec)(nil)
 
+func (r *ResourceSpec) GetRawIdentity() metav1.Identity {
+	return r.ElementMeta.GetRawIdentity()
+}
+
 func (r *ResourceSpec) Info() string {
 	return fmt.Sprintf("resource %s: %s", r.Type, r.GetRawIdentity())
 }

cmds/ocm/commands/ocmcmds/common/addhdlrs/srcs/elements.go

@@ -14,6 +14,7 @@ import (
 	"github.com/open-component-model/ocm/pkg/contexts/clictx"
 	"github.com/open-component-model/ocm/pkg/contexts/ocm"
 	"github.com/open-component-model/ocm/pkg/contexts/ocm/compdesc"
+	metav1 "github.com/open-component-model/ocm/pkg/contexts/ocm/compdesc/meta/v1"
 	compdescv2 "github.com/open-component-model/ocm/pkg/contexts/ocm/compdesc/versions/v2"
 	"github.com/open-component-model/ocm/pkg/runtime"
 )
@@ -70,6 +71,10 @@ type ResourceSpec struct {
 
 var _ addhdlrs.ElementSpec = (*ResourceSpec)(nil)
 
+func (r *ResourceSpec) GetRawIdentity() metav1.Identity {
+	return r.ElementMeta.GetRawIdentity()
+}
+
 func (r *ResourceSpec) Info() string {
 	return fmt.Sprintf("source %s: %s", r.Type, r.GetRawIdentity())
 }

cmds/ocm/commands/ocmcmds/common/addhdlrs/utils.go

@@ -37,6 +37,10 @@ func ProcessDescriptions(ctx clictx.Context, printer common2.Printer, templ temp
 		}
 		elems = append(elems, tmp...)
 	}
+	err := ValdateElementIdentities(h.Key(), elems)
+	if err != nil {
+		return nil, nil, err
+	}
 	ictx.Printf("found %d %s\n", len(elems), utils.Plural(h.Key(), len(elems)))
 	return elems, ictx, nil
 }
@@ -279,6 +283,39 @@ func Validate(r *ResourceInput, ctx inputs.Context, inputFilePath string) error
 	return allErrs.ToAggregate()
 }
 
+func ValdateElementIdentities(kind string, elems []Element) error {
+	list := errors.ErrList()
+	ids := map[string]SourceInfo{}
+	for _, r := range elems {
+		var i interface{}
+		err := runtime.DefaultYAMLEncoding.Unmarshal(r.Data(), &i)
+		if err != nil {
+			return errors.Wrapf(err, "cannot eval data %q", string(r.Data()))
+		}
+		id := r.Spec().GetRawIdentity()
+		dig := id.Digest()
+		if s, ok := ids[string(dig)]; ok {
+			list.Add(fmt.Errorf("duplicate %s identity %s (%s and %s)", kind, id, r.Source(), s))
+		}
+		ids[string(dig)] = r.Source()
+	}
+	return list.Result()
+}
+
+func ValdateElementSpecIdentities(kind string, src string, elems []ElementSpec) error {
+	list := errors.ErrList()
+	ids := map[string]int{}
+	for i, r := range elems {
+		id := r.GetRawIdentity()
+		dig := id.Digest()
+		if s, ok := ids[string(dig)]; ok {
+			list.Add(fmt.Errorf("duplicate %s identity %s (%s index %d and %d)", kind, id, src, i+1, s+1))
+		}
+		ids[string(dig)] = i
+	}
+	return list.Result()
+}
+
 func PrintElements(p common2.Printer, elems []Element, outfile string, fss ...vfs.FileSystem) error {
 	if outfile != "" && outfile != "-" {
 		f, err := accessio.FileSystem(fss...).OpenFile(outfile, vfs.O_TRUNC|vfs.O_CREATE|vfs.O_WRONLY, 0o644)

cmds/ocm/commands/ocmcmds/components/add/cmd_test.go

@@ -99,6 +99,29 @@ var _ = Describe("Test Environment", func() {
 		CheckComponent(env, nil)
 	})
 
+	Context("failures", func() {
+		It("rejects adding duplicate components", func() {
+			ExpectError(env.Execute("add", "c", "-fc", "--file", ARCH, "--version", "1.0.0", "testdata/components-dup.yaml")).To(
+				MatchError(`duplicate component identity "name"="ocm.software/demo/test","version"="1.0.0" (testdata/components-dup.yaml[1][2] and testdata/components-dup.yaml[1][1])`),
+			)
+		})
+		It("rejects adding duplicate resources", func() {
+			ExpectError(env.Execute("add", "c", "-fc", "--file", ARCH, "--version", "1.0.0", "testdata/component-dup-res.yaml")).To(
+				MatchError(`duplicate resource identity "name"="text" (testdata/component-dup-res.yaml[1][1] index 3 and 1)`),
+			)
+		})
+		It("rejects adding duplicate source", func() {
+			ExpectError(env.Execute("add", "c", "-fc", "--file", ARCH, "--version", "1.0.0", "testdata/component-dup-src.yaml")).To(
+				MatchError(`duplicate source identity "name"="source" (testdata/component-dup-src.yaml[1][1] index 2 and 1)`),
+			)
+		})
+		It("rejects adding duplicate reference", func() {
+			ExpectError(env.Execute("add", "c", "-fc", "--file", ARCH, "--version", "1.0.0", "testdata/component-dup-ref.yaml")).To(
+				MatchError(`duplicate reference identity "name"="ref","version"="v1" (testdata/component-dup-ref.yaml[1][1] index 2 and 1)`),
+			)
+		})
+	})
+
 	Context("with completion", func() {
 		var ldesc *artdesc.Descriptor
 

cmds/ocm/commands/ocmcmds/components/add/testdata/component-dup-ref.yaml

@@ -0,0 +1,38 @@
+name: ocm.software/demo/test
+version: 1.0.0
+provider:
+  name: ocm.software
+  labels:
+    - name: city
+      value: Karlsruhe
+labels:
+  - name: purpose
+    value: test
+
+resources:
+  - name: text
+    type: PlainText
+    labels:
+      - name: city
+        value: Karlsruhe
+        merge:
+          algorithm: default
+          config:
+            overwrite: inbound
+    input:
+      type: file
+      path: testdata
+  - name: data
+    type: PlainText
+    input:
+      type: binary
+      data: IXN0cmluZ2RhdGE=
+
+componentReferences:
+  - name: ref
+    version: v1
+    componentName: github.com/mandelsoft/test2
+  - name: ref
+    version: v1
+    componentName: github.com/mandelsoft/test3
+

cmds/ocm/commands/ocmcmds/components/add/testdata/component-dup-res.yaml

@@ -0,0 +1,39 @@
+name: ocm.software/demo/test
+version: 1.0.0
+provider:
+  name: ocm.software
+  labels:
+    - name: city
+      value: Karlsruhe
+labels:
+  - name: purpose
+    value: test
+
+resources:
+  - name: text
+    type: PlainText
+    labels:
+      - name: city
+        value: Karlsruhe
+        merge:
+          algorithm: default
+          config:
+            overwrite: inbound
+    input:
+      type: file
+      path: testdata
+  - name: data
+    type: PlainText
+    input:
+      type: binary
+      data: IXN0cmluZ2RhdGE=
+  - name: text
+    type: PlainText
+    input:
+      type: binary
+      data: IXN0cmluZ2RhdGE=
+
+componentReferences:
+  - name: ref
+    version: v1
+    componentName: github.com/mandelsoft/test2

cmds/ocm/commands/ocmcmds/components/add/testdata/component-dup-src.yaml

@@ -0,0 +1,46 @@
+name: ocm.software/demo/test
+version: 1.0.0
+provider:
+  name: ocm.software
+  labels:
+    - name: city
+      value: Karlsruhe
+labels:
+  - name: purpose
+    value: test
+
+sources:
+  - name: source
+    type: DirectoryTree
+    input:
+      type: binary
+      data: IXN0cmluZ2RhdGE=
+  - name: source
+    type: DirectoryTree
+    input:
+      type: binary
+      data: IXN0cmluZ2RhdGE=
+
+resources:
+  - name: text
+    type: PlainText
+    labels:
+      - name: city
+        value: Karlsruhe
+        merge:
+          algorithm: default
+          config:
+            overwrite: inbound
+    input:
+      type: file
+      path: testdata
+  - name: data
+    type: PlainText
+    input:
+      type: binary
+      data: IXN0cmluZ2RhdGE=
+
+componentReferences:
+  - name: ref
+    version: v1
+    componentName: github.com/mandelsoft/test2

cmds/ocm/commands/ocmcmds/components/add/testdata/components-dup.yaml

@@ -0,0 +1,40 @@
+components:
+- name: ocm.software/demo/test
+  provider:
+    name: ocm.software
+    labels:
+      - name: city
+        value: Karlsruhe
+  labels:
+    - name: purpose
+      value: test
+
+  resources:
+    - name: text
+      type: PlainText
+      labels:
+        - name: city
+          value: Karlsruhe
+          merge:
+            algorithm: default
+            config:
+              overwrite: inbound
+      input:
+        type: file
+        path: testdata
+    - name: data
+      type: PlainText
+      input:
+        type: binary
+        data: IXN0cmluZ2RhdGE=
+  componentReferences:
+    - name: ref
+      version: v1
+      componentName: github.com/mandelsoft/test2
+
+- name: ocm.software/demo/test
+  provider:
+    name: ocm.software
+    labels:
+      - name: city
+        value: Karlsruhe

cmds/ocm/commands/ocmcmds/references/add/cmd_test.go

@@ -14,6 +14,7 @@ import (
 	"github.com/open-component-model/ocm/pkg/contexts/ocm/compdesc"
 	metav1 "github.com/open-component-model/ocm/pkg/contexts/ocm/compdesc/meta/v1"
 	"github.com/open-component-model/ocm/pkg/contexts/ocm/repositories/comparch"
+	"github.com/open-component-model/ocm/pkg/testutils"
 )
 
 const ARCH = "/tmp/ca"
@@ -175,4 +176,12 @@ labels:
 			})
 		})
 	})
+
+	Context("failures", func() {
+		It("rejects adding duplicate ref", func() {
+			testutils.ExpectError(env.Execute("add", "references", "--file", ARCH, "/testdata/references-dup.yaml")).To(
+				MatchError(`duplicate reference identity "name"="testdata","version"="v1.1.1" (/testdata/references-dup.yaml[1][2] and /testdata/references-dup.yaml[1][1])`),
+			)
+		})
+	})
 })

cmds/ocm/commands/ocmcmds/references/add/testdata/references-dup.yaml

@@ -0,0 +1,8 @@
+---
+references:
+- name: testdata
+  componentName: github.com/mandelsoft/ref
+  version: v1.1.1
+- name: testdata
+  componentName: github.com/mandelsoft/ref2
+  version: v1.1.1

go.mod

@@ -69,6 +69,7 @@ require (
 	golang.org/x/lint v0.0.0-20210508222113-6edffad5e616
 	golang.org/x/oauth2 v0.9.0
 	golang.org/x/text v0.13.0
+	google.golang.org/api v0.128.0
 	gopkg.in/yaml.v3 v3.0.1
 	helm.sh/helm/v3 v3.12.2
 	k8s.io/api v0.27.3
@@ -196,6 +197,7 @@ require (
 	github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
 	github.com/google/uuid v1.3.0 // indirect
 	github.com/googleapis/enterprise-certificate-proxy v0.2.4 // indirect
+	github.com/googleapis/gax-go/v2 v2.11.0 // indirect
 	github.com/gorilla/mux v1.8.0 // indirect
 	github.com/gosuri/uitable v0.0.4 // indirect
 	github.com/gregjones/httpcache v0.0.0-20190611155906-901d90724c79 // indirect
@@ -303,7 +305,6 @@ require (
 	golang.org/x/time v0.3.0 // indirect
 	golang.org/x/tools v0.9.3 // indirect
 	golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect
-	google.golang.org/api v0.128.0 // indirect
 	google.golang.org/appengine v1.6.7 // indirect
 	google.golang.org/genproto/googleapis/rpc v0.0.0-20230530153820-e85fd2cbaebc // indirect
 	google.golang.org/grpc v1.56.3 // indirect