From 7941d684b2b6b0ec4d6764112d22fc418984f883 Mon Sep 17 00:00:00 2001 From: Nicholas King Date: Tue, 28 Aug 2018 08:34:57 -0700 Subject: [PATCH] WebApps - Add ResourceHealthMetadata.json to readme.md for SDK generation (#3692) * WebApps - Add ResourceHealthMetadata.json to readme.md for SDK generation * Change deleted site model to be proxy only resource --- .../stable/2018-02-01/CommonDefinitions.json | 78 +++++++++++-------- specification/web/resource-manager/readme.md | 1 + 2 files changed, 48 insertions(+), 31 deletions(-) diff --git a/specification/web/resource-manager/Microsoft.Web/stable/2018-02-01/CommonDefinitions.json b/specification/web/resource-manager/Microsoft.Web/stable/2018-02-01/CommonDefinitions.json index 9a102b1333c5..f7637d3bc98e 100644 --- a/specification/web/resource-manager/Microsoft.Web/stable/2018-02-01/CommonDefinitions.json +++ b/specification/web/resource-manager/Microsoft.Web/stable/2018-02-01/CommonDefinitions.json @@ -860,37 +860,53 @@ "DeletedSite": { "description": "A deleted app.", "type": "object", + "allOf": [ + { + "$ref": "#/definitions/ProxyOnlyResource" + } + ], "properties": { - "deletedSiteId": { - "format": "int32", - "description": "Numeric id for the deleted site", - "type": "integer", - "readOnly": true - }, - "deletedTimestamp": { - "description": "Time in UTC when the app was deleted.", - "type": "string", - "readOnly": true - }, - "subscription": { - "description": "Subscription containing the deleted site", - "type": "string", - "readOnly": true - }, - "resourceGroup": { - "description": "ResourceGroup that contained the deleted site", - "type": "string", - "readOnly": true - }, - "deletedSiteName": { - "description": "Name of the deleted site", - "type": "string", - "readOnly": true - }, - "slot": { - "description": "Slot of the deleted site", - "type": "string", - "readOnly": true + "properties": { + "description": "DeletedSite resource specific properties", + "properties": { + "deletedSiteId": { + "format": "int32", + "description": "Numeric id for the deleted site", + "type": "integer", + "readOnly": true + }, + "deletedTimestamp": { + "description": "Time in UTC when the app was deleted.", + "type": "string", + "readOnly": true + }, + "subscription": { + "description": "Subscription containing the deleted site", + "type": "string", + "readOnly": true + }, + "resourceGroup": { + "description": "ResourceGroup that contained the deleted site", + "type": "string", + "readOnly": true + }, + "deletedSiteName": { + "description": "Name of the deleted site", + "type": "string", + "readOnly": true + }, + "slot": { + "description": "Slot of the deleted site", + "type": "string", + "readOnly": true + }, + "kind": { + "description": "Kind of site that was deleted", + "type": "string", + "readOnly": true + } + }, + "x-ms-client-flatten": true } } }, @@ -3028,4 +3044,4 @@ ] } ] -} \ No newline at end of file +} diff --git a/specification/web/resource-manager/readme.md b/specification/web/resource-manager/readme.md index 0be882ab5141..0cd07300dcc0 100644 --- a/specification/web/resource-manager/readme.md +++ b/specification/web/resource-manager/readme.md @@ -58,6 +58,7 @@ input-file: - Microsoft.Web/stable/2018-02-01/WebApps.json - Microsoft.Web/stable/2018-02-01/AppServiceEnvironments.json - Microsoft.Web/stable/2018-02-01/AppServicePlans.json +- Microsoft.Web/stable/2018-02-01/ResourceHealthMetadata.json directive: # suppress each RPC 3019 error - where: $.definitions.Identifier.properties