Merge branch 'dee0sap_main' into ocm-issue-179-block-in-config-yields…

…-invalid-xml

.github/workflows/buildcomponents.yaml

@@ -24,6 +24,9 @@ jobs:
       packages: write
       repository-projects: read
     steps:
+      - name: Self Hosted Runner Post Job Cleanup Action
+        uses: TooMuch4U/[email protected]
+
       - name: Checkout
         uses: actions/checkout@v4
         with:
@@ -63,4 +66,4 @@ jobs:
         uses: actions/upload-artifact@v4
         with:
           name: ocm.ctf
-          path: gen/ctf
+          path: gen/ctf

.github/workflows/components.yaml

@@ -39,6 +39,7 @@ jobs:
         run: |
           cd components/ocmcli
           PATH=$PATH:$(go env GOPATH)/bin make ctf
+
   build-helminstaller:
     name: Build HelmInstaller
     runs-on: large_runner
@@ -65,6 +66,7 @@ jobs:
         run: |
           cd components/helminstaller
           PATH=$PATH:$(go env GOPATH)/bin make ctf
+
   build-helmdemo:
     name: Build HelmDemo
     runs-on: large_runner
@@ -91,6 +93,7 @@ jobs:
         run: |
           cd components/helmdemo
           PATH=$PATH:$(go env GOPATH)/bin make ctf
+
   build-subchartsdemo:
     name: Build Helm SubChartsDemo
     runs-on: large_runner
@@ -117,10 +120,14 @@ jobs:
         run: |
           cd components/subchartsdemo
           PATH=$PATH:$(go env GOPATH)/bin make ctf
+
   build-ecrplugin:
     name: Build ECR Plugin
     runs-on: large_runner
     steps:
+      - name: Self Hosted Runner Post Job Cleanup Action
+        uses: TooMuch4U/[email protected]
+
       - name: Checkout
         uses: actions/checkout@v4
         with:

.github/workflows/lint_and_test.yaml

@@ -39,6 +39,7 @@ jobs:
         run: |
           PATH=$PATH:$(go env GOPATH)/bin make build
           PATH=$PATH:$(go env GOPATH)/bin make test
+
   lint:
     name: Lint
     runs-on: large_runner
@@ -71,10 +72,14 @@ jobs:
       - name: Lint
         run: |
           PATH=$PATH:$(go env GOPATH)/bin make check
+
   generate:
     name: DeepCopy verification
     runs-on: large_runner
     steps:
+      - name: Self Hosted Runner Post Job Cleanup Action
+        uses: TooMuch4U/[email protected]
+
       - name: Checkout
         uses: actions/checkout@v4
         with:
@@ -99,3 +104,4 @@ jobs:
       - name: Check for diff
         run: |
           git diff --exit-code --shortstat
+  

.github/workflows/release.yaml

@@ -122,6 +122,8 @@ jobs:
       id-token: write
       packages: write
     steps:
+    - name: Self Hosted Runner Post Job Cleanup Action
+      uses: TooMuch4U/[email protected]
     - name: Generate token
       id: generate_token
       uses: tibdex/github-app-token@v2

pkg/contexts/ocm/repositories/genericocireg/component.go

@@ -1,7 +1,3 @@
-// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors.
-//
-// SPDX-License-Identifier: Apache-2.0
-
 package genericocireg
 
 import (
@@ -73,12 +69,12 @@ func (c *componentAccessImpl) GetName() string {
 
 ////////////////////////////////////////////////////////////////////////////////
 
-func toTag(v string) string {
+func toTag(v string) (string, error) {
 	_, err := semver.NewVersion(v)
 	if err != nil {
-		panic(errors.Wrapf(err, "%s is no semver version", v))
+		return "", err
 	}
-	return strings.ReplaceAll(v, "+", META_SEPARATOR)
+	return strings.ReplaceAll(v, "+", META_SEPARATOR), nil
 }
 
 func toVersion(t string) string {
@@ -132,7 +128,11 @@ func (c *componentAccessImpl) HasVersion(vers string) (bool, error) {
 }
 
 func (c *componentAccessImpl) LookupVersion(version string) (*repocpi.ComponentVersionAccessInfo, error) {
-	acc, err := c.namespace.GetArtifact(toTag(version))
+	tag, err := toTag(version)
+	if err != nil {
+		return nil, err
+	}
+	acc, err := c.namespace.GetArtifact(tag)
 	if err != nil {
 		if errors.IsErrNotFound(err) {
 			return nil, cpi.ErrComponentVersionNotFoundWrap(err, c.name, version)
@@ -151,7 +151,11 @@ func (c *componentAccessImpl) NewVersion(version string, overrides ...bool) (*re
 		return nil, accessio.ErrReadOnly
 	}
 	override := utils.Optional(overrides...)
-	acc, err := c.namespace.GetArtifact(toTag(version))
+	tag, err := toTag(version)
+	if err != nil {
+		return nil, err
+	}
+	acc, err := c.namespace.GetArtifact(tag)
 	if err == nil {
 		if override {
 			return newComponentVersionAccess(accessobj.ACC_CREATE, c, version, acc, false)

pkg/contexts/ocm/repositories/genericocireg/componentversion.go

@@ -1,7 +1,3 @@
-// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors.
-//
-// SPDX-License-Identifier: Apache-2.0
-
 package genericocireg
 
 import (
@@ -222,7 +218,11 @@ func (c *ComponentVersionContainer) Update() error {
 		}
 
 		logger.Debug("add oci artifact")
-		if _, err := c.comp.namespace.AddArtifact(c.manifest, toTag(c.version)); err != nil {
+		tag, err := toTag(c.version)
+		if err != nil {
+			return err
+		}
+		if _, err := c.comp.namespace.AddArtifact(c.manifest, tag); err != nil {
 			return fmt.Errorf("unable to add artifact: %w", err)
 		}
 	}

pkg/contexts/ocm/repositories/genericocireg/repo_test.go

@@ -1,20 +1,14 @@
-// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors.
-//
-// SPDX-License-Identifier: Apache-2.0
-
 package genericocireg_test
 
 import (
 	"fmt"
 	"path"
 	"reflect"
 
-	. "github.com/onsi/ginkgo/v2"
-	. "github.com/onsi/gomega"
-	. "github.com/open-component-model/ocm/pkg/testutils"
-
 	"github.com/mandelsoft/vfs/pkg/osfs"
 	"github.com/mandelsoft/vfs/pkg/vfs"
+	. "github.com/onsi/ginkgo/v2"
+	. "github.com/onsi/gomega"
 	"github.com/opencontainers/go-digest"
 
 	"github.com/open-component-model/ocm/pkg/blobaccess"
@@ -50,6 +44,7 @@ import (
 	"github.com/open-component-model/ocm/pkg/finalizer"
 	"github.com/open-component-model/ocm/pkg/mime"
 	"github.com/open-component-model/ocm/pkg/signing/hasher/sha256"
+	. "github.com/open-component-model/ocm/pkg/testutils"
 )
 
 var DefaultContext = ocm.New()
@@ -79,6 +74,15 @@ var _ = Describe("component repository mapping", func() {
 		vfs.Cleanup(tempfs)
 	})
 
+	It("Don't Panik! When it's not a semver.org conform version. #756", func() {
+		repo := Must(DefaultContext.RepositoryForSpec(spec))
+		comp := Must(repo.LookupComponent(COMPONENT))
+		cva, err := comp.NewVersion("v1.two.zeo-2")
+		Expect(err).To(HaveOccurred())
+		Expect(cva).To(BeNil())
+		Expect(err.Error()).To(Equal("Invalid Semantic Version"))
+	})
+
 	It("creates a dummy component", func() {
 		var finalize finalizer.Finalizer
 		defer Defer(finalize.Finalize)