Install go-bindata and yaml2json

kevinjqiu · Jun 19, 2018 · 4a3f3ae · 4a3f3ae
1 parent 202294b
commit 4a3f3ae
Show file tree

Hide file tree

Showing 5 changed files with 38 additions and 56 deletions.
diff --git a/Makefile b/Makefile
@@ -6,8  6,14 @@ test: generate
 build: generate
 	go build -o pat
 
-generate: schema
 generate: bindata schema
 	cd pkg && go-bindata -pkg pkg schema
 
-schema:
 schema: yaml2json
 	cd pkg/schema && yaml2json < schema.yaml | jq . > schema.json
 
 bindata:
 	go get -u github.com/jteeuwen/go-bindata
 
 yaml2json:
 	go get -u github.com/bronze1man/yaml2json
diff --git a/pkg/bindata.go b/pkg/bindata.go
diff --git a/pkg/schema/pat.json b/pkg/schema/pat.json
diff --git a/pkg/schema/schema.json b/pkg/schema/schema.json
@@ -2,6  2,25 @@
   "$schema": "http://json-schema.org/draft-04/schema#",
   "additionalProperties": false,
   "definitions": {
     "Fixture": {
       "properties": {
         "duration": {
           "pattern": "^\\d (ns|us|ms|s|m|h)$",
           "type": "string"
         },
         "metrics": {
           "items": {
             "type": "string"
           },
           "type": "array"
         }
       },
       "required": [
         "duration",
         "metrics"
       ],
       "type": "object"
     },
     "Rules": {
       "oneOf": [
         {
@@ -30,7  49,12 @@
   },
   "properties": {
     "assertions": {},
-    "fixtures": {},
     "fixtures": {
       "items": {
         "$ref": "#/definitions/Fixture"
       },
       "type": "array"
     },
     "name": {
       "type": "string"
     },

diff --git a/pkg/schema/schema.yaml b/pkg/schema/schema.yaml
@@ -35,7  35,7 @@ definitions:
     properties:
       duration:
         type: string
-        pattern: "^\d (ns|us|ms|s|m|h)$"
         pattern: "^\\d (ns|us|ms|s|m|h)$"
       metrics:
         type: array
         items: