Merge pull request #22 from kaleido-io/metaschema-improvements

Allow numbers and booleans to be expressed as strings
hyperledger · Jun 24, 2022 · afee4a3 · afee4a3
2 parents 7f6b2ea + 8438aaa
commit afee4a3
Showing 1 changed file with 41 additions and 3 deletions.
diff --git a/pkg/fftypes/ffi_param_validator.go b/pkg/fftypes/ffi_param_validator.go
@@ -42,6 +42,30 @@ func (v *BaseFFIParamValidator) GetMetaSchema() *jsonschema.Schema {
 					}
 				}
 			},
+			"numberTypeOptions": {
+				"type": "object",
+				"properties": {
+					"type": {
+						"type": "string",
+						"enum": [
+							"number",
+							"string"
+						]
+					}
+				}
+			},
+			"booleanTypeOptions": {
+				"type": "object",
+				"properties": {
+					"type": {
+						"type": "string",
+						"enum": [
+							"boolean",
+							"string"
+						]
+					}
+				}
+			},
 			"ffiParam": {
 				"oneOf": [
 					{
@@ -68,9 +92,23 @@ func (v *BaseFFIParamValidator) GetMetaSchema() *jsonschema.Schema {
 						"properties": {
 							"oneOf": {
 								"type": "array",
-								"items": {
-									"$ref": "#/$defs/integerTypeOptions"
-								}
+								"oneOf": [
+									{
+										"items": {
+											"$ref": "#/$defs/integerTypeOptions"
+										}
+									},
+									{
+										"items": {
+											"$ref": "#/$defs/numberTypeOptions"
+										}
+									},
+									{
+										"items": {
+											"$ref": "#/$defs/booleanTypeOptions"
+										}
+									}
+								]
 							}
 						},
 						"required": [