From 7eb7e94175b3ca6ce93f972624728ffafe875e47 Mon Sep 17 00:00:00 2001 From: Sami Akkawi Date: Wed, 7 Apr 2021 21:52:48 +0200 Subject: [PATCH 1/4] servers is an array of server --- schemas/v3.1/schema.json | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/schemas/v3.1/schema.json b/schemas/v3.1/schema.json index fa987c12d6..4abe3d498e 100644 --- a/schemas/v3.1/schema.json +++ b/schemas/v3.1/schema.json @@ -15,7 +15,10 @@ "default": "https://spec.openapis.org/oas/3.1/dialect/base" }, "servers": { - "$ref": "#/$defs/server" + "type": "array", + "items": { + "$ref": "#/$defs/server" + } }, "paths": { "$ref": "#/$defs/paths" From 23628df8291f1149b5e0733682664994629f1c75 Mon Sep 17 00:00:00 2001 From: Sami Akkawi Date: Thu, 8 Apr 2021 05:48:11 +0200 Subject: [PATCH 2/4] fix only yaml file --- schemas/v3.1/schema.json | 5 +---- schemas/v3.1/schema.yaml | 4 +++- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/schemas/v3.1/schema.json b/schemas/v3.1/schema.json index 4abe3d498e..fa987c12d6 100644 --- a/schemas/v3.1/schema.json +++ b/schemas/v3.1/schema.json @@ -15,10 +15,7 @@ "default": "https://spec.openapis.org/oas/3.1/dialect/base" }, "servers": { - "type": "array", - "items": { - "$ref": "#/$defs/server" - } + "$ref": "#/$defs/server" }, "paths": { "$ref": "#/$defs/paths" diff --git a/schemas/v3.1/schema.yaml b/schemas/v3.1/schema.yaml index 9b71e11031..60377ae424 100644 --- a/schemas/v3.1/schema.yaml +++ b/schemas/v3.1/schema.yaml @@ -12,7 +12,9 @@ properties: $ref: '#/$defs/uri' default: 'https://spec.openapis.org/oas/3.1/dialect/base' servers: - $ref: '#/$defs/server' + type: array + items: + $ref: '#/$defs/server' paths: $ref: '#/$defs/paths' webhooks: From 73ae96294c6d1a5d7423844640be0e03b88f9075 Mon Sep 17 00:00:00 2001 From: Sami Akkawi Date: Thu, 8 Apr 2021 05:49:20 +0200 Subject: [PATCH 3/4] add servers test --- tests/v3.1/fail/servers.yaml | 8 ++++++++ tests/v3.1/pass/servers.yaml | 10 ++++++++++ 2 files changed, 18 insertions(+) create mode 100644 tests/v3.1/fail/servers.yaml create mode 100644 tests/v3.1/pass/servers.yaml diff --git a/tests/v3.1/fail/servers.yaml b/tests/v3.1/fail/servers.yaml new file mode 100644 index 0000000000..7aaa05c0af --- /dev/null +++ b/tests/v3.1/fail/servers.yaml @@ -0,0 +1,8 @@ +openapi: 3.1.0 +info: + title: API + version: 1.0.0 +paths: {} +servers: + url: /v1 + description: Run locally. diff --git a/tests/v3.1/pass/servers.yaml b/tests/v3.1/pass/servers.yaml new file mode 100644 index 0000000000..77a20498da --- /dev/null +++ b/tests/v3.1/pass/servers.yaml @@ -0,0 +1,10 @@ +openapi: 3.1.0 +info: + title: API + version: 1.0.0 +paths: {} +servers: + - url: /v1 + description: Run locally. + - url: https://production.com/v1 + description: Run on production server. From 89469ddca9fc178fe4b834d91f2f44fe5f6eff69 Mon Sep 17 00:00:00 2001 From: Sami Akkawi Date: Thu, 8 Apr 2021 05:52:01 +0200 Subject: [PATCH 4/4] update schema.json from shema.yaml --- schemas/v3.1/schema.json | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/schemas/v3.1/schema.json b/schemas/v3.1/schema.json index fa987c12d6..e1e859dbe3 100644 --- a/schemas/v3.1/schema.json +++ b/schemas/v3.1/schema.json @@ -15,7 +15,10 @@ "default": "https://spec.openapis.org/oas/3.1/dialect/base" }, "servers": { - "$ref": "#/$defs/server" + "type": "array", + "items": { + "$ref": "#/$defs/server" + } }, "paths": { "$ref": "#/$defs/paths" @@ -1337,4 +1340,4 @@ } } } -} +} \ No newline at end of file