encoding/openapi: correct typo

mpvl · mpvl · commit 0a9753308f1f · 2019-07-04T08:49:48.000Z
Change-Id: I864b86c333069e7e1cacf02ed9d140e13c29ad2a Reviewed-on: https://cue-review.googlesource.com/c/cue/+/2461 Reviewed-by: Marcel van Lohuizen <mpvl@golang.org>
diff --git a/encoding/openapi/build.go b/encoding/openapi/build.go
@@ -76,7 +76,7 @@ func schemas(g *Generator, inst *cue.Instance) (schemas *OrderedMap, err error)
 
 	c := buildContext{
 		inst:         inst,
-		refPrefix:    "components/schema",
+		refPrefix:    "components/schemas",
 		expandRefs:   g.ExpandReferences,
 		nameFunc:     g.ReferenceFunc,
 		descFunc:     g.DescriptionFunc,
diff --git a/encoding/openapi/openapi.go b/encoding/openapi/openapi.go
@@ -82,7 +82,7 @@ func (g *Generator) All(inst *cue.Instance) (*OrderedMap, error) {
 	}
 
 	schemas := &OrderedMap{}
-	schemas.Set("schema", all)
+	schemas.Set("schemas", all)
 
 	top := &OrderedMap{}
 	top.Set("openapi", "3.0.0")
diff --git a/encoding/openapi/testdata/array.json b/encoding/openapi/testdata/array.json
@@ -2,7 +2,7 @@
    "openapi": "3.0.0",
    "info": {},
    "components": {
-      "schema": {
+      "schemas": {
          "Arrays": {
             "type": "object",
             "properties": {
diff --git a/encoding/openapi/testdata/oneof-funcs.json b/encoding/openapi/testdata/oneof-funcs.json
@@ -5,7 +5,7 @@
       "version": "v1"
    },
    "components": {
-      "schema": {
+      "schemas": {
          "MYSTRING": {
             "description": "Randomly picked description from a set of size one.",
             "oneOf": [
@@ -51,17 +51,17 @@
             ],
             "properties": {
                "include": {
-                  "$ref": "#/components/schema/MYSTRING"
+                  "$ref": "#/components/schemas/MYSTRING"
                },
                "exclude": {
                   "description": "Randomly picked description from a set of size one.",
                   "type": "array",
                   "items": {
-                     "$ref": "#/components/schema/MYSTRING"
+                     "$ref": "#/components/schemas/MYSTRING"
                   }
                },
                "count": {
-                  "$ref": "#/components/schema/MYINT"
+                  "$ref": "#/components/schemas/MYINT"
                }
             }
          }
diff --git a/encoding/openapi/testdata/oneof.json b/encoding/openapi/testdata/oneof.json
@@ -2,7 +2,7 @@
    "openapi": "3.0.0",
    "info": {},
    "components": {
-      "schema": {
+      "schemas": {
          "MyString": {
             "oneOf": [
                {
@@ -43,16 +43,16 @@
             ],
             "properties": {
                "include": {
-                  "$ref": "#/components/schema/MyString"
+                  "$ref": "#/components/schemas/MyString"
                },
                "exclude": {
                   "type": "array",
                   "items": {
-                     "$ref": "#/components/schema/MyString"
+                     "$ref": "#/components/schemas/MyString"
                   }
                },
                "count": {
-                  "$ref": "#/components/schema/MyInt"
+                  "$ref": "#/components/schemas/MyInt"
                }
             }
          }
diff --git a/encoding/openapi/testdata/openapi-norefs.json b/encoding/openapi/testdata/openapi-norefs.json
@@ -5,7 +5,7 @@
       "version": "v1"
    },
    "components": {
-      "schema": {
+      "schemas": {
          "MyMessage": {
             "description": "MyMessage is my message.",
             "allOf": [
diff --git a/encoding/openapi/testdata/openapi.json b/encoding/openapi/testdata/openapi.json
@@ -2,7 +2,7 @@
    "openapi": "3.0.0",
    "info": {},
    "components": {
-      "schema": {
+      "schemas": {
          "MyMessage": {
             "description": "MyMessage is my message.",
             "allOf": [
@@ -14,13 +14,13 @@
                   ],
                   "properties": {
                      "port": {
-                        "$ref": "#/components/schema/Port",
+                        "$ref": "#/components/schemas/Port",
                         "type": "object"
                      },
                      "foo": {
                         "allOf": [
                            {
-                              "$ref": "#/components/schema/Int32"
+                              "$ref": "#/components/schemas/Int32"
                            },
                            {
                               "type": "number",
@@ -261,7 +261,7 @@
                {
                   "oneOf": [
                      {
-                        "$ref": "#/components/schema/Port"
+                        "$ref": "#/components/schemas/Port"
                      },
                      {
                         "type": "object",
diff --git a/encoding/openapi/testdata/simple-filter.json b/encoding/openapi/testdata/simple-filter.json
@@ -5,7 +5,7 @@
       "version": "v1"
    },
    "components": {
-      "schema": {
+      "schemas": {
          "MyStruct": {
             "type": "object",
             "required": [
diff --git a/encoding/openapi/testdata/simple.json b/encoding/openapi/testdata/simple.json
@@ -5,7 +5,7 @@
       "version": "v1"
    },
    "components": {
-      "schema": {
+      "schemas": {
          "MyStruct": {
             "type": "object",
             "required": [

Original file line number	Diff line number	Diff line change
`@@ -82,7 +82,7 @@ func (g Generator) All(inst cue.Instance) (*OrderedMap, error) {`
`82`	`82`	`}`
`83`	`83`
`84`	`84`	`schemas := &OrderedMap{}`
`85`		`- schemas.Set("schema", all)`
	`85`	`+ schemas.Set("schemas", all)`
`86`	`86`
`87`	`87`	`top := &OrderedMap{}`
`88`	`88`	`top.Set("openapi", "3.0.0")`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`	`"openapi": "3.0.0",`
`3`	`3`	`"info": {},`
`4`	`4`	`"components": {`
`5`		`- "schema": {`
	`5`	`+ "schemas": {`
`6`	`6`	`"MyString": {`
`7`	`7`	`"oneOf": [`
`8`	`8`	`{`
`@@ -43,16 +43,16 @@`
`43`	`43`	`],`
`44`	`44`	`"properties": {`
`45`	`45`	`"include": {`
`46`		`- "$ref": "#/components/schema/MyString"`
	`46`	`+ "$ref": "#/components/schemas/MyString"`
`47`	`47`	`},`
`48`	`48`	`"exclude": {`
`49`	`49`	`"type": "array",`
`50`	`50`	`"items": {`
`51`		`- "$ref": "#/components/schema/MyString"`
	`51`	`+ "$ref": "#/components/schemas/MyString"`
`52`	`52`	`}`
`53`	`53`	`},`
`54`	`54`	`"count": {`
`55`		`- "$ref": "#/components/schema/MyInt"`
	`55`	`+ "$ref": "#/components/schemas/MyInt"`
`56`	`56`	`}`
`57`	`57`	`}`
`58`	`58`	`}`