chore(backport release-0.9): fix(directives): do not require `targetB…

…ranch` for `git-push` (#2642) Co-authored-by: Hidde Beydals <[email protected]>
akuity · Oct 3, 2024 · 7492143 · 7492143
1 parent 1791c00
commit 7492143
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 23 deletions.
diff --git a/internal/directives/git_pusher_test.go b/internal/directives/git_pusher_test.go
@@ -40,22 +40,23 @@ func Test_gitPusher_validate(t *testing.T) {
 		{
 			name: "just generateTargetBranch is true",
 			config: Config{ // Should be completely valid
-				"generateTargetBranch": true,
 				"path":                 "/fake/path",
+				"generateTargetBranch": true,
 			},
 		},
 		{
 			name: "generateTargetBranch is true and targetBranch is empty string",
 			config: Config{ // Should be completely valid
-				"generateTargetBranch": true,
 				"path":                 "/fake/path",
+				"generateTargetBranch": true,
 				"targetBranch":         "",
 			},
 		},
 		{
 			name: "generateTargetBranch is true and targetBranch is specified",
 			// These are meant to be mutually exclusive.
 			config: Config{
+				"path":                 "/fake/path",
 				"generateTargetBranch": true,
 				"targetBranch":         "fake-branch",
 			},
@@ -64,20 +65,17 @@ func Test_gitPusher_validate(t *testing.T) {
 			},
 		},
 		{
-			name:   "generateTargetBranch not specified and targetBranch not specified",
-			config: Config{},
-			expectedProblems: []string{
-				"(root): Must validate one and only one schema",
+			name: "generateTargetBranch not specified and targetBranch not specified",
+			config: Config{ // Should be completely valid
+				"path": "/fake/path",
 			},
 		},
 		{
 			name: "generateTargetBranch not specified and targetBranch is empty string",
-			config: Config{
+			config: Config{ // Should be completely valid
+				"path":         "/fake/path",
 				"targetBranch": "",
 			},
-			expectedProblems: []string{
-				"(root): Must validate one and only one schema",
-			},
 		},
 		{
 			name: "generateTargetBranch not specified and targetBranch is specified",
@@ -88,22 +86,18 @@ func Test_gitPusher_validate(t *testing.T) {
 		},
 		{
 			name: "just generateTargetBranch is false",
-			config: Config{
+			config: Config{ // Should be completely valid
+				"path":                 "/fake/path",
 				"generateTargetBranch": false,
 			},
-			expectedProblems: []string{
-				"(root): Must validate one and only one schema",
-			},
 		},
 		{
 			name: "generateTargetBranch is false and targetBranch is empty string",
-			config: Config{
+			config: Config{ // Should be completely valid
+				"path":                 "/fake/path",
 				"generateTargetBranch": false,
 				"targetBranch":         "",
 			},
-			expectedProblems: []string{
-				"(root): Must validate one and only one schema",
-			},
 		},
 		{
 			name: "generateTargetBranch is false and targetBranch is specified",

diff --git a/internal/directives/schemas/git-push-config.json b/internal/directives/schemas/git-push-config.json
@@ -21,17 +21,23 @@
   },
   "oneOf": [
     {
-      "required": ["generateTargetBranch"],
       "properties": {
         "generateTargetBranch": { "const": true },
-        "targetBranch": {  "enum": ["", null] }
-      }
+        "targetBranch": { "enum": ["", null] }
+      },
+      "required": ["generateTargetBranch"]
     },
     {
-      "required": ["targetBranch"],
       "properties": {
-        "generateTargetBranch": { "enum": [null, false] },
+        "generateTargetBranch": { "enum": [false, null] },
         "targetBranch": { "minLength": 1 }
+      },
+      "required": ["targetBranch"]
+    },
+    {
+      "properties": {
+        "generateTargetBranch": { "enum": [false, null] },
+        "targetBranch": { "enum": ["", null] }
       }
     }
   ]