Merge pull request #542 from replicatedhq/schemagen-quotedbool

Schemagen for QuotedBools
replicatedhq · May 14, 2020 · 1539e16 · 1539e16
2 parents f5a74c9 + e733e4e
commit 1539e16
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/kotskinds/schemagen/cli/root.go b/kotskinds/schemagen/cli/root.go
@@ -154,7 +154,11 @@ func generateSchemaFromCRD(crd []byte, outfile string) error {
 	// whoa now
 	// working around the fact that controller-gen doesn't have tags to generate oneOf schemas, so this is hacky.
 	// going to work to add an issue there to support and if they accept, this terrible thing can go away
-	boolStringed := strings.ReplaceAll(string(b), `"type": "BoolString"`, `"oneOf": [{"type": "string"},{"type": "boolean"}]`)
+	replacer := strings.NewReplacer(
+		`"type": "BoolString"`, `"oneOf": [{"type": "string"},{"type": "boolean"}]`,
+		`"type": "QuotedBool"`, `"oneOf": [{"type": "string"},{"type": "boolean"}]`,
+	)
+	boolStringed := replacer.Replace(string(b))
 
 	err = ioutil.WriteFile(outfile, []byte(boolStringed), 0644)
 	if err != nil {

diff --git a/kotskinds/schemas/config-kots-v1beta1.json b/kotskinds/schemas/config-kots-v1beta1.json
@@ -122,7 +122,7 @@
                     },
                     "when": {
                       "description": "QuotedBool is a string type that can also unmarshal raw yaml bools.",
-                      "type": "QuotedBool"
+                      "oneOf": [{"type": "string"},{"type": "boolean"}]
                     },
                     "write_once": {
                       "type": "boolean"