fix: update codegen and fix verify script (#430)

The refactor introduced in #413 caused a bug in the verify script which
resulted in an outdated schema after #419.
This fixes the schema and the verify script.

Author: hbagdi

file/kong_json_schema.json

@@ -260,19 +260,7 @@
         }
       },
       "additionalProperties": false,
-      "type": "object",
-      "anyOf": [
-        {
-          "required": [
-            "username"
-          ]
-        },
-        {
-          "required": [
-            "id"
-          ]
-        }
-      ]
+      "type": "object"
     },
     "FCACertificate": {
       "required": [
@@ -640,7 +628,6 @@
           "type": "boolean"
         },
         "service": {
-          "$schema": "http://json-schema.org/draft-04/schema#",
           "$ref": "#/definitions/Service"
         },
         "snis": {
@@ -651,7 +638,6 @@
         },
         "sources": {
           "items": {
-            "$schema": "http://json-schema.org/draft-04/schema#",
             "$ref": "#/definitions/CIDRPort"
           },
           "type": "array"
@@ -847,7 +833,6 @@
           "type": "string"
         },
         "upstream": {
-          "$schema": "http://json-schema.org/draft-04/schema#",
           "$ref": "#/definitions/Upstream"
         },
         "weight": {
@@ -890,7 +875,6 @@
           "type": "string"
         },
         "healthchecks": {
-          "$schema": "http://json-schema.org/draft-04/schema#",
           "$ref": "#/definitions/Healthcheck"
         },
         "host_header": {
@@ -1007,6 +991,10 @@
     },
     "Info": {
       "properties": {
+        "defaults": {
+          "$schema": "http://json-schema.org/draft-04/schema#",
+          "$ref": "#/definitions/KongDefaults"
+        },
         "select_tags": {
           "items": {
             "type": "string"
@@ -1094,6 +1082,28 @@
       "additionalProperties": false,
       "type": "object"
     },
+    "KongDefaults": {
+      "properties": {
+        "route": {
+          "$schema": "http://json-schema.org/draft-04/schema#",
+          "$ref": "#/definitions/Route"
+        },
+        "service": {
+          "$schema": "http://json-schema.org/draft-04/schema#",
+          "$ref": "#/definitions/Service"
+        },
+        "target": {
+          "$schema": "http://json-schema.org/draft-04/schema#",
+          "$ref": "#/definitions/Target"
+        },
+        "upstream": {
+          "$schema": "http://json-schema.org/draft-04/schema#",
+          "$ref": "#/definitions/Upstream"
+        }
+      },
+      "additionalProperties": false,
+      "type": "object"
+    },
     "MTLSAuth": {
       "required": [
         "id",
@@ -1285,6 +1295,7 @@
         },
         "sources": {
           "items": {
+            "$schema": "http://json-schema.org/draft-04/schema#",
             "$ref": "#/definitions/CIDRPort"
           },
           "type": "array"
@@ -1303,19 +1314,7 @@
         }
       },
       "additionalProperties": false,
-      "type": "object",
-      "anyOf": [
-        {
-          "required": [
-            "name"
-          ]
-        },
-        {
-          "required": [
-            "id"
-          ]
-        }
-      ]
+      "type": "object"
     },
     "SNI": {
       "properties": {
@@ -1350,6 +1349,7 @@
           "type": "array"
         },
         "client_certificate": {
+          "$schema": "http://json-schema.org/draft-04/schema#",
           "$ref": "#/definitions/Certificate"
         },
         "connect_timeout": {
@@ -1405,19 +1405,34 @@
         }
       },
       "additionalProperties": false,
-      "type": "object",
-      "anyOf": [
-        {
-          "required": [
-            "name"
-          ]
+      "type": "object"
+    },
+    "Target": {
+      "properties": {
+        "created_at": {
+          "type": "number"
         },
-        {
-          "required": [
-            "id"
-          ]
+        "id": {
+          "type": "string"
+        },
+        "tags": {
+          "items": {
+            "type": "string"
+          },
+          "type": "array"
+        },
+        "target": {
+          "type": "string"
+        },
+        "upstream": {
+          "$ref": "#/definitions/Upstream"
+        },
+        "weight": {
+          "type": "integer"
         }
-      ]
+      },
+      "additionalProperties": false,
+      "type": "object"
     },
     "Unhealthy": {
       "properties": {
@@ -1444,9 +1459,6 @@
       "type": "object"
     },
     "Upstream": {
-      "required": [
-        "name"
-      ],
       "properties": {
         "algorithm": {
           "type": "string"
@@ -1476,6 +1488,7 @@
           "type": "string"
         },
         "healthchecks": {
+          "$schema": "http://json-schema.org/draft-04/schema#",
           "$ref": "#/definitions/Healthcheck"
         },
         "host_header": {

scripts/verify-codegen.sh

@@ -1,6 +1,7 @@
 #!/bin/bash -e
 
-cp file/schema.go /tmp/schema.go
+FILE="kong_json_schema.json"
+cp file/${FILE} /tmp/${FILE}
 go generate ./...
 
-diff -u /tmp/schema.go file/schema.go
+diff -u /tmp/${FILE} file/${FILE}