From 1084d408ece04007d82115b0bc9258cc5a4dfc00 Mon Sep 17 00:00:00 2001 From: balopat Date: Wed, 3 Apr 2019 09:25:11 -0700 Subject: [PATCH 1/2] remove inline structs from schema --- docs/content/en/schemas/v1alpha1.json | 34 ------ docs/content/en/schemas/v1alpha2.json | 72 ----------- docs/content/en/schemas/v1alpha3.json | 72 ----------- docs/content/en/schemas/v1alpha4.json | 80 ------------ docs/content/en/schemas/v1alpha5.json | 84 ------------- docs/content/en/schemas/v1beta1.json | 80 ------------ docs/content/en/schemas/v1beta2.json | 80 ------------ docs/content/en/schemas/v1beta3.json | 80 ------------ docs/content/en/schemas/v1beta4.json | 80 ------------ docs/content/en/schemas/v1beta5.json | 104 ---------------- docs/content/en/schemas/v1beta6.json | 108 ----------------- docs/content/en/schemas/v1beta7.json | 114 ------------------ hack/schemas/main.go | 7 ++ .../schemas/testdata/inline-anyof/output.json | 21 ---- .../testdata/inline-hybrid/output.json | 42 ------- hack/schemas/testdata/inline/output.json | 30 ----- 16 files changed, 7 insertions(+), 1081 deletions(-) diff --git a/docs/content/en/schemas/v1alpha1.json b/docs/content/en/schemas/v1alpha1.json index 40b63289f49..2d92d92a31e 100755 --- a/docs/content/en/schemas/v1alpha1.json +++ b/docs/content/en/schemas/v1alpha1.json @@ -104,23 +104,6 @@ "description": "contains all the configuration for the build steps", "x-intellij-html-description": "contains all the configuration for the build steps" }, - "BuildType": { - "properties": { - "googleCloudBuild": { - "$ref": "#/definitions/GoogleCloudBuild" - }, - "local": { - "$ref": "#/definitions/LocalBuild" - } - }, - "preferredOrder": [ - "local", - "googleCloudBuild" - ], - "additionalProperties": false, - "description": "contains the specific implementation and parameters needed for the build step. Only one field should be populated.", - "x-intellij-html-description": "contains the specific implementation and parameters needed for the build step. Only one field should be populated." - }, "DeployConfig": { "anyOf": [ { @@ -168,23 +151,6 @@ "description": "contains all the configuration needed by the deploy steps", "x-intellij-html-description": "contains all the configuration needed by the deploy steps" }, - "DeployType": { - "properties": { - "helm": { - "$ref": "#/definitions/HelmDeploy" - }, - "kubectl": { - "$ref": "#/definitions/KubectlDeploy" - } - }, - "preferredOrder": [ - "helm", - "kubectl" - ], - "additionalProperties": false, - "description": "contains the specific implementation and parameters needed for the deploy step. Only one field should be populated.", - "x-intellij-html-description": "contains the specific implementation and parameters needed for the deploy step. Only one field should be populated." - }, "GoogleCloudBuild": { "properties": { "projectId": { diff --git a/docs/content/en/schemas/v1alpha2.json b/docs/content/en/schemas/v1alpha2.json index 5cde3badaa6..7f89ffbb11f 100755 --- a/docs/content/en/schemas/v1alpha2.json +++ b/docs/content/en/schemas/v1alpha2.json @@ -66,21 +66,6 @@ "description": "represents items that need to be built, along with the context in which they should be built.", "x-intellij-html-description": "represents items that need to be built, along with the context in which they should be built." }, - "ArtifactType": { - "properties": { - "bazel": { - "$ref": "#/definitions/BazelArtifact" - }, - "docker": { - "$ref": "#/definitions/DockerArtifact" - } - }, - "preferredOrder": [ - "docker", - "bazel" - ], - "additionalProperties": false - }, "BazelArtifact": { "properties": { "target": { @@ -182,27 +167,6 @@ "description": "contains all the configuration for the build steps", "x-intellij-html-description": "contains all the configuration for the build steps" }, - "BuildType": { - "properties": { - "googleCloudBuild": { - "$ref": "#/definitions/GoogleCloudBuild" - }, - "kaniko": { - "$ref": "#/definitions/KanikoBuild" - }, - "local": { - "$ref": "#/definitions/LocalBuild" - } - }, - "preferredOrder": [ - "local", - "googleCloudBuild", - "kaniko" - ], - "additionalProperties": false, - "description": "contains the specific implementation and parameters needed for the build step. Only one field should be populated.", - "x-intellij-html-description": "contains the specific implementation and parameters needed for the build step. Only one field should be populated." - }, "DateTimeTagger": { "properties": { "format": { @@ -262,27 +226,6 @@ "description": "contains all the configuration needed by the deploy steps", "x-intellij-html-description": "contains all the configuration needed by the deploy steps" }, - "DeployType": { - "properties": { - "helm": { - "$ref": "#/definitions/HelmDeploy" - }, - "kubectl": { - "$ref": "#/definitions/KubectlDeploy" - }, - "kustomize": { - "$ref": "#/definitions/KustomizeDeploy" - } - }, - "preferredOrder": [ - "helm", - "kubectl", - "kustomize" - ], - "additionalProperties": false, - "description": "contains the specific implementation and parameters needed for the deploy step. Only one field should be populated.", - "x-intellij-html-description": "contains the specific implementation and parameters needed for the deploy step. Only one field should be populated." - }, "DockerArtifact": { "properties": { "buildArgs": { @@ -393,21 +336,6 @@ "description": "represents image config to use the FullyQualifiedImageName as param to set", "x-intellij-html-description": "represents image config to use the FullyQualifiedImageName as param to set" }, - "HelmImageConfig": { - "properties": { - "fqn": { - "$ref": "#/definitions/HelmFQNConfig" - }, - "helm": { - "$ref": "#/definitions/HelmConventionConfig" - } - }, - "preferredOrder": [ - "fqn", - "helm" - ], - "additionalProperties": false - }, "HelmImageStrategy": { "anyOf": [ { diff --git a/docs/content/en/schemas/v1alpha3.json b/docs/content/en/schemas/v1alpha3.json index 3fe5354f4e4..43378c87b31 100755 --- a/docs/content/en/schemas/v1alpha3.json +++ b/docs/content/en/schemas/v1alpha3.json @@ -66,21 +66,6 @@ "description": "represents items that need to be built, along with the context in which they should be built.", "x-intellij-html-description": "represents items that need to be built, along with the context in which they should be built." }, - "ArtifactType": { - "properties": { - "bazel": { - "$ref": "#/definitions/BazelArtifact" - }, - "docker": { - "$ref": "#/definitions/DockerArtifact" - } - }, - "preferredOrder": [ - "docker", - "bazel" - ], - "additionalProperties": false - }, "BazelArtifact": { "properties": { "target": { @@ -182,27 +167,6 @@ "description": "contains all the configuration for the build steps", "x-intellij-html-description": "contains all the configuration for the build steps" }, - "BuildType": { - "properties": { - "googleCloudBuild": { - "$ref": "#/definitions/GoogleCloudBuild" - }, - "kaniko": { - "$ref": "#/definitions/KanikoBuild" - }, - "local": { - "$ref": "#/definitions/LocalBuild" - } - }, - "preferredOrder": [ - "local", - "googleCloudBuild", - "kaniko" - ], - "additionalProperties": false, - "description": "contains the specific implementation and parameters needed for the build step. Only one field should be populated.", - "x-intellij-html-description": "contains the specific implementation and parameters needed for the build step. Only one field should be populated." - }, "DateTimeTagger": { "properties": { "format": { @@ -262,27 +226,6 @@ "description": "contains all the configuration needed by the deploy steps", "x-intellij-html-description": "contains all the configuration needed by the deploy steps" }, - "DeployType": { - "properties": { - "helm": { - "$ref": "#/definitions/HelmDeploy" - }, - "kubectl": { - "$ref": "#/definitions/KubectlDeploy" - }, - "kustomize": { - "$ref": "#/definitions/KustomizeDeploy" - } - }, - "preferredOrder": [ - "helm", - "kubectl", - "kustomize" - ], - "additionalProperties": false, - "description": "contains the specific implementation and parameters needed for the deploy step. Only one field should be populated.", - "x-intellij-html-description": "contains the specific implementation and parameters needed for the deploy step. Only one field should be populated." - }, "DockerArtifact": { "properties": { "buildArgs": { @@ -393,21 +336,6 @@ "description": "represents image config to use the FullyQualifiedImageName as param to set", "x-intellij-html-description": "represents image config to use the FullyQualifiedImageName as param to set" }, - "HelmImageConfig": { - "properties": { - "fqn": { - "$ref": "#/definitions/HelmFQNConfig" - }, - "helm": { - "$ref": "#/definitions/HelmConventionConfig" - } - }, - "preferredOrder": [ - "fqn", - "helm" - ], - "additionalProperties": false - }, "HelmImageStrategy": { "anyOf": [ { diff --git a/docs/content/en/schemas/v1alpha4.json b/docs/content/en/schemas/v1alpha4.json index 49d2bab8a1d..9e8fce1821b 100755 --- a/docs/content/en/schemas/v1alpha4.json +++ b/docs/content/en/schemas/v1alpha4.json @@ -144,29 +144,6 @@ "description": "represents items that need to be built, along with the context in which they should be built.", "x-intellij-html-description": "represents items that need to be built, along with the context in which they should be built." }, - "ArtifactType": { - "properties": { - "bazel": { - "$ref": "#/definitions/BazelArtifact" - }, - "docker": { - "$ref": "#/definitions/DockerArtifact" - }, - "jibGradle": { - "$ref": "#/definitions/JibGradleArtifact" - }, - "jibMaven": { - "$ref": "#/definitions/JibMavenArtifact" - } - }, - "preferredOrder": [ - "docker", - "bazel", - "jibMaven", - "jibGradle" - ], - "additionalProperties": false - }, "BazelArtifact": { "properties": { "target": { @@ -270,27 +247,6 @@ "description": "contains all the configuration for the build steps", "x-intellij-html-description": "contains all the configuration for the build steps" }, - "BuildType": { - "properties": { - "googleCloudBuild": { - "$ref": "#/definitions/GoogleCloudBuild" - }, - "kaniko": { - "$ref": "#/definitions/KanikoBuild" - }, - "local": { - "$ref": "#/definitions/LocalBuild" - } - }, - "preferredOrder": [ - "local", - "googleCloudBuild", - "kaniko" - ], - "additionalProperties": false, - "description": "contains the specific implementation and parameters needed for the build step. Only one field should be populated.", - "x-intellij-html-description": "contains the specific implementation and parameters needed for the build step. Only one field should be populated." - }, "DateTimeTagger": { "properties": { "format": { @@ -350,27 +306,6 @@ "description": "contains all the configuration needed by the deploy steps", "x-intellij-html-description": "contains all the configuration needed by the deploy steps" }, - "DeployType": { - "properties": { - "helm": { - "$ref": "#/definitions/HelmDeploy" - }, - "kubectl": { - "$ref": "#/definitions/KubectlDeploy" - }, - "kustomize": { - "$ref": "#/definitions/KustomizeDeploy" - } - }, - "preferredOrder": [ - "helm", - "kubectl", - "kustomize" - ], - "additionalProperties": false, - "description": "contains the specific implementation and parameters needed for the deploy step. Only one field should be populated.", - "x-intellij-html-description": "contains the specific implementation and parameters needed for the deploy step. Only one field should be populated." - }, "DockerArtifact": { "properties": { "buildArgs": { @@ -483,21 +418,6 @@ "description": "represents image config to use the FullyQualifiedImageName as param to set", "x-intellij-html-description": "represents image config to use the FullyQualifiedImageName as param to set" }, - "HelmImageConfig": { - "properties": { - "fqn": { - "$ref": "#/definitions/HelmFQNConfig" - }, - "helm": { - "$ref": "#/definitions/HelmConventionConfig" - } - }, - "preferredOrder": [ - "fqn", - "helm" - ], - "additionalProperties": false - }, "HelmImageStrategy": { "anyOf": [ { diff --git a/docs/content/en/schemas/v1alpha5.json b/docs/content/en/schemas/v1alpha5.json index 8f08e24e151..e327c7e494d 100755 --- a/docs/content/en/schemas/v1alpha5.json +++ b/docs/content/en/schemas/v1alpha5.json @@ -144,29 +144,6 @@ "description": "represents items that need to be built, along with the context in which they should be built.", "x-intellij-html-description": "represents items that need to be built, along with the context in which they should be built." }, - "ArtifactType": { - "properties": { - "bazel": { - "$ref": "#/definitions/BazelArtifact" - }, - "docker": { - "$ref": "#/definitions/DockerArtifact" - }, - "jibGradle": { - "$ref": "#/definitions/JibGradleArtifact" - }, - "jibMaven": { - "$ref": "#/definitions/JibMavenArtifact" - } - }, - "preferredOrder": [ - "docker", - "bazel", - "jibMaven", - "jibGradle" - ], - "additionalProperties": false - }, "AzureContainerBuild": { "properties": { "clientId": { @@ -317,31 +294,6 @@ "description": "contains all the configuration for the build steps", "x-intellij-html-description": "contains all the configuration for the build steps" }, - "BuildType": { - "properties": { - "acr": { - "$ref": "#/definitions/AzureContainerBuild" - }, - "googleCloudBuild": { - "$ref": "#/definitions/GoogleCloudBuild" - }, - "kaniko": { - "$ref": "#/definitions/KanikoBuild" - }, - "local": { - "$ref": "#/definitions/LocalBuild" - } - }, - "preferredOrder": [ - "local", - "googleCloudBuild", - "kaniko", - "acr" - ], - "additionalProperties": false, - "description": "contains the specific implementation and parameters needed for the build step. Only one field should be populated.", - "x-intellij-html-description": "contains the specific implementation and parameters needed for the build step. Only one field should be populated." - }, "DateTimeTagger": { "properties": { "format": { @@ -401,27 +353,6 @@ "description": "contains all the configuration needed by the deploy steps", "x-intellij-html-description": "contains all the configuration needed by the deploy steps" }, - "DeployType": { - "properties": { - "helm": { - "$ref": "#/definitions/HelmDeploy" - }, - "kubectl": { - "$ref": "#/definitions/KubectlDeploy" - }, - "kustomize": { - "$ref": "#/definitions/KustomizeDeploy" - } - }, - "preferredOrder": [ - "helm", - "kubectl", - "kustomize" - ], - "additionalProperties": false, - "description": "contains the specific implementation and parameters needed for the deploy step. Only one field should be populated.", - "x-intellij-html-description": "contains the specific implementation and parameters needed for the deploy step. Only one field should be populated." - }, "DockerArtifact": { "properties": { "buildArgs": { @@ -534,21 +465,6 @@ "description": "represents image config to use the FullyQualifiedImageName as param to set", "x-intellij-html-description": "represents image config to use the FullyQualifiedImageName as param to set" }, - "HelmImageConfig": { - "properties": { - "fqn": { - "$ref": "#/definitions/HelmFQNConfig" - }, - "helm": { - "$ref": "#/definitions/HelmConventionConfig" - } - }, - "preferredOrder": [ - "fqn", - "helm" - ], - "additionalProperties": false - }, "HelmImageStrategy": { "anyOf": [ { diff --git a/docs/content/en/schemas/v1beta1.json b/docs/content/en/schemas/v1beta1.json index ef80743cf5a..e4c6cc6bed6 100755 --- a/docs/content/en/schemas/v1beta1.json +++ b/docs/content/en/schemas/v1beta1.json @@ -144,29 +144,6 @@ "description": "represents items that need to be built, along with the context in which they should be built.", "x-intellij-html-description": "represents items that need to be built, along with the context in which they should be built." }, - "ArtifactType": { - "properties": { - "bazel": { - "$ref": "#/definitions/BazelArtifact" - }, - "docker": { - "$ref": "#/definitions/DockerArtifact" - }, - "jibGradle": { - "$ref": "#/definitions/JibGradleArtifact" - }, - "jibMaven": { - "$ref": "#/definitions/JibMavenArtifact" - } - }, - "preferredOrder": [ - "docker", - "bazel", - "jibMaven", - "jibGradle" - ], - "additionalProperties": false - }, "BazelArtifact": { "properties": { "args": { @@ -278,27 +255,6 @@ "description": "contains all the configuration for the build steps", "x-intellij-html-description": "contains all the configuration for the build steps" }, - "BuildType": { - "properties": { - "googleCloudBuild": { - "$ref": "#/definitions/GoogleCloudBuild" - }, - "kaniko": { - "$ref": "#/definitions/KanikoBuild" - }, - "local": { - "$ref": "#/definitions/LocalBuild" - } - }, - "preferredOrder": [ - "local", - "googleCloudBuild", - "kaniko" - ], - "additionalProperties": false, - "description": "contains the specific implementation and parameters needed for the build step. Only one field should be populated.", - "x-intellij-html-description": "contains the specific implementation and parameters needed for the build step. Only one field should be populated." - }, "DateTimeTagger": { "properties": { "format": { @@ -358,27 +314,6 @@ "description": "contains all the configuration needed by the deploy steps", "x-intellij-html-description": "contains all the configuration needed by the deploy steps" }, - "DeployType": { - "properties": { - "helm": { - "$ref": "#/definitions/HelmDeploy" - }, - "kubectl": { - "$ref": "#/definitions/KubectlDeploy" - }, - "kustomize": { - "$ref": "#/definitions/KustomizeDeploy" - } - }, - "preferredOrder": [ - "helm", - "kubectl", - "kustomize" - ], - "additionalProperties": false, - "description": "contains the specific implementation and parameters needed for the deploy step. Only one field should be populated.", - "x-intellij-html-description": "contains the specific implementation and parameters needed for the deploy step. Only one field should be populated." - }, "DockerArtifact": { "properties": { "buildArgs": { @@ -491,21 +426,6 @@ "description": "represents image config to use the FullyQualifiedImageName as param to set", "x-intellij-html-description": "represents image config to use the FullyQualifiedImageName as param to set" }, - "HelmImageConfig": { - "properties": { - "fqn": { - "$ref": "#/definitions/HelmFQNConfig" - }, - "helm": { - "$ref": "#/definitions/HelmConventionConfig" - } - }, - "preferredOrder": [ - "fqn", - "helm" - ], - "additionalProperties": false - }, "HelmImageStrategy": { "anyOf": [ { diff --git a/docs/content/en/schemas/v1beta2.json b/docs/content/en/schemas/v1beta2.json index 8f94a85f546..2fb0c069102 100755 --- a/docs/content/en/schemas/v1beta2.json +++ b/docs/content/en/schemas/v1beta2.json @@ -144,29 +144,6 @@ "description": "represents items that need to be built, along with the context in which they should be built.", "x-intellij-html-description": "represents items that need to be built, along with the context in which they should be built." }, - "ArtifactType": { - "properties": { - "bazel": { - "$ref": "#/definitions/BazelArtifact" - }, - "docker": { - "$ref": "#/definitions/DockerArtifact" - }, - "jibGradle": { - "$ref": "#/definitions/JibGradleArtifact" - }, - "jibMaven": { - "$ref": "#/definitions/JibMavenArtifact" - } - }, - "preferredOrder": [ - "docker", - "bazel", - "jibMaven", - "jibGradle" - ], - "additionalProperties": false - }, "BazelArtifact": { "properties": { "args": { @@ -278,27 +255,6 @@ "description": "contains all the configuration for the build steps", "x-intellij-html-description": "contains all the configuration for the build steps" }, - "BuildType": { - "properties": { - "googleCloudBuild": { - "$ref": "#/definitions/GoogleCloudBuild" - }, - "kaniko": { - "$ref": "#/definitions/KanikoBuild" - }, - "local": { - "$ref": "#/definitions/LocalBuild" - } - }, - "preferredOrder": [ - "local", - "googleCloudBuild", - "kaniko" - ], - "additionalProperties": false, - "description": "contains the specific implementation and parameters needed for the build step. Only one field should be populated.", - "x-intellij-html-description": "contains the specific implementation and parameters needed for the build step. Only one field should be populated." - }, "DateTimeTagger": { "properties": { "format": { @@ -358,27 +314,6 @@ "description": "contains all the configuration needed by the deploy steps", "x-intellij-html-description": "contains all the configuration needed by the deploy steps" }, - "DeployType": { - "properties": { - "helm": { - "$ref": "#/definitions/HelmDeploy" - }, - "kubectl": { - "$ref": "#/definitions/KubectlDeploy" - }, - "kustomize": { - "$ref": "#/definitions/KustomizeDeploy" - } - }, - "preferredOrder": [ - "helm", - "kubectl", - "kustomize" - ], - "additionalProperties": false, - "description": "contains the specific implementation and parameters needed for the deploy step. Only one field should be populated.", - "x-intellij-html-description": "contains the specific implementation and parameters needed for the deploy step. Only one field should be populated." - }, "DockerArtifact": { "properties": { "buildArgs": { @@ -491,21 +426,6 @@ "description": "represents image config to use the FullyQualifiedImageName as param to set", "x-intellij-html-description": "represents image config to use the FullyQualifiedImageName as param to set" }, - "HelmImageConfig": { - "properties": { - "fqn": { - "$ref": "#/definitions/HelmFQNConfig" - }, - "helm": { - "$ref": "#/definitions/HelmConventionConfig" - } - }, - "preferredOrder": [ - "fqn", - "helm" - ], - "additionalProperties": false - }, "HelmImageStrategy": { "anyOf": [ { diff --git a/docs/content/en/schemas/v1beta3.json b/docs/content/en/schemas/v1beta3.json index dba07be6d16..cac3a27e47b 100755 --- a/docs/content/en/schemas/v1beta3.json +++ b/docs/content/en/schemas/v1beta3.json @@ -144,29 +144,6 @@ "description": "represents items that need to be built, along with the context in which they should be built.", "x-intellij-html-description": "represents items that need to be built, along with the context in which they should be built." }, - "ArtifactType": { - "properties": { - "bazel": { - "$ref": "#/definitions/BazelArtifact" - }, - "docker": { - "$ref": "#/definitions/DockerArtifact" - }, - "jibGradle": { - "$ref": "#/definitions/JibGradleArtifact" - }, - "jibMaven": { - "$ref": "#/definitions/JibMavenArtifact" - } - }, - "preferredOrder": [ - "docker", - "bazel", - "jibMaven", - "jibGradle" - ], - "additionalProperties": false - }, "BazelArtifact": { "properties": { "args": { @@ -278,27 +255,6 @@ "description": "contains all the configuration for the build steps", "x-intellij-html-description": "contains all the configuration for the build steps" }, - "BuildType": { - "properties": { - "googleCloudBuild": { - "$ref": "#/definitions/GoogleCloudBuild" - }, - "kaniko": { - "$ref": "#/definitions/KanikoBuild" - }, - "local": { - "$ref": "#/definitions/LocalBuild" - } - }, - "preferredOrder": [ - "local", - "googleCloudBuild", - "kaniko" - ], - "additionalProperties": false, - "description": "contains the specific implementation and parameters needed for the build step. Only one field should be populated.", - "x-intellij-html-description": "contains the specific implementation and parameters needed for the build step. Only one field should be populated." - }, "DateTimeTagger": { "properties": { "format": { @@ -358,27 +314,6 @@ "description": "contains all the configuration needed by the deploy steps", "x-intellij-html-description": "contains all the configuration needed by the deploy steps" }, - "DeployType": { - "properties": { - "helm": { - "$ref": "#/definitions/HelmDeploy" - }, - "kubectl": { - "$ref": "#/definitions/KubectlDeploy" - }, - "kustomize": { - "$ref": "#/definitions/KustomizeDeploy" - } - }, - "preferredOrder": [ - "helm", - "kubectl", - "kustomize" - ], - "additionalProperties": false, - "description": "contains the specific implementation and parameters needed for the deploy step. Only one field should be populated.", - "x-intellij-html-description": "contains the specific implementation and parameters needed for the deploy step. Only one field should be populated." - }, "DockerArtifact": { "properties": { "buildArgs": { @@ -516,21 +451,6 @@ "description": "represents image config to use the FullyQualifiedImageName as param to set", "x-intellij-html-description": "represents image config to use the FullyQualifiedImageName as param to set" }, - "HelmImageConfig": { - "properties": { - "fqn": { - "$ref": "#/definitions/HelmFQNConfig" - }, - "helm": { - "$ref": "#/definitions/HelmConventionConfig" - } - }, - "preferredOrder": [ - "fqn", - "helm" - ], - "additionalProperties": false - }, "HelmImageStrategy": { "anyOf": [ { diff --git a/docs/content/en/schemas/v1beta4.json b/docs/content/en/schemas/v1beta4.json index fe667fd6725..0d5e24c2794 100755 --- a/docs/content/en/schemas/v1beta4.json +++ b/docs/content/en/schemas/v1beta4.json @@ -165,29 +165,6 @@ "description": "represents items that need to be built, along with the context in which they should be built.", "x-intellij-html-description": "represents items that need to be built, along with the context in which they should be built." }, - "ArtifactType": { - "properties": { - "bazel": { - "$ref": "#/definitions/BazelArtifact" - }, - "docker": { - "$ref": "#/definitions/DockerArtifact" - }, - "jibGradle": { - "$ref": "#/definitions/JibGradleArtifact" - }, - "jibMaven": { - "$ref": "#/definitions/JibMavenArtifact" - } - }, - "preferredOrder": [ - "docker", - "bazel", - "jibMaven", - "jibGradle" - ], - "additionalProperties": false - }, "BazelArtifact": { "properties": { "args": { @@ -299,27 +276,6 @@ "description": "contains all the configuration for the build steps", "x-intellij-html-description": "contains all the configuration for the build steps" }, - "BuildType": { - "properties": { - "googleCloudBuild": { - "$ref": "#/definitions/GoogleCloudBuild" - }, - "kaniko": { - "$ref": "#/definitions/KanikoBuild" - }, - "local": { - "$ref": "#/definitions/LocalBuild" - } - }, - "preferredOrder": [ - "local", - "googleCloudBuild", - "kaniko" - ], - "additionalProperties": false, - "description": "contains the specific implementation and parameters needed for the build step. Only one field should be populated.", - "x-intellij-html-description": "contains the specific implementation and parameters needed for the build step. Only one field should be populated." - }, "DateTimeTagger": { "properties": { "format": { @@ -379,27 +335,6 @@ "description": "contains all the configuration needed by the deploy steps", "x-intellij-html-description": "contains all the configuration needed by the deploy steps" }, - "DeployType": { - "properties": { - "helm": { - "$ref": "#/definitions/HelmDeploy" - }, - "kubectl": { - "$ref": "#/definitions/KubectlDeploy" - }, - "kustomize": { - "$ref": "#/definitions/KustomizeDeploy" - } - }, - "preferredOrder": [ - "helm", - "kubectl", - "kustomize" - ], - "additionalProperties": false, - "description": "contains the specific implementation and parameters needed for the deploy step. Only one field should be populated.", - "x-intellij-html-description": "contains the specific implementation and parameters needed for the deploy step. Only one field should be populated." - }, "DockerArtifact": { "properties": { "buildArgs": { @@ -537,21 +472,6 @@ "description": "represents image config to use the FullyQualifiedImageName as param to set", "x-intellij-html-description": "represents image config to use the FullyQualifiedImageName as param to set" }, - "HelmImageConfig": { - "properties": { - "fqn": { - "$ref": "#/definitions/HelmFQNConfig" - }, - "helm": { - "$ref": "#/definitions/HelmConventionConfig" - } - }, - "preferredOrder": [ - "fqn", - "helm" - ], - "additionalProperties": false - }, "HelmImageStrategy": { "anyOf": [ { diff --git a/docs/content/en/schemas/v1beta5.json b/docs/content/en/schemas/v1beta5.json index 558a585bcaf..6d165b58b98 100755 --- a/docs/content/en/schemas/v1beta5.json +++ b/docs/content/en/schemas/v1beta5.json @@ -286,37 +286,6 @@ "description": "items that need to be built, along with the context in which they should be built.", "x-intellij-html-description": "items that need to be built, along with the context in which they should be built." }, - "ArtifactType": { - "properties": { - "bazel": { - "$ref": "#/definitions/BazelArtifact", - "description": "*beta* requires bazel CLI to be installed and the sources to contain [Bazel](https://bazel.build/) configuration files.", - "x-intellij-html-description": "beta requires bazel CLI to be installed and the sources to contain Bazel configuration files." - }, - "docker": { - "$ref": "#/definitions/DockerArtifact", - "description": "*beta* describes an artifact built from a Dockerfile.", - "x-intellij-html-description": "beta describes an artifact built from a Dockerfile." - }, - "jibGradle": { - "$ref": "#/definitions/JibGradleArtifact", - "description": "*alpha* builds images using the [Jib plugin for Gradle](https://github.com/GoogleContainerTools/jib/tree/master/jib-gradle-plugin).", - "x-intellij-html-description": "alpha builds images using the Jib plugin for Gradle." - }, - "jibMaven": { - "$ref": "#/definitions/JibMavenArtifact", - "description": "*alpha* builds images using the [Jib plugin for Maven](https://github.com/GoogleContainerTools/jib/tree/master/jib-maven-plugin).", - "x-intellij-html-description": "alpha builds images using the Jib plugin for Maven." - } - }, - "preferredOrder": [ - "docker", - "bazel", - "jibMaven", - "jibGradle" - ], - "additionalProperties": false - }, "BazelArtifact": { "required": [ "target" @@ -487,33 +456,6 @@ "description": "contains all the configuration for the build steps.", "x-intellij-html-description": "contains all the configuration for the build steps." }, - "BuildType": { - "properties": { - "googleCloudBuild": { - "$ref": "#/definitions/GoogleCloudBuild", - "description": "*beta* describes how to do a remote build on [Google Cloud Build](https://cloud.google.com/cloud-build/).", - "x-intellij-html-description": "beta describes how to do a remote build on Google Cloud Build." - }, - "kaniko": { - "$ref": "#/definitions/KanikoBuild", - "description": "*beta* describes how to do an on-cluster build using [Kaniko](https://github.com/GoogleContainerTools/kaniko).", - "x-intellij-html-description": "beta describes how to do an on-cluster build using Kaniko." - }, - "local": { - "$ref": "#/definitions/LocalBuild", - "description": "*beta* describes how to do a build on the local docker daemon and optionally push to a repository.", - "x-intellij-html-description": "beta describes how to do a build on the local docker daemon and optionally push to a repository." - } - }, - "preferredOrder": [ - "local", - "googleCloudBuild", - "kaniko" - ], - "additionalProperties": false, - "description": "contains the specific implementation and parameters needed for the build step. Only one field should be populated.", - "x-intellij-html-description": "contains the specific implementation and parameters needed for the build step. Only one field should be populated." - }, "BuilderPlugin": { "properties": { "name": { @@ -607,33 +549,6 @@ "description": "contains all the configuration needed by the deploy steps.", "x-intellij-html-description": "contains all the configuration needed by the deploy steps." }, - "DeployType": { - "properties": { - "helm": { - "$ref": "#/definitions/HelmDeploy", - "description": "*beta* uses the `helm` CLI to apply the charts to the cluster.", - "x-intellij-html-description": "beta uses the helm CLI to apply the charts to the cluster." - }, - "kubectl": { - "$ref": "#/definitions/KubectlDeploy", - "description": "*beta* uses a client side `kubectl apply` to deploy manifests. You'll need a `kubectl` CLI version installed that's compatible with your cluster.", - "x-intellij-html-description": "beta uses a client side kubectl apply to deploy manifests. You'll need a kubectl CLI version installed that's compatible with your cluster." - }, - "kustomize": { - "$ref": "#/definitions/KustomizeDeploy", - "description": "*beta* uses the `kustomize` CLI to \"patch\" a deployment for a target environment.", - "x-intellij-html-description": "beta uses the kustomize CLI to "patch" a deployment for a target environment." - } - }, - "preferredOrder": [ - "helm", - "kubectl", - "kustomize" - ], - "additionalProperties": false, - "description": "contains the specific implementation and parameters needed for the deploy step. Only one field should be populated.", - "x-intellij-html-description": "contains the specific implementation and parameters needed for the deploy step. Only one field should be populated." - }, "DockerArtifact": { "properties": { "buildArgs": { @@ -848,25 +763,6 @@ "description": "image config to use the FullyQualifiedImageName as param to set.", "x-intellij-html-description": "image config to use the FullyQualifiedImageName as param to set." }, - "HelmImageConfig": { - "properties": { - "fqn": { - "$ref": "#/definitions/HelmFQNConfig", - "description": "image configuration uses the syntax `IMAGE-NAME=IMAGE-REPOSITORY:IMAGE-TAG`.", - "x-intellij-html-description": "image configuration uses the syntax IMAGE-NAME=IMAGE-REPOSITORY:IMAGE-TAG." - }, - "helm": { - "$ref": "#/definitions/HelmConventionConfig", - "description": "image configuration uses the syntax `IMAGE-NAME.repository=IMAGE-REPOSITORY, IMAGE-NAME.tag=IMAGE-TAG`.", - "x-intellij-html-description": "image configuration uses the syntax IMAGE-NAME.repository=IMAGE-REPOSITORY, IMAGE-NAME.tag=IMAGE-TAG." - } - }, - "preferredOrder": [ - "fqn", - "helm" - ], - "additionalProperties": false - }, "HelmImageStrategy": { "anyOf": [ { diff --git a/docs/content/en/schemas/v1beta6.json b/docs/content/en/schemas/v1beta6.json index 221a76d5e44..7679226e3a4 100755 --- a/docs/content/en/schemas/v1beta6.json +++ b/docs/content/en/schemas/v1beta6.json @@ -286,39 +286,6 @@ "description": "items that need to be built, along with the context in which they should be built.", "x-intellij-html-description": "items that need to be built, along with the context in which they should be built." }, - "ArtifactType": { - "properties": { - "bazel": { - "$ref": "#/definitions/BazelArtifact", - "description": "*beta* requires bazel CLI to be installed and the sources to contain [Bazel](https://bazel.build/) configuration files.", - "x-intellij-html-description": "beta requires bazel CLI to be installed and the sources to contain Bazel configuration files." - }, - "docker": { - "$ref": "#/definitions/DockerArtifact", - "description": "*beta* describes an artifact built from a Dockerfile.", - "x-intellij-html-description": "beta describes an artifact built from a Dockerfile." - }, - "jibGradle": { - "$ref": "#/definitions/JibGradleArtifact", - "description": "*alpha* builds images using the [Jib plugin for Gradle](https://github.com/GoogleContainerTools/jib/tree/master/jib-gradle-plugin).", - "x-intellij-html-description": "alpha builds images using the Jib plugin for Gradle." - }, - "jibMaven": { - "$ref": "#/definitions/JibMavenArtifact", - "description": "*alpha* builds images using the [Jib plugin for Maven](https://github.com/GoogleContainerTools/jib/tree/master/jib-maven-plugin).", - "x-intellij-html-description": "alpha builds images using the Jib plugin for Maven." - } - }, - "preferredOrder": [ - "docker", - "bazel", - "jibMaven", - "jibGradle" - ], - "additionalProperties": false, - "description": "describes how to build an artifact.", - "x-intellij-html-description": "describes how to build an artifact." - }, "BazelArtifact": { "required": [ "target" @@ -489,33 +456,6 @@ "description": "contains all the configuration for the build steps.", "x-intellij-html-description": "contains all the configuration for the build steps." }, - "BuildType": { - "properties": { - "googleCloudBuild": { - "$ref": "#/definitions/GoogleCloudBuild", - "description": "*beta* describes how to do a remote build on [Google Cloud Build](https://cloud.google.com/cloud-build/).", - "x-intellij-html-description": "beta describes how to do a remote build on Google Cloud Build." - }, - "kaniko": { - "$ref": "#/definitions/KanikoBuild", - "description": "*beta* describes how to do an on-cluster build using [Kaniko](https://github.com/GoogleContainerTools/kaniko).", - "x-intellij-html-description": "beta describes how to do an on-cluster build using Kaniko." - }, - "local": { - "$ref": "#/definitions/LocalBuild", - "description": "*beta* describes how to do a build on the local docker daemon and optionally push to a repository.", - "x-intellij-html-description": "beta describes how to do a build on the local docker daemon and optionally push to a repository." - } - }, - "preferredOrder": [ - "local", - "googleCloudBuild", - "kaniko" - ], - "additionalProperties": false, - "description": "contains the specific implementation and parameters needed for the build step. Only one field should be populated.", - "x-intellij-html-description": "contains the specific implementation and parameters needed for the build step. Only one field should be populated." - }, "BuilderPlugin": { "properties": { "name": { @@ -609,33 +549,6 @@ "description": "contains all the configuration needed by the deploy steps.", "x-intellij-html-description": "contains all the configuration needed by the deploy steps." }, - "DeployType": { - "properties": { - "helm": { - "$ref": "#/definitions/HelmDeploy", - "description": "*beta* uses the `helm` CLI to apply the charts to the cluster.", - "x-intellij-html-description": "beta uses the helm CLI to apply the charts to the cluster." - }, - "kubectl": { - "$ref": "#/definitions/KubectlDeploy", - "description": "*beta* uses a client side `kubectl apply` to deploy manifests. You'll need a `kubectl` CLI version installed that's compatible with your cluster.", - "x-intellij-html-description": "beta uses a client side kubectl apply to deploy manifests. You'll need a kubectl CLI version installed that's compatible with your cluster." - }, - "kustomize": { - "$ref": "#/definitions/KustomizeDeploy", - "description": "*beta* uses the `kustomize` CLI to \"patch\" a deployment for a target environment.", - "x-intellij-html-description": "beta uses the kustomize CLI to "patch" a deployment for a target environment." - } - }, - "preferredOrder": [ - "helm", - "kubectl", - "kustomize" - ], - "additionalProperties": false, - "description": "contains the specific implementation and parameters needed for the deploy step. Only one field should be populated.", - "x-intellij-html-description": "contains the specific implementation and parameters needed for the deploy step. Only one field should be populated." - }, "DockerArtifact": { "properties": { "buildArgs": { @@ -897,27 +810,6 @@ "description": "image config to use the FullyQualifiedImageName as param to set.", "x-intellij-html-description": "image config to use the FullyQualifiedImageName as param to set." }, - "HelmImageConfig": { - "properties": { - "fqn": { - "$ref": "#/definitions/HelmFQNConfig", - "description": "image configuration uses the syntax `IMAGE-NAME=IMAGE-REPOSITORY:IMAGE-TAG`.", - "x-intellij-html-description": "image configuration uses the syntax IMAGE-NAME=IMAGE-REPOSITORY:IMAGE-TAG." - }, - "helm": { - "$ref": "#/definitions/HelmConventionConfig", - "description": "image configuration uses the syntax `IMAGE-NAME.repository=IMAGE-REPOSITORY, IMAGE-NAME.tag=IMAGE-TAG`.", - "x-intellij-html-description": "image configuration uses the syntax IMAGE-NAME.repository=IMAGE-REPOSITORY, IMAGE-NAME.tag=IMAGE-TAG." - } - }, - "preferredOrder": [ - "fqn", - "helm" - ], - "additionalProperties": false, - "description": "describes an image configuration.", - "x-intellij-html-description": "describes an image configuration." - }, "HelmImageStrategy": { "anyOf": [ { diff --git a/docs/content/en/schemas/v1beta7.json b/docs/content/en/schemas/v1beta7.json index f93c16490f8..33fdbc8a076 100755 --- a/docs/content/en/schemas/v1beta7.json +++ b/docs/content/en/schemas/v1beta7.json @@ -334,45 +334,6 @@ "description": "items that need to be built, along with the context in which they should be built.", "x-intellij-html-description": "items that need to be built, along with the context in which they should be built." }, - "ArtifactType": { - "properties": { - "bazel": { - "$ref": "#/definitions/BazelArtifact", - "description": "*beta* requires bazel CLI to be installed and the sources to contain [Bazel](https://bazel.build/) configuration files.", - "x-intellij-html-description": "beta requires bazel CLI to be installed and the sources to contain Bazel configuration files." - }, - "docker": { - "$ref": "#/definitions/DockerArtifact", - "description": "*beta* describes an artifact built from a Dockerfile.", - "x-intellij-html-description": "beta describes an artifact built from a Dockerfile." - }, - "jibGradle": { - "$ref": "#/definitions/JibGradleArtifact", - "description": "*alpha* builds images using the [Jib plugin for Gradle](https://github.com/GoogleContainerTools/jib/tree/master/jib-gradle-plugin).", - "x-intellij-html-description": "alpha builds images using the Jib plugin for Gradle." - }, - "jibMaven": { - "$ref": "#/definitions/JibMavenArtifact", - "description": "*alpha* builds images using the [Jib plugin for Maven](https://github.com/GoogleContainerTools/jib/tree/master/jib-maven-plugin).", - "x-intellij-html-description": "alpha builds images using the Jib plugin for Maven." - }, - "kaniko": { - "$ref": "#/definitions/KanikoArtifact", - "description": "*alpha* builds images using [kaniko](https://github.com/GoogleContainerTools/kaniko).", - "x-intellij-html-description": "alpha builds images using kaniko." - } - }, - "preferredOrder": [ - "docker", - "bazel", - "jibMaven", - "jibGradle", - "kaniko" - ], - "additionalProperties": false, - "description": "describes how to build an artifact.", - "x-intellij-html-description": "describes how to build an artifact." - }, "BazelArtifact": { "required": [ "target" @@ -543,33 +504,6 @@ "description": "contains all the configuration for the build steps.", "x-intellij-html-description": "contains all the configuration for the build steps." }, - "BuildType": { - "properties": { - "cluster": { - "$ref": "#/definitions/ClusterDetails", - "description": "*beta* describes how to do an on-cluster build.", - "x-intellij-html-description": "beta describes how to do an on-cluster build." - }, - "googleCloudBuild": { - "$ref": "#/definitions/GoogleCloudBuild", - "description": "*beta* describes how to do a remote build on [Google Cloud Build](https://cloud.google.com/cloud-build/).", - "x-intellij-html-description": "beta describes how to do a remote build on Google Cloud Build." - }, - "local": { - "$ref": "#/definitions/LocalBuild", - "description": "*beta* describes how to do a build on the local docker daemon and optionally push to a repository.", - "x-intellij-html-description": "beta describes how to do a build on the local docker daemon and optionally push to a repository." - } - }, - "preferredOrder": [ - "local", - "googleCloudBuild", - "cluster" - ], - "additionalProperties": false, - "description": "contains the specific implementation and parameters needed for the build step. Only one field should be populated.", - "x-intellij-html-description": "contains the specific implementation and parameters needed for the build step. Only one field should be populated." - }, "BuilderPlugin": { "properties": { "name": { @@ -703,33 +637,6 @@ "description": "contains all the configuration needed by the deploy steps.", "x-intellij-html-description": "contains all the configuration needed by the deploy steps." }, - "DeployType": { - "properties": { - "helm": { - "$ref": "#/definitions/HelmDeploy", - "description": "*beta* uses the `helm` CLI to apply the charts to the cluster.", - "x-intellij-html-description": "beta uses the helm CLI to apply the charts to the cluster." - }, - "kubectl": { - "$ref": "#/definitions/KubectlDeploy", - "description": "*beta* uses a client side `kubectl apply` to deploy manifests. You'll need a `kubectl` CLI version installed that's compatible with your cluster.", - "x-intellij-html-description": "beta uses a client side kubectl apply to deploy manifests. You'll need a kubectl CLI version installed that's compatible with your cluster." - }, - "kustomize": { - "$ref": "#/definitions/KustomizeDeploy", - "description": "*beta* uses the `kustomize` CLI to \"patch\" a deployment for a target environment.", - "x-intellij-html-description": "beta uses the kustomize CLI to "patch" a deployment for a target environment." - } - }, - "preferredOrder": [ - "helm", - "kubectl", - "kustomize" - ], - "additionalProperties": false, - "description": "contains the specific implementation and parameters needed for the deploy step. Only one field should be populated.", - "x-intellij-html-description": "contains the specific implementation and parameters needed for the deploy step. Only one field should be populated." - }, "DockerArtifact": { "properties": { "buildArgs": { @@ -991,27 +898,6 @@ "description": "image config to use the FullyQualifiedImageName as param to set.", "x-intellij-html-description": "image config to use the FullyQualifiedImageName as param to set." }, - "HelmImageConfig": { - "properties": { - "fqn": { - "$ref": "#/definitions/HelmFQNConfig", - "description": "image configuration uses the syntax `IMAGE-NAME=IMAGE-REPOSITORY:IMAGE-TAG`.", - "x-intellij-html-description": "image configuration uses the syntax IMAGE-NAME=IMAGE-REPOSITORY:IMAGE-TAG." - }, - "helm": { - "$ref": "#/definitions/HelmConventionConfig", - "description": "image configuration uses the syntax `IMAGE-NAME.repository=IMAGE-REPOSITORY, IMAGE-NAME.tag=IMAGE-TAG`.", - "x-intellij-html-description": "image configuration uses the syntax IMAGE-NAME.repository=IMAGE-REPOSITORY, IMAGE-NAME.tag=IMAGE-TAG." - } - }, - "preferredOrder": [ - "fqn", - "helm" - ], - "additionalProperties": false, - "description": "describes an image configuration.", - "x-intellij-html-description": "describes an image configuration." - }, "HelmImageStrategy": { "anyOf": [ { diff --git a/hack/schemas/main.go b/hack/schemas/main.go index f56c91f4551..b2fcb2fe05a 100644 --- a/hack/schemas/main.go +++ b/hack/schemas/main.go @@ -289,6 +289,8 @@ func (g *schemaGenerator) Apply(inputPath string) ([]byte, error) { } } + var inlines []string + for _, k := range preferredOrder { def := definitions[k] if len(def.inlines) == 0 { @@ -300,6 +302,7 @@ func (g *schemaGenerator) Apply(inputPath string) ([]byte, error) { for _, inlineStruct := range def.inlines { ref := strings.TrimPrefix(inlineStruct.Ref, defPrefix) inlineStructRef := definitions[ref] + inlines = append(inlines, ref) // if not anyof, merge & continue if !isOneOf(inlineStructRef) { @@ -352,6 +355,10 @@ func (g *schemaGenerator) Apply(inputPath string) ([]byte, error) { def.AnyOf = options } + for _, ref := range inlines { + delete(definitions, ref) + } + schema := Schema{ Version: version7, Definition: &Definition{ diff --git a/hack/schemas/testdata/inline-anyof/output.json b/hack/schemas/testdata/inline-anyof/output.json index d2dbcbaee82..7b0bd564294 100644 --- a/hack/schemas/testdata/inline-anyof/output.json +++ b/hack/schemas/testdata/inline-anyof/output.json @@ -7,27 +7,6 @@ ], "$schema": "http://json-schema-org/draft-07/schema#", "definitions": { - "InlineOneOfStruct": { - "properties": { - "field1": { - "type": "string", - "description": "should be the first choice", - "x-intellij-html-description": "should be the first choice" - }, - "field2": { - "type": "string", - "description": "should be the second choice", - "x-intellij-html-description": "should be the second choice" - } - }, - "preferredOrder": [ - "field1", - "field2" - ], - "additionalProperties": false, - "description": "embedded inline into TestStruct", - "x-intellij-html-description": "embedded inline into TestStruct" - }, "TestStruct": { "required": [ "reqField" diff --git a/hack/schemas/testdata/inline-hybrid/output.json b/hack/schemas/testdata/inline-hybrid/output.json index a94fea83b2a..5de1eba9ffd 100644 --- a/hack/schemas/testdata/inline-hybrid/output.json +++ b/hack/schemas/testdata/inline-hybrid/output.json @@ -7,48 +7,6 @@ ], "$schema": "http://json-schema-org/draft-07/schema#", "definitions": { - "InlineOneOfStruct": { - "properties": { - "f1": { - "type": "string", - "description": "should be the first choice", - "x-intellij-html-description": "should be the first choice" - }, - "f2": { - "type": "string", - "description": "should be the second choice", - "x-intellij-html-description": "should be the second choice" - } - }, - "preferredOrder": [ - "f1", - "f2" - ], - "additionalProperties": false, - "description": "embedded inline into TestStruct", - "x-intellij-html-description": "embedded inline into TestStruct" - }, - "InlineOneOfStructAnyOf": { - "properties": { - "choice1": { - "type": "string", - "description": "should be the first choice", - "x-intellij-html-description": "should be the first choice" - }, - "choice2": { - "type": "string", - "description": "should be the second choice", - "x-intellij-html-description": "should be the second choice" - } - }, - "preferredOrder": [ - "choice1", - "choice2" - ], - "additionalProperties": false, - "description": "embedded inline into TestStruct", - "x-intellij-html-description": "embedded inline into TestStruct" - }, "TestStruct": { "required": [ "reqField" diff --git a/hack/schemas/testdata/inline/output.json b/hack/schemas/testdata/inline/output.json index 4d933a8333a..6a13d249cf6 100644 --- a/hack/schemas/testdata/inline/output.json +++ b/hack/schemas/testdata/inline/output.json @@ -7,36 +7,6 @@ ], "$schema": "http://json-schema-org/draft-07/schema#", "definitions": { - "InlineStruct": { - "required": [ - "reqField3" - ], - "properties": { - "field1": { - "type": "string", - "description": "should be the first field", - "x-intellij-html-description": "should be the first field" - }, - "field2": { - "type": "string", - "description": "should be the second field", - "x-intellij-html-description": "should be the second field" - }, - "reqField3": { - "type": "string", - "description": "Field3 should be the third field and listed in required", - "x-intellij-html-description": "Field3 should be the third field and listed in required" - } - }, - "preferredOrder": [ - "field1", - "field2", - "reqField3" - ], - "additionalProperties": false, - "description": "InlineOneOfStruct is embedded inline into TestStruct", - "x-intellij-html-description": "InlineOneOfStruct is embedded inline into TestStruct" - }, "TestStruct": { "required": [ "reqField", From 218260733e7c8592e3e439f1db18f5ca79f3cc16 Mon Sep 17 00:00:00 2001 From: balopat Date: Wed, 3 Apr 2019 10:20:12 -0700 Subject: [PATCH 2/2] merging in v1beta7 freeze --- docs/content/en/schemas/v1beta8.json | 114 --------------------------- 1 file changed, 114 deletions(-) diff --git a/docs/content/en/schemas/v1beta8.json b/docs/content/en/schemas/v1beta8.json index f93c16490f8..33fdbc8a076 100755 --- a/docs/content/en/schemas/v1beta8.json +++ b/docs/content/en/schemas/v1beta8.json @@ -334,45 +334,6 @@ "description": "items that need to be built, along with the context in which they should be built.", "x-intellij-html-description": "items that need to be built, along with the context in which they should be built." }, - "ArtifactType": { - "properties": { - "bazel": { - "$ref": "#/definitions/BazelArtifact", - "description": "*beta* requires bazel CLI to be installed and the sources to contain [Bazel](https://bazel.build/) configuration files.", - "x-intellij-html-description": "beta requires bazel CLI to be installed and the sources to contain Bazel configuration files." - }, - "docker": { - "$ref": "#/definitions/DockerArtifact", - "description": "*beta* describes an artifact built from a Dockerfile.", - "x-intellij-html-description": "beta describes an artifact built from a Dockerfile." - }, - "jibGradle": { - "$ref": "#/definitions/JibGradleArtifact", - "description": "*alpha* builds images using the [Jib plugin for Gradle](https://github.com/GoogleContainerTools/jib/tree/master/jib-gradle-plugin).", - "x-intellij-html-description": "alpha builds images using the Jib plugin for Gradle." - }, - "jibMaven": { - "$ref": "#/definitions/JibMavenArtifact", - "description": "*alpha* builds images using the [Jib plugin for Maven](https://github.com/GoogleContainerTools/jib/tree/master/jib-maven-plugin).", - "x-intellij-html-description": "alpha builds images using the Jib plugin for Maven." - }, - "kaniko": { - "$ref": "#/definitions/KanikoArtifact", - "description": "*alpha* builds images using [kaniko](https://github.com/GoogleContainerTools/kaniko).", - "x-intellij-html-description": "alpha builds images using kaniko." - } - }, - "preferredOrder": [ - "docker", - "bazel", - "jibMaven", - "jibGradle", - "kaniko" - ], - "additionalProperties": false, - "description": "describes how to build an artifact.", - "x-intellij-html-description": "describes how to build an artifact." - }, "BazelArtifact": { "required": [ "target" @@ -543,33 +504,6 @@ "description": "contains all the configuration for the build steps.", "x-intellij-html-description": "contains all the configuration for the build steps." }, - "BuildType": { - "properties": { - "cluster": { - "$ref": "#/definitions/ClusterDetails", - "description": "*beta* describes how to do an on-cluster build.", - "x-intellij-html-description": "beta describes how to do an on-cluster build." - }, - "googleCloudBuild": { - "$ref": "#/definitions/GoogleCloudBuild", - "description": "*beta* describes how to do a remote build on [Google Cloud Build](https://cloud.google.com/cloud-build/).", - "x-intellij-html-description": "beta describes how to do a remote build on Google Cloud Build." - }, - "local": { - "$ref": "#/definitions/LocalBuild", - "description": "*beta* describes how to do a build on the local docker daemon and optionally push to a repository.", - "x-intellij-html-description": "beta describes how to do a build on the local docker daemon and optionally push to a repository." - } - }, - "preferredOrder": [ - "local", - "googleCloudBuild", - "cluster" - ], - "additionalProperties": false, - "description": "contains the specific implementation and parameters needed for the build step. Only one field should be populated.", - "x-intellij-html-description": "contains the specific implementation and parameters needed for the build step. Only one field should be populated." - }, "BuilderPlugin": { "properties": { "name": { @@ -703,33 +637,6 @@ "description": "contains all the configuration needed by the deploy steps.", "x-intellij-html-description": "contains all the configuration needed by the deploy steps." }, - "DeployType": { - "properties": { - "helm": { - "$ref": "#/definitions/HelmDeploy", - "description": "*beta* uses the `helm` CLI to apply the charts to the cluster.", - "x-intellij-html-description": "beta uses the helm CLI to apply the charts to the cluster." - }, - "kubectl": { - "$ref": "#/definitions/KubectlDeploy", - "description": "*beta* uses a client side `kubectl apply` to deploy manifests. You'll need a `kubectl` CLI version installed that's compatible with your cluster.", - "x-intellij-html-description": "beta uses a client side kubectl apply to deploy manifests. You'll need a kubectl CLI version installed that's compatible with your cluster." - }, - "kustomize": { - "$ref": "#/definitions/KustomizeDeploy", - "description": "*beta* uses the `kustomize` CLI to \"patch\" a deployment for a target environment.", - "x-intellij-html-description": "beta uses the kustomize CLI to "patch" a deployment for a target environment." - } - }, - "preferredOrder": [ - "helm", - "kubectl", - "kustomize" - ], - "additionalProperties": false, - "description": "contains the specific implementation and parameters needed for the deploy step. Only one field should be populated.", - "x-intellij-html-description": "contains the specific implementation and parameters needed for the deploy step. Only one field should be populated." - }, "DockerArtifact": { "properties": { "buildArgs": { @@ -991,27 +898,6 @@ "description": "image config to use the FullyQualifiedImageName as param to set.", "x-intellij-html-description": "image config to use the FullyQualifiedImageName as param to set." }, - "HelmImageConfig": { - "properties": { - "fqn": { - "$ref": "#/definitions/HelmFQNConfig", - "description": "image configuration uses the syntax `IMAGE-NAME=IMAGE-REPOSITORY:IMAGE-TAG`.", - "x-intellij-html-description": "image configuration uses the syntax IMAGE-NAME=IMAGE-REPOSITORY:IMAGE-TAG." - }, - "helm": { - "$ref": "#/definitions/HelmConventionConfig", - "description": "image configuration uses the syntax `IMAGE-NAME.repository=IMAGE-REPOSITORY, IMAGE-NAME.tag=IMAGE-TAG`.", - "x-intellij-html-description": "image configuration uses the syntax IMAGE-NAME.repository=IMAGE-REPOSITORY, IMAGE-NAME.tag=IMAGE-TAG." - } - }, - "preferredOrder": [ - "fqn", - "helm" - ], - "additionalProperties": false, - "description": "describes an image configuration.", - "x-intellij-html-description": "describes an image configuration." - }, "HelmImageStrategy": { "anyOf": [ {