fix history creation in tree output of cvs (#382)

cmds/ocm/commands/ocmcmds/common/handlers/comphdlr/closure.go

@@ -51,7 +51,7 @@ func traverse(hist common.History, o *Object, octx out.Context, lookup ocm.Compo
 			continue
 		}
 		obj := &Object{
-			History:  hist,
+			History:  hist.Copy(),
 			Identity: ref.GetIdentity(refs),
 			Spec: ocm.RefSpec{
 				UniformRepositorySpec: o.Spec.UniformRepositorySpec,

cmds/ocm/commands/ocmcmds/common/handlers/elemhdlr/typehandler.go

@@ -32,6 +32,10 @@ type Object struct {
 	Element compdesc.ElementMetaAccessor
 }
 
+func (o *Object) String() string {
+	return fmt.Sprintf("history: %s, id: %s, location: %s", o.History, o.Id, common.VersionedElementKey(o.Version))
+}
+
 var (
 	_ common.HistorySource = (*Object)(nil)
 	_ tree.Object          = (*Object)(nil)

cmds/ocm/commands/ocmcmds/resources/get/deep_test.go

@@ -0,0 +1,133 @@
+// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors.
+//
+// SPDX-License-Identifier: Apache-2.0
+
+package get_test
+
+import (
+	"bytes"
+
+	. "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/open-component-model/ocm/pkg/common/accessio"
+	metav1 "github.com/open-component-model/ocm/pkg/contexts/ocm/compdesc/meta/v1"
+	"github.com/open-component-model/ocm/pkg/mime"
+)
+
+const C1 = "github.com/gardener/landscaper"
+const C11 = "github.com/gardener/landscaper/container-deployer"
+const C12 = "github.com/gardener/landscaper/helm-deployer"
+const C13 = "github.com/gardener/landscaper/manifest-deployer"
+const C14 = "github.com/gardener/landscaper/mock-deployer"
+
+const CS = "github.com/gardener/landscaper-service"
+const CI = "github.com/gardener/landscaper-instance"
+
+var _ = Describe("Test Environment", func() {
+	var env *TestEnv
+
+	BeforeEach(func() {
+		env = NewTestEnv()
+
+		env.OCMCommonTransport(ARCH, accessio.FormatDirectory, func() {
+			env.Component(C11, func() {
+				env.Version(VERSION, func() {
+					env.Provider(PROVIDER)
+					env.Resource("container-deployer-blueprint", "", "PlainText", metav1.LocalRelation, func() {
+						env.BlobStringData(mime.MIME_TEXT, "testdata")
+					})
+				})
+			})
+			env.Component(C12, func() {
+				env.Version(VERSION, func() {
+					env.Provider(PROVIDER)
+					env.Resource("helm-deployer-blueprint", "", "PlainText", metav1.LocalRelation, func() {
+						env.BlobStringData(mime.MIME_TEXT, "testdata")
+					})
+				})
+			})
+			env.Component(C13, func() {
+				env.Version(VERSION, func() {
+					env.Provider(PROVIDER)
+					env.Resource("manifest-deployer-blueprint", "", "PlainText", metav1.LocalRelation, func() {
+						env.BlobStringData(mime.MIME_TEXT, "testdata")
+					})
+				})
+			})
+			env.Component(C14, func() {
+				env.Version(VERSION, func() {
+					env.Provider(PROVIDER)
+					env.Resource("mock-deployer-blueprint", "", "PlainText", metav1.LocalRelation, func() {
+						env.BlobStringData(mime.MIME_TEXT, "testdata")
+					})
+				})
+			})
+
+			env.Component(C1, func() {
+				env.Version(VERSION, func() {
+					env.Provider(PROVIDER)
+					env.Resource("c1-testdata", "", "PlainText", metav1.LocalRelation, func() {
+						env.BlobStringData(mime.MIME_TEXT, "testdata")
+					})
+					env.Reference("mock-deployer", C14, VERSION)
+					env.Reference("manifest-deployer", C13, VERSION)
+					env.Reference("helm-deployer", C11, VERSION)
+					env.Reference("container-deployer", C12, VERSION)
+				})
+			})
+
+			env.Component(CI, func() {
+				env.Version(VERSION, func() {
+					env.Provider(PROVIDER)
+					env.Resource("installation-blueprint", "", "PlainText", metav1.LocalRelation, func() {
+						env.BlobStringData(mime.MIME_TEXT, "testdata")
+					})
+					env.Reference("landscaper", C1, VERSION)
+				})
+			})
+
+			env.Component(CS, func() {
+				env.Version(VERSION, func() {
+					env.Provider(PROVIDER)
+					env.Resource("landscaper-service-blueprint", "", "PlainText", metav1.LocalRelation, func() {
+						env.BlobStringData(mime.MIME_TEXT, "testdata")
+					})
+					env.Reference("landscaper-instance", CI, VERSION)
+				})
+			})
+		})
+	})
+
+	AfterEach(func() {
+		env.Cleanup()
+	})
+
+	It("lists all components in a deep structure", func() {
+
+		buf := bytes.NewBuffer(nil)
+		Expect(env.CatchOutput(buf).Execute("get", "resources", "--recursive", "-o", "tree", "--repo", ARCH, CS+":"+VERSION)).To(Succeed())
+		Expect(buf.String()).To(StringEqualTrimmedWithContext(
+			`
+COMPONENT                                                     NAME                         VERSION IDENTITY TYPE      RELATION
+└─ github.com/gardener/landscaper-service                                                  v1                         
+   ├─                                                         landscaper-service-blueprint v1               PlainText local
+   └─ github.com/gardener/landscaper-instance                 landscaper-instance          v1                         
+      ├─                                                      installation-blueprint       v1               PlainText local
+      └─ github.com/gardener/landscaper                       landscaper                   v1                         
+         ├─                                                   c1-testdata                  v1               PlainText local
+         ├─ github.com/gardener/landscaper/container-deployer helm-deployer                v1                         
+         │  └─                                                container-deployer-blueprint v1               PlainText local
+         ├─ github.com/gardener/landscaper/helm-deployer      container-deployer           v1                         
+         │  └─                                                helm-deployer-blueprint      v1               PlainText local
+         ├─ github.com/gardener/landscaper/manifest-deployer  manifest-deployer            v1                         
+         │  └─                                                manifest-deployer-blueprint  v1               PlainText local
+         └─ github.com/gardener/landscaper/mock-deployer      mock-deployer                v1                         
+            └─                                                mock-deployer-blueprint      v1               PlainText local
+`))
+	})
+
+})