Fix schema generation for inline elements

Signed-off-by: David Gageot <[email protected]>
GoogleContainerTools · Feb 21, 2019 · 742aa9f · 742aa9f
1 parent a2bdf96
commit 742aa9f
Show file tree

Hide file tree

Showing 12 changed files with 440 additions and 117 deletions.
diff --git a/docs/content/en/docs/references/yaml/main.js b/docs/content/en/docs/references/yaml/main.js
@@ -20,8 +20,8 @@ function* template(definitions, parentDefinition, ref, ident) {
   for (var key in properties) {
       allProperties.push([key, properties[key]]);
   }
-  if (definitions[name].oneOf) {
-      for (var properties of definitions[name].oneOf) {
+  if (definitions[name].anyOf) {
+      for (var properties of definitions[name].anyOf) {
           for (var key in properties.properties) {
               allProperties.push([key, properties.properties[key]]);
           }
@@ -70,7 +70,7 @@ function* template(definitions, parentDefinition, ref, ident) {
     if (definition.$ref) {
         // Check if the referenced description is a final one
         const refName = definition.$ref.replace('#/definitions/', '');
-        if (!definitions[refName].properties && !definitions[refName].oneOf) {
+        if (!definitions[refName].properties && !definitions[refName].anyOf) {
             value = '{}'
         }
 

diff --git a/docs/content/en/schemas/v1alpha1.json b/docs/content/en/schemas/v1alpha1.json
@@ -1,6 +1,6 @@
 {
   "type": "object",
-  "oneOf": [
+  "anyOf": [
     {
       "$ref": "#/definitions/SkaffoldPipeline"
     }
@@ -23,6 +23,7 @@
           "$ref": "#/definitions/DeployConfig"
         }
       },
+      "additionalProperties": false,
       "description": "top level config object that is parsed from a skaffold.yaml"
     },
     "BuildConfig": {
@@ -38,7 +39,8 @@
           "default": "\"\""
         }
       },
-      "oneOf": [
+      "additionalProperties": false,
+      "anyOf": [
         {
           "properties": {
             "local": {
@@ -65,6 +67,7 @@
           "$ref": "#/definitions/GoogleCloudBuild"
         }
       },
+      "additionalProperties": false,
       "description": "contains the specific implementation and parameters needed for the build step. Only one field should be populated."
     },
     "LocalBuild": {
@@ -73,6 +76,7 @@
           "type": "boolean"
         }
       },
+      "additionalProperties": false,
       "description": "contains the fields needed to do a build on the local docker daemon and optionally push to a repository."
     },
     "GoogleCloudBuild": {
@@ -81,7 +85,8 @@
           "type": "string",
           "default": "\"\""
         }
-      }
+      },
+      "additionalProperties": false
     },
     "DeployConfig": {
       "properties": {
@@ -90,7 +95,8 @@
           "default": "\"\""
         }
       },
-      "oneOf": [
+      "additionalProperties": false,
+      "anyOf": [
         {
           "properties": {
             "helm": {
@@ -117,6 +123,7 @@
           "$ref": "#/definitions/KubectlDeploy"
         }
       },
+      "additionalProperties": false,
       "description": "contains the specific implementation and parameters needed for the deploy step. Only one field should be populated."
     },
     "KubectlDeploy": {
@@ -128,6 +135,7 @@
           "type": "array"
         }
       },
+      "additionalProperties": false,
       "description": "contains the configuration needed for deploying with <code>kubectl apply</code>"
     },
     "Manifest": {
@@ -148,7 +156,8 @@
           "type": "object",
           "default": "{}"
         }
-      }
+      },
+      "additionalProperties": false
     },
     "HelmDeploy": {
       "properties": {
@@ -158,7 +167,8 @@
           },
           "type": "array"
         }
-      }
+      },
+      "additionalProperties": false
     },
     "HelmRelease": {
       "properties": {
@@ -190,7 +200,8 @@
           "type": "string",
           "default": "\"\""
         }
-      }
+      },
+      "additionalProperties": false
     },
     "Artifact": {
       "properties": {
@@ -214,6 +225,7 @@
           "default": "{}"
         }
       },
+      "additionalProperties": false,
       "description": "represents items that need should be built, along with the context in which they should be built."
     }
   }

diff --git a/docs/content/en/schemas/v1alpha2.json b/docs/content/en/schemas/v1alpha2.json
@@ -1,6 +1,6 @@
 {
   "type": "object",
-  "oneOf": [
+  "anyOf": [
     {
       "$ref": "#/definitions/SkaffoldPipeline"
     }
@@ -28,7 +28,8 @@
           },
           "type": "array"
         }
-      }
+      },
+      "additionalProperties": false
     },
     "BuildConfig": {
       "properties": {
@@ -42,7 +43,8 @@
           "$ref": "#/definitions/TagPolicy"
         }
       },
