Merge pull request #333 from superbrothers/server-dry-run

Extracting validation error from apply server dry run output

Author: stefanprodan

controllers/utils.go

@@ -57,10 +57,13 @@ func parseApplyError(in []byte) string {
 		if line != "" &&
 			!strings.HasSuffix(line, "created") &&
 			!strings.HasSuffix(line, "created (dry run)") &&
+			!strings.HasSuffix(line, "created (server dry run)") &&
 			!strings.HasSuffix(line, "configured") &&
 			!strings.HasSuffix(line, "configured (dry run)") &&
+			!strings.HasSuffix(line, "configured (server dry run)") &&
 			!strings.HasSuffix(line, "unchanged") &&
-			!strings.HasSuffix(line, "unchanged (dry run)") {
+			!strings.HasSuffix(line, "unchanged (dry run)") &&
+			!strings.HasSuffix(line, "unchanged (server dry run)") {
 			errors += line + "\n"
 		}
 	}

controllers/utils_test.go

@@ -5,28 +5,52 @@ import (
 	"testing"
 )
 
-func Test_parseApplyError(t *testing.T) {
-	filtered := parseApplyError([]byte(`
+func TestParseApplyError(t *testing.T) {
+	tests := []struct {
+		name     string
+		in       []byte
+		filtered string
+	}{
+		{
+			"apply",
+			[]byte(`
 gitrepository.source.toolkit.fluxcd.io/flux-workspaces unchanged
 ingressroute.traefik.containo.us/flux-receiver configured
 service/notification-controller created
-The Service "webhook-receiver" is invalid: spec.clusterIP: Invalid value: "10.200.133.61": field is immutable`))
-	filtered = strings.TrimSpace(filtered)
-	numLines := len(strings.Split(filtered, "\n"))
-	if numLines != 1 {
-		t.Errorf("Should filter out all but one line from the error output, but got %d lines", numLines)
-	}
-}
-
-func Test_parseApplyError_dryRun(t *testing.T) {
-	filtered := parseApplyError([]byte(`
+The Service "webhook-receiver" is invalid: spec.clusterIP: Invalid value: "10.200.133.61": field is immutable
+`),
+			`The Service "webhook-receiver" is invalid: spec.clusterIP: Invalid value: "10.200.133.61": field is immutable`,
+		},
+		{
+			"client dry-run",
+			[]byte(`
 gitrepository.source.toolkit.fluxcd.io/flux-workspaces unchanged (dry run)
 ingressroute.traefik.containo.us/flux-receiver configured (dry run)
 service/notification-controller created (dry run)
-error: error validating data: unknown field "ima  ge" in io.k8s.api.core.v1.Container`))
-	filtered = strings.TrimSpace(filtered)
-	numLines := len(strings.Split(filtered, "\n"))
-	if numLines != 1 {
-		t.Errorf("Should filter out all but one line from the error output, but got %d lines", numLines)
+error: error validating data: unknown field "ima  ge" in io.k8s.api.core.v1.Container
+`),
+			`error: error validating data: unknown field "ima  ge" in io.k8s.api.core.v1.Container`,
+		},
+		{
+			"server dry-run",
+			[]byte(`
+gitrepository.source.toolkit.fluxcd.io/flux-workspaces unchanged (server dry run)
+ingressroute.traefik.containo.us/flux-receiver configured (server dry run)
+service/notification-controller created (server dry run)
+error: error validating data: unknown field "ima  ge" in io.k8s.api.core.v1.Container
+`),
+			`error: error validating data: unknown field "ima  ge" in io.k8s.api.core.v1.Container`,
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			filtered := parseApplyError(tt.in)
+			filtered = strings.TrimSpace(filtered)
+
+			if tt.filtered != filtered {
+				t.Errorf("expected %q, but actual %q", tt.filtered, filtered)
+			}
+		})
 	}
 }