From 2c5adbd433ff4f4b4eb3f472310f4f1a111ab824 Mon Sep 17 00:00:00 2001 From: Ales Pour Date: Tue, 1 Nov 2022 12:10:31 +0100 Subject: [PATCH 1/6] fix: name property is actually optional --- src/common/schemas/CreateDashboardRequest.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/src/common/schemas/CreateDashboardRequest.yml b/src/common/schemas/CreateDashboardRequest.yml index 0e307e174..227ef3500 100644 --- a/src/common/schemas/CreateDashboardRequest.yml +++ b/src/common/schemas/CreateDashboardRequest.yml @@ -10,4 +10,3 @@ description: The user-facing description of the dashboard. required: - orgID - - name From 40a5153905944089b146d87f5dd4725b852bf4c9 Mon Sep 17 00:00:00 2001 From: Ales Pour Date: Tue, 1 Nov 2022 12:17:31 +0100 Subject: [PATCH 2/6] fix: add missing required properties --- src/common/paths/stacks.yml | 1 + src/common/schemas/CheckBase.yml | 2 +- src/common/schemas/NotificationEndpointBase.yml | 2 +- src/common/schemas/NotificationRuleBase.yml | 2 ++ src/common/schemas/ScraperTargetRequest.yml | 1 + src/common/schemas/Source.yml | 1 + src/common/schemas/TelegrafPluginRequest.yml | 1 + src/common/schemas/TemplateApply.yml | 1 + src/common/schemas/TemplateExportByID.yml | 1 + src/common/schemas/TemplateExportByName.yml | 1 + 10 files changed, 11 insertions(+), 2 deletions(-) diff --git a/src/common/paths/stacks.yml b/src/common/paths/stacks.yml index 4a24704d9..cf37ade22 100644 --- a/src/common/paths/stacks.yml +++ b/src/common/paths/stacks.yml @@ -145,6 +145,7 @@ post: properties: orgID: type: string + required: true name: type: string description: diff --git a/src/common/schemas/CheckBase.yml b/src/common/schemas/CheckBase.yml index 1874ff9f1..bf3b6560d 100644 --- a/src/common/schemas/CheckBase.yml +++ b/src/common/schemas/CheckBase.yml @@ -71,4 +71,4 @@ query: description: The URL to retrieve the Flux script for this check. $ref: "./Link.yml" - required: [name, orgID, query] + required: [name, orgID, query, status] diff --git a/src/common/schemas/NotificationEndpointBase.yml b/src/common/schemas/NotificationEndpointBase.yml index f84642be5..419a22de5 100644 --- a/src/common/schemas/NotificationEndpointBase.yml +++ b/src/common/schemas/NotificationEndpointBase.yml @@ -1,5 +1,5 @@ type: object - required: [type, name] + required: [orgID, type, name, status] properties: id: type: string diff --git a/src/common/schemas/NotificationRuleBase.yml b/src/common/schemas/NotificationRuleBase.yml index ddea84d2e..660746e5d 100644 --- a/src/common/schemas/NotificationRuleBase.yml +++ b/src/common/schemas/NotificationRuleBase.yml @@ -5,6 +5,8 @@ - name - statusRules - endpointID + - status + - every properties: latestCompleted: description: A timestamp ([RFC3339 date/time format]({{% INFLUXDB_DOCS_URL %}}/reference/glossary/#rfc3339-timestamp)) of the latest scheduled and completed run. diff --git a/src/common/schemas/ScraperTargetRequest.yml b/src/common/schemas/ScraperTargetRequest.yml index 0f6c18065..f44f8910c 100644 --- a/src/common/schemas/ScraperTargetRequest.yml +++ b/src/common/schemas/ScraperTargetRequest.yml @@ -21,3 +21,4 @@ type: boolean description: Skip TLS verification on endpoint. default: false + required: [orgID, bucketID] \ No newline at end of file diff --git a/src/common/schemas/Source.yml b/src/common/schemas/Source.yml index c6c6b4303..ca75ce167 100644 --- a/src/common/schemas/Source.yml +++ b/src/common/schemas/Source.yml @@ -50,3 +50,4 @@ enum: - flux - influxql + required: [orgID] \ No newline at end of file diff --git a/src/common/schemas/TelegrafPluginRequest.yml b/src/common/schemas/TelegrafPluginRequest.yml index 296aab431..ec3484c84 100644 --- a/src/common/schemas/TelegrafPluginRequest.yml +++ b/src/common/schemas/TelegrafPluginRequest.yml @@ -31,3 +31,4 @@ properties: type: string orgID: type: string +required: [orgID] \ No newline at end of file diff --git a/src/common/schemas/TemplateApply.yml b/src/common/schemas/TemplateApply.yml index 0288bfeb2..fac03fd3a 100644 --- a/src/common/schemas/TemplateApply.yml +++ b/src/common/schemas/TemplateApply.yml @@ -195,3 +195,4 @@ resourceTemplateName: type: string required: ["kind", "resourceTemplateName"] + required: [orgID] \ No newline at end of file diff --git a/src/common/schemas/TemplateExportByID.yml b/src/common/schemas/TemplateExportByID.yml index 00658401e..293290f17 100644 --- a/src/common/schemas/TemplateExportByID.yml +++ b/src/common/schemas/TemplateExportByID.yml @@ -20,6 +20,7 @@ type: array items: $ref: "./TemplateKind.yml" + required: [orgID] resources: type: array items: diff --git a/src/common/schemas/TemplateExportByName.yml b/src/common/schemas/TemplateExportByName.yml index 5eda3caf0..ce6117a04 100644 --- a/src/common/schemas/TemplateExportByName.yml +++ b/src/common/schemas/TemplateExportByName.yml @@ -20,6 +20,7 @@ type: array items: $ref: "./TemplateKind.yml" + required: [orgID] resources: type: array items: From 4ab5e014cddb348e80aad7414d3a14e5607e3917 Mon Sep 17 00:00:00 2001 From: Ales Pour Date: Tue, 1 Nov 2022 12:20:45 +0100 Subject: [PATCH 3/6] fix: X-Influxdb-Version return string --- src/common/paths/ping.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/common/paths/ping.yml b/src/common/paths/ping.yml index 5e92cecde..15ffb6e8e 100644 --- a/src/common/paths/ping.yml +++ b/src/common/paths/ping.yml @@ -32,7 +32,7 @@ get: The type of InfluxDB build. X-Influxdb-Version: schema: - type: integer + type: string description: | The version of InfluxDB. @@ -75,7 +75,7 @@ head: description: The type of InfluxDB build. X-Influxdb-Version: schema: - type: integer + type: string description: | The version of InfluxDB. From eb1cebf3f9f93648fb5bd08f51ceefd2dcf71b08 Mon Sep 17 00:00:00 2001 From: Ales Pour Date: Tue, 1 Nov 2022 12:35:29 +0100 Subject: [PATCH 4/6] style: add missing newline --- src/common/schemas/ScraperTargetRequest.yml | 2 +- src/common/schemas/Source.yml | 2 +- src/common/schemas/TelegrafPluginRequest.yml | 2 +- src/common/schemas/TemplateApply.yml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/common/schemas/ScraperTargetRequest.yml b/src/common/schemas/ScraperTargetRequest.yml index f44f8910c..c3638e520 100644 --- a/src/common/schemas/ScraperTargetRequest.yml +++ b/src/common/schemas/ScraperTargetRequest.yml @@ -21,4 +21,4 @@ type: boolean description: Skip TLS verification on endpoint. default: false - required: [orgID, bucketID] \ No newline at end of file + required: [orgID, bucketID] diff --git a/src/common/schemas/Source.yml b/src/common/schemas/Source.yml index ca75ce167..5f4c6c4a7 100644 --- a/src/common/schemas/Source.yml +++ b/src/common/schemas/Source.yml @@ -50,4 +50,4 @@ enum: - flux - influxql - required: [orgID] \ No newline at end of file + required: [orgID] diff --git a/src/common/schemas/TelegrafPluginRequest.yml b/src/common/schemas/TelegrafPluginRequest.yml index ec3484c84..cc9d3a676 100644 --- a/src/common/schemas/TelegrafPluginRequest.yml +++ b/src/common/schemas/TelegrafPluginRequest.yml @@ -31,4 +31,4 @@ properties: type: string orgID: type: string -required: [orgID] \ No newline at end of file +required: [orgID] diff --git a/src/common/schemas/TemplateApply.yml b/src/common/schemas/TemplateApply.yml index fac03fd3a..95b83e0aa 100644 --- a/src/common/schemas/TemplateApply.yml +++ b/src/common/schemas/TemplateApply.yml @@ -195,4 +195,4 @@ resourceTemplateName: type: string required: ["kind", "resourceTemplateName"] - required: [orgID] \ No newline at end of file + required: [orgID] From d8778082297d127a880d62227972290ea73973b1 Mon Sep 17 00:00:00 2001 From: Ales Pour Date: Tue, 1 Nov 2022 13:06:23 +0100 Subject: [PATCH 5/6] chore: update generated contracts --- contracts/cloud-diff.yml | 2 +- contracts/cloud.json | 41 +++++++++++++++++++++---------- contracts/cloud.yml | 19 ++++++++++++--- contracts/common.yml | 19 ++++++++++++--- contracts/oss-diff.yml | 7 +++++- contracts/oss.json | 52 +++++++++++++++++++++++++++++----------- contracts/oss.yml | 24 ++++++++++++++++--- contracts/ref/cloud.yml | 19 ++++++++++++--- contracts/ref/oss.yml | 24 ++++++++++++++++--- 9 files changed, 164 insertions(+), 43 deletions(-) diff --git a/contracts/cloud-diff.yml b/contracts/cloud-diff.yml index f19781072..624b5ff7a 100644 --- a/contracts/cloud-diff.yml +++ b/contracts/cloud-diff.yml @@ -1423,7 +1423,6 @@ paths: description: The user-facing description of the dashboard. required: - orgID - - name responses: '201': description: Success. The dashboard is created. @@ -2298,6 +2297,7 @@ paths: - name - orgID - query + - status - type: object required: - type diff --git a/contracts/cloud.json b/contracts/cloud.json index 9640cc831..7eada08c0 100644 --- a/contracts/cloud.json +++ b/contracts/cloud.json @@ -245,7 +245,7 @@ }, "X-Influxdb-Version": { "schema": { - "type": "integer" + "type": "string" }, "description": "The version of InfluxDB.\n\n#### InfluxDB Cloud\n - Doesn't return version.\n" } @@ -284,7 +284,7 @@ }, "X-Influxdb-Version": { "schema": { - "type": "integer" + "type": "string" }, "description": "The version of InfluxDB.\n\n#### InfluxDB Cloud\n- Doesn't return version.\n" } @@ -7681,7 +7681,8 @@ "title": "PostStackRequest", "properties": { "orgID": { - "type": "string" + "type": "string", + "required": true }, "name": { "type": "string" @@ -14874,7 +14875,10 @@ ] } } - } + }, + "required": [ + "orgID" + ] }, "TemplateKind": { "type": "string", @@ -14926,7 +14930,10 @@ } } } - } + }, + "required": [ + "orgID" + ] } }, "resources": { @@ -14984,7 +14991,10 @@ } } } - } + }, + "required": [ + "orgID" + ] } }, "resources": { @@ -19092,8 +19102,7 @@ } }, "required": [ - "orgID", - "name" + "orgID" ] }, "DashboardWithViewProperties": { @@ -19321,7 +19330,10 @@ "orgID": { "type": "string" } - } + }, + "required": [ + "orgID" + ] }, "Telegraf": { "type": "object", @@ -19808,7 +19820,8 @@ "required": [ "name", "orgID", - "query" + "query", + "status" ] }, "ThresholdCheck": { @@ -20172,7 +20185,9 @@ "status", "name", "statusRules", - "endpointID" + "endpointID", + "status", + "every" ], "properties": { "latestCompleted": { @@ -20585,8 +20600,10 @@ "NotificationEndpointBase": { "type": "object", "required": [ + "orgID", "type", - "name" + "name", + "status" ], "properties": { "id": { diff --git a/contracts/cloud.yml b/contracts/cloud.yml index ea80266e5..dab1bd56a 100644 --- a/contracts/cloud.yml +++ b/contracts/cloud.yml @@ -428,7 +428,7 @@ paths: The type of InfluxDB build. X-Influxdb-Version: schema: - type: integer + type: string description: | The version of InfluxDB. @@ -471,7 +471,7 @@ paths: description: The type of InfluxDB build. X-Influxdb-Version: schema: - type: integer + type: string description: | The version of InfluxDB. @@ -6417,6 +6417,7 @@ paths: properties: orgID: type: string + required: true name: type: string description: @@ -12197,6 +12198,8 @@ components: required: - kind - resourceTemplateName + required: + - orgID TemplateKind: type: string enum: @@ -12237,6 +12240,8 @@ components: type: array items: $ref: '#/components/schemas/TemplateKind' + required: + - orgID resources: type: array items: @@ -12275,6 +12280,8 @@ components: type: array items: $ref: '#/components/schemas/TemplateKind' + required: + - orgID resources: type: array items: @@ -15142,7 +15149,6 @@ components: description: The user-facing description of the dashboard. required: - orgID - - name DashboardWithViewProperties: type: object allOf: @@ -15291,6 +15297,8 @@ components: type: string orgID: type: string + required: + - orgID Telegraf: type: object allOf: @@ -15633,6 +15641,7 @@ components: - name - orgID - query + - status ThresholdCheck: allOf: - $ref: '#/components/schemas/CheckBase' @@ -15857,6 +15866,8 @@ components: - name - statusRules - endpointID + - status + - every properties: latestCompleted: description: 'A timestamp ([RFC3339 date/time format](https://docs.influxdata.com/influxdb/cloud/reference/glossary/#rfc3339-timestamp)) of the latest scheduled and completed run.' @@ -16124,8 +16135,10 @@ components: NotificationEndpointBase: type: object required: + - orgID - type - name + - status properties: id: type: string diff --git a/contracts/common.yml b/contracts/common.yml index dcf366600..3dfd91266 100644 --- a/contracts/common.yml +++ b/contracts/common.yml @@ -139,7 +139,7 @@ paths: The type of InfluxDB build. X-Influxdb-Version: schema: - type: integer + type: string description: | The version of InfluxDB. @@ -182,7 +182,7 @@ paths: description: The type of InfluxDB build. X-Influxdb-Version: schema: - type: integer + type: string description: | The version of InfluxDB. @@ -6128,6 +6128,7 @@ paths: properties: orgID: type: string + required: true name: type: string description: @@ -10119,6 +10120,8 @@ components: required: - kind - resourceTemplateName + required: + - orgID TemplateKind: type: string enum: @@ -10159,6 +10162,8 @@ components: type: array items: $ref: '#/components/schemas/TemplateKind' + required: + - orgID resources: type: array items: @@ -10197,6 +10202,8 @@ components: type: array items: $ref: '#/components/schemas/TemplateKind' + required: + - orgID resources: type: array items: @@ -13064,7 +13071,6 @@ components: description: The user-facing description of the dashboard. required: - orgID - - name DashboardWithViewProperties: type: object allOf: @@ -13213,6 +13219,8 @@ components: type: string orgID: type: string + required: + - orgID Telegraf: type: object allOf: @@ -13555,6 +13563,7 @@ components: - name - orgID - query + - status ThresholdCheck: allOf: - $ref: '#/components/schemas/CheckBase' @@ -13779,6 +13788,8 @@ components: - name - statusRules - endpointID + - status + - every properties: latestCompleted: description: 'A timestamp ([RFC3339 date/time format](https://docs.influxdata.com/influxdb/v2.3/reference/glossary/#rfc3339-timestamp)) of the latest scheduled and completed run.' @@ -14046,8 +14057,10 @@ components: NotificationEndpointBase: type: object required: + - orgID - type - name + - status properties: id: type: string diff --git a/contracts/oss-diff.yml b/contracts/oss-diff.yml index 1f634a0b0..9c852ac35 100644 --- a/contracts/oss-diff.yml +++ b/contracts/oss-diff.yml @@ -3261,7 +3261,6 @@ paths: description: The user-facing description of the dashboard. required: - orgID - - name responses: '201': description: Success. The dashboard is created. @@ -4133,6 +4132,7 @@ paths: - name - orgID - query + - status - type: object required: - type @@ -6013,6 +6013,8 @@ components: enum: - flux - influxql + required: + - orgID Sources: type: object properties: @@ -6051,6 +6053,9 @@ components: type: boolean description: Skip TLS verification on endpoint. default: false + required: + - orgID + - bucketID ScraperTargetResponse: type: object allOf: diff --git a/contracts/oss.json b/contracts/oss.json index 7810f447b..7c1d19aba 100644 --- a/contracts/oss.json +++ b/contracts/oss.json @@ -246,7 +246,7 @@ }, "X-Influxdb-Version": { "schema": { - "type": "integer" + "type": "string" }, "description": "The version of InfluxDB.\n\n#### InfluxDB Cloud\n - Doesn't return version.\n" } @@ -285,7 +285,7 @@ }, "X-Influxdb-Version": { "schema": { - "type": "integer" + "type": "string" }, "description": "The version of InfluxDB.\n\n#### InfluxDB Cloud\n- Doesn't return version.\n" } @@ -7682,7 +7682,8 @@ "title": "PostStackRequest", "properties": { "orgID": { - "type": "string" + "type": "string", + "required": true }, "name": { "type": "string" @@ -17251,7 +17252,10 @@ ] } } - } + }, + "required": [ + "orgID" + ] }, "TemplateKind": { "type": "string", @@ -17303,7 +17307,10 @@ } } } - } + }, + "required": [ + "orgID" + ] } }, "resources": { @@ -17361,7 +17368,10 @@ } } } - } + }, + "required": [ + "orgID" + ] } }, "resources": { @@ -21469,8 +21479,7 @@ } }, "required": [ - "orgID", - "name" + "orgID" ] }, "DashboardWithViewProperties": { @@ -21698,7 +21707,10 @@ "orgID": { "type": "string" } - } + }, + "required": [ + "orgID" + ] }, "Telegraf": { "type": "object", @@ -22185,7 +22197,8 @@ "required": [ "name", "orgID", - "query" + "query", + "status" ] }, "ThresholdCheck": { @@ -22549,7 +22562,9 @@ "status", "name", "statusRules", - "endpointID" + "endpointID", + "status", + "every" ], "properties": { "latestCompleted": { @@ -22962,8 +22977,10 @@ "NotificationEndpointBase": { "type": "object", "required": [ + "orgID", "type", - "name" + "name", + "status" ], "properties": { "id": { @@ -23614,7 +23631,10 @@ ] } } - } + }, + "required": [ + "orgID" + ] }, "Sources": { "type": "object", @@ -23668,7 +23688,11 @@ "description": "Skip TLS verification on endpoint.", "default": false } - } + }, + "required": [ + "orgID", + "bucketID" + ] }, "ScraperTargetResponse": { "type": "object", diff --git a/contracts/oss.yml b/contracts/oss.yml index 0b4d47e4a..b73f22b40 100644 --- a/contracts/oss.yml +++ b/contracts/oss.yml @@ -418,7 +418,7 @@ paths: The type of InfluxDB build. X-Influxdb-Version: schema: - type: integer + type: string description: | The version of InfluxDB. @@ -461,7 +461,7 @@ paths: description: The type of InfluxDB build. X-Influxdb-Version: schema: - type: integer + type: string description: | The version of InfluxDB. @@ -6407,6 +6407,7 @@ paths: properties: orgID: type: string + required: true name: type: string description: @@ -13773,6 +13774,8 @@ components: required: - kind - resourceTemplateName + required: + - orgID TemplateKind: type: string enum: @@ -13813,6 +13816,8 @@ components: type: array items: $ref: '#/components/schemas/TemplateKind' + required: + - orgID resources: type: array items: @@ -13851,6 +13856,8 @@ components: type: array items: $ref: '#/components/schemas/TemplateKind' + required: + - orgID resources: type: array items: @@ -16718,7 +16725,6 @@ components: description: The user-facing description of the dashboard. required: - orgID - - name DashboardWithViewProperties: type: object allOf: @@ -16867,6 +16873,8 @@ components: type: string orgID: type: string + required: + - orgID Telegraf: type: object allOf: @@ -17209,6 +17217,7 @@ components: - name - orgID - query + - status ThresholdCheck: allOf: - $ref: '#/components/schemas/CheckBase' @@ -17433,6 +17442,8 @@ components: - name - statusRules - endpointID + - status + - every properties: latestCompleted: description: 'A timestamp ([RFC3339 date/time format](https://docs.influxdata.com/influxdb/v2.3/reference/glossary/#rfc3339-timestamp)) of the latest scheduled and completed run.' @@ -17700,8 +17711,10 @@ components: NotificationEndpointBase: type: object required: + - orgID - type - name + - status properties: id: type: string @@ -18151,6 +18164,8 @@ components: enum: - flux - influxql + required: + - orgID Sources: type: object properties: @@ -18189,6 +18204,9 @@ components: type: boolean description: Skip TLS verification on endpoint. default: false + required: + - orgID + - bucketID ScraperTargetResponse: type: object allOf: diff --git a/contracts/ref/cloud.yml b/contracts/ref/cloud.yml index d4913bf67..e716b0d26 100644 --- a/contracts/ref/cloud.yml +++ b/contracts/ref/cloud.yml @@ -869,6 +869,7 @@ components: - name - orgID - query + - status CheckDiscriminator: discriminator: mapping: @@ -1032,7 +1033,6 @@ components: type: string required: - orgID - - name CustomCheck: allOf: - $ref: '#/components/schemas/CheckBase' @@ -3117,8 +3117,10 @@ components: userID: type: string required: + - orgID - type - name + - status type: object NotificationEndpointDiscriminator: discriminator: @@ -3275,6 +3277,8 @@ components: - name - statusRules - endpointID + - status + - every type: object NotificationRuleDiscriminator: discriminator: @@ -5093,6 +5097,8 @@ components: type: string type: object type: array + required: + - orgID type: object TelegrafPlugins: properties: @@ -5435,6 +5441,8 @@ components: type: array type: object type: array + required: + - orgID type: object TemplateChart: properties: @@ -5499,6 +5507,8 @@ components: $ref: '#/components/schemas/TemplateKind' type: array type: object + required: + - orgID type: object type: array resources: @@ -5539,6 +5549,8 @@ components: $ref: '#/components/schemas/TemplateKind' type: array type: object + required: + - orgID type: object type: array resources: @@ -12103,7 +12115,7 @@ paths: #### InfluxDB Cloud - Doesn't return version. schema: - type: integer + type: string servers: - url: "" summary: Get the status of the instance @@ -12147,7 +12159,7 @@ paths: #### InfluxDB Cloud - Doesn't return version. schema: - type: integer + type: string servers: - url: "" summary: Get the status of the instance @@ -14752,6 +14764,7 @@ paths: name: type: string orgID: + required: true type: string urls: items: diff --git a/contracts/ref/oss.yml b/contracts/ref/oss.yml index 350b92605..a0737a52f 100644 --- a/contracts/ref/oss.yml +++ b/contracts/ref/oss.yml @@ -898,6 +898,7 @@ components: - name - orgID - query + - status CheckDiscriminator: discriminator: mapping: @@ -1051,7 +1052,6 @@ components: type: string required: - orgID - - name CustomCheck: allOf: - $ref: '#/components/schemas/CheckBase' @@ -2881,8 +2881,10 @@ components: userID: type: string required: + - orgID - type - name + - status type: object NotificationEndpointDiscriminator: discriminator: @@ -3039,6 +3041,8 @@ components: - name - statusRules - endpointID + - status + - every type: object NotificationRuleDiscriminator: discriminator: @@ -4362,6 +4366,9 @@ components: description: The URL of the metrics endpoint. example: http://localhost:9090/metrics type: string + required: + - orgID + - bucketID type: object ScraperTargetResponse: allOf: @@ -4651,6 +4658,8 @@ components: type: string username: type: string + required: + - orgID type: object Sources: properties: @@ -5143,6 +5152,8 @@ components: type: string type: object type: array + required: + - orgID type: object TelegrafPlugins: properties: @@ -5485,6 +5496,8 @@ components: type: array type: object type: array + required: + - orgID type: object TemplateChart: properties: @@ -5549,6 +5562,8 @@ components: $ref: '#/components/schemas/TemplateKind' type: array type: object + required: + - orgID type: object type: array resources: @@ -5589,6 +5604,8 @@ components: $ref: '#/components/schemas/TemplateKind' type: array type: object + required: + - orgID type: object type: array resources: @@ -12635,7 +12652,7 @@ paths: #### InfluxDB Cloud - Doesn't return version. schema: - type: integer + type: string servers: - url: "" summary: Get the status of the instance @@ -12679,7 +12696,7 @@ paths: #### InfluxDB Cloud - Doesn't return version. schema: - type: integer + type: string servers: - url: "" summary: Get the status of the instance @@ -15672,6 +15689,7 @@ paths: name: type: string orgID: + required: true type: string urls: items: From fd26b08a24b516174c30fdbbdef5ee152f582b42 Mon Sep 17 00:00:00 2001 From: Ales Pour Date: Tue, 1 Nov 2022 13:18:14 +0100 Subject: [PATCH 6/6] fix: required format --- contracts/cloud.json | 8 +++++--- contracts/cloud.yml | 3 ++- contracts/common.yml | 3 ++- contracts/oss.json | 8 +++++--- contracts/oss.yml | 3 ++- contracts/ref/cloud.yml | 3 ++- contracts/ref/oss.yml | 3 ++- src/common/paths/stacks.yml | 3 ++- 8 files changed, 22 insertions(+), 12 deletions(-) diff --git a/contracts/cloud.json b/contracts/cloud.json index 7eada08c0..bf17ab354 100644 --- a/contracts/cloud.json +++ b/contracts/cloud.json @@ -7681,8 +7681,7 @@ "title": "PostStackRequest", "properties": { "orgID": { - "type": "string", - "required": true + "type": "string" }, "name": { "type": "string" @@ -7696,7 +7695,10 @@ "type": "string" } } - } + }, + "required": [ + "orgID" + ] } } } diff --git a/contracts/cloud.yml b/contracts/cloud.yml index dab1bd56a..a5c3ad70c 100644 --- a/contracts/cloud.yml +++ b/contracts/cloud.yml @@ -6417,7 +6417,6 @@ paths: properties: orgID: type: string - required: true name: type: string description: @@ -6426,6 +6425,8 @@ paths: type: array items: type: string + required: + - orgID responses: '201': description: Success. Returns the newly created stack. diff --git a/contracts/common.yml b/contracts/common.yml index 3dfd91266..deb0d6e48 100644 --- a/contracts/common.yml +++ b/contracts/common.yml @@ -6128,7 +6128,6 @@ paths: properties: orgID: type: string - required: true name: type: string description: @@ -6137,6 +6136,8 @@ paths: type: array items: type: string + required: + - orgID responses: '201': description: Success. Returns the newly created stack. diff --git a/contracts/oss.json b/contracts/oss.json index 7c1d19aba..13b3d170b 100644 --- a/contracts/oss.json +++ b/contracts/oss.json @@ -7682,8 +7682,7 @@ "title": "PostStackRequest", "properties": { "orgID": { - "type": "string", - "required": true + "type": "string" }, "name": { "type": "string" @@ -7697,7 +7696,10 @@ "type": "string" } } - } + }, + "required": [ + "orgID" + ] } } } diff --git a/contracts/oss.yml b/contracts/oss.yml index b73f22b40..44b7c9ba8 100644 --- a/contracts/oss.yml +++ b/contracts/oss.yml @@ -6407,7 +6407,6 @@ paths: properties: orgID: type: string - required: true name: type: string description: @@ -6416,6 +6415,8 @@ paths: type: array items: type: string + required: + - orgID responses: '201': description: Success. Returns the newly created stack. diff --git a/contracts/ref/cloud.yml b/contracts/ref/cloud.yml index e716b0d26..1eeb8dc29 100644 --- a/contracts/ref/cloud.yml +++ b/contracts/ref/cloud.yml @@ -14764,12 +14764,13 @@ paths: name: type: string orgID: - required: true type: string urls: items: type: string type: array + required: + - orgID title: PostStackRequest type: object description: The stack to create. diff --git a/contracts/ref/oss.yml b/contracts/ref/oss.yml index a0737a52f..0d5788e5a 100644 --- a/contracts/ref/oss.yml +++ b/contracts/ref/oss.yml @@ -15689,12 +15689,13 @@ paths: name: type: string orgID: - required: true type: string urls: items: type: string type: array + required: + - orgID title: PostStackRequest type: object description: The stack to create. diff --git a/src/common/paths/stacks.yml b/src/common/paths/stacks.yml index cf37ade22..290236098 100644 --- a/src/common/paths/stacks.yml +++ b/src/common/paths/stacks.yml @@ -145,7 +145,6 @@ post: properties: orgID: type: string - required: true name: type: string description: @@ -154,6 +153,8 @@ post: type: array items: type: string + required: + - orgID responses: "201": description: Success. Returns the newly created stack.