-      "oneOf": [
+      "additionalProperties": false,
+      "anyOf": [
         {
           "properties": {
             "local": {
@@ -82,12 +84,15 @@
           "$ref": "#/definitions/DateTimeTagger"
         }
       },
+      "additionalProperties": false,
       "description": "contains all the configuration for the tagging step"
     },
     "ShaTagger": {
+      "additionalProperties": false,
       "description": "contains the configuration for the SHA tagger."
     },
     "GitTagger": {
+      "additionalProperties": false,
       "description": "contains the configuration for the git tagger."
     },
     "EnvTemplateTagger": {
@@ -97,6 +102,7 @@
           "default": "\"\""
         }
       },
+      "additionalProperties": false,
       "description": "contains the configuration for the envTemplate tagger."
     },
     "DateTimeTagger": {
@@ -110,6 +116,7 @@
           "default": "\"\""
         }
       },
+      "additionalProperties": false,
       "description": "contains the configuration for the DateTime tagger."
     },
     "BuildType": {
@@ -124,6 +131,7 @@
           "$ref": "#/definitions/KanikoBuild"
         }
       },
+      "additionalProperties": false,
       "description": "contains the specific implementation and parameters needed for the build step. Only one field should be populated."
     },
     "LocalBuild": {
@@ -140,6 +148,7 @@
           "default": "false"
         }
       },
+      "additionalProperties": false,
       "description": "contains the fields needed to do a build on the local docker daemon and optionally push to a repository."
     },
     "GoogleCloudBuild": {
@@ -165,6 +174,7 @@
           "default": "\"\""
         }
       },
+      "additionalProperties": false,
       "description": "contains the fields needed to do a remote build on Google Cloud Build."
     },
     "KanikoBuild": {
@@ -190,10 +200,12 @@
           "default": "\"\""
         }
       },
+      "additionalProperties": false,
       "description": "contains the fields needed to do a on-cluster build using the kaniko image"
     },
     "DeployConfig": {
-      "oneOf": [
+      "additionalProperties": false,
+      "anyOf": [
         {
           "properties": {
             "helm": {
@@ -230,6 +242,7 @@
           "$ref": "#/definitions/KustomizeDeploy"
         }
       },
+      "additionalProperties": false,
       "description": "contains the specific implementation and parameters needed for the deploy step. Only one field should be populated."
     },
     "KubectlDeploy": {
@@ -254,6 +267,7 @@
           "$ref": "#/definitions/KubectlFlags"
         }
       },
+      "additionalProperties": false,
       "description": "contains the configuration needed for deploying with <code>kubectl apply</code>"
     },
     "KubectlFlags": {
@@ -283,6 +297,7 @@
           "default": "[]"
         }
       },
+      "additionalProperties": false,
       "description": "describes additional options flags that are passed on the command line to kubectl either on every command (Global), on creations (Apply) or deletions (Delete)."
     },
     "HelmDeploy": {
@@ -294,6 +309,7 @@
           "type": "array"
         }
       },
+      "additionalProperties": false,
       "description": "contains the configuration needed for deploying with helm"
     },
     "KustomizeDeploy": {
@@ -305,7 +321,8 @@
         "flags": {
           "$ref": "#/definitions/KubectlFlags"
         }
-      }
+      },
+      "additionalProperties": false
     },
     "HelmRelease": {
       "properties": {
@@ -372,7 +389,8 @@
         "imageStrategy": {
           "$ref": "#/definitions/HelmImageStrategy"
         }
-      }
+      },
+      "additionalProperties": false
     },
     "HelmPackaged": {
       "properties": {
@@ -387,10 +405,12 @@
           "default": "\"\""
         }
       },
+      "additionalProperties": false,
       "description": "represents parameters for packaging helm chart."
     },
     "HelmImageStrategy": {
-      "oneOf": [
+      "additionalProperties": false,
+      "anyOf": [
         {
           "properties": {
             "fqn": {
@@ -415,7 +435,8 @@
         "helm": {
           "$ref": "#/definitions/HelmConventionConfig"
         }
-      }
+      },
+      "additionalProperties": false
     },
     "HelmFQNConfig": {
       "properties": {
@@ -424,9 +445,11 @@
           "default": "\"\""
         }
       },
+      "additionalProperties": false,
       "description": "represents image config to use the FullyQualifiedImageName as param to set"
     },
     "HelmConventionConfig": {
+      "additionalProperties": false,
       "description": "represents image config in the syntax of image.repository and image.tag"
     },
     "Artifact": {
@@ -440,7 +463,8 @@
           "default": "\"\""
         }
       },
-      "oneOf": [
+      "additionalProperties": false,
+      "anyOf": [
         {
           "properties": {
             "docker": {
@@ -471,6 +495,7 @@
           "$ref": "#/definitions/DeployConfig"
         }
       },
+      "additionalProperties": false,
       "description": "additional configuration that overrides default configuration when it is activated."
     },
     "ArtifactType": {
@@ -481,7 +506,8 @@
         "bazel": {
           "$ref": "#/definitions/BazelArtifact"
         }
-      }
+      },
+      "additionalProperties": false
     },
     "DockerArtifact": {
       "properties": {
@@ -508,15 +534,17 @@
           "type": "string",
           "default": "\"\""
         }
-      }
+      },
+      "additionalProperties": false
     },
     "BazelArtifact": {
       "properties": {
         "target": {
           "type": "string",
           "default": "\"\""
         }
-      }
+      },
+      "additionalProperties": false
     }
   }
 }