Merge pull request #814 from neoaggelos/fix/parse-oci-source

 🐛 Fix OCI source parsing issues

Author: k8s-ci-robot

internal/controller/oci_source.go

@@ -195,20 +195,29 @@ func (m mapStore) Tag(ctx context.Context, desc ocispec.Descriptor, reference st
 
 var _ oras.Target = &mapStore{}
 
-// CopyOCIStore collects artifacts from the provider OCI url and creates a map of file contents.
-func CopyOCIStore(ctx context.Context, url string, version string, store *mapStore, credential *auth.Credential) error {
-	log := log.FromContext(ctx)
-
+// parseOCISource accepts an OCI URL and the provider version. It returns the image name,
+// the image version (if not set on the OCI URL, the provider version is used) and whether
+// plain HTTP should be used to fetch the image (when url starts with "http://").
+func parseOCISource(url string, version string) (string, string, bool) {
 	url, plainHTTP := strings.CutPrefix(url, "http://")
 
-	if parts := strings.SplitN(url, ":", 3); len(parts) == 2 {
+	if parts := strings.SplitN(url, ":", 3); len(parts) == 2 && !strings.Contains(parts[1], "/") {
 		url = parts[0]
 		version = parts[1]
 	} else if len(parts) == 3 {
 		version = parts[2]
-		url, _ = strings.CutSuffix(url, version)
+		url = fmt.Sprintf("%s:%s", parts[0], parts[1])
 	}
 
+	return url, version, plainHTTP
+}
+
+// CopyOCIStore collects artifacts from the provider OCI url and creates a map of file contents.
+func CopyOCIStore(ctx context.Context, url string, version string, store *mapStore, credential *auth.Credential) error {
+	log := log.FromContext(ctx)
+
+	url, version, plainHTTP := parseOCISource(url, version)
+
 	repo, err := remote.NewRepository(url)
 	if err != nil {
 		log.Error(err, "Invalid registry URL specified")

internal/controller/oci_source_parse_test.go

@@ -0,0 +1,82 @@
+/*
+Copyright 2025 The Kubernetes Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package controller
+
+import (
+	"fmt"
+	"testing"
+
+	. "github.com/onsi/gomega"
+)
+
+func Test_parseOCISource(t *testing.T) {
+	for _, tc := range []struct {
+		url           string
+		version       string
+		expectURL     string
+		expectVersion string
+	}{
+		{
+			url:           "registry/image:v1.1.0",
+			version:       "v1.2.0",
+			expectURL:     "registry/image",
+			expectVersion: "v1.1.0",
+		},
+		{
+			url:           "registry/image",
+			version:       "v1.2.0",
+			expectURL:     "registry/image",
+			expectVersion: "v1.2.0",
+		},
+		{
+			url:           "registry:5050/image",
+			version:       "v1.2.0",
+			expectURL:     "registry:5050/image",
+			expectVersion: "v1.2.0",
+		},
+		{
+			url:           "registry:5050/image:v1.1.0",
+			version:       "v1.2.0",
+			expectURL:     "registry:5050/image",
+			expectVersion: "v1.1.0",
+		},
+		{
+			url:           "image",
+			version:       "v1.2.0",
+			expectURL:     "image",
+			expectVersion: "v1.2.0",
+		},
+	} {
+		t.Run(tc.url, func(t *testing.T) {
+			g := NewWithT(t)
+
+			{
+				url, version, plainHTTP := parseOCISource(tc.url, tc.version)
+				g.Expect(url).To(Equal(tc.expectURL))
+				g.Expect(version).To(Equal(tc.expectVersion))
+				g.Expect(plainHTTP).To(BeFalse())
+			}
+
+			{
+				url, version, plainHTTP := parseOCISource(fmt.Sprintf("http://%s", tc.url), tc.version)
+				g.Expect(url).To(Equal(tc.expectURL))
+				g.Expect(version).To(Equal(tc.expectVersion))
+				g.Expect(plainHTTP).To(BeTrue())
+			}
+		})
+	}
+}