diff --git a/specification/web/resource-manager/Microsoft.CertificateRegistration/2015-08-01/AppServiceCertificateOrders.json b/specification/web/resource-manager/Microsoft.CertificateRegistration/2015-08-01/AppServiceCertificateOrders.json index 990bcc5ff39f..8cf78faf1edc 100644 --- a/specification/web/resource-manager/Microsoft.CertificateRegistration/2015-08-01/AppServiceCertificateOrders.json +++ b/specification/web/resource-manager/Microsoft.CertificateRegistration/2015-08-01/AppServiceCertificateOrders.json @@ -1152,7 +1152,7 @@ "type": "object", "allOf": [ { - "$ref": "#/definitions/Resource" + "$ref": "#/definitions/ProxyOnlyResource" } ], "properties": { @@ -1229,6 +1229,31 @@ } } }, + "ProxyOnlyResource": { + "description": "Azure proxy only resource. This resource is not tracked by Azure Resource Manager.", + "properties": { + "id": { + "description": "Resource Id.", + "type": "string", + "readOnly": true + }, + "name": { + "description": "Resource Name.", + "type": "string", + "readOnly": true + }, + "kind": { + "description": "Kind of resource.", + "type": "string" + }, + "type": { + "description": "Resource type.", + "type": "string", + "readOnly": true + } + }, + "x-ms-azure-resource": true + }, "ReissueCertificateOrderRequest": { "description": "Class representing certificate reissue request.", "type": "object", @@ -1295,7 +1320,7 @@ } }, "Resource": { - "description": "Azure resource.", + "description": "Azure resource. This resource is tracked in Azure Resource Manager", "required": [ "location" ], @@ -1307,7 +1332,8 @@ }, "name": { "description": "Resource Name.", - "type": "string" + "type": "string", + "readOnly": true }, "kind": { "description": "Kind of resource.", @@ -1319,7 +1345,8 @@ }, "type": { "description": "Resource type.", - "type": "string" + "type": "string", + "readOnly": true }, "tags": { "description": "Resource tags.", diff --git a/specification/web/resource-manager/Microsoft.DomainRegistration/2015-04-01/Domains.json b/specification/web/resource-manager/Microsoft.DomainRegistration/2015-04-01/Domains.json index 1661c24ac9fd..c2bdfeea7da9 100644 --- a/specification/web/resource-manager/Microsoft.DomainRegistration/2015-04-01/Domains.json +++ b/specification/web/resource-manager/Microsoft.DomainRegistration/2015-04-01/Domains.json @@ -1129,7 +1129,7 @@ } }, "Resource": { - "description": "Azure resource.", + "description": "Azure resource. This resource is tracked in Azure Resource Manager", "required": [ "location" ], @@ -1141,7 +1141,8 @@ }, "name": { "description": "Resource Name.", - "type": "string" + "type": "string", + "readOnly": true }, "kind": { "description": "Kind of resource.", @@ -1153,7 +1154,8 @@ }, "type": { "description": "Resource type.", - "type": "string" + "type": "string", + "readOnly": true }, "tags": { "description": "Resource tags.", diff --git a/specification/web/resource-manager/Microsoft.DomainRegistration/2015-04-01/TopLevelDomains.json b/specification/web/resource-manager/Microsoft.DomainRegistration/2015-04-01/TopLevelDomains.json index c256e40f01e3..55ac48d6e6c4 100644 --- a/specification/web/resource-manager/Microsoft.DomainRegistration/2015-04-01/TopLevelDomains.json +++ b/specification/web/resource-manager/Microsoft.DomainRegistration/2015-04-01/TopLevelDomains.json @@ -139,11 +139,8 @@ } }, "definitions": { - "Resource": { - "description": "Azure resource.", - "required": [ - "location" - ], + "ProxyOnlyResource": { + "description": "Azure proxy only resource. This resource is not tracked by Azure Resource Manager.", "properties": { "id": { "description": "Resource Id.", @@ -152,26 +149,17 @@ }, "name": { "description": "Resource Name.", - "type": "string" + "type": "string", + "readOnly": true }, "kind": { "description": "Kind of resource.", "type": "string" }, - "location": { - "description": "Resource Location.", - "type": "string" - }, "type": { "description": "Resource type.", - "type": "string" - }, - "tags": { - "description": "Resource tags.", - "type": "object", - "additionalProperties": { - "type": "string" - } + "type": "string", + "readOnly": true } }, "x-ms-azure-resource": true @@ -228,7 +216,7 @@ "type": "object", "allOf": [ { - "$ref": "#/definitions/Resource" + "$ref": "#/definitions/ProxyOnlyResource" } ], "properties": { diff --git a/specification/web/resource-manager/Microsoft.Web/2016-03-01/Certificates.json b/specification/web/resource-manager/Microsoft.Web/2016-03-01/Certificates.json index fdcd383d3d1e..796275822261 100644 --- a/specification/web/resource-manager/Microsoft.Web/2016-03-01/Certificates.json +++ b/specification/web/resource-manager/Microsoft.Web/2016-03-01/Certificates.json @@ -450,7 +450,7 @@ } }, "Resource": { - "description": "Azure resource.", + "description": "Azure resource. This resource is tracked in Azure Resource Manager", "required": [ "location" ], diff --git a/specification/web/resource-manager/Microsoft.Web/2016-03-01/DeletedWebApps.json b/specification/web/resource-manager/Microsoft.Web/2016-03-01/DeletedWebApps.json index 791aae74bc72..a2a771b0b5f6 100644 --- a/specification/web/resource-manager/Microsoft.Web/2016-03-01/DeletedWebApps.json +++ b/specification/web/resource-manager/Microsoft.Web/2016-03-01/DeletedWebApps.json @@ -732,7 +732,7 @@ } }, "Resource": { - "description": "Azure resource.", + "description": "Azure resource. This resource is tracked in Azure Resource Manager", "required": [ "location" ], diff --git a/specification/web/resource-manager/Microsoft.Web/2016-03-01/Provider.json b/specification/web/resource-manager/Microsoft.Web/2016-03-01/Provider.json index 08b23473d243..53d02bfbe046 100644 --- a/specification/web/resource-manager/Microsoft.Web/2016-03-01/Provider.json +++ b/specification/web/resource-manager/Microsoft.Web/2016-03-01/Provider.json @@ -38,6 +38,34 @@ } } }, + "/providers/Microsoft.Web/operations": { + "get": { + "tags": [ + "Provider" + ], + "operationId": "Provider_ListOperations", + "produces": [ + "application/json", + "text/json" + ], + "parameters": [ + { + "$ref": "#/parameters/apiVersionParameter" + } + ], + "responses": { + "200": { + "description": "OK", + "schema": { + "$ref": "#/definitions/CsmOperationCollection" + } + } + }, + "x-ms-pageable": { + "nextLinkName": "nextLink" + } + } + }, "/subscriptions/{subscriptionId}/providers/Microsoft.Web/availableStacks": { "get": { "tags": [ @@ -72,9 +100,166 @@ } }, "definitions": { + "CsmOperationCollection": { + "description": "Collection of Azure resource manager operation metadata.", + "required": [ + "value" + ], + "type": "object", + "properties": { + "value": { + "description": "Collection of resources.", + "type": "array", + "items": { + "$ref": "#/definitions/CsmOperationDescription" + } + }, + "nextLink": { + "description": "Link to next page of resources.", + "type": "string" + } + } + }, + "CsmOperationDescription": { + "type": "object", + "properties": { + "name": { + "type": "string" + }, + "display": { + "$ref": "#/definitions/CsmOperationDisplay" + }, + "origin": { + "type": "string" + }, + "properties": { + "$ref": "#/definitions/CsmOperationDescriptionProperties" + } + } + }, + "CsmOperationDescriptionProperties": { + "type": "object", + "properties": { + "serviceSpecification": { + "$ref": "#/definitions/ServiceSpecification" + } + } + }, + "CsmOperationDisplay": { + "type": "object", + "properties": { + "provider": { + "type": "string" + }, + "resource": { + "type": "string" + }, + "operation": { + "type": "string" + }, + "description": { + "type": "string" + } + } + }, + "Dimension": { + "type": "object", + "properties": { + "name": { + "type": "string" + }, + "displayName": { + "type": "string" + }, + "internalName": { + "type": "string" + }, + "toBeExportedForShoebox": { + "type": "boolean" + } + } + }, + "MetricAvailability": { + "type": "object", + "properties": { + "timeGrain": { + "type": "string" + }, + "blobDuration": { + "type": "string" + } + } + }, + "MetricSpecification": { + "type": "object", + "properties": { + "name": { + "type": "string" + }, + "displayName": { + "type": "string" + }, + "displayDescription": { + "type": "string" + }, + "unit": { + "type": "string" + }, + "aggregationType": { + "type": "string" + }, + "supportsInstanceLevelAggregation": { + "type": "boolean" + }, + "enableRegionalMdmAccount": { + "type": "boolean" + }, + "sourceMdmAccount": { + "type": "string" + }, + "sourceMdmNamespace": { + "type": "string" + }, + "metricFilterPattern": { + "type": "string" + }, + "fillGapWithZero": { + "type": "boolean" + }, + "isInternal": { + "type": "boolean" + }, + "dimensions": { + "type": "array", + "items": { + "$ref": "#/definitions/Dimension" + } + }, + "category": { + "type": "string" + }, + "availabilities": { + "type": "array", + "items": { + "$ref": "#/definitions/MetricAvailability" + } + } + } + }, "Object": { "type": "object", "properties": {} + }, + "ServiceSpecification": { + "type": "object", + "properties": { + "metricSpecifications": { + "type": "array", + "items": { + "$ref": "#/definitions/MetricSpecification" + } + } + } } }, "parameters": { diff --git a/specification/web/resource-manager/Microsoft.Web/2016-03-01/ResourceProvider.json b/specification/web/resource-manager/Microsoft.Web/2016-03-01/ResourceProvider.json index 2382b1b69851..b83279672898 100644 --- a/specification/web/resource-manager/Microsoft.Web/2016-03-01/ResourceProvider.json +++ b/specification/web/resource-manager/Microsoft.Web/2016-03-01/ResourceProvider.json @@ -476,7 +476,7 @@ "type": "object", "allOf": [ { - "$ref": "#/definitions/Resource" + "$ref": "#/definitions/ProxyOnlyResource" } ], "properties": { @@ -560,7 +560,7 @@ "type": "object", "allOf": [ { - "$ref": "#/definitions/Resource" + "$ref": "#/definitions/ProxyOnlyResource" } ], "properties": { @@ -649,11 +649,8 @@ } } }, - "Resource": { - "description": "Azure resource.", - "required": [ - "location" - ], + "ProxyOnlyResource": { + "description": "Azure proxy only resource. This resource is not tracked by Azure Resource Manager.", "properties": { "id": { "description": "Resource Id.", @@ -669,21 +666,10 @@ "description": "Kind of resource.", "type": "string" }, - "location": { - "description": "Resource Location.", - "type": "string" - }, "type": { "description": "Resource type.", "type": "string", "readOnly": true - }, - "tags": { - "description": "Resource tags.", - "type": "object", - "additionalProperties": { - "type": "string" - } } }, "x-ms-azure-resource": true @@ -792,7 +778,7 @@ "type": "object", "allOf": [ { - "$ref": "#/definitions/Resource" + "$ref": "#/definitions/ProxyOnlyResource" } ], "properties": { @@ -850,7 +836,7 @@ "type": "object", "allOf": [ { - "$ref": "#/definitions/Resource" + "$ref": "#/definitions/ProxyOnlyResource" } ], "properties": { diff --git a/specification/web/resource-manager/Microsoft.Web/2016-08-01/WebApps.json b/specification/web/resource-manager/Microsoft.Web/2016-08-01/WebApps.json index 70a81e865d99..b42d5817bc58 100644 --- a/specification/web/resource-manager/Microsoft.Web/2016-08-01/WebApps.json +++ b/specification/web/resource-manager/Microsoft.Web/2016-08-01/WebApps.json @@ -12383,7 +12383,7 @@ "type": "integer" }, "enabled": { - "description": "Enabled.", + "description": "True if configuration is enabled, false if it is disabled and null if configuration is not set.", "type": "boolean" } } @@ -12421,7 +12421,7 @@ "type": "object", "allOf": [ { - "$ref": "#/definitions/Resource" + "$ref": "#/definitions/ProxyOnlyResource" } ], "properties": { @@ -12554,7 +12554,7 @@ "type": "object", "allOf": [ { - "$ref": "#/definitions/Resource" + "$ref": "#/definitions/ProxyOnlyResource" } ], "properties": { @@ -12792,7 +12792,7 @@ "type": "object", "allOf": [ { - "$ref": "#/definitions/Resource" + "$ref": "#/definitions/ProxyOnlyResource" } ], "properties": { @@ -12910,7 +12910,7 @@ "type": "object", "allOf": [ { - "$ref": "#/definitions/Resource" + "$ref": "#/definitions/ProxyOnlyResource" } ], "properties": { @@ -13035,7 +13035,7 @@ "type": "object", "allOf": [ { - "$ref": "#/definitions/Resource" + "$ref": "#/definitions/ProxyOnlyResource" } ], "properties": { @@ -13043,7 +13043,7 @@ "description": "Deployment resource specific properties", "properties": { "id": { - "description": "ID.", + "description": "Identifier for deployment.", "type": "string", "x-ms-mutability": [ "create", @@ -13052,19 +13052,19 @@ }, "status": { "format": "int32", - "description": "Status.", + "description": "Deployment status.", "type": "integer" }, "message": { - "description": "Message.", + "description": "Details about deployment status.", "type": "string" }, "author": { - "description": "Author.", + "description": "Who authored the deployment.", "type": "string" }, "deployer": { - "description": "Deployer.", + "description": "Who performed the deployment.", "type": "string" }, "authorEmail": { @@ -13086,11 +13086,11 @@ "type": "string" }, "active": { - "description": "Active.", + "description": "True if deployment is currently active, false if completed and null if not started.", "type": "boolean" }, "details": { - "description": "Detail.", + "description": "Details on deployment.", "type": "string" } }, @@ -13123,7 +13123,7 @@ "type": "object", "properties": { "enabled": { - "description": "Enabled.", + "description": "True if configuration is enabled, false if it is disabled and null if configuration is not set.", "type": "boolean" } } @@ -13216,7 +13216,7 @@ "type": "integer" }, "enabled": { - "description": "Enabled.", + "description": "True if configuration is enabled, false if it is disabled and null if configuration is not set.", "type": "boolean" } } @@ -13244,7 +13244,7 @@ "type": "object", "allOf": [ { - "$ref": "#/definitions/Resource" + "$ref": "#/definitions/ProxyOnlyResource" } ], "properties": { @@ -13362,9 +13362,7 @@ "virtualIP": { "description": "Virtual IP address assigned to the hostname if IP based SSL is enabled.", "type": "string", - "x-ms-mutability": [ - "read" - ] + "readOnly": true } }, "x-ms-client-flatten": true @@ -13477,7 +13475,7 @@ "type": "object", "allOf": [ { - "$ref": "#/definitions/Resource" + "$ref": "#/definitions/ProxyOnlyResource" } ], "properties": { @@ -13535,7 +13533,7 @@ "type": "object", "allOf": [ { - "$ref": "#/definitions/Resource" + "$ref": "#/definitions/ProxyOnlyResource" } ], "properties": { @@ -13562,7 +13560,7 @@ "type": "object", "allOf": [ { - "$ref": "#/definitions/Resource" + "$ref": "#/definitions/ProxyOnlyResource" } ], "properties": { @@ -13570,7 +13568,7 @@ "description": "Identifier resource specific properties", "properties": { "id": { - "description": "ID.", + "description": "String representation of the identity.", "type": "string" } }, @@ -13632,44 +13630,24 @@ "MSDeploy": { "description": "MSDeploy ARM PUT information", "type": "object", + "allOf": [ + { + "$ref": "#/definitions/ProxyOnlyResource" + } + ], "properties": { - "addOnPackages": { - "description": "List of Add-On packages. Add-On packages implicitly enable the Do Not Delete MSDeploy rule.", - "type": "array", - "items": { - "$ref": "#/definitions/MSDeployCore" - } - }, - "packageUri": { - "description": "Package URI", - "type": "string" - }, - "connectionString": { - "description": "SQL Connection String", - "type": "string" - }, - "dbType": { - "description": "Database Type", - "type": "string" - }, - "setParametersXmlFileUri": { - "description": "URI of MSDeploy Parameters file. Must not be set if SetParameters is used.", - "type": "string" - }, - "setParameters": { - "description": "MSDeploy Parameters. Must not be set if SetParametersXmlFileUri is used.", - "type": "array", - "items": { - "$ref": "#/definitions/MSDeployParameterEntry" - } - }, - "skipAppData": { - "description": "Controls whether the MSDeploy operation skips the AppData directory. If set to true, the existing AppData directory on the destination will not be deleted and overwritten.", - "type": "boolean" - }, - "appOffline": { - "description": "Sets the AppOffline rule while the MSDeploy operation executes.", - "type": "boolean" + "properties": { + "$ref": "#/definitions/MSDeployCore", + "properties": { + "addOnPackages": { + "description": "List of Add-On packages. Add-On packages implicitly enable the Do Not Delete MSDeploy rule.", + "type": "array", + "items": { + "$ref": "#/definitions/MSDeployCore" + } + } + }, + "x-ms-client-flatten": true } } }, @@ -13695,9 +13673,9 @@ }, "setParameters": { "description": "MSDeploy Parameters. Must not be set if SetParametersXmlFileUri is used.", - "type": "array", - "items": { - "$ref": "#/definitions/MSDeployParameterEntry" + "type": "object", + "additionalProperties": { + "type": "string" } }, "skipAppData": { @@ -13713,14 +13691,25 @@ "MSDeployLog": { "description": "MSDeploy log", "type": "object", + "allOf": [ + { + "$ref": "#/definitions/ProxyOnlyResource" + } + ], "properties": { - "entries": { - "description": "List of log entry messages", - "type": "array", - "items": { - "$ref": "#/definitions/MSDeployLogEntry" + "properties": { + "description": "MSDeployLog resource specific properties", + "properties": { + "entries": { + "description": "List of log entry messages", + "type": "array", + "items": { + "$ref": "#/definitions/MSDeployLogEntry" + }, + "readOnly": true + } }, - "readOnly": true + "x-ms-client-flatten": true } } }, @@ -13755,26 +13744,12 @@ } } }, - "MSDeployParameterEntry": { - "description": "MSDeploy ARM PUT core information", - "type": "object", - "properties": { - "name": { - "description": "Parameter name", - "type": "string" - }, - "value": { - "description": "Parameter value", - "type": "string" - } - } - }, "MSDeployStatus": { "description": "MSDeploy ARM response", "type": "object", "allOf": [ { - "$ref": "#/definitions/Resource" + "$ref": "#/definitions/ProxyOnlyResource" } ], "properties": { @@ -13829,7 +13804,7 @@ "type": "object", "allOf": [ { - "$ref": "#/definitions/Resource" + "$ref": "#/definitions/ProxyOnlyResource" } ], "properties": { @@ -13866,7 +13841,7 @@ "type": "object", "allOf": [ { - "$ref": "#/definitions/Resource" + "$ref": "#/definitions/ProxyOnlyResource" } ], "properties": { @@ -13923,7 +13898,7 @@ "type": "object", "allOf": [ { - "$ref": "#/definitions/Resource" + "$ref": "#/definitions/ProxyOnlyResource" } ], "properties": { @@ -14163,12 +14138,37 @@ } } }, + "ProxyOnlyResource": { + "description": "Azure proxy only resource. This resource is not tracked by Azure Resource Manager.", + "properties": { + "id": { + "description": "Resource Id.", + "type": "string", + "readOnly": true + }, + "name": { + "description": "Resource Name.", + "type": "string", + "readOnly": true + }, + "kind": { + "description": "Kind of resource.", + "type": "string" + }, + "type": { + "description": "Resource type.", + "type": "string", + "readOnly": true + } + }, + "x-ms-azure-resource": true + }, "PublicCertificate": { "description": "Public certificate object", "type": "object", "allOf": [ { - "$ref": "#/definitions/Resource" + "$ref": "#/definitions/ProxyOnlyResource" } ], "properties": { @@ -14224,26 +14224,37 @@ }, "PushSettings": { "description": "Push settings for the App.", - "required": [ - "isPushEnabled" - ], "type": "object", + "allOf": [ + { + "$ref": "#/definitions/ProxyOnlyResource" + } + ], "properties": { - "isPushEnabled": { - "description": "Gets or sets a flag indicating whether the Push endpoint is enabled.", - "type": "boolean" - }, - "tagWhitelistJson": { - "description": "Gets or sets a JSON string containing a list of tags that are whitelisted for use by the push registration endpoint.", - "type": "string" - }, - "tagsRequiringAuth": { - "description": "Gets or sets a JSON string containing a list of tags that require user authentication to be used in the push registration endpoint.\n Tags can consist of alphanumeric characters and the following:\n '_', '@', '#', '.', ':', '-'. \n Validation should be performed at the PushRequestHandler.", - "type": "string" - }, - "dynamicTagsJson": { - "description": "Gets or sets a JSON string containing a list of dynamic tags that will be evaluated from user claims in the push registration endpoint.", - "type": "string" + "properties": { + "description": "PushSettings resource specific properties", + "required": [ + "isPushEnabled" + ], + "properties": { + "isPushEnabled": { + "description": "Gets or sets a flag indicating whether the Push endpoint is enabled.", + "type": "boolean" + }, + "tagWhitelistJson": { + "description": "Gets or sets a JSON string containing a list of tags that are whitelisted for use by the push registration endpoint.", + "type": "string" + }, + "tagsRequiringAuth": { + "description": "Gets or sets a JSON string containing a list of tags that require user authentication to be used in the push registration endpoint.\n Tags can consist of alphanumeric characters and the following:\n '_', '@', '#', '.', ':', '-'. \n Validation should be performed at the PushRequestHandler.", + "type": "string" + }, + "dynamicTagsJson": { + "description": "Gets or sets a JSON string containing a list of dynamic tags that will be evaluated from user claims in the push registration endpoint.", + "type": "string" + } + }, + "x-ms-client-flatten": true } } }, @@ -14317,7 +14328,7 @@ "type": "object", "allOf": [ { - "$ref": "#/definitions/Resource" + "$ref": "#/definitions/ProxyOnlyResource" } ], "properties": { @@ -14367,7 +14378,7 @@ } }, "Resource": { - "description": "Azure resource.", + "description": "Azure resource. This resource is tracked in Azure Resource Manager", "required": [ "location" ], @@ -14504,7 +14515,7 @@ "type": "object", "allOf": [ { - "$ref": "#/definitions/Resource" + "$ref": "#/definitions/ProxyOnlyResource" } ], "properties": { @@ -14661,7 +14672,7 @@ "type": "object", "allOf": [ { - "$ref": "#/definitions/Resource" + "$ref": "#/definitions/ProxyOnlyResource" } ], "properties": { @@ -14738,7 +14749,7 @@ "type": "object", "allOf": [ { - "$ref": "#/definitions/Resource" + "$ref": "#/definitions/ProxyOnlyResource" } ], "properties": { @@ -14956,7 +14967,7 @@ "type": "object", "allOf": [ { - "$ref": "#/definitions/Resource" + "$ref": "#/definitions/ProxyOnlyResource" } ], "properties": { @@ -15401,7 +15412,7 @@ "type": "object", "allOf": [ { - "$ref": "#/definitions/Resource" + "$ref": "#/definitions/ProxyOnlyResource" } ], "properties": { @@ -15436,7 +15447,7 @@ "type": "object", "allOf": [ { - "$ref": "#/definitions/Resource" + "$ref": "#/definitions/ProxyOnlyResource" } ], "properties": { @@ -15465,7 +15476,7 @@ "type": "object", "allOf": [ { - "$ref": "#/definitions/Resource" + "$ref": "#/definitions/ProxyOnlyResource" } ], "properties": { @@ -15508,7 +15519,7 @@ "type": "object", "allOf": [ { - "$ref": "#/definitions/Resource" + "$ref": "#/definitions/ProxyOnlyResource" } ], "properties": { @@ -15563,7 +15574,7 @@ "type": "object", "allOf": [ { - "$ref": "#/definitions/Resource" + "$ref": "#/definitions/ProxyOnlyResource" } ], "properties": { @@ -15596,7 +15607,7 @@ "type": "object", "allOf": [ { - "$ref": "#/definitions/Resource" + "$ref": "#/definitions/ProxyOnlyResource" } ], "properties": { @@ -15673,7 +15684,7 @@ "type": "object", "allOf": [ { - "$ref": "#/definitions/Resource" + "$ref": "#/definitions/ProxyOnlyResource" } ], "properties": { @@ -15688,7 +15699,7 @@ "type": "object", "allOf": [ { - "$ref": "#/definitions/Resource" + "$ref": "#/definitions/ProxyOnlyResource" } ], "properties": { @@ -15801,7 +15812,7 @@ "type": "object", "allOf": [ { - "$ref": "#/definitions/Resource" + "$ref": "#/definitions/ProxyOnlyResource" } ], "properties": { @@ -15844,7 +15855,7 @@ "type": "object", "allOf": [ { - "$ref": "#/definitions/Resource" + "$ref": "#/definitions/ProxyOnlyResource" } ], "properties": { @@ -15925,7 +15936,7 @@ "type": "object", "allOf": [ { - "$ref": "#/definitions/Resource" + "$ref": "#/definitions/ProxyOnlyResource" } ], "properties": { @@ -15976,7 +15987,7 @@ "type": "object", "allOf": [ { - "$ref": "#/definitions/Resource" + "$ref": "#/definitions/ProxyOnlyResource" } ], "properties": { @@ -15998,7 +16009,7 @@ "type": "object", "allOf": [ { - "$ref": "#/definitions/Resource" + "$ref": "#/definitions/ProxyOnlyResource" } ], "properties": { @@ -16017,7 +16028,7 @@ "type": "object", "allOf": [ { - "$ref": "#/definitions/Resource" + "$ref": "#/definitions/ProxyOnlyResource" } ], "properties": { @@ -16100,7 +16111,7 @@ "type": "object", "allOf": [ { - "$ref": "#/definitions/Resource" + "$ref": "#/definitions/ProxyOnlyResource" } ], "properties": { @@ -16134,36 +16145,47 @@ "VnetInfo": { "description": "Virtual Network information contract.", "type": "object", + "allOf": [ + { + "$ref": "#/definitions/ProxyOnlyResource" + } + ], "properties": { - "vnetResourceId": { - "description": "The Virtual Network's resource ID.", - "type": "string" - }, - "certThumbprint": { - "description": "The client certificate thumbprint.", - "type": "string", - "readOnly": true - }, - "certBlob": { - "description": "A certificate file (.cer) blob containing the public key of the private key used to authenticate a \n Point-To-Site VPN connection.", - "type": "string" - }, - "routes": { - "description": "The routes that this Virtual Network connection uses.", - "type": "array", - "items": { - "$ref": "#/definitions/VnetRoute" + "properties": { + "description": "VnetInfo resource specific properties", + "properties": { + "vnetResourceId": { + "description": "The Virtual Network's resource ID.", + "type": "string" + }, + "certThumbprint": { + "description": "The client certificate thumbprint.", + "type": "string", + "readOnly": true + }, + "certBlob": { + "description": "A certificate file (.cer) blob containing the public key of the private key used to authenticate a \n Point-To-Site VPN connection.", + "type": "string" + }, + "routes": { + "description": "The routes that this Virtual Network connection uses.", + "type": "array", + "items": { + "$ref": "#/definitions/VnetRoute" + }, + "readOnly": true + }, + "resyncRequired": { + "description": "true if a resync is required; otherwise, false.", + "type": "boolean", + "readOnly": true + }, + "dnsServers": { + "description": "DNS servers to be used by this Virtual Network. This should be a comma-separated list of IP addresses.", + "type": "string" + } }, - "readOnly": true - }, - "resyncRequired": { - "description": "true if a resync is required; otherwise, false.", - "type": "boolean", - "readOnly": true - }, - "dnsServers": { - "description": "DNS servers to be used by this Virtual Network. This should be a comma-separated list of IP addresses.", - "type": "string" + "x-ms-client-flatten": true } } }, @@ -16172,7 +16194,7 @@ "type": "object", "allOf": [ { - "$ref": "#/definitions/Resource" + "$ref": "#/definitions/ProxyOnlyResource" } ], "properties": { diff --git a/specification/web/resource-manager/Microsoft.Web/2016-09-01/AppServiceEnvironments.json b/specification/web/resource-manager/Microsoft.Web/2016-09-01/AppServiceEnvironments.json index 7e97521e5654..c24107d6da69 100644 --- a/specification/web/resource-manager/Microsoft.Web/2016-09-01/AppServiceEnvironments.json +++ b/specification/web/resource-manager/Microsoft.Web/2016-09-01/AppServiceEnvironments.json @@ -2707,7 +2707,7 @@ "type": "object", "allOf": [ { - "$ref": "#/definitions/Resource" + "$ref": "#/definitions/ProxyOnlyResource" } ], "properties": { @@ -2847,28 +2847,64 @@ } } }, - "PushSettings": { - "description": "Push settings for the App.", - "required": [ - "isPushEnabled" - ], - "type": "object", + "ProxyOnlyResource": { + "description": "Azure proxy only resource. This resource is not tracked by Azure Resource Manager.", "properties": { - "isPushEnabled": { - "description": "Gets or sets a flag indicating whether the Push endpoint is enabled.", - "type": "boolean" + "id": { + "description": "Resource Id.", + "type": "string", + "readOnly": true }, - "tagWhitelistJson": { - "description": "Gets or sets a JSON string containing a list of tags that are whitelisted for use by the push registration endpoint.", - "type": "string" + "name": { + "description": "Resource Name.", + "type": "string", + "readOnly": true }, - "tagsRequiringAuth": { - "description": "Gets or sets a JSON string containing a list of tags that require user authentication to be used in the push registration endpoint.\n Tags can consist of alphanumeric characters and the following:\n '_', '@', '#', '.', ':', '-'. \n Validation should be performed at the PushRequestHandler.", + "kind": { + "description": "Kind of resource.", "type": "string" }, - "dynamicTagsJson": { - "description": "Gets or sets a JSON string containing a list of dynamic tags that will be evaluated from user claims in the push registration endpoint.", - "type": "string" + "type": { + "description": "Resource type.", + "type": "string", + "readOnly": true + } + }, + "x-ms-azure-resource": true + }, + "PushSettings": { + "description": "Push settings for the App.", + "type": "object", + "allOf": [ + { + "$ref": "#/definitions/ProxyOnlyResource" + } + ], + "properties": { + "properties": { + "description": "PushSettings resource specific properties", + "required": [ + "isPushEnabled" + ], + "properties": { + "isPushEnabled": { + "description": "Gets or sets a flag indicating whether the Push endpoint is enabled.", + "type": "boolean" + }, + "tagWhitelistJson": { + "description": "Gets or sets a JSON string containing a list of tags that are whitelisted for use by the push registration endpoint.", + "type": "string" + }, + "tagsRequiringAuth": { + "description": "Gets or sets a JSON string containing a list of tags that require user authentication to be used in the push registration endpoint.\n Tags can consist of alphanumeric characters and the following:\n '_', '@', '#', '.', ':', '-'. \n Validation should be performed at the PushRequestHandler.", + "type": "string" + }, + "dynamicTagsJson": { + "description": "Gets or sets a JSON string containing a list of dynamic tags that will be evaluated from user claims in the push registration endpoint.", + "type": "string" + } + }, + "x-ms-client-flatten": true } } }, @@ -2931,7 +2967,7 @@ } }, "Resource": { - "description": "Azure resource.", + "description": "Azure resource. This resource is tracked in Azure Resource Manager", "required": [ "location" ], @@ -3069,7 +3105,7 @@ "type": "object", "allOf": [ { - "$ref": "#/definitions/Resource" + "$ref": "#/definitions/ProxyOnlyResource" } ], "properties": { @@ -3998,7 +4034,7 @@ "type": "object", "allOf": [ { - "$ref": "#/definitions/Resource" + "$ref": "#/definitions/ProxyOnlyResource" } ], "properties": { @@ -4260,7 +4296,7 @@ "type": "object", "allOf": [ { - "$ref": "#/definitions/Resource" + "$ref": "#/definitions/ProxyOnlyResource" } ], "properties": { diff --git a/specification/web/resource-manager/Microsoft.Web/2016-09-01/AppServicePlans.json b/specification/web/resource-manager/Microsoft.Web/2016-09-01/AppServicePlans.json index cc9990895ed2..bcec1ee56a75 100644 --- a/specification/web/resource-manager/Microsoft.Web/2016-09-01/AppServicePlans.json +++ b/specification/web/resource-manager/Microsoft.Web/2016-09-01/AppServicePlans.json @@ -1797,7 +1797,7 @@ "type": "object", "allOf": [ { - "$ref": "#/definitions/Resource" + "$ref": "#/definitions/ProxyOnlyResource" } ], "properties": { @@ -1871,7 +1871,7 @@ "type": "object", "allOf": [ { - "$ref": "#/definitions/Resource" + "$ref": "#/definitions/ProxyOnlyResource" } ], "properties": { @@ -1898,7 +1898,7 @@ "type": "object", "allOf": [ { - "$ref": "#/definitions/Resource" + "$ref": "#/definitions/ProxyOnlyResource" } ], "properties": { @@ -1953,28 +1953,64 @@ } } }, - "PushSettings": { - "description": "Push settings for the App.", - "required": [ - "isPushEnabled" - ], - "type": "object", + "ProxyOnlyResource": { + "description": "Azure proxy only resource. This resource is not tracked by Azure Resource Manager.", "properties": { - "isPushEnabled": { - "description": "Gets or sets a flag indicating whether the Push endpoint is enabled.", - "type": "boolean" + "id": { + "description": "Resource Id.", + "type": "string", + "readOnly": true }, - "tagWhitelistJson": { - "description": "Gets or sets a JSON string containing a list of tags that are whitelisted for use by the push registration endpoint.", - "type": "string" + "name": { + "description": "Resource Name.", + "type": "string", + "readOnly": true }, - "tagsRequiringAuth": { - "description": "Gets or sets a JSON string containing a list of tags that require user authentication to be used in the push registration endpoint.\n Tags can consist of alphanumeric characters and the following:\n '_', '@', '#', '.', ':', '-'. \n Validation should be performed at the PushRequestHandler.", + "kind": { + "description": "Kind of resource.", "type": "string" }, - "dynamicTagsJson": { - "description": "Gets or sets a JSON string containing a list of dynamic tags that will be evaluated from user claims in the push registration endpoint.", - "type": "string" + "type": { + "description": "Resource type.", + "type": "string", + "readOnly": true + } + }, + "x-ms-azure-resource": true + }, + "PushSettings": { + "description": "Push settings for the App.", + "type": "object", + "allOf": [ + { + "$ref": "#/definitions/ProxyOnlyResource" + } + ], + "properties": { + "properties": { + "description": "PushSettings resource specific properties", + "required": [ + "isPushEnabled" + ], + "properties": { + "isPushEnabled": { + "description": "Gets or sets a flag indicating whether the Push endpoint is enabled.", + "type": "boolean" + }, + "tagWhitelistJson": { + "description": "Gets or sets a JSON string containing a list of tags that are whitelisted for use by the push registration endpoint.", + "type": "string" + }, + "tagsRequiringAuth": { + "description": "Gets or sets a JSON string containing a list of tags that require user authentication to be used in the push registration endpoint.\n Tags can consist of alphanumeric characters and the following:\n '_', '@', '#', '.', ':', '-'. \n Validation should be performed at the PushRequestHandler.", + "type": "string" + }, + "dynamicTagsJson": { + "description": "Gets or sets a JSON string containing a list of dynamic tags that will be evaluated from user claims in the push registration endpoint.", + "type": "string" + } + }, + "x-ms-client-flatten": true } } }, @@ -2037,7 +2073,7 @@ } }, "Resource": { - "description": "Azure resource.", + "description": "Azure resource. This resource is tracked in Azure Resource Manager", "required": [ "location" ], @@ -2195,7 +2231,7 @@ "type": "object", "allOf": [ { - "$ref": "#/definitions/Resource" + "$ref": "#/definitions/ProxyOnlyResource" } ], "properties": { @@ -3037,7 +3073,7 @@ "type": "object", "allOf": [ { - "$ref": "#/definitions/Resource" + "$ref": "#/definitions/ProxyOnlyResource" } ], "properties": { @@ -3071,36 +3107,47 @@ "VnetInfo": { "description": "Virtual Network information contract.", "type": "object", + "allOf": [ + { + "$ref": "#/definitions/ProxyOnlyResource" + } + ], "properties": { - "vnetResourceId": { - "description": "The Virtual Network's resource ID.", - "type": "string" - }, - "certThumbprint": { - "description": "The client certificate thumbprint.", - "type": "string", - "readOnly": true - }, - "certBlob": { - "description": "A certificate file (.cer) blob containing the public key of the private key used to authenticate a \n Point-To-Site VPN connection.", - "type": "string" - }, - "routes": { - "description": "The routes that this Virtual Network connection uses.", - "type": "array", - "items": { - "$ref": "#/definitions/VnetRoute" + "properties": { + "description": "VnetInfo resource specific properties", + "properties": { + "vnetResourceId": { + "description": "The Virtual Network's resource ID.", + "type": "string" + }, + "certThumbprint": { + "description": "The client certificate thumbprint.", + "type": "string", + "readOnly": true + }, + "certBlob": { + "description": "A certificate file (.cer) blob containing the public key of the private key used to authenticate a \n Point-To-Site VPN connection.", + "type": "string" + }, + "routes": { + "description": "The routes that this Virtual Network connection uses.", + "type": "array", + "items": { + "$ref": "#/definitions/VnetRoute" + }, + "readOnly": true + }, + "resyncRequired": { + "description": "true if a resync is required; otherwise, false.", + "type": "boolean", + "readOnly": true + }, + "dnsServers": { + "description": "DNS servers to be used by this Virtual Network. This should be a comma-separated list of IP addresses.", + "type": "string" + } }, - "readOnly": true - }, - "resyncRequired": { - "description": "true if a resync is required; otherwise, false.", - "type": "boolean", - "readOnly": true - }, - "dnsServers": { - "description": "DNS servers to be used by this Virtual Network. This should be a comma-separated list of IP addresses.", - "type": "string" + "x-ms-client-flatten": true } } }, @@ -3109,7 +3156,7 @@ "type": "object", "allOf": [ { - "$ref": "#/definitions/Resource" + "$ref": "#/definitions/ProxyOnlyResource" } ], "properties": {