Merge branch 'k8s-ignore-empty-kubernetes-user-options' into 'main'

Suppress unnecessary warnings when Kubernetes user values are empty

See merge request https://gitlab.com/gitlab-org/gitlab-runner/-/merge_requests/5551

Merged-by: Romuald Atchadé <[email protected]>
Approved-by: Joe Burnett <[email protected]>
Reviewed-by: Joe Burnett <[email protected]>

Author: Romuald Atchadé

common/network.go

@@ -467,6 +467,10 @@ func (iko *ImageKubernetesOptions) UnmarshalJSON(data []byte) error {
 }
 
 func (iko *ImageKubernetesOptions) GetUIDGID() (int64, int64, error) {
+	if iko.User == "" {
+		return 0, 0, nil
+	}
+
 	user, group, ok := strings.Cut(iko.User, ":")
 
 	uid, err := strconv.ParseInt(user, 10, 64)

common/network_test.go

@@ -556,6 +556,64 @@ func Test_Image_ExecutorOptions_UnmarshalJSON(t *testing.T) {
 	}
 }
 
+func Test_Image_ExecutorOptions_GetUIDGID(t *testing.T) {
+	tests := map[string]struct {
+		kubernetesOptions func() *ImageKubernetesOptions
+		expectedError     bool
+		expectedUID       int64
+		expectedGID       int64
+	}{
+		"empty user": {
+			kubernetesOptions: func() *ImageKubernetesOptions {
+				return &ImageKubernetesOptions{
+					User: "",
+				}
+			},
+		},
+		"only user": {
+			kubernetesOptions: func() *ImageKubernetesOptions {
+				return &ImageKubernetesOptions{
+					User: "1000",
+				}
+			},
+			expectedUID: int64(1000),
+		},
+		"uid and gid": {
+			kubernetesOptions: func() *ImageKubernetesOptions {
+				return &ImageKubernetesOptions{
+					User: "1000:1000",
+				}
+			},
+			expectedUID: int64(1000),
+			expectedGID: int64(1000),
+		},
+		"invalid user": {
+			kubernetesOptions: func() *ImageKubernetesOptions {
+				return &ImageKubernetesOptions{
+					User: "gitlab-runner",
+				}
+			},
+			expectedError: true,
+		},
+	}
+
+	for name, tt := range tests {
+		t.Run(name, func(t *testing.T) {
+			uid, gid, err := tt.kubernetesOptions().GetUIDGID()
+			if tt.expectedError {
+				require.Error(t, err)
+				require.Equal(t, int64(0), uid)
+				require.Equal(t, int64(0), gid)
+				return
+			}
+
+			require.NoError(t, err)
+			require.Equal(t, tt.expectedUID, uid)
+			require.Equal(t, tt.expectedGID, gid)
+		})
+	}
+}
+
 func TestJobResponse_Run(t *testing.T) {
 	tests := map[string]struct {
 		json            string