Fix schemas for 3.12 (#180)

Author: mheap

Makefile

@@ -1,2 +1,2 @@
 admin-spec:
-	./plugins convert_json_schema --plugins $$(ls schemas/) --version 3.11.x --skip-custom-annotations --allow-auto-fields; cp -r json_schemas/* ../kong-admin-spec-generator/data/plugins
+	./plugins convert_json_schema --plugins $$(ls schemas/) --version 3.12.x --skip-custom-annotations --allow-auto-fields; cp -r json_schemas/* ../kong-admin-spec-generator/data/plugins

lib/convert_json_schema.rb

@@ -69,10 +69,12 @@ def convert_to_json_schema(props, parent)
       end
     end
 
-    if props['type'] == 'map'
-      if props['values']['referenceable'] && props.key?('description')
-        values_desc = 'The values are [referenceable](/gateway/entities/vault/#how-do-i-reference-secrets-stored-in-a-vault).'
-        props['description'] = "#{props['description']} #{values_desc}"
+    if !@options[:skip_custom_annotations]
+      if props['type'] == 'map'
+        if props['values']['referenceable'] && props.key?('description')
+          values_desc = 'The values are [referenceable](/gateway/entities/vault/#how-do-i-reference-secrets-stored-in-a-vault).'
+          props['description'] = "#{props['description']} #{values_desc}"
+        end
       end
     end
 
@@ -163,10 +165,12 @@ def convert_to_json_schema(props, parent)
         'subschema_definitions',
         'subschema_error',
         'subschema_key',
-        'subschema_override_parent'
+        'subschema_override_parent',
+        'ne',
+        'json_schema'
       ].include?(k)
 
-      if k == 'type' && v == 'foreign'
+      if k == 'type' && (v == 'foreign' || v == 'json')
         v = 'string'
       end