From 81f4d1f8da4894c88721ad935640b23d51b9c932 Mon Sep 17 00:00:00 2001
From: Hilmar Falkenberg <hilmar.falkenberg@sap.com>
Date: Tue, 14 Jan 2025 14:28:33 +0100
Subject: [PATCH] =?UTF-8?q?fix:=20unable=20to=20close,=20unable=20to=20unr?=
 =?UTF-8?q?ef=20last:=20unable=20to=20cleanup=20compone=E2=80=A6=20(#1253)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

backport https://github.com/open-component-model/ocm/pull/1243 into
v0.19
---
 .../genericocireg/componentversion.go         |  6 ++
 .../genericocireg/componentversion_test.go    | 85 +++++++++++++++++++
 2 files changed, 91 insertions(+)
 create mode 100644 api/ocm/extensions/repositories/genericocireg/componentversion_test.go

diff --git a/api/ocm/extensions/repositories/genericocireg/componentversion.go b/api/ocm/extensions/repositories/genericocireg/componentversion.go
index f603fbe509..cfbf26a688 100644
--- a/api/ocm/extensions/repositories/genericocireg/componentversion.go
+++ b/api/ocm/extensions/repositories/genericocireg/componentversion.go
@@ -97,6 +97,12 @@ func (c *ComponentVersionContainer) SetReadOnly() {
 
 func (c *ComponentVersionContainer) Check() error {
 	if c.version != c.GetDescriptor().Version {
+		// check if version contained '+' which has been replaced by META_SEPARATOR to create OCI compliant tag
+		if replaced, _ := toTag(c.GetDescriptor().Version); replaced != c.GetDescriptor().Version && replaced == c.version {
+			Logger(c.GetContext()).Warn(fmt.Sprintf(
+				"checked version %q contains %q, this is discouraged and you should prefer the original component version %q", c.version, META_SEPARATOR, c.GetDescriptor().Version))
+			return nil
+		}
 		return errors.ErrInvalid("component version", c.GetDescriptor().Version)
 	}
 	if c.comp.name != c.GetDescriptor().Name {
diff --git a/api/ocm/extensions/repositories/genericocireg/componentversion_test.go b/api/ocm/extensions/repositories/genericocireg/componentversion_test.go
new file mode 100644
index 0000000000..0b79d0b968
--- /dev/null
+++ b/api/ocm/extensions/repositories/genericocireg/componentversion_test.go
@@ -0,0 +1,85 @@
+package genericocireg
+
+import (
+	"testing"
+
+	"github.com/stretchr/testify/assert"
+
+	"ocm.software/ocm/api/ocm/internal"
+	"ocm.software/ocm/api/utils/accessobj"
+)
+
+func TestComponentVersionContainer_Check(t *testing.T) {
+	// Setup
+	state, err := accessobj.NewBlobStateForBlob(accessobj.ACC_READONLY, nil, NewStateHandler("mock.test.com/state_handler", "1.0.0"))
+	assert.NoError(t, err)
+	repo := &RepositoryImpl{ctx: internal.DefaultContext}
+	comp := &componentAccessImpl{repo: repo}
+	cvc := &ComponentVersionContainer{state: state, comp: comp}
+
+	// Test cases
+	tests := []struct {
+		name      string
+		setup     func()
+		expectErr bool
+	}{
+		{
+			name: "valid version and name",
+			setup: func() {
+				cvc.version = "1.0.0"
+				cvc.GetDescriptor().Version = "1.0.0"
+				cvc.comp.name = "test-component"
+				cvc.GetDescriptor().Name = "test-component"
+			},
+			expectErr: false,
+		},
+		{
+			name: "half valid version - containing META_SEPARATOR = " + META_SEPARATOR,
+			setup: func() {
+				cvc.version = "0.0.1-20250108132333.build-af79499"
+				cvc.GetDescriptor().Version = "0.0.1-20250108132333+af79499"
+				cvc.comp.name = "test-component"
+				cvc.GetDescriptor().Name = "test-component"
+			},
+			expectErr: false,
+		},
+		{
+			name: "valid version - containing '+'",
+			setup: func() {
+				cvc.version = "0.0.1-20250108132333+af79499"
+				cvc.GetDescriptor().Version = "0.0.1-20250108132333+af79499"
+				cvc.comp.name = "test-component"
+				cvc.GetDescriptor().Name = "test-component"
+			},
+			expectErr: false,
+		},
+		{
+			name: "invalid version",
+			setup: func() {
+				cvc.version = "1.0.0"
+				cvc.GetDescriptor().Version = "2.0.0"
+			},
+			expectErr: true,
+		},
+		{
+			name: "invalid name",
+			setup: func() {
+				cvc.comp.name = "test-component"
+				cvc.GetDescriptor().Name = "invalid-component"
+			},
+			expectErr: true,
+		},
+	}
+
+	for _, test := range tests {
+		t.Run(test.name, func(t *testing.T) {
+			test.setup()
+			err := cvc.Check()
+			if test.expectErr {
+				assert.Error(t, err)
+			} else {
+				assert.NoError(t, err)
+			}
+		})
+	}
+}