converter: restrict captures to prefix when mapping *FromOwned

Fixes: kubeflow#255

Signed-off-by: Isabella do Amaral <idoamara@redhat.com>

internal/converter/mlmd_converter_util_test.go

@@ -185,6 +185,14 @@ func TestPrefixWhenOwnedWithoutOwner(t *testing.T) {
 	assertion.Equal("name", strings.Split(prefixed, ":")[1])
 }
 
+func TestPrefixNameWithColonWhenOwned(t *testing.T) {
+	assertion := setup(t)
+
+	owner := "owner"
+	entity := "name:with:colon"
+	assertion.Equal("owner:name:with:colon", PrefixWhenOwned(&owner, entity))
+}
+
 func TestMapRegisteredModelProperties(t *testing.T) {
 	assertion := setup(t)
 
@@ -578,7 +586,7 @@ func TestMapNameFromOwned(t *testing.T) {
 	assertion.Equal("name", *name)
 
 	name = MapNameFromOwned(of("prefix:name:postfix"))
-	assertion.Equal("name", *name)
+	assertion.Equal("name:postfix", *name)
 
 	name = MapNameFromOwned(nil)
 	assertion.Nil(name)
@@ -594,8 +602,9 @@ func TestMapRegisteredModelIdFromOwned(t *testing.T) {
 	_, err = MapRegisteredModelIdFromOwned(of("name"))
 	assertion.NotNil(err)
 
-	_, err = MapRegisteredModelIdFromOwned(of("prefix:name:postfix"))
-	assertion.NotNil(err)
+	result, err = MapRegisteredModelIdFromOwned(of("prefix:name:postfix"))
+	assertion.Nil(err)
+	assertion.Equal("prefix", result)
 
 	result, err = MapRegisteredModelIdFromOwned(nil)
 	assertion.Nil(err)

internal/converter/mlmd_openapi_converter_util.go

@@ -97,7 +97,9 @@ func MapNameFromOwned(source *string) *string {
 	if len(exploded) == 1 {
 		return source
 	}
-	return &exploded[1]
+	// cat remaining parts of the exploded string
+	joined := strings.Join(exploded[1:], ":")
+	return &joined
 }
 
 // MapName derive the entity name from the mlmd fullname
@@ -124,7 +126,7 @@ func MapRegisteredModelIdFromOwned(source *string) (string, error) {
 	}
 
 	exploded := strings.Split(*source, ":")
-	if len(exploded) != 2 {
+	if len(exploded) < 2 {
 		return "", fmt.Errorf("wrong owned format")
 	}
 	return exploded[0], nil