update schema version config

Author: cchenggit

plugins/jsonschema_validator/plugin.go

@@ -15,7 +15,7 @@ import (
 )
 
 type Config struct {
-	DraftVersion  int                `json:"draft_version" validate:"required,oneof=6"`
+	Draft         string             `json:"draft" validate:"required,oneof=6 default:6"`
 	DefaultSchema string             `json:"default_schema" validate:"omitempty,json,max=1048576"`
 	Schemas       map[string]*Schema `json:"schemas" validate:"dive"`
 }

test/cmd/admin_test.go

@@ -101,8 +101,7 @@ var _ = Describe("admin", Ordered, func() {
 				assert.Equal(GinkgoT(), `{"function": "function handle() {}"}`, string(plugins[0].Config))
 				assert.Equal(GinkgoT(), `jsonschema-validator`, plugins[1].Name)
 				assert.Equal(GinkgoT(), true, plugins[1].Enabled)
-
-				assert.Equal(GinkgoT(), `{"schemas": {"charge.succeeded": {"schema": "{\n  \"type\": \"object\",\n  \"properties\": {\n      \"id\": { \"type\": \"string\" },\n      \"amount\": { \"type\": \"integer\", \"minimum\": 1 },\n      \"currency\": { \"type\": \"string\", \"minLength\": 3, \"maxLength\": 6 }\n  },\n  \"required\": [\"id\", \"amount\", \"currency\"]\n}\n"}}, "draft_version": 6, "default_schema": "{\n  \"type\": \"object\",\n  \"properties\": {\n      \"id\": { \"type\": \"string\" }\n  },\n  \"required\": [\"id\"]\n}\n"}`, string(plugins[1].Config))
+				assert.Equal(GinkgoT(), `{"draft": "6", "schemas": {"charge.succeeded": {"schema": "{\n  \"type\": \"object\",\n  \"properties\": {\n      \"id\": { \"type\": \"string\" },\n      \"amount\": { \"type\": \"integer\", \"minimum\": 1 },\n      \"currency\": { \"type\": \"string\", \"minLength\": 3, \"maxLength\": 6 }\n  },\n  \"required\": [\"id\", \"amount\", \"currency\"]\n}\n"}}, "default_schema": "{\n  \"type\": \"object\",\n  \"properties\": {\n      \"id\": { \"type\": \"string\" }\n  },\n  \"required\": [\"id\"]\n}\n"}`, string(plugins[1].Config))
 			})
 
 			It("entities not defined in the declarative configuration should be deleted", func() {

test/declarative/declarative_test.go

@@ -65,7 +65,7 @@ sources:
     plugins:
       - name: "jsonschema-validator"
         config:
-          draft_version: 6
+          draft: "6"
           default_schema: |
             %s
           schemas:
@@ -148,7 +148,7 @@ var _ = Describe("Declarative", Ordered, func() {
 				assert.Nil(GinkgoT(), err)
 				assert.Equal(GinkgoT(), 400, resp.StatusCode())
 				assert.Equal(GinkgoT(),
-					`{"message":"Request Validation","error":{"message":"request validation","fields":{"config":{"default_schema":"value must be a valid json string","draft_version":"required field missing","schemas[charge.succeed]":{"schema":"value must be a valid json string"}}}}}`,
+					`{"message":"Request Validation","error":{"message":"request validation","fields":{"config":{"default_schema":"value must be a valid json string","draft":"required field missing","schemas[charge.succeed]":{"schema":"value must be a valid json string"}}}}}`,
 					string(resp.Body()))
 			})
 

test/fixtures/webhookx.yml

@@ -39,7 +39,7 @@ sources:
           function: "function handle() {}"
       - name: "jsonschema-validator"
         config:
-          draft_version: 6
+          draft: "6"
           default_schema: |
             {
               "type": "object",

test/plugins/jsonschema_validator_test.go

@@ -53,7 +53,7 @@ var _ = Describe("jsonschema-validator", Ordered, func() {
 				factory.WithPluginSourceID(entitiesConfig.Sources[0].ID),
 				factory.WithPluginName("jsonschema-validator"),
 				factory.WithPluginConfig(jsonschema_validator.Config{
-					DraftVersion:  6,
+					Draft:         "6",
 					DefaultSchema: jsonString,
 					Schemas: map[string]*jsonschema_validator.Schema{
 						"charge.succeeded": {

utils/validate.go

@@ -50,12 +50,6 @@ func init() {
 	RegisterFormatter("max", func(fe validator.FieldError) string {
 		return fmt.Sprintf("length must be at most %s", fe.Param())
 	})
-	RegisterFormatter("url", func(fe validator.FieldError) string {
-		return "value must be a valid url"
-	})
-	RegisterFormatter("file", func(fe validator.FieldError) string {
-		return "value must be a valid exist file"
-	})
 	RegisterFormatter("json", func(fe validator.FieldError) string {
 		return "value must be a valid json string"
 	})

webhookx.sample.yml

@@ -33,7 +33,7 @@ sources:
     plugins:
       - name: "jsonschema-validator"
         config:
-          draft_version: 6
+          draft: "6"
           schemas:
             charge.succeeded:
               schema: |