Merge pull request #289 from openshift-cherrypick-robot/cherry-pick-2…

…80-to-release-4.8

Bug 2053122: [release-4.8] getAssembleUser(): strip the group part out before checking the UID

pkg/build/builder/sti.go

@@ -600,5 +600,13 @@ func getAssembleUser(docker DockerClient, imageTag string) (string, error) {
 		// If the builder image has the assemble-user label, override with the provided value
 		assembleUser = labelAssembleUser
 	}
-	return assembleUser, nil
+	return extractUser(assembleUser), nil
+}
+
+func extractUser(userSpec string) string {
+	if strings.Contains(userSpec, ":") {
+		parts := strings.SplitN(userSpec, ":", 2)
+		return strings.TrimSpace(parts[0])
+	}
+	return strings.TrimSpace(userSpec)
 }

pkg/build/builder/sti_test.go

@@ -351,17 +351,33 @@ func TestGetAssembleUser(t *testing.T) {
 			containerUser:  "1002",
 			expectedResult: "1002",
 		},
+		{
+			name:           "container user:group set",
+			containerUser:  "1002:1002",
+			expectedResult: "1002",
+		},
 		{
 			name:              "assemble user label set",
 			assembleUserLabel: "1003",
 			expectedResult:    "1003",
 		},
+		{
+			name:              "assemble user:group label set",
+			assembleUserLabel: "1003:1003",
+			expectedResult:    "1003",
+		},
 		{
 			name:              "assemble user override",
 			containerUser:     "1002",
 			assembleUserLabel: "1003",
 			expectedResult:    "1003",
 		},
+		{
+			name:              "assemble user:group override",
+			containerUser:     "1002:1002",
+			assembleUserLabel: "1003:1003",
+			expectedResult:    "1003",
+		},
 	}
 	for _, tc := range testCases {
 		t.Run(tc.name, func(t *testing.T) {