chore: updates json schema for gcp-blueprint-metadata (#3156)

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
SchemaStore · Aug 23, 2023 · 875dabd · 875dabd
1 parent 8c6907b
commit 875dabd
Showing 1 changed file with 74 additions and 41 deletions.
diff --git a/src/schemas/json/gcp-blueprint-metadata.json b/src/schemas/json/gcp-blueprint-metadata.json
@@ -187,12 +187,6 @@
           },
           "type": "array"
         },
-        "orgPolicyChecks": {
-          "items": {
-            "$ref": "#/$defs/BlueprintOrgPolicyCheck"
-          },
-          "type": "array"
-        },
         "quotaDetails": {
           "items": {
             "$ref": "#/$defs/BlueprintQuotaDetail"
@@ -211,6 +205,12 @@
         "supportInfo": {
           "$ref": "#/$defs/BlueprintSupport"
         },
+        "orgPolicyChecks": {
+          "items": {
+            "$ref": "#/$defs/BlueprintOrgPolicyCheck"
+          },
+          "type": "array"
+        },
         "singleDeployment": {
           "type": "boolean"
         }
@@ -265,7 +265,7 @@
           "type": "string"
         },
         "metadata": {
-          "$ref": "#/$defs/ObjectMeta"
+          "$ref": "#/$defs/ResourceTypeMeta"
         },
         "spec": {
           "$ref": "#/$defs/BlueprintMetadataSpec"
@@ -344,8 +344,14 @@
           "type": "string"
         },
         "resourceType": {
-          "type": "string",
-          "enum": ["QRT_GCE_INSTANCE", "QRT_GCE_DISK", "QRT_UNDEFINED"]
+          "oneOf": [
+            {
+              "type": "string"
+            },
+            {
+              "type": "integer"
+            }
+          ]
         },
         "quotaType": {
           "patternProperties": {
@@ -432,8 +438,14 @@
     "BlueprintSoftwareGroup": {
       "properties": {
         "type": {
-          "type": "string",
-          "enum": ["SG_UNSPECIFIED", "SG_OS"]
+          "oneOf": [
+            {
+              "type": "string"
+            },
+            {
+              "type": "integer"
+            }
+          ]
         },
         "software": {
           "items": {
@@ -620,9 +632,6 @@
         "placeholder": {
           "type": "string"
         },
-        "validation": {
-          "type": "string"
-        },
         "regexValidation": {
           "type": "string"
         },
@@ -649,6 +658,18 @@
         },
         "xGoogleProperty": {
           "$ref": "#/$defs/GooglePropertyExtension"
+        },
+        "validation": {
+          "type": "string"
+        },
+        "subtext": {
+          "type": "string"
+        },
+        "enumValueLabels": {
+          "items": {
+            "$ref": "#/$defs/ValueLabel"
+          },
+          "type": "array"
         }
       },
       "additionalProperties": false,
@@ -671,8 +692,14 @@
           "type": "string"
         },
         "type": {
-          "type": "string",
-          "enum": ["IP_UNSPECIFIED", "IP_EPHEMERAL", "NONE"]
+          "oneOf": [
+            {
+              "type": "string"
+            },
+            {
+              "type": "integer"
+            }
+          ]
         },
         "notConfigurable": {
           "type": "boolean"
@@ -782,6 +809,9 @@
         },
         "disallowCustomMachineTypes": {
           "type": "boolean"
+        },
+        "diskImageProperty": {
+          "type": "string"
         }
       },
       "additionalProperties": false,
@@ -819,27 +849,13 @@
     "GooglePropertyExtension": {
       "properties": {
         "type": {
-          "type": "string",
-          "enum": [
-            "ET_EMAIL_ADDRESS",
-            "ET_MULTI_LINE_STRING",
-            "ET_GCE_DISK_IMAGE",
-            "ET_GCE_DISK_TYPE",
-            "ET_GCE_DISK_SIZE",
-            "ET_GCE_MACHINE_TYPE",
-            "ET_GCE_NETWORK",
-            "ET_GCE_ZONE",
-            "ET_GCE_SUBNETWORK",
-            "ET_GCE_REGION",
-            "ET_GCE_GPU_TYPE",
-            "ET_GCE_GPU_COUNT",
-            "ET_GCE_EXTERNAL_IP",
-            "ET_GCE_IP_FORWARDING",
-            "ET_GCE_FIREWALL",
-            "ET_GCE_FIREWALL_RANGE",
-            "ET_GCE_GENERIC_RESOURCE",
-            "ET_GCS_BUCKET",
-            "ET_IAM_SERVICE_ACCOUNT"
+          "oneOf": [
+            {
+              "type": "string"
+            },
+            {
+              "type": "integer"
+            }
           ]
         },
         "zoneProperty": {
@@ -905,14 +921,11 @@
       "type": "object",
       "required": ["roles"]
     },
-    "ObjectMeta": {
+    "ResourceTypeMeta": {
       "properties": {
         "name": {
           "type": "string"
         },
-        "namespace": {
-          "type": "string"
-        },
         "labels": {
           "patternProperties": {
             ".*": {
@@ -951,6 +964,26 @@
       "additionalProperties": false,
       "type": "object",
       "required": ["heading"]
+    },
+    "Value": {
+      "properties": {
+        "Kind": true
+      },
+      "additionalProperties": false,
+      "type": "object",
+      "required": ["Kind"]
+    },
+    "ValueLabel": {
+      "properties": {
+        "label": {
+          "type": "string"
+        },
+        "value": {
+          "type": "string"
+        }
+      },
+      "additionalProperties": false,
+      "type": "object"
     }
   },
   "$id": "https://github.com/GoogleCloudPlatform/cloud-foundation-toolkit/cli/bpmetadata/blueprint-metadata",