fix: handle annotations for resources with ':' in the name (argoproj#…

…15101) (argoproj#15380) * fix: handle annotations for resources with ':' in the name Signed-off-by: Oreon Lothamer <[email protected]> * fix: switch to using splitN for handling annotation splitting Signed-off-by: Oreon Lothamer <[email protected]> * fix: check len(parts) !=3 Signed-off-by: Oreon Lothamer <[email protected]> * Retrigger CI pipeline Signed-off-by: Oreon Lothamer <[email protected]> --------- Signed-off-by: Oreon Lothamer <[email protected]>
tesla59 · Dec 16, 2023 · 98ead56 · 98ead56
1 parent fd6e8b6
commit 98ead56
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 1 deletion.
diff --git a/util/argo/resource_tracking.go b/util/argo/resource_tracking.go
@@ -178,7 +178,7 @@ func (rt *resourceTracking) BuildAppInstanceValue(value AppInstanceValue) string
 // ParseAppInstanceValue parse resource tracking id from format <application-name>:<group>/<kind>:<namespace>/<name> to struct
 func (rt *resourceTracking) ParseAppInstanceValue(value string) (*AppInstanceValue, error) {
 	var appInstanceValue AppInstanceValue
-	parts := strings.Split(value, ":")
+	parts := strings.SplitN(value, ":", 3)
 	appInstanceValue.ApplicationName = parts[0]
 	if len(parts) != 3 {
 		return nil, WrongResourceTrackingFormat

diff --git a/util/argo/resource_tracking_test.go b/util/argo/resource_tracking_test.go
@@ -89,6 +89,19 @@ func TestParseAppInstanceValue(t *testing.T) {
 	assert.Equal(t, appInstanceValue.Name, "<name>")
 }
 
+func TestParseAppInstanceValueColon(t *testing.T) {
+	resourceTracking := NewResourceTracking()
+	appInstanceValue, err := resourceTracking.ParseAppInstanceValue("app:<group>/<kind>:<namespace>/<name>:<colon>")
+	if !assert.NoError(t, err) {
+		t.Fatal()
+	}
+	assert.Equal(t, appInstanceValue.ApplicationName, "app")
+	assert.Equal(t, appInstanceValue.Group, "<group>")
+	assert.Equal(t, appInstanceValue.Kind, "<kind>")
+	assert.Equal(t, appInstanceValue.Namespace, "<namespace>")
+	assert.Equal(t, appInstanceValue.Name, "<name>:<colon>")
+}
+
 func TestParseAppInstanceValueWrongFormat1(t *testing.T) {
 	resourceTracking := NewResourceTracking()
 	_, err := resourceTracking.ParseAppInstanceValue("app")