From 24883c62d954bd536f6d999a6a88133e4545a450 Mon Sep 17 00:00:00 2001 From: Alex Kachanov Date: Mon, 2 Nov 2020 17:02:12 -0800 Subject: [PATCH 1/5] #8187884: Swagger Correctness: MICROSOFT.PORTAL(Azure Portal (IbizaFx)) --- .../preview/2019-01-01-preview/portal.json | 8 +++++++- .../preview/2019-01-01-preview/tenantConfiguration.json | 3 +++ .../preview/2020-09-01-preview/portal.json | 8 +++++++- .../preview/2020-09-01-preview/tenantConfiguration.json | 3 +++ 4 files changed, 20 insertions(+), 2 deletions(-) diff --git a/specification/portal/resource-manager/Microsoft.Portal/preview/2019-01-01-preview/portal.json b/specification/portal/resource-manager/Microsoft.Portal/preview/2019-01-01-preview/portal.json index 32b291f51c49..6316b1029d95 100644 --- a/specification/portal/resource-manager/Microsoft.Portal/preview/2019-01-01-preview/portal.json +++ b/specification/portal/resource-manager/Microsoft.Portal/preview/2019-01-01-preview/portal.json @@ -213,6 +213,9 @@ "$ref": "#/definitions/Dashboard" } }, + "404": { + "description": "Not found. Dashboard with provided id doesn't exist." + }, "default": { "description": "Error response describing why the operation failed.", "schema": { @@ -268,6 +271,9 @@ "$ref": "#/definitions/Dashboard" } }, + "404": { + "description": "Not found. Dashboard with provided id doesn't exist." + }, "default": { "description": "Error response describing why the operation failed.", "schema": { @@ -630,7 +636,7 @@ "properties": { "code": { "description": "Service specific error code which serves as the substatus for the HTTP error code.", - "type": "string", + "type": "integer", "readOnly": true }, "message": { diff --git a/specification/portal/resource-manager/Microsoft.Portal/preview/2019-01-01-preview/tenantConfiguration.json b/specification/portal/resource-manager/Microsoft.Portal/preview/2019-01-01-preview/tenantConfiguration.json index 1895a45a5f2f..0465059bda7d 100644 --- a/specification/portal/resource-manager/Microsoft.Portal/preview/2019-01-01-preview/tenantConfiguration.json +++ b/specification/portal/resource-manager/Microsoft.Portal/preview/2019-01-01-preview/tenantConfiguration.json @@ -81,6 +81,9 @@ "$ref": "#/definitions/Configuration" } }, + "404": { + "description": "Not found. Tenant configuration wasn't created yet." + }, "default": { "description": "Error response describing why the operation failed.", "schema": { diff --git a/specification/portal/resource-manager/Microsoft.Portal/preview/2020-09-01-preview/portal.json b/specification/portal/resource-manager/Microsoft.Portal/preview/2020-09-01-preview/portal.json index 2ebeb8c17ede..ba90493839c2 100644 --- a/specification/portal/resource-manager/Microsoft.Portal/preview/2020-09-01-preview/portal.json +++ b/specification/portal/resource-manager/Microsoft.Portal/preview/2020-09-01-preview/portal.json @@ -213,6 +213,9 @@ "$ref": "#/definitions/Dashboard" } }, + "404": { + "description": "Not found. Dashboard with provided id doesn't exist." + }, "default": { "description": "Error response describing why the operation failed.", "schema": { @@ -268,6 +271,9 @@ "$ref": "#/definitions/Dashboard" } }, + "404": { + "description": "Not found. Dashboard with provided id doesn't exist." + }, "default": { "description": "Error response describing why the operation failed.", "schema": { @@ -700,7 +706,7 @@ "properties": { "code": { "description": "Service specific error code which serves as the substatus for the HTTP error code.", - "type": "string", + "type": "integer", "readOnly": true }, "message": { diff --git a/specification/portal/resource-manager/Microsoft.Portal/preview/2020-09-01-preview/tenantConfiguration.json b/specification/portal/resource-manager/Microsoft.Portal/preview/2020-09-01-preview/tenantConfiguration.json index 31ea569ca460..1aa0d5dd2f75 100644 --- a/specification/portal/resource-manager/Microsoft.Portal/preview/2020-09-01-preview/tenantConfiguration.json +++ b/specification/portal/resource-manager/Microsoft.Portal/preview/2020-09-01-preview/tenantConfiguration.json @@ -84,6 +84,9 @@ "$ref": "#/definitions/Configuration" } }, + "404": { + "description": "Not found. Tenant configuration wasn't created yet." + }, "default": { "description": "Error response describing why the operation failed.", "schema": { From ce9884f18408d25c02a5da2905037bfee957b680 Mon Sep 17 00:00:00 2001 From: Alex Kachanov Date: Mon, 2 Nov 2020 18:43:30 -0800 Subject: [PATCH 2/5] Update examples --- .../examples/TenantConfiguration/GetTenantConfiguration.json | 3 ++- .../preview/2019-01-01-preview/examples/getDashboard.json | 3 ++- .../preview/2019-01-01-preview/examples/updateDashboard.json | 3 ++- .../examples/TenantConfiguration/GetTenantConfiguration.json | 3 ++- .../preview/2020-09-01-preview/examples/getDashboard.json | 3 ++- .../preview/2020-09-01-preview/examples/updateDashboard.json | 3 ++- 6 files changed, 12 insertions(+), 6 deletions(-) diff --git a/specification/portal/resource-manager/Microsoft.Portal/preview/2019-01-01-preview/examples/TenantConfiguration/GetTenantConfiguration.json b/specification/portal/resource-manager/Microsoft.Portal/preview/2019-01-01-preview/examples/TenantConfiguration/GetTenantConfiguration.json index b945a54fcc08..c15c075b4649 100644 --- a/specification/portal/resource-manager/Microsoft.Portal/preview/2019-01-01-preview/examples/TenantConfiguration/GetTenantConfiguration.json +++ b/specification/portal/resource-manager/Microsoft.Portal/preview/2019-01-01-preview/examples/TenantConfiguration/GetTenantConfiguration.json @@ -13,6 +13,7 @@ "enforcePrivateMarkdownStorage": true } } - } + }, + "404": {} } } diff --git a/specification/portal/resource-manager/Microsoft.Portal/preview/2019-01-01-preview/examples/getDashboard.json b/specification/portal/resource-manager/Microsoft.Portal/preview/2019-01-01-preview/examples/getDashboard.json index b397a514c868..37ed26e67117 100644 --- a/specification/portal/resource-manager/Microsoft.Portal/preview/2019-01-01-preview/examples/getDashboard.json +++ b/specification/portal/resource-manager/Microsoft.Portal/preview/2019-01-01-preview/examples/getDashboard.json @@ -54,6 +54,7 @@ "anotherKey": "anotherValue" } } - } + }, + "404": {} } } diff --git a/specification/portal/resource-manager/Microsoft.Portal/preview/2019-01-01-preview/examples/updateDashboard.json b/specification/portal/resource-manager/Microsoft.Portal/preview/2019-01-01-preview/examples/updateDashboard.json index b993eb1ae2e5..300e75b6c06f 100644 --- a/specification/portal/resource-manager/Microsoft.Portal/preview/2019-01-01-preview/examples/updateDashboard.json +++ b/specification/portal/resource-manager/Microsoft.Portal/preview/2019-01-01-preview/examples/updateDashboard.json @@ -60,6 +60,7 @@ "anotherKey": "anotherValue2" } } - } + }, + "404": {} } } diff --git a/specification/portal/resource-manager/Microsoft.Portal/preview/2020-09-01-preview/examples/TenantConfiguration/GetTenantConfiguration.json b/specification/portal/resource-manager/Microsoft.Portal/preview/2020-09-01-preview/examples/TenantConfiguration/GetTenantConfiguration.json index acdef20dfe34..4617b15396d8 100644 --- a/specification/portal/resource-manager/Microsoft.Portal/preview/2020-09-01-preview/examples/TenantConfiguration/GetTenantConfiguration.json +++ b/specification/portal/resource-manager/Microsoft.Portal/preview/2020-09-01-preview/examples/TenantConfiguration/GetTenantConfiguration.json @@ -13,6 +13,7 @@ "enforcePrivateMarkdownStorage": true } } - } + }, + "404": {} } } diff --git a/specification/portal/resource-manager/Microsoft.Portal/preview/2020-09-01-preview/examples/getDashboard.json b/specification/portal/resource-manager/Microsoft.Portal/preview/2020-09-01-preview/examples/getDashboard.json index 8245989bfe7f..e015271439b1 100644 --- a/specification/portal/resource-manager/Microsoft.Portal/preview/2020-09-01-preview/examples/getDashboard.json +++ b/specification/portal/resource-manager/Microsoft.Portal/preview/2020-09-01-preview/examples/getDashboard.json @@ -54,6 +54,7 @@ "anotherKey": "anotherValue" } } - } + }, + "404": {} } } diff --git a/specification/portal/resource-manager/Microsoft.Portal/preview/2020-09-01-preview/examples/updateDashboard.json b/specification/portal/resource-manager/Microsoft.Portal/preview/2020-09-01-preview/examples/updateDashboard.json index e0c901c6d277..e846feaedb86 100644 --- a/specification/portal/resource-manager/Microsoft.Portal/preview/2020-09-01-preview/examples/updateDashboard.json +++ b/specification/portal/resource-manager/Microsoft.Portal/preview/2020-09-01-preview/examples/updateDashboard.json @@ -60,6 +60,7 @@ "anotherKey": "anotherValue2" } } - } + }, + "404": {} } } From 032e9020eb60095d33b64e2a6823150a4e051198 Mon Sep 17 00:00:00 2001 From: Alex Kachanov Date: Mon, 2 Nov 2020 19:07:12 -0800 Subject: [PATCH 3/5] Fix Linter error on integer format --- .../Microsoft.Portal/preview/2019-01-01-preview/portal.json | 5 +++++ .../Microsoft.Portal/preview/2020-09-01-preview/portal.json | 6 ++++++ 2 files changed, 11 insertions(+) diff --git a/specification/portal/resource-manager/Microsoft.Portal/preview/2019-01-01-preview/portal.json b/specification/portal/resource-manager/Microsoft.Portal/preview/2019-01-01-preview/portal.json index 6316b1029d95..df21682a36aa 100644 --- a/specification/portal/resource-manager/Microsoft.Portal/preview/2019-01-01-preview/portal.json +++ b/specification/portal/resource-manager/Microsoft.Portal/preview/2019-01-01-preview/portal.json @@ -420,18 +420,22 @@ "properties": { "x": { "type": "integer", + "format": "int32", "description": "The dashboard's part x coordinate." }, "y": { "type": "integer", + "format": "int32", "description": "The dashboard's part y coordinate." }, "rowSpan": { "type": "integer", + "format": "int32", "description": "The dashboard's part row span." }, "colSpan": { "type": "integer", + "format": "int32", "description": "The dashboard's part column span." }, "metadata": { @@ -462,6 +466,7 @@ "properties": { "order": { "type": "integer", + "format": "int32", "description": "The lens order." }, "parts": { diff --git a/specification/portal/resource-manager/Microsoft.Portal/preview/2020-09-01-preview/portal.json b/specification/portal/resource-manager/Microsoft.Portal/preview/2020-09-01-preview/portal.json index ba90493839c2..baaa733fdb55 100644 --- a/specification/portal/resource-manager/Microsoft.Portal/preview/2020-09-01-preview/portal.json +++ b/specification/portal/resource-manager/Microsoft.Portal/preview/2020-09-01-preview/portal.json @@ -420,18 +420,22 @@ "properties": { "x": { "type": "integer", + "format": "int32", "description": "The dashboard's part x coordinate." }, "y": { "type": "integer", + "format": "int32", "description": "The dashboard's part y coordinate." }, "rowSpan": { "type": "integer", + "format": "int32", "description": "The dashboard's part row span." }, "colSpan": { "type": "integer", + "format": "int32", "description": "The dashboard's part column span." }, "metadata": { @@ -532,6 +536,7 @@ "properties": { "order": { "type": "integer", + "format": "int32", "description": "The lens order." }, "parts": { @@ -707,6 +712,7 @@ "code": { "description": "Service specific error code which serves as the substatus for the HTTP error code.", "type": "integer", + "format": "int32", "readOnly": true }, "message": { From 775fe12637e9ba974ad493536b71ef2f0839526d Mon Sep 17 00:00:00 2001 From: Alex Kachanov Date: Mon, 2 Nov 2020 19:14:06 -0800 Subject: [PATCH 4/5] Fix Prettier --- .../preview/2019-01-01-preview/portal.json | 10 +++++----- .../preview/2020-09-01-preview/portal.json | 12 ++++++------ 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/specification/portal/resource-manager/Microsoft.Portal/preview/2019-01-01-preview/portal.json b/specification/portal/resource-manager/Microsoft.Portal/preview/2019-01-01-preview/portal.json index df21682a36aa..5af12756c5b0 100644 --- a/specification/portal/resource-manager/Microsoft.Portal/preview/2019-01-01-preview/portal.json +++ b/specification/portal/resource-manager/Microsoft.Portal/preview/2019-01-01-preview/portal.json @@ -420,22 +420,22 @@ "properties": { "x": { "type": "integer", - "format": "int32", + "format": "int32", "description": "The dashboard's part x coordinate." }, "y": { "type": "integer", - "format": "int32", + "format": "int32", "description": "The dashboard's part y coordinate." }, "rowSpan": { "type": "integer", - "format": "int32", + "format": "int32", "description": "The dashboard's part row span." }, "colSpan": { "type": "integer", - "format": "int32", + "format": "int32", "description": "The dashboard's part column span." }, "metadata": { @@ -466,7 +466,7 @@ "properties": { "order": { "type": "integer", - "format": "int32", + "format": "int32", "description": "The lens order." }, "parts": { diff --git a/specification/portal/resource-manager/Microsoft.Portal/preview/2020-09-01-preview/portal.json b/specification/portal/resource-manager/Microsoft.Portal/preview/2020-09-01-preview/portal.json index baaa733fdb55..0d02b3278e4e 100644 --- a/specification/portal/resource-manager/Microsoft.Portal/preview/2020-09-01-preview/portal.json +++ b/specification/portal/resource-manager/Microsoft.Portal/preview/2020-09-01-preview/portal.json @@ -420,22 +420,22 @@ "properties": { "x": { "type": "integer", - "format": "int32", + "format": "int32", "description": "The dashboard's part x coordinate." }, "y": { "type": "integer", - "format": "int32", + "format": "int32", "description": "The dashboard's part y coordinate." }, "rowSpan": { "type": "integer", - "format": "int32", + "format": "int32", "description": "The dashboard's part row span." }, "colSpan": { "type": "integer", - "format": "int32", + "format": "int32", "description": "The dashboard's part column span." }, "metadata": { @@ -536,7 +536,7 @@ "properties": { "order": { "type": "integer", - "format": "int32", + "format": "int32", "description": "The lens order." }, "parts": { @@ -712,7 +712,7 @@ "code": { "description": "Service specific error code which serves as the substatus for the HTTP error code.", "type": "integer", - "format": "int32", + "format": "int32", "readOnly": true }, "message": { From 572c012d508094f32be6df5e020996c5551c50a3 Mon Sep 17 00:00:00 2001 From: Alex Kachanov Date: Mon, 2 Nov 2020 19:32:28 -0800 Subject: [PATCH 5/5] Fix Linter error --- .../Microsoft.Portal/preview/2019-01-01-preview/portal.json | 1 + 1 file changed, 1 insertion(+) diff --git a/specification/portal/resource-manager/Microsoft.Portal/preview/2019-01-01-preview/portal.json b/specification/portal/resource-manager/Microsoft.Portal/preview/2019-01-01-preview/portal.json index 5af12756c5b0..d3494deaa119 100644 --- a/specification/portal/resource-manager/Microsoft.Portal/preview/2019-01-01-preview/portal.json +++ b/specification/portal/resource-manager/Microsoft.Portal/preview/2019-01-01-preview/portal.json @@ -642,6 +642,7 @@ "code": { "description": "Service specific error code which serves as the substatus for the HTTP error code.", "type": "integer", + "format": "int32", "readOnly": true }, "message": {