diff --git a/specification/sql/resource-manager/Microsoft.Sql/preview/2015-05-01-preview/advisors.json b/specification/sql/resource-manager/Microsoft.Sql/preview/2015-05-01-preview/advisors.json index 551024a77dcd..4d33219bb8ef 100644 --- a/specification/sql/resource-manager/Microsoft.Sql/preview/2015-05-01-preview/advisors.json +++ b/specification/sql/resource-manager/Microsoft.Sql/preview/2015-05-01-preview/advisors.json @@ -486,38 +486,6 @@ } }, "definitions": { - "Resource": { - "description": "ARM resource.", - "type": "object", - "properties": { - "id": { - "description": "Resource ID.", - "type": "string", - "readOnly": true - }, - "name": { - "description": "Resource name.", - "type": "string", - "readOnly": true - }, - "type": { - "description": "Resource type.", - "type": "string", - "readOnly": true - } - }, - "x-ms-azure-resource": true - }, - "ProxyResource": { - "description": "ARM proxy resource.", - "type": "object", - "allOf": [ - { - "$ref": "#/definitions/Resource" - } - ], - "properties": {} - }, "AdvisorProperties": { "description": "Properties for a Database, Server or Elastic Pool Advisor.", "required": [ @@ -923,7 +891,7 @@ "type": "object", "allOf": [ { - "$ref": "#/definitions/ProxyResource" + "$ref": "../../../common/v1/types.json#/definitions/ProxyResource" } ], "properties": { @@ -949,7 +917,7 @@ "type": "object", "allOf": [ { - "$ref": "#/definitions/ProxyResource" + "$ref": "../../../common/v1/types.json#/definitions/ProxyResource" } ], "properties": { diff --git a/specification/sql/resource-manager/Microsoft.Sql/preview/2015-05-01-preview/blobAuditingPolicies.json b/specification/sql/resource-manager/Microsoft.Sql/preview/2015-05-01-preview/blobAuditingPolicies.json index 92b1c570230f..3cf853992136 100644 --- a/specification/sql/resource-manager/Microsoft.Sql/preview/2015-05-01-preview/blobAuditingPolicies.json +++ b/specification/sql/resource-manager/Microsoft.Sql/preview/2015-05-01-preview/blobAuditingPolicies.json @@ -208,44 +208,12 @@ } } }, - "Resource": { - "description": "ARM resource.", - "type": "object", - "properties": { - "id": { - "description": "Resource ID.", - "type": "string", - "readOnly": true - }, - "name": { - "description": "Resource name.", - "type": "string", - "readOnly": true - }, - "type": { - "description": "Resource type.", - "type": "string", - "readOnly": true - } - }, - "x-ms-azure-resource": true - }, - "ProxyResource": { - "description": "ARM proxy resource.", - "type": "object", - "allOf": [ - { - "$ref": "#/definitions/Resource" - } - ], - "properties": {} - }, "DatabaseBlobAuditingPolicy": { "description": "A database blob auditing policy.", "type": "object", "allOf": [ { - "$ref": "#/definitions/ProxyResource" + "$ref": "../../../common/v1/types.json#/definitions/ProxyResource" } ], "properties": { diff --git a/specification/sql/resource-manager/Microsoft.Sql/preview/2015-05-01-preview/databaseAutomaticTuning.json b/specification/sql/resource-manager/Microsoft.Sql/preview/2015-05-01-preview/databaseAutomaticTuning.json index c781a5f5f378..0b3a16bfc6c5 100644 --- a/specification/sql/resource-manager/Microsoft.Sql/preview/2015-05-01-preview/databaseAutomaticTuning.json +++ b/specification/sql/resource-manager/Microsoft.Sql/preview/2015-05-01-preview/databaseAutomaticTuning.json @@ -210,44 +210,12 @@ } } }, - "Resource": { - "description": "ARM resource.", - "type": "object", - "properties": { - "id": { - "description": "Resource ID.", - "type": "string", - "readOnly": true - }, - "name": { - "description": "Resource name.", - "type": "string", - "readOnly": true - }, - "type": { - "description": "Resource type.", - "type": "string", - "readOnly": true - } - }, - "x-ms-azure-resource": true - }, - "ProxyResource": { - "description": "ARM proxy resource.", - "type": "object", - "allOf": [ - { - "$ref": "#/definitions/Resource" - } - ], - "properties": {} - }, "DatabaseAutomaticTuning": { "description": "Database-level Automatic Tuning.", "type": "object", "allOf": [ { - "$ref": "#/definitions/ProxyResource" + "$ref": "../../../common/v1/types.json#/definitions/ProxyResource" } ], "properties": { diff --git a/specification/sql/resource-manager/Microsoft.Sql/preview/2015-05-01-preview/encryptionProtectors.json b/specification/sql/resource-manager/Microsoft.Sql/preview/2015-05-01-preview/encryptionProtectors.json index 2222dfcc3533..f830b727a15b 100644 --- a/specification/sql/resource-manager/Microsoft.Sql/preview/2015-05-01-preview/encryptionProtectors.json +++ b/specification/sql/resource-manager/Microsoft.Sql/preview/2015-05-01-preview/encryptionProtectors.json @@ -239,44 +239,12 @@ } } }, - "Resource": { - "description": "ARM resource.", - "type": "object", - "properties": { - "id": { - "description": "Resource ID.", - "type": "string", - "readOnly": true - }, - "name": { - "description": "Resource name.", - "type": "string", - "readOnly": true - }, - "type": { - "description": "Resource type.", - "type": "string", - "readOnly": true - } - }, - "x-ms-azure-resource": true - }, - "ProxyResource": { - "description": "ARM proxy resource.", - "type": "object", - "allOf": [ - { - "$ref": "#/definitions/Resource" - } - ], - "properties": {} - }, "EncryptionProtector": { "description": "The server encryption protector.", "type": "object", "allOf": [ { - "$ref": "#/definitions/ProxyResource" + "$ref": "../../../common/v1/types.json#/definitions/ProxyResource" } ], "properties": { diff --git a/specification/sql/resource-manager/Microsoft.Sql/preview/2015-05-01-preview/failoverGroups.json b/specification/sql/resource-manager/Microsoft.Sql/preview/2015-05-01-preview/failoverGroups.json index 30041b08e990..478a3e56320d 100644 --- a/specification/sql/resource-manager/Microsoft.Sql/preview/2015-05-01-preview/failoverGroups.json +++ b/specification/sql/resource-manager/Microsoft.Sql/preview/2015-05-01-preview/failoverGroups.json @@ -531,44 +531,12 @@ } } }, - "Resource": { - "description": "ARM resource.", - "type": "object", - "properties": { - "id": { - "description": "Resource ID.", - "type": "string", - "readOnly": true - }, - "name": { - "description": "Resource name.", - "type": "string", - "readOnly": true - }, - "type": { - "description": "Resource type.", - "type": "string", - "readOnly": true - } - }, - "x-ms-azure-resource": true - }, - "ProxyResource": { - "description": "ARM proxy resource.", - "type": "object", - "allOf": [ - { - "$ref": "#/definitions/Resource" - } - ], - "properties": {} - }, "FailoverGroup": { "description": "A failover group.", "type": "object", "allOf": [ { - "$ref": "#/definitions/ProxyResource" + "$ref": "../../../common/v1/types.json#/definitions/ProxyResource" } ], "properties": { diff --git a/specification/sql/resource-manager/Microsoft.Sql/preview/2015-05-01-preview/managedInstances.json b/specification/sql/resource-manager/Microsoft.Sql/preview/2015-05-01-preview/managedInstances.json index 75e19a2b6ea5..aa2587737227 100644 --- a/specification/sql/resource-manager/Microsoft.Sql/preview/2015-05-01-preview/managedInstances.json +++ b/specification/sql/resource-manager/Microsoft.Sql/preview/2015-05-01-preview/managedInstances.json @@ -304,65 +304,6 @@ } } }, - "ResourceIdentity": { - "description": "Azure Active Directory identity configuration for a resource.", - "type": "object", - "properties": { - "principalId": { - "format": "uuid", - "description": "The Azure Active Directory principal id.", - "type": "string", - "readOnly": true - }, - "type": { - "description": "The identity type. Set this to 'SystemAssigned' in order to automatically create and assign an Azure Active Directory principal for the resource.", - "enum": [ - "SystemAssigned" - ], - "type": "string", - "x-ms-enum": { - "name": "IdentityType", - "modelAsString": true - } - }, - "tenantId": { - "format": "uuid", - "description": "The Azure Active Directory tenant id.", - "type": "string", - "readOnly": true - } - } - }, - "Sku": { - "description": "An ARM Resource SKU.", - "required": [ - "name" - ], - "type": "object", - "properties": { - "name": { - "description": "The name of the SKU, typically, a letter + Number code, e.g. P3.", - "type": "string" - }, - "tier": { - "description": "The tier of the particular SKU, e.g. Basic, Premium.", - "type": "string" - }, - "size": { - "description": "Size of the particular SKU", - "type": "string" - }, - "family": { - "description": "If the service has different generations of hardware, for the same SKU, then that can be captured here.", - "type": "string" - }, - "capacity": { - "format": "int32", - "description": "Capacity of the particular SKU.", - "type": "integer" - } - } - }, "ManagedInstanceProperties": { "description": "The properties of a managed instance.", "type": "object", @@ -413,57 +354,6 @@ } } }, - "Resource": { - "description": "ARM resource.", - "type": "object", - "properties": { - "id": { - "description": "Resource ID.", - "type": "string", - "readOnly": true - }, - "name": { - "description": "Resource name.", - "type": "string", - "readOnly": true - }, - "type": { - "description": "Resource type.", - "type": "string", - "readOnly": true - } - }, - "x-ms-azure-resource": true - }, - "TrackedResource": { - "description": "ARM tracked top level resource.", - "required": [ - "location" - ], - "type": "object", - "allOf": [ - { - "$ref": "#/definitions/Resource" - } - ], - "properties": { - "location": { - "description": "Resource location.", - "type": "string", - "x-ms-mutability": [ - "read", - "create" - ] - }, - "tags": { - "description": "Resource tags.", - "type": "object", - "additionalProperties": { - "type": "string" - } - } - } - }, "ManagedInstance": { "description": "An Azure SQL managed instance.", "required": [ @@ -472,12 +362,12 @@ "type": "object", "allOf": [ { - "$ref": "#/definitions/TrackedResource" + "$ref": "../../../common/v1/types.json#/definitions/TrackedResource" } ], "properties": { "identity": { - "$ref": "#/definitions/ResourceIdentity", + "$ref": "../../../common/v1/types.json#/definitions/ResourceIdentity", "description": "The Azure Active Directory identity of the managed instance.", "x-ms-mutability": [ "read", @@ -485,7 +375,7 @@ ] }, "sku": { - "$ref": "#/definitions/Sku", + "$ref": "../../../common/v1/types.json#/definitions/Sku", "description": "Managed instance sku" }, "properties": { @@ -500,7 +390,7 @@ "type": "object", "properties": { "sku": { - "$ref": "#/definitions/Sku", + "$ref": "../../../common/v1/types.json#/definitions/Sku", "description": "Managed instance sku" }, "properties": { diff --git a/specification/sql/resource-manager/Microsoft.Sql/preview/2015-05-01-preview/serverKeys.json b/specification/sql/resource-manager/Microsoft.Sql/preview/2015-05-01-preview/serverKeys.json index 7496e64c061f..eddac31684e7 100644 --- a/specification/sql/resource-manager/Microsoft.Sql/preview/2015-05-01-preview/serverKeys.json +++ b/specification/sql/resource-manager/Microsoft.Sql/preview/2015-05-01-preview/serverKeys.json @@ -275,44 +275,12 @@ } } }, - "Resource": { - "description": "ARM resource.", - "type": "object", - "properties": { - "id": { - "description": "Resource ID.", - "type": "string", - "readOnly": true - }, - "name": { - "description": "Resource name.", - "type": "string", - "readOnly": true - }, - "type": { - "description": "Resource type.", - "type": "string", - "readOnly": true - } - }, - "x-ms-azure-resource": true - }, - "ProxyResource": { - "description": "ARM proxy resource.", - "type": "object", - "allOf": [ - { - "$ref": "#/definitions/Resource" - } - ], - "properties": {} - }, "ServerKey": { "description": "A server key.", "type": "object", "allOf": [ { - "$ref": "#/definitions/ProxyResource" + "$ref": "../../../common/v1/types.json#/definitions/ProxyResource" } ], "properties": { diff --git a/specification/sql/resource-manager/Microsoft.Sql/preview/2015-05-01-preview/servers.json b/specification/sql/resource-manager/Microsoft.Sql/preview/2015-05-01-preview/servers.json index 2b6e9046d2a2..a0a386c83c18 100644 --- a/specification/sql/resource-manager/Microsoft.Sql/preview/2015-05-01-preview/servers.json +++ b/specification/sql/resource-manager/Microsoft.Sql/preview/2015-05-01-preview/servers.json @@ -304,35 +304,6 @@ } } }, - "ResourceIdentity": { - "description": "Azure Active Directory identity configuration for a resource.", - "type": "object", - "properties": { - "principalId": { - "format": "uuid", - "description": "The Azure Active Directory principal id.", - "type": "string", - "readOnly": true - }, - "type": { - "description": "The identity type. Set this to 'SystemAssigned' in order to automatically create and assign an Azure Active Directory principal for the resource.", - "enum": [ - "SystemAssigned" - ], - "type": "string", - "x-ms-enum": { - "name": "IdentityType", - "modelAsString": true - } - }, - "tenantId": { - "format": "uuid", - "description": "The Azure Active Directory tenant id.", - "type": "string", - "readOnly": true - } - } - }, "ServerProperties": { "description": "The properties of a server.", "type": "object", @@ -369,57 +340,6 @@ } } }, - "Resource": { - "description": "ARM resource.", - "type": "object", - "properties": { - "id": { - "description": "Resource ID.", - "type": "string", - "readOnly": true - }, - "name": { - "description": "Resource name.", - "type": "string", - "readOnly": true - }, - "type": { - "description": "Resource type.", - "type": "string", - "readOnly": true - } - }, - "x-ms-azure-resource": true - }, - "TrackedResource": { - "description": "ARM tracked top level resource.", - "required": [ - "location" - ], - "type": "object", - "allOf": [ - { - "$ref": "#/definitions/Resource" - } - ], - "properties": { - "location": { - "description": "Resource location.", - "type": "string", - "x-ms-mutability": [ - "read", - "create" - ] - }, - "tags": { - "description": "Resource tags.", - "type": "object", - "additionalProperties": { - "type": "string" - } - } - } - }, "Server": { "description": "An Azure SQL Database server.", "required": [ @@ -428,12 +348,12 @@ "type": "object", "allOf": [ { - "$ref": "#/definitions/TrackedResource" + "$ref": "../../../common/v1/types.json#/definitions/TrackedResource" } ], "properties": { "identity": { - "$ref": "#/definitions/ResourceIdentity", + "$ref": "../../../common/v1/types.json#/definitions/ResourceIdentity", "description": "The Azure Active Directory identity of the server.", "x-ms-mutability": [ "read", diff --git a/specification/sql/resource-manager/Microsoft.Sql/preview/2015-05-01-preview/syncAgents.json b/specification/sql/resource-manager/Microsoft.Sql/preview/2015-05-01-preview/syncAgents.json index 5da0e3ce7f0d..fb223eb22bc2 100644 --- a/specification/sql/resource-manager/Microsoft.Sql/preview/2015-05-01-preview/syncAgents.json +++ b/specification/sql/resource-manager/Microsoft.Sql/preview/2015-05-01-preview/syncAgents.json @@ -390,44 +390,12 @@ } } }, - "Resource": { - "description": "ARM resource.", - "type": "object", - "properties": { - "id": { - "description": "Resource ID.", - "type": "string", - "readOnly": true - }, - "name": { - "description": "Resource name.", - "type": "string", - "readOnly": true - }, - "type": { - "description": "Resource type.", - "type": "string", - "readOnly": true - } - }, - "x-ms-azure-resource": true - }, - "ProxyResource": { - "description": "ARM proxy resource.", - "type": "object", - "allOf": [ - { - "$ref": "#/definitions/Resource" - } - ], - "properties": {} - }, "SyncAgent": { "description": "An Azure SQL Database sync agent.", "type": "object", "allOf": [ { - "$ref": "#/definitions/ProxyResource" + "$ref": "../../../common/v1/types.json#/definitions/ProxyResource" } ], "properties": { @@ -536,7 +504,7 @@ "type": "object", "allOf": [ { - "$ref": "#/definitions/ProxyResource" + "$ref": "../../../common/v1/types.json#/definitions/ProxyResource" } ], "properties": { diff --git a/specification/sql/resource-manager/Microsoft.Sql/preview/2015-05-01-preview/syncGroups.json b/specification/sql/resource-manager/Microsoft.Sql/preview/2015-05-01-preview/syncGroups.json index 0167df498d45..aeffda81a886 100644 --- a/specification/sql/resource-manager/Microsoft.Sql/preview/2015-05-01-preview/syncGroups.json +++ b/specification/sql/resource-manager/Microsoft.Sql/preview/2015-05-01-preview/syncGroups.json @@ -948,28 +948,6 @@ } } }, - "Resource": { - "description": "ARM resource.", - "type": "object", - "properties": { - "id": { - "description": "Resource ID.", - "type": "string", - "readOnly": true - }, - "name": { - "description": "Resource name.", - "type": "string", - "readOnly": true - }, - "type": { - "description": "Resource type.", - "type": "string", - "readOnly": true - } - }, - "x-ms-azure-resource": true - }, "SyncGroupSchemaTable": { "description": "Properties of table in sync group schema.", "type": "object", @@ -1005,22 +983,12 @@ } } }, - "ProxyResource": { - "description": "ARM proxy resource.", - "type": "object", - "allOf": [ - { - "$ref": "#/definitions/Resource" - } - ], - "properties": {} - }, "SyncGroup": { "description": "An Azure SQL Database sync group.", "type": "object", "allOf": [ { - "$ref": "#/definitions/ProxyResource" + "$ref": "../../../common/v1/types.json#/definitions/ProxyResource" } ], "properties": { diff --git a/specification/sql/resource-manager/Microsoft.Sql/preview/2015-05-01-preview/syncMembers.json b/specification/sql/resource-manager/Microsoft.Sql/preview/2015-05-01-preview/syncMembers.json index fa01a242cfdd..419a1b9835d4 100644 --- a/specification/sql/resource-manager/Microsoft.Sql/preview/2015-05-01-preview/syncMembers.json +++ b/specification/sql/resource-manager/Microsoft.Sql/preview/2015-05-01-preview/syncMembers.json @@ -560,44 +560,12 @@ } } }, - "Resource": { - "description": "ARM resource.", - "type": "object", - "properties": { - "id": { - "description": "Resource ID.", - "type": "string", - "readOnly": true - }, - "name": { - "description": "Resource name.", - "type": "string", - "readOnly": true - }, - "type": { - "description": "Resource type.", - "type": "string", - "readOnly": true - } - }, - "x-ms-azure-resource": true - }, - "ProxyResource": { - "description": "ARM proxy resource.", - "type": "object", - "allOf": [ - { - "$ref": "#/definitions/Resource" - } - ], - "properties": {} - }, "SyncMember": { "description": "An Azure SQL Database sync member.", "type": "object", "allOf": [ { - "$ref": "#/definitions/ProxyResource" + "$ref": "../../../common/v1/types.json#/definitions/ProxyResource" } ], "properties": { diff --git a/specification/sql/resource-manager/Microsoft.Sql/preview/2015-05-01-preview/usages.json b/specification/sql/resource-manager/Microsoft.Sql/preview/2015-05-01-preview/usages.json index 2d578bd03300..9508cd8d5489 100644 --- a/specification/sql/resource-manager/Microsoft.Sql/preview/2015-05-01-preview/usages.json +++ b/specification/sql/resource-manager/Microsoft.Sql/preview/2015-05-01-preview/usages.json @@ -155,44 +155,12 @@ } } }, - "Resource": { - "description": "ARM resource.", - "type": "object", - "properties": { - "id": { - "description": "Resource ID.", - "type": "string", - "readOnly": true - }, - "name": { - "description": "Resource name.", - "type": "string", - "readOnly": true - }, - "type": { - "description": "Resource type.", - "type": "string", - "readOnly": true - } - }, - "x-ms-azure-resource": true - }, - "ProxyResource": { - "description": "ARM proxy resource.", - "type": "object", - "allOf": [ - { - "$ref": "#/definitions/Resource" - } - ], - "properties": {} - }, "SubscriptionUsage": { "description": "Usage Metric of a Subscription in a Location.", "type": "object", "allOf": [ { - "$ref": "#/definitions/ProxyResource" + "$ref": "../../../common/v1/types.json#/definitions/ProxyResource" } ], "properties": { diff --git a/specification/sql/resource-manager/Microsoft.Sql/preview/2015-05-01-preview/virtualNetworkRules.json b/specification/sql/resource-manager/Microsoft.Sql/preview/2015-05-01-preview/virtualNetworkRules.json index 5d6ca4a3227c..c220bbf2fca3 100644 --- a/specification/sql/resource-manager/Microsoft.Sql/preview/2015-05-01-preview/virtualNetworkRules.json +++ b/specification/sql/resource-manager/Microsoft.Sql/preview/2015-05-01-preview/virtualNetworkRules.json @@ -250,44 +250,12 @@ } } }, - "Resource": { - "description": "ARM resource.", - "type": "object", - "properties": { - "id": { - "description": "Resource ID.", - "type": "string", - "readOnly": true - }, - "name": { - "description": "Resource name.", - "type": "string", - "readOnly": true - }, - "type": { - "description": "Resource type.", - "type": "string", - "readOnly": true - } - }, - "x-ms-azure-resource": true - }, - "ProxyResource": { - "description": "ARM proxy resource.", - "type": "object", - "allOf": [ - { - "$ref": "#/definitions/Resource" - } - ], - "properties": {} - }, "VirtualNetworkRule": { "description": "A virtual network rule.", "type": "object", "allOf": [ { - "$ref": "#/definitions/ProxyResource" + "$ref": "../../../common/v1/types.json#/definitions/ProxyResource" } ], "properties": { diff --git a/specification/sql/resource-manager/Microsoft.Sql/preview/2017-03-01-preview/cancelOperations.json b/specification/sql/resource-manager/Microsoft.Sql/preview/2017-03-01-preview/cancelOperations.json index 34aaf23d5bf2..92c259a2f671 100644 --- a/specification/sql/resource-manager/Microsoft.Sql/preview/2017-03-01-preview/cancelOperations.json +++ b/specification/sql/resource-manager/Microsoft.Sql/preview/2017-03-01-preview/cancelOperations.json @@ -222,22 +222,12 @@ } } }, - "ProxyResource": { - "description": "ARM proxy resource.", - "type": "object", - "allOf": [ - { - "$ref": "#/definitions/Resource" - } - ], - "properties": {} - }, "DatabaseOperation": { "description": "A database operation.", "type": "object", "allOf": [ { - "$ref": "#/definitions/ProxyResource" + "$ref": "../../../common/v1/types.json#/definitions/ProxyResource" } ], "properties": { @@ -247,28 +237,6 @@ "x-ms-client-flatten": true } } - }, - "Resource": { - "description": "ARM resource.", - "type": "object", - "properties": { - "id": { - "description": "Resource ID.", - "type": "string", - "readOnly": true - }, - "name": { - "description": "Resource name.", - "type": "string", - "readOnly": true - }, - "type": { - "description": "Resource type.", - "type": "string", - "readOnly": true - } - }, - "x-ms-azure-resource": true } }, "parameters": { diff --git a/specification/sql/resource-manager/Microsoft.Sql/preview/2017-03-01-preview/dataWarehouseUserActivities.json b/specification/sql/resource-manager/Microsoft.Sql/preview/2017-03-01-preview/dataWarehouseUserActivities.json index 2f5edfd5272f..ccd361e0df59 100644 --- a/specification/sql/resource-manager/Microsoft.Sql/preview/2017-03-01-preview/dataWarehouseUserActivities.json +++ b/specification/sql/resource-manager/Microsoft.Sql/preview/2017-03-01-preview/dataWarehouseUserActivities.json @@ -86,44 +86,12 @@ } } }, - "Resource": { - "description": "ARM resource.", - "type": "object", - "properties": { - "id": { - "description": "Resource ID.", - "type": "string", - "readOnly": true - }, - "name": { - "description": "Resource name.", - "type": "string", - "readOnly": true - }, - "type": { - "description": "Resource type.", - "type": "string", - "readOnly": true - } - }, - "x-ms-azure-resource": true - }, - "ProxyResource": { - "description": "ARM proxy resource.", - "type": "object", - "allOf": [ - { - "$ref": "#/definitions/Resource" - } - ], - "properties": {} - }, "DataWarehouseUserActivities": { "description": "User activities of a data warehouse", "type": "object", "allOf": [ { - "$ref": "#/definitions/ProxyResource" + "$ref": "../../../common/v1/types.json#/definitions/ProxyResource" } ], "properties": { diff --git a/specification/sql/resource-manager/Microsoft.Sql/preview/2017-03-01-preview/databaseVulnerabilityAssessmentBaselines.json b/specification/sql/resource-manager/Microsoft.Sql/preview/2017-03-01-preview/databaseVulnerabilityAssessmentBaselines.json index 727c934b4357..d1a60d1507aa 100644 --- a/specification/sql/resource-manager/Microsoft.Sql/preview/2017-03-01-preview/databaseVulnerabilityAssessmentBaselines.json +++ b/specification/sql/resource-manager/Microsoft.Sql/preview/2017-03-01-preview/databaseVulnerabilityAssessmentBaselines.json @@ -295,44 +295,12 @@ } } }, - "Resource": { - "description": "ARM resource.", - "type": "object", - "properties": { - "id": { - "description": "Resource ID.", - "type": "string", - "readOnly": true - }, - "name": { - "description": "Resource name.", - "type": "string", - "readOnly": true - }, - "type": { - "description": "Resource type.", - "type": "string", - "readOnly": true - } - }, - "x-ms-azure-resource": true - }, - "ProxyResource": { - "description": "ARM proxy resource.", - "type": "object", - "allOf": [ - { - "$ref": "#/definitions/Resource" - } - ], - "properties": {} - }, "DatabaseVulnerabilityAssessmentRuleBaseline": { "description": "A database vulnerability assessment rule baseline.", "type": "object", "allOf": [ { - "$ref": "#/definitions/ProxyResource" + "$ref": "../../../common/v1/types.json#/definitions/ProxyResource" } ], "properties": { diff --git a/specification/sql/resource-manager/Microsoft.Sql/preview/2017-03-01-preview/databaseVulnerabilityAssessments.json b/specification/sql/resource-manager/Microsoft.Sql/preview/2017-03-01-preview/databaseVulnerabilityAssessments.json index 137eb2b2dd57..b21e461b321b 100644 --- a/specification/sql/resource-manager/Microsoft.Sql/preview/2017-03-01-preview/databaseVulnerabilityAssessments.json +++ b/specification/sql/resource-manager/Microsoft.Sql/preview/2017-03-01-preview/databaseVulnerabilityAssessments.json @@ -261,44 +261,12 @@ } } }, - "Resource": { - "description": "ARM resource.", - "type": "object", - "properties": { - "id": { - "description": "Resource ID.", - "type": "string", - "readOnly": true - }, - "name": { - "description": "Resource name.", - "type": "string", - "readOnly": true - }, - "type": { - "description": "Resource type.", - "type": "string", - "readOnly": true - } - }, - "x-ms-azure-resource": true - }, - "ProxyResource": { - "description": "ARM proxy resource.", - "type": "object", - "allOf": [ - { - "$ref": "#/definitions/Resource" - } - ], - "properties": {} - }, "DatabaseVulnerabilityAssessment": { "description": "A database vulnerability assessment.", "type": "object", "allOf": [ { - "$ref": "#/definitions/ProxyResource" + "$ref": "../../../common/v1/types.json#/definitions/ProxyResource" } ], "properties": { diff --git a/specification/sql/resource-manager/Microsoft.Sql/preview/2017-03-01-preview/databases.json b/specification/sql/resource-manager/Microsoft.Sql/preview/2017-03-01-preview/databases.json index 7ed0ddc75746..b169058d891e 100644 --- a/specification/sql/resource-manager/Microsoft.Sql/preview/2017-03-01-preview/databases.json +++ b/specification/sql/resource-manager/Microsoft.Sql/preview/2017-03-01-preview/databases.json @@ -502,33 +502,6 @@ } } }, - "Sku": { - "description": "An ARM Resource SKU.", - "type": "object", - "properties": { - "name": { - "description": "The name of the SKU, typically, a letter + Number code, e.g. P3.", - "type": "string" - }, - "tier": { - "description": "The tier of the particular SKU, e.g. Basic, Premium.", - "type": "string" - }, - "size": { - "description": "Size of the particular SKU", - "type": "string" - }, - "family": { - "description": "If the service has different generations of hardware, for the same SKU, then that can be captured here.", - "type": "string" - }, - "capacity": { - "format": "int32", - "description": "Capacity of the particular SKU.", - "type": "integer" - } - } - }, "DatabaseProperties": { "description": "The database's properties.", "type": "object", @@ -718,57 +691,6 @@ } } }, - "Resource": { - "description": "ARM resource.", - "type": "object", - "properties": { - "id": { - "description": "Resource ID.", - "type": "string", - "readOnly": true - }, - "name": { - "description": "Resource name.", - "type": "string", - "readOnly": true - }, - "type": { - "description": "Resource type.", - "type": "string", - "readOnly": true - } - }, - "x-ms-azure-resource": true - }, - "TrackedResource": { - "description": "ARM tracked top level resource.", - "required": [ - "location" - ], - "type": "object", - "allOf": [ - { - "$ref": "#/definitions/Resource" - } - ], - "properties": { - "location": { - "description": "Resource location.", - "type": "string", - "x-ms-mutability": [ - "read", - "create" - ] - }, - "tags": { - "description": "Resource tags.", - "type": "object", - "additionalProperties": { - "type": "string" - } - } - } - }, "Database": { "description": "A database resource.", "required": [ @@ -777,12 +699,12 @@ "type": "object", "allOf": [ { - "$ref": "#/definitions/TrackedResource" + "$ref": "../../../common/v1/types.json#/definitions/TrackedResource" } ], "properties": { "sku": { - "$ref": "#/definitions/Sku", + "$ref": "../../../common/v1/types.json#/definitions/Sku", "description": "The name and tier of the SKU." }, "kind": { @@ -802,7 +724,7 @@ "type": "object", "properties": { "sku": { - "$ref": "#/definitions/Sku", + "$ref": "../../../common/v1/types.json#/definitions/Sku", "description": "The name and tier of the SKU." }, "properties": { @@ -915,22 +837,12 @@ } } }, - "ProxyResource": { - "description": "ARM proxy resource.", - "type": "object", - "allOf": [ - { - "$ref": "#/definitions/Resource" - } - ], - "properties": {} - }, "DatabaseOperation": { "description": "A database operation.", "type": "object", "allOf": [ { - "$ref": "#/definitions/ProxyResource" + "$ref": "../../../common/v1/types.json#/definitions/ProxyResource" } ], "properties": { @@ -1081,7 +993,7 @@ "type": "object", "allOf": [ { - "$ref": "#/definitions/ProxyResource" + "$ref": "../../../common/v1/types.json#/definitions/ProxyResource" } ], "properties": { diff --git a/specification/sql/resource-manager/Microsoft.Sql/preview/2017-03-01-preview/jobs.json b/specification/sql/resource-manager/Microsoft.Sql/preview/2017-03-01-preview/jobs.json index 519d316da8bd..c00788ad2829 100644 --- a/specification/sql/resource-manager/Microsoft.Sql/preview/2017-03-01-preview/jobs.json +++ b/specification/sql/resource-manager/Microsoft.Sql/preview/2017-03-01-preview/jobs.json @@ -2419,36 +2419,6 @@ } } }, - "Sku": { - "description": "An ARM Resource SKU.", - "required": [ - "name" - ], - "type": "object", - "properties": { - "name": { - "description": "The name of the SKU, typically, a letter + Number code, e.g. P3.", - "type": "string" - }, - "tier": { - "description": "The tier of the particular SKU, e.g. Basic, Premium.", - "type": "string" - }, - "size": { - "description": "Size of the particular SKU", - "type": "string" - }, - "family": { - "description": "If the service has different generations of hardware, for the same SKU, then that can be captured here.", - "type": "string" - }, - "capacity": { - "format": "int32", - "description": "Capacity of the particular SKU.", - "type": "integer" - } - } - }, "JobAgentProperties": { "description": "Properties of a job agent.", "required": [ @@ -2482,57 +2452,6 @@ } } }, - "Resource": { - "description": "ARM resource.", - "type": "object", - "properties": { - "id": { - "description": "Resource ID.", - "type": "string", - "readOnly": true - }, - "name": { - "description": "Resource name.", - "type": "string", - "readOnly": true - }, - "type": { - "description": "Resource type.", - "type": "string", - "readOnly": true - } - }, - "x-ms-azure-resource": true - }, - "TrackedResource": { - "description": "ARM tracked top level resource.", - "required": [ - "location" - ], - "type": "object", - "allOf": [ - { - "$ref": "#/definitions/Resource" - } - ], - "properties": { - "location": { - "description": "Resource location.", - "type": "string", - "x-ms-mutability": [ - "read", - "create" - ] - }, - "tags": { - "description": "Resource tags.", - "type": "object", - "additionalProperties": { - "type": "string" - } - } - } - }, "JobAgent": { "description": "An Azure SQL job agent.", "required": [ @@ -2541,12 +2460,12 @@ "type": "object", "allOf": [ { - "$ref": "#/definitions/TrackedResource" + "$ref": "../../../common/v1/types.json#/definitions/TrackedResource" } ], "properties": { "sku": { - "$ref": "#/definitions/Sku", + "$ref": "../../../common/v1/types.json#/definitions/Sku", "description": "The name and tier of the SKU." }, "properties": { @@ -2610,22 +2529,12 @@ } } }, - "ProxyResource": { - "description": "ARM proxy resource.", - "type": "object", - "allOf": [ - { - "$ref": "#/definitions/Resource" - } - ], - "properties": {} - }, "JobCredential": { "description": "A stored credential that can be used by a job to connect to target databases.", "type": "object", "allOf": [ { - "$ref": "#/definitions/ProxyResource" + "$ref": "../../../common/v1/types.json#/definitions/ProxyResource" } ], "properties": { @@ -2797,7 +2706,7 @@ "type": "object", "allOf": [ { - "$ref": "#/definitions/ProxyResource" + "$ref": "../../../common/v1/types.json#/definitions/ProxyResource" } ], "properties": { @@ -2892,7 +2801,7 @@ "type": "object", "allOf": [ { - "$ref": "#/definitions/ProxyResource" + "$ref": "../../../common/v1/types.json#/definitions/ProxyResource" } ], "properties": { @@ -3090,7 +2999,7 @@ "type": "object", "allOf": [ { - "$ref": "#/definitions/ProxyResource" + "$ref": "../../../common/v1/types.json#/definitions/ProxyResource" } ], "properties": { @@ -3198,7 +3107,7 @@ "type": "object", "allOf": [ { - "$ref": "#/definitions/ProxyResource" + "$ref": "../../../common/v1/types.json#/definitions/ProxyResource" } ], "properties": { @@ -3233,7 +3142,7 @@ "type": "object", "allOf": [ { - "$ref": "#/definitions/ProxyResource" + "$ref": "../../../common/v1/types.json#/definitions/ProxyResource" } ], "properties": {} diff --git a/specification/sql/resource-manager/Microsoft.Sql/preview/2017-03-01-preview/longTermRetention.json b/specification/sql/resource-manager/Microsoft.Sql/preview/2017-03-01-preview/longTermRetention.json index 2a4176ee62be..8049cf5fefca 100644 --- a/specification/sql/resource-manager/Microsoft.Sql/preview/2017-03-01-preview/longTermRetention.json +++ b/specification/sql/resource-manager/Microsoft.Sql/preview/2017-03-01-preview/longTermRetention.json @@ -517,44 +517,12 @@ } } }, - "Resource": { - "description": "ARM resource.", - "type": "object", - "properties": { - "id": { - "description": "Resource ID.", - "type": "string", - "readOnly": true - }, - "name": { - "description": "Resource name.", - "type": "string", - "readOnly": true - }, - "type": { - "description": "Resource type.", - "type": "string", - "readOnly": true - } - }, - "x-ms-azure-resource": true - }, - "ProxyResource": { - "description": "ARM proxy resource.", - "type": "object", - "allOf": [ - { - "$ref": "#/definitions/Resource" - } - ], - "properties": {} - }, "LongTermRetentionBackup": { "description": "A long term retention backup.", "type": "object", "allOf": [ { - "$ref": "#/definitions/ProxyResource" + "$ref": "../../../common/v1/types.json#/definitions/ProxyResource" } ], "properties": { @@ -612,7 +580,7 @@ "type": "object", "allOf": [ { - "$ref": "#/definitions/ProxyResource" + "$ref": "../../../common/v1/types.json#/definitions/ProxyResource" } ], "properties": { diff --git a/specification/sql/resource-manager/Microsoft.Sql/preview/2017-03-01-preview/managedDatabases.json b/specification/sql/resource-manager/Microsoft.Sql/preview/2017-03-01-preview/managedDatabases.json index 6894d182d083..81de6b717226 100644 --- a/specification/sql/resource-manager/Microsoft.Sql/preview/2017-03-01-preview/managedDatabases.json +++ b/specification/sql/resource-manager/Microsoft.Sql/preview/2017-03-01-preview/managedDatabases.json @@ -473,57 +473,6 @@ } } }, - "Resource": { - "description": "ARM resource.", - "type": "object", - "properties": { - "id": { - "description": "Resource ID.", - "type": "string", - "readOnly": true - }, - "name": { - "description": "Resource name.", - "type": "string", - "readOnly": true - }, - "type": { - "description": "Resource type.", - "type": "string", - "readOnly": true - } - }, - "x-ms-azure-resource": true - }, - "TrackedResource": { - "description": "ARM tracked top level resource.", - "required": [ - "location" - ], - "type": "object", - "allOf": [ - { - "$ref": "#/definitions/Resource" - } - ], - "properties": { - "location": { - "description": "Resource location.", - "type": "string", - "x-ms-mutability": [ - "read", - "create" - ] - }, - "tags": { - "description": "Resource tags.", - "type": "object", - "additionalProperties": { - "type": "string" - } - } - } - }, "ManagedDatabase": { "description": "A managed database resource.", "required": [ @@ -532,7 +481,7 @@ "type": "object", "allOf": [ { - "$ref": "#/definitions/TrackedResource" + "$ref": "../../../common/v1/types.json#/definitions/TrackedResource" } ], "properties": { diff --git a/specification/sql/resource-manager/Microsoft.Sql/preview/2017-03-01-preview/restorePoints.json b/specification/sql/resource-manager/Microsoft.Sql/preview/2017-03-01-preview/restorePoints.json index 2be16b54a812..f01d7090abbc 100644 --- a/specification/sql/resource-manager/Microsoft.Sql/preview/2017-03-01-preview/restorePoints.json +++ b/specification/sql/resource-manager/Microsoft.Sql/preview/2017-03-01-preview/restorePoints.json @@ -276,44 +276,12 @@ } } }, - "Resource": { - "description": "ARM resource.", - "type": "object", - "properties": { - "id": { - "description": "Resource ID.", - "type": "string", - "readOnly": true - }, - "name": { - "description": "Resource name.", - "type": "string", - "readOnly": true - }, - "type": { - "description": "Resource type.", - "type": "string", - "readOnly": true - } - }, - "x-ms-azure-resource": true - }, - "ProxyResource": { - "description": "ARM proxy resource.", - "type": "object", - "allOf": [ - { - "$ref": "#/definitions/Resource" - } - ], - "properties": {} - }, "RestorePoint": { "description": "Database restore points.", "type": "object", "allOf": [ { - "$ref": "#/definitions/ProxyResource" + "$ref": "../../../common/v1/types.json#/definitions/ProxyResource" } ], "properties": { diff --git a/specification/sql/resource-manager/Microsoft.Sql/preview/2017-03-01-preview/serverAutomaticTuning.json b/specification/sql/resource-manager/Microsoft.Sql/preview/2017-03-01-preview/serverAutomaticTuning.json index 7b66e5a50ceb..97f737c7d881 100644 --- a/specification/sql/resource-manager/Microsoft.Sql/preview/2017-03-01-preview/serverAutomaticTuning.json +++ b/specification/sql/resource-manager/Microsoft.Sql/preview/2017-03-01-preview/serverAutomaticTuning.json @@ -198,44 +198,12 @@ } } }, - "Resource": { - "description": "ARM resource.", - "type": "object", - "properties": { - "id": { - "description": "Resource ID.", - "type": "string", - "readOnly": true - }, - "name": { - "description": "Resource name.", - "type": "string", - "readOnly": true - }, - "type": { - "description": "Resource type.", - "type": "string", - "readOnly": true - } - }, - "x-ms-azure-resource": true - }, - "ProxyResource": { - "description": "ARM proxy resource.", - "type": "object", - "allOf": [ - { - "$ref": "#/definitions/Resource" - } - ], - "properties": {} - }, "ServerAutomaticTuning": { "description": "Server-level Automatic Tuning.", "type": "object", "allOf": [ { - "$ref": "#/definitions/ProxyResource" + "$ref": "../../../common/v1/types.json#/definitions/ProxyResource" } ], "properties": { diff --git a/specification/sql/resource-manager/Microsoft.Sql/preview/2017-03-01-preview/serverDnsAliases.json b/specification/sql/resource-manager/Microsoft.Sql/preview/2017-03-01-preview/serverDnsAliases.json index 5dd066d31f8b..43519c53e7e1 100644 --- a/specification/sql/resource-manager/Microsoft.Sql/preview/2017-03-01-preview/serverDnsAliases.json +++ b/specification/sql/resource-manager/Microsoft.Sql/preview/2017-03-01-preview/serverDnsAliases.json @@ -294,44 +294,12 @@ } } }, - "Resource": { - "description": "ARM resource.", - "type": "object", - "properties": { - "id": { - "description": "Resource ID.", - "type": "string", - "readOnly": true - }, - "name": { - "description": "Resource name.", - "type": "string", - "readOnly": true - }, - "type": { - "description": "Resource type.", - "type": "string", - "readOnly": true - } - }, - "x-ms-azure-resource": true - }, - "ProxyResource": { - "description": "ARM proxy resource.", - "type": "object", - "allOf": [ - { - "$ref": "#/definitions/Resource" - } - ], - "properties": {} - }, "ServerDnsAlias": { "description": "A server DNS alias.", "type": "object", "allOf": [ { - "$ref": "#/definitions/ProxyResource" + "$ref": "../../../common/v1/types.json#/definitions/ProxyResource" } ], "properties": { diff --git a/specification/sql/resource-manager/Microsoft.Sql/preview/2017-10-01-preview/cancelOperations.json b/specification/sql/resource-manager/Microsoft.Sql/preview/2017-10-01-preview/cancelOperations.json index 8686c830239d..31277778c542 100644 --- a/specification/sql/resource-manager/Microsoft.Sql/preview/2017-10-01-preview/cancelOperations.json +++ b/specification/sql/resource-manager/Microsoft.Sql/preview/2017-10-01-preview/cancelOperations.json @@ -134,7 +134,7 @@ "type": "object", "allOf": [ { - "$ref": "#/definitions/ProxyResource" + "$ref": "../../../common/v1/types.json#/definitions/ProxyResource" } ], "properties": { @@ -145,16 +145,6 @@ } } }, - "ProxyResource": { - "description": "ARM proxy resource.", - "type": "object", - "allOf": [ - { - "$ref": "#/definitions/Resource" - } - ], - "properties": {} - }, "DatabaseOperationProperties": { "description": "The properties of a database operation.", "type": "object", @@ -247,28 +237,6 @@ "readOnly": true } } - }, - "Resource": { - "description": "ARM resource.", - "type": "object", - "properties": { - "id": { - "description": "Resource ID.", - "type": "string", - "readOnly": true - }, - "name": { - "description": "Resource name.", - "type": "string", - "readOnly": true - }, - "type": { - "description": "Resource type.", - "type": "string", - "readOnly": true - } - }, - "x-ms-azure-resource": true } }, "parameters": { diff --git a/specification/sql/resource-manager/Microsoft.Sql/preview/2017-10-01-preview/cancelPoolOperations.json b/specification/sql/resource-manager/Microsoft.Sql/preview/2017-10-01-preview/cancelPoolOperations.json index 0017374449ca..5a8b41c0c48c 100644 --- a/specification/sql/resource-manager/Microsoft.Sql/preview/2017-10-01-preview/cancelPoolOperations.json +++ b/specification/sql/resource-manager/Microsoft.Sql/preview/2017-10-01-preview/cancelPoolOperations.json @@ -216,22 +216,12 @@ } } }, - "ProxyResource": { - "description": "ARM proxy resource.", - "type": "object", - "allOf": [ - { - "$ref": "#/definitions/Resource" - } - ], - "properties": {} - }, "ElasticPoolOperation": { "description": "A elastic pool operation.", "type": "object", "allOf": [ { - "$ref": "#/definitions/ProxyResource" + "$ref": "../../../common/v1/types.json#/definitions/ProxyResource" } ], "properties": { @@ -241,28 +231,6 @@ "x-ms-client-flatten": true } } - }, - "Resource": { - "description": "ARM resource.", - "type": "object", - "properties": { - "id": { - "description": "Resource ID.", - "type": "string", - "readOnly": true - }, - "name": { - "description": "Resource name.", - "type": "string", - "readOnly": true - }, - "type": { - "description": "Resource type.", - "type": "string", - "readOnly": true - } - }, - "x-ms-azure-resource": true } }, "parameters": { diff --git a/specification/sql/resource-manager/Microsoft.Sql/preview/2017-10-01-preview/capabilities.json b/specification/sql/resource-manager/Microsoft.Sql/preview/2017-10-01-preview/capabilities.json index b9ca95b76e20..db057acb2985 100644 --- a/specification/sql/resource-manager/Microsoft.Sql/preview/2017-10-01-preview/capabilities.json +++ b/specification/sql/resource-manager/Microsoft.Sql/preview/2017-10-01-preview/capabilities.json @@ -355,7 +355,7 @@ "readOnly": true }, "sku": { - "$ref": "#/definitions/Sku", + "$ref": "../../../common/v1/types.json#/definitions/Sku", "description": "The sku.", "readOnly": true }, @@ -403,7 +403,7 @@ "readOnly": true }, "sku": { - "$ref": "#/definitions/Sku", + "$ref": "../../../common/v1/types.json#/definitions/Sku", "description": "The sku.", "readOnly": true }, @@ -605,36 +605,6 @@ } } }, - "Sku": { - "description": "An ARM Resource SKU.", - "required": [ - "name" - ], - "type": "object", - "properties": { - "name": { - "description": "The name of the SKU, typically, a letter + Number code, e.g. P3.", - "type": "string" - }, - "tier": { - "description": "The tier of the particular SKU, e.g. Basic, Premium.", - "type": "string" - }, - "size": { - "description": "Size of the particular SKU", - "type": "string" - }, - "family": { - "description": "If the service has different generations of hardware, for the same SKU, then that can be captured here.", - "type": "string" - }, - "capacity": { - "format": "int32", - "description": "Capacity of the particular SKU.", - "type": "integer" - } - } - }, "LicenseTypeCapability": { "description": "The license type capability", "type": "object", diff --git a/specification/sql/resource-manager/Microsoft.Sql/preview/2017-10-01-preview/databaseVulnerabilityAssessmentScans.json b/specification/sql/resource-manager/Microsoft.Sql/preview/2017-10-01-preview/databaseVulnerabilityAssessmentScans.json index 502c6eb0973c..fcec506f7deb 100644 --- a/specification/sql/resource-manager/Microsoft.Sql/preview/2017-10-01-preview/databaseVulnerabilityAssessmentScans.json +++ b/specification/sql/resource-manager/Microsoft.Sql/preview/2017-10-01-preview/databaseVulnerabilityAssessmentScans.json @@ -277,67 +277,12 @@ } }, "definitions": { - "Resource": { - "description": "ARM resource.", - "type": "object", - "properties": { - "id": { - "description": "Resource ID.", - "type": "string", - "readOnly": true - }, - "name": { - "description": "Resource name.", - "type": "string", - "readOnly": true - }, - "type": { - "description": "Resource type.", - "type": "string", - "readOnly": true - } - }, - "x-ms-azure-resource": true - }, - "ProxyResource": { - "description": "ARM proxy resource.", - "type": "object", - "allOf": [ - { - "$ref": "#/definitions/Resource" - } - ], - "properties": {} - }, - "Sku": { - "description": "An ARM Resource SKU.", - "type": "object", - "properties": { - "name": { - "description": "The name of the SKU, typically, a letter + Number code, e.g. P3.", - "type": "string" - }, - "tier": { - "description": "The tier of the particular SKU, e.g. Basic, Premium.", - "type": "string" - }, - "size": { - "description": "Size of the particular SKU", - "type": "string" - }, - "family": { - "description": "If the service has different generations of hardware, for the same SKU, then that can be captured here.", - "type": "string" - }, - "capacity": { - "format": "int32", - "description": "Capacity of the particular SKU.", - "type": "integer" - } - } - }, "DatabaseVulnerabilityAssessmentProperties": { "description": "Properties of a database Vulnerability Assessment.", + "required": [ + "storageContainerPath", + "storageContainerSasKey" + ], "type": "object", "properties": { "storageContainerPath": { @@ -389,7 +334,7 @@ "type": "object", "allOf": [ { - "$ref": "#/definitions/ProxyResource" + "$ref": "../../../common/v1/types.json#/definitions/ProxyResource" } ], "properties": { @@ -491,7 +436,7 @@ "type": "object", "allOf": [ { - "$ref": "#/definitions/ProxyResource" + "$ref": "../../../common/v1/types.json#/definitions/ProxyResource" } ], "properties": { @@ -537,7 +482,7 @@ "type": "object", "allOf": [ { - "$ref": "#/definitions/ProxyResource" + "$ref": "../../../common/v1/types.json#/definitions/ProxyResource" } ], "properties": { diff --git a/specification/sql/resource-manager/Microsoft.Sql/preview/2017-10-01-preview/databases.json b/specification/sql/resource-manager/Microsoft.Sql/preview/2017-10-01-preview/databases.json index b64954a91cf7..ecdcd45edfc4 100644 --- a/specification/sql/resource-manager/Microsoft.Sql/preview/2017-10-01-preview/databases.json +++ b/specification/sql/resource-manager/Microsoft.Sql/preview/2017-10-01-preview/databases.json @@ -549,36 +549,6 @@ } } }, - "Sku": { - "description": "An ARM Resource SKU.", - "required": [ - "name" - ], - "type": "object", - "properties": { - "name": { - "description": "The name of the SKU, typically, a letter + Number code, e.g. P3.", - "type": "string" - }, - "tier": { - "description": "The tier of the particular SKU, e.g. Basic, Premium.", - "type": "string" - }, - "size": { - "description": "Size of the particular SKU", - "type": "string" - }, - "family": { - "description": "If the service has different generations of hardware, for the same SKU, then that can be captured here.", - "type": "string" - }, - "capacity": { - "format": "int32", - "description": "Capacity of the particular SKU.", - "type": "integer" - } - } - }, "DatabaseProperties": { "description": "The database's properties.", "type": "object", @@ -812,63 +782,12 @@ ] }, "currentSku": { - "$ref": "#/definitions/Sku", + "$ref": "../../../common/v1/types.json#/definitions/Sku", "description": "The name and tier of the SKU.", "readOnly": true } } }, - "Resource": { - "description": "ARM resource.", - "type": "object", - "properties": { - "id": { - "description": "Resource ID.", - "type": "string", - "readOnly": true - }, - "name": { - "description": "Resource name.", - "type": "string", - "readOnly": true - }, - "type": { - "description": "Resource type.", - "type": "string", - "readOnly": true - } - }, - "x-ms-azure-resource": true - }, - "TrackedResource": { - "description": "ARM tracked top level resource.", - "required": [ - "location" - ], - "type": "object", - "allOf": [ - { - "$ref": "#/definitions/Resource" - } - ], - "properties": { - "location": { - "description": "Resource location.", - "type": "string", - "x-ms-mutability": [ - "read", - "create" - ] - }, - "tags": { - "description": "Resource tags.", - "type": "object", - "additionalProperties": { - "type": "string" - } - } - } - }, "Database": { "description": "A database resource.", "required": [ @@ -877,12 +796,12 @@ "type": "object", "allOf": [ { - "$ref": "#/definitions/TrackedResource" + "$ref": "../../../common/v1/types.json#/definitions/TrackedResource" } ], "properties": { "sku": { - "$ref": "#/definitions/Sku", + "$ref": "../../../common/v1/types.json#/definitions/Sku", "description": "The name and tier of the SKU." }, "kind": { @@ -907,7 +826,7 @@ "type": "object", "properties": { "sku": { - "$ref": "#/definitions/Sku", + "$ref": "../../../common/v1/types.json#/definitions/Sku", "description": "The name and tier of the SKU." }, "properties": { @@ -924,16 +843,6 @@ } } }, - "ProxyResource": { - "description": "ARM proxy resource.", - "type": "object", - "allOf": [ - { - "$ref": "#/definitions/Resource" - } - ], - "properties": {} - }, "ResourceMoveDefinition": { "description": "Contains the information necessary to perform a resource move (rename).", "required": [ diff --git a/specification/sql/resource-manager/Microsoft.Sql/preview/2017-10-01-preview/elasticPools.json b/specification/sql/resource-manager/Microsoft.Sql/preview/2017-10-01-preview/elasticPools.json index 302c987a9465..c8afd90bbed1 100644 --- a/specification/sql/resource-manager/Microsoft.Sql/preview/2017-10-01-preview/elasticPools.json +++ b/specification/sql/resource-manager/Microsoft.Sql/preview/2017-10-01-preview/elasticPools.json @@ -306,36 +306,6 @@ } } }, - "Sku": { - "description": "An ARM Resource SKU.", - "required": [ - "name" - ], - "type": "object", - "properties": { - "name": { - "description": "The name of the SKU, typically, a letter + Number code, e.g. P3.", - "type": "string" - }, - "tier": { - "description": "The tier of the particular SKU, e.g. Basic, Premium.", - "type": "string" - }, - "size": { - "description": "Size of the particular SKU", - "type": "string" - }, - "family": { - "description": "If the service has different generations of hardware, for the same SKU, then that can be captured here.", - "type": "string" - }, - "capacity": { - "format": "int32", - "description": "Capacity of the particular SKU.", - "type": "integer" - } - } - }, "ElasticPoolProperties": { "description": "Properties of an elastic pool", "type": "object", @@ -403,57 +373,6 @@ } } }, - "Resource": { - "description": "ARM resource.", - "type": "object", - "properties": { - "id": { - "description": "Resource ID.", - "type": "string", - "readOnly": true - }, - "name": { - "description": "Resource name.", - "type": "string", - "readOnly": true - }, - "type": { - "description": "Resource type.", - "type": "string", - "readOnly": true - } - }, - "x-ms-azure-resource": true - }, - "TrackedResource": { - "description": "ARM tracked top level resource.", - "required": [ - "location" - ], - "type": "object", - "allOf": [ - { - "$ref": "#/definitions/Resource" - } - ], - "properties": { - "location": { - "description": "Resource location.", - "type": "string", - "x-ms-mutability": [ - "read", - "create" - ] - }, - "tags": { - "description": "Resource tags.", - "type": "object", - "additionalProperties": { - "type": "string" - } - } - } - }, "ElasticPool": { "description": "An elastic pool.", "required": [ @@ -462,12 +381,12 @@ "type": "object", "allOf": [ { - "$ref": "#/definitions/TrackedResource" + "$ref": "../../../common/v1/types.json#/definitions/TrackedResource" } ], "properties": { "sku": { - "$ref": "#/definitions/Sku" + "$ref": "../../../common/v1/types.json#/definitions/Sku" }, "kind": { "description": "Kind of elastic pool. This is metadata used for the Azure portal experience.", @@ -486,7 +405,7 @@ "type": "object", "properties": { "sku": { - "$ref": "#/definitions/Sku" + "$ref": "../../../common/v1/types.json#/definitions/Sku" }, "properties": { "$ref": "#/definitions/ElasticPoolUpdateProperties", @@ -532,16 +451,6 @@ } } } - }, - "ProxyResource": { - "description": "ARM proxy resource.", - "type": "object", - "allOf": [ - { - "$ref": "#/definitions/Resource" - } - ], - "properties": {} } }, "parameters": { diff --git a/specification/sql/resource-manager/Microsoft.Sql/preview/2017-10-01-preview/instanceFailoverGroups.json b/specification/sql/resource-manager/Microsoft.Sql/preview/2017-10-01-preview/instanceFailoverGroups.json index 5c87d3747b3d..188855b33c45 100644 --- a/specification/sql/resource-manager/Microsoft.Sql/preview/2017-10-01-preview/instanceFailoverGroups.json +++ b/specification/sql/resource-manager/Microsoft.Sql/preview/2017-10-01-preview/instanceFailoverGroups.json @@ -477,44 +477,12 @@ } } }, - "Resource": { - "description": "ARM resource.", - "type": "object", - "properties": { - "id": { - "description": "Resource ID.", - "type": "string", - "readOnly": true - }, - "name": { - "description": "Resource name.", - "type": "string", - "readOnly": true - }, - "type": { - "description": "Resource type.", - "type": "string", - "readOnly": true - } - }, - "x-ms-azure-resource": true - }, - "ProxyResource": { - "description": "ARM proxy resource.", - "type": "object", - "allOf": [ - { - "$ref": "#/definitions/Resource" - } - ], - "properties": {} - }, "InstanceFailoverGroup": { "description": "An instance failover group.", "type": "object", "allOf": [ { - "$ref": "#/definitions/ProxyResource" + "$ref": "../../../common/v1/types.json#/definitions/ProxyResource" } ], "properties": { diff --git a/specification/sql/resource-manager/Microsoft.Sql/preview/2017-10-01-preview/shortTermRetentionPolicies.json b/specification/sql/resource-manager/Microsoft.Sql/preview/2017-10-01-preview/shortTermRetentionPolicies.json index 3402288358c9..5f65de0b75cb 100644 --- a/specification/sql/resource-manager/Microsoft.Sql/preview/2017-10-01-preview/shortTermRetentionPolicies.json +++ b/specification/sql/resource-manager/Microsoft.Sql/preview/2017-10-01-preview/shortTermRetentionPolicies.json @@ -219,44 +219,12 @@ } } }, - "Resource": { - "description": "ARM resource.", - "type": "object", - "properties": { - "id": { - "description": "Resource ID.", - "type": "string", - "readOnly": true - }, - "name": { - "description": "Resource name.", - "type": "string", - "readOnly": true - }, - "type": { - "description": "Resource type.", - "type": "string", - "readOnly": true - } - }, - "x-ms-azure-resource": true - }, - "ProxyResource": { - "description": "ARM proxy resource.", - "type": "object", - "allOf": [ - { - "$ref": "#/definitions/Resource" - } - ], - "properties": {} - }, "BackupShortTermRetentionPolicy": { "description": "A short term retention policy.", "type": "object", "allOf": [ { - "$ref": "#/definitions/ProxyResource" + "$ref": "../../../common/v1/types.json#/definitions/ProxyResource" } ], "properties": { diff --git a/specification/sql/resource-manager/Microsoft.Sql/stable/2014-04-01/advisors.json b/specification/sql/resource-manager/Microsoft.Sql/stable/2014-04-01/advisors.json index b22624afb065..93a1728f0291 100644 --- a/specification/sql/resource-manager/Microsoft.Sql/stable/2014-04-01/advisors.json +++ b/specification/sql/resource-manager/Microsoft.Sql/stable/2014-04-01/advisors.json @@ -336,38 +336,6 @@ } }, "definitions": { - "Resource": { - "description": "ARM resource.", - "type": "object", - "properties": { - "id": { - "description": "Resource ID.", - "type": "string", - "readOnly": true - }, - "name": { - "description": "Resource name.", - "type": "string", - "readOnly": true - }, - "type": { - "description": "Resource type.", - "type": "string", - "readOnly": true - } - }, - "x-ms-azure-resource": true - }, - "ProxyResource": { - "description": "ARM proxy resource.", - "type": "object", - "allOf": [ - { - "$ref": "#/definitions/Resource" - } - ], - "properties": {} - }, "AdvisorProperties": { "description": "Properties for a Database, Server or Elastic Pool Advisor.", "required": [ @@ -421,7 +389,7 @@ "type": "object", "allOf": [ { - "$ref": "#/definitions/ProxyResource" + "$ref": "../../../common/v1/types.json#/definitions/ProxyResource" } ], "properties": { diff --git a/specification/sql/resource-manager/Microsoft.Sql/stable/2014-04-01/backupLongTermRetentionPolicies.json b/specification/sql/resource-manager/Microsoft.Sql/stable/2014-04-01/backupLongTermRetentionPolicies.json index a7c8f5d3039f..97298cebeef2 100644 --- a/specification/sql/resource-manager/Microsoft.Sql/stable/2014-04-01/backupLongTermRetentionPolicies.json +++ b/specification/sql/resource-manager/Microsoft.Sql/stable/2014-04-01/backupLongTermRetentionPolicies.json @@ -195,35 +195,6 @@ } }, "definitions": { - "Resource": { - "description": "ARM resource.", - "properties": { - "id": { - "readOnly": true, - "type": "string", - "description": "Resource ID." - }, - "name": { - "readOnly": true, - "type": "string", - "description": "Resource name." - }, - "type": { - "readOnly": true, - "type": "string", - "description": "Resource type." - } - }, - "x-ms-azure-resource": true - }, - "ProxyResource": { - "description": "ARM proxy resource.", - "allOf": [ - { - "$ref": "#/definitions/Resource" - } - ] - }, "BackupLongTermRetentionPolicyProperties": { "properties": { "state": { @@ -260,7 +231,7 @@ }, "allOf": [ { - "$ref": "#/definitions/ProxyResource" + "$ref": "../../../common/v1/types.json#/definitions/ProxyResource" } ], "description": "A backup long term retention policy" diff --git a/specification/sql/resource-manager/Microsoft.Sql/stable/2014-04-01/backupLongTermRetentionVaults.json b/specification/sql/resource-manager/Microsoft.Sql/stable/2014-04-01/backupLongTermRetentionVaults.json index bbfc2c5c81ae..177a1f5f6f45 100644 --- a/specification/sql/resource-manager/Microsoft.Sql/stable/2014-04-01/backupLongTermRetentionVaults.json +++ b/specification/sql/resource-manager/Microsoft.Sql/stable/2014-04-01/backupLongTermRetentionVaults.json @@ -174,35 +174,6 @@ } }, "definitions": { - "Resource": { - "description": "ARM resource.", - "properties": { - "id": { - "readOnly": true, - "type": "string", - "description": "Resource ID." - }, - "name": { - "readOnly": true, - "type": "string", - "description": "Resource name." - }, - "type": { - "readOnly": true, - "type": "string", - "description": "Resource type." - } - }, - "x-ms-azure-resource": true - }, - "ProxyResource": { - "description": "ARM proxy resource.", - "allOf": [ - { - "$ref": "#/definitions/Resource" - } - ] - }, "BackupLongTermRetentionVaultProperties": { "properties": { "recoveryServicesVaultResourceId": { @@ -228,7 +199,7 @@ }, "allOf": [ { - "$ref": "#/definitions/ProxyResource" + "$ref": "../../../common/v1/types.json#/definitions/ProxyResource" } ], "description": "A backup long term retention vault" diff --git a/specification/sql/resource-manager/Microsoft.Sql/stable/2014-04-01/backups.json b/specification/sql/resource-manager/Microsoft.Sql/stable/2014-04-01/backups.json index 7c64253f16db..68143abb0cac 100644 --- a/specification/sql/resource-manager/Microsoft.Sql/stable/2014-04-01/backups.json +++ b/specification/sql/resource-manager/Microsoft.Sql/stable/2014-04-01/backups.json @@ -182,68 +182,6 @@ } }, "definitions": { - "Resource": { - "description": "ARM resource.", - "properties": { - "id": { - "readOnly": true, - "type": "string", - "description": "Resource ID." - }, - "name": { - "readOnly": true, - "type": "string", - "description": "Resource name." - }, - "type": { - "readOnly": true, - "type": "string", - "description": "Resource type." - } - }, - "x-ms-azure-resource": true - }, - "TrackedResource": { - "description": "ARM tracked top level resource.", - "properties": { - "tags": { - "type": "object", - "additionalProperties": { - "type": "string" - }, - "x-ms-mutability": [ - "read", - "create", - "update" - ], - "description": "Resource tags." - }, - "location": { - "type": "string", - "x-ms-mutability": [ - "read", - "create" - ], - "description": "Resource location." - } - }, - "required": [ - "location" - ], - "allOf": [ - { - "$ref": "#/definitions/Resource" - } - ] - }, - "ProxyResource": { - "description": "ARM proxy resource.", - "allOf": [ - { - "$ref": "#/definitions/Resource" - } - ] - }, "RecoverableDatabaseProperties": { "properties": { "edition": { @@ -280,7 +218,7 @@ }, "allOf": [ { - "$ref": "#/definitions/ProxyResource" + "$ref": "../../../common/v1/types.json#/definitions/ProxyResource" } ], "description": "A recoverable database" @@ -361,7 +299,7 @@ }, "allOf": [ { - "$ref": "#/definitions/ProxyResource" + "$ref": "../../../common/v1/types.json#/definitions/ProxyResource" } ], "description": "A restorable dropped database" diff --git a/specification/sql/resource-manager/Microsoft.Sql/stable/2014-04-01/capabilities.json b/specification/sql/resource-manager/Microsoft.Sql/stable/2014-04-01/capabilities.json index f9c50f55e1c9..01f9ff89228b 100644 --- a/specification/sql/resource-manager/Microsoft.Sql/stable/2014-04-01/capabilities.json +++ b/specification/sql/resource-manager/Microsoft.Sql/stable/2014-04-01/capabilities.json @@ -411,4 +411,4 @@ } } } - + diff --git a/specification/sql/resource-manager/Microsoft.Sql/stable/2014-04-01/connectionPolicies.json b/specification/sql/resource-manager/Microsoft.Sql/stable/2014-04-01/connectionPolicies.json index c3a4f3e94974..5bf2d2826a20 100644 --- a/specification/sql/resource-manager/Microsoft.Sql/stable/2014-04-01/connectionPolicies.json +++ b/specification/sql/resource-manager/Microsoft.Sql/stable/2014-04-01/connectionPolicies.json @@ -143,39 +143,10 @@ }, "allOf": [ { - "$ref": "#/definitions/ProxyResource" + "$ref": "../../../common/v1/types.json#/definitions/ProxyResource" } ], "description": "A server secure connection policy." - }, - "Resource":{ - "description":"ARM resource.", - "properties":{ - "id":{ - "readOnly":true, - "type":"string", - "description":"Resource ID." - }, - "name":{ - "readOnly":true, - "type":"string", - "description":"Resource name." - }, - "type":{ - "readOnly":true, - "type":"string", - "description":"Resource type." - } - }, - "x-ms-azure-resource": true - }, - "ProxyResource":{ - "description":"ARM proxy resource.", - "allOf":[ - { - "$ref":"#/definitions/Resource" - } - ] } }, "parameters": { diff --git a/specification/sql/resource-manager/Microsoft.Sql/stable/2014-04-01/dataMasking.json b/specification/sql/resource-manager/Microsoft.Sql/stable/2014-04-01/dataMasking.json index 5295dab97b91..8be24ff10616 100644 --- a/specification/sql/resource-manager/Microsoft.Sql/stable/2014-04-01/dataMasking.json +++ b/specification/sql/resource-manager/Microsoft.Sql/stable/2014-04-01/dataMasking.json @@ -268,7 +268,7 @@ }, "allOf": [ { - "$ref": "#/definitions/ProxyResource" + "$ref": "../../../common/v1/types.json#/definitions/ProxyResource" } ], "description": "Represents a database data masking policy." @@ -373,7 +373,7 @@ }, "allOf": [ { - "$ref": "#/definitions/ProxyResource" + "$ref": "../../../common/v1/types.json#/definitions/ProxyResource" } ], "description": "Represents a database data masking rule." @@ -389,35 +389,6 @@ } }, "description": "The response to a list data masking rules request." - }, - "Resource": { - "description": "ARM resource.", - "properties": { - "id": { - "readOnly": true, - "type": "string", - "description": "Resource ID." - }, - "name": { - "readOnly": true, - "type": "string", - "description": "Resource name." - }, - "type": { - "readOnly": true, - "type": "string", - "description": "Resource type." - } - }, - "x-ms-azure-resource": true - }, - "ProxyResource": { - "description": "ARM proxy resource.", - "allOf": [ - { - "$ref": "#/definitions/Resource" - } - ] } }, "parameters": { diff --git a/specification/sql/resource-manager/Microsoft.Sql/stable/2014-04-01/databaseSecurityAlertPolicies.json b/specification/sql/resource-manager/Microsoft.Sql/stable/2014-04-01/databaseSecurityAlertPolicies.json index 909a308ff2ba..f099a01f856e 100644 --- a/specification/sql/resource-manager/Microsoft.Sql/stable/2014-04-01/databaseSecurityAlertPolicies.json +++ b/specification/sql/resource-manager/Microsoft.Sql/stable/2014-04-01/databaseSecurityAlertPolicies.json @@ -144,68 +144,6 @@ } }, "definitions": { - "Resource":{ - "description":"ARM resource.", - "properties":{ - "id":{ - "readOnly":true, - "type":"string", - "description":"Resource ID." - }, - "name":{ - "readOnly":true, - "type":"string", - "description":"Resource name." - }, - "type":{ - "readOnly":true, - "type":"string", - "description":"Resource type." - } - }, - "x-ms-azure-resource": true - }, - "TrackedResource":{ - "description":"ARM tracked top level resource.", - "properties":{ - "tags":{ - "type":"object", - "additionalProperties":{ - "type":"string" - }, - "x-ms-mutability":[ - "read", - "create", - "update" - ], - "description":"Resource tags." - }, - "location":{ - "type":"string", - "x-ms-mutability":[ - "read", - "create" - ], - "description":"Resource location." - } - }, - "required":[ - "location" - ], - "allOf":[ - { - "$ref":"#/definitions/Resource" - } - ] - }, - "ProxyResource":{ - "description":"ARM proxy resource.", - "allOf":[ - { - "$ref":"#/definitions/Resource" - } - ] - }, "DatabaseSecurityAlertPolicy": { "description": "Contains information about a database Threat Detection policy.", "type": "object", @@ -231,7 +169,7 @@ }, "allOf": [ { - "$ref": "#/definitions/ProxyResource" + "$ref": "../../../common/v1/types.json#/definitions/ProxyResource" } ] }, diff --git a/specification/sql/resource-manager/Microsoft.Sql/stable/2014-04-01/databases.json b/specification/sql/resource-manager/Microsoft.Sql/stable/2014-04-01/databases.json index 4f4aec4ad8a3..ccfe2647aeaf 100644 --- a/specification/sql/resource-manager/Microsoft.Sql/stable/2014-04-01/databases.json +++ b/specification/sql/resource-manager/Microsoft.Sql/stable/2014-04-01/databases.json @@ -587,60 +587,6 @@ } }, "definitions":{ - "Resource":{ - "description":"ARM resource.", - "properties":{ - "id":{ - "readOnly":true, - "type":"string", - "description":"Resource ID." - }, - "name":{ - "readOnly":true, - "type":"string", - "description":"Resource name." - }, - "type":{ - "readOnly":true, - "type":"string", - "description":"Resource type." - } - }, - "x-ms-azure-resource":true - }, - "TrackedResource":{ - "description":"ARM tracked top level resource.", - "properties":{ - "tags":{ - "type":"object", - "additionalProperties":{ - "type":"string" - }, - "x-ms-mutability":[ - "read", - "create", - "update" - ], - "description":"Resource tags." - }, - "location":{ - "type":"string", - "x-ms-mutability":[ - "read", - "create" - ], - "description":"Resource location." - } - }, - "required":[ - "location" - ], - "allOf":[ - { - "$ref":"#/definitions/Resource" - } - ] - }, "DatabaseProperties":{ "properties":{ "collation":{ @@ -1003,7 +949,7 @@ }, "allOf":[ { - "$ref":"#/definitions/TrackedResource" + "$ref":"../../../common/v1/types.json#/definitions/TrackedResource" } ], "description":"Represents a database." @@ -1025,7 +971,7 @@ }, "allOf":[ { - "$ref":"#/definitions/Resource" + "$ref":"../../../common/v1/types.json#/definitions/Resource" } ], "description":"Represents a database update." diff --git a/specification/sql/resource-manager/Microsoft.Sql/stable/2014-04-01/disasterRecoveryConfigurations.json b/specification/sql/resource-manager/Microsoft.Sql/stable/2014-04-01/disasterRecoveryConfigurations.json index fb8a8dfaab60..f34bc8f87262 100644 --- a/specification/sql/resource-manager/Microsoft.Sql/stable/2014-04-01/disasterRecoveryConfigurations.json +++ b/specification/sql/resource-manager/Microsoft.Sql/stable/2014-04-01/disasterRecoveryConfigurations.json @@ -230,7 +230,7 @@ }, "x-ms-long-running-operation": true } - }, + }, "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Sql/servers/{serverName}/disasterRecoveryConfiguration/{disasterRecoveryConfigurationName}/forceFailoverAllowDataLoss": { "post": { "tags": [ @@ -275,35 +275,6 @@ } }, "definitions": { - "Resource":{ - "description":"ARM resource.", - "properties":{ - "id":{ - "readOnly":true, - "type":"string", - "description":"Resource ID." - }, - "name":{ - "readOnly":true, - "type":"string", - "description":"Resource name." - }, - "type":{ - "readOnly":true, - "type":"string", - "description":"Resource type." - } - }, - "x-ms-azure-resource": true - }, - "ProxyResource":{ - "description":"ARM proxy resource.", - "allOf":[ - { - "$ref":"#/definitions/Resource" - } - ] - }, "DisasterRecoveryConfigurationProperties": { "properties": { "status": { @@ -372,20 +343,20 @@ "type": { "readOnly": true, "type": "string", - "description": "Type of resource this is." + "description": "Type of resource this is." }, "location": { "type": "string", "description": "Location of the server that contains this disaster recovery configuration.", "readOnly": true - } + } }, "required": [ "properties" ], "allOf": [ { - "$ref": "#/definitions/ProxyResource" + "$ref": "../../../common/v1/types.json#/definitions/ProxyResource" } ], "description": "Represents a disaster recovery configuration." diff --git a/specification/sql/resource-manager/Microsoft.Sql/stable/2014-04-01/elasticPools.json b/specification/sql/resource-manager/Microsoft.Sql/stable/2014-04-01/elasticPools.json index aa52b9c1517a..4993a3b73a2c 100644 --- a/specification/sql/resource-manager/Microsoft.Sql/stable/2014-04-01/elasticPools.json +++ b/specification/sql/resource-manager/Microsoft.Sql/stable/2014-04-01/elasticPools.json @@ -261,60 +261,6 @@ } }, "definitions":{ - "Resource":{ - "description":"ARM resource.", - "properties":{ - "id":{ - "readOnly":true, - "type":"string", - "description":"Resource ID." - }, - "name":{ - "readOnly":true, - "type":"string", - "description":"Resource name." - }, - "type":{ - "readOnly":true, - "type":"string", - "description":"Resource type." - } - }, - "x-ms-azure-resource":true - }, - "TrackedResource":{ - "description":"ARM tracked top level resource.", - "properties":{ - "tags":{ - "type":"object", - "additionalProperties":{ - "type":"string" - }, - "x-ms-mutability":[ - "read", - "create", - "update" - ], - "description":"Resource tags." - }, - "location":{ - "type":"string", - "x-ms-mutability":[ - "read", - "create" - ], - "description":"Resource location." - } - }, - "required":[ - "location" - ], - "allOf":[ - { - "$ref":"#/definitions/Resource" - } - ] - }, "ElasticPoolProperties":{ "properties":{ "creationDate":{ @@ -396,7 +342,7 @@ }, "allOf":[ { - "$ref":"#/definitions/TrackedResource" + "$ref":"../../../common/v1/types.json#/definitions/TrackedResource" } ], "description":"Represents a database elastic pool." @@ -418,7 +364,7 @@ }, "allOf":[ { - "$ref":"#/definitions/Resource" + "$ref":"../../../common/v1/types.json#/definitions/Resource" } ], "description":"Represents an elastic pool update." diff --git a/specification/sql/resource-manager/Microsoft.Sql/stable/2014-04-01/examples/CapabilitiesList.json b/specification/sql/resource-manager/Microsoft.Sql/stable/2014-04-01/examples/CapabilitiesList.json index 2bbf0b8d9898..b154e81320a3 100644 --- a/specification/sql/resource-manager/Microsoft.Sql/stable/2014-04-01/examples/CapabilitiesList.json +++ b/specification/sql/resource-manager/Microsoft.Sql/stable/2014-04-01/examples/CapabilitiesList.json @@ -2,7 +2,7 @@ "parameters": { "subscriptionId": "00000000-1111-2222-3333-444444444444", "locationId": "eastus2euap", - "api-version": "2014-04-01", + "api-version": "2014-04-01" }, "responses": { "200": { diff --git a/specification/sql/resource-manager/Microsoft.Sql/stable/2014-04-01/firewallRules.json b/specification/sql/resource-manager/Microsoft.Sql/stable/2014-04-01/firewallRules.json index de19a56c3c6b..e56b65e20402 100644 --- a/specification/sql/resource-manager/Microsoft.Sql/stable/2014-04-01/firewallRules.json +++ b/specification/sql/resource-manager/Microsoft.Sql/stable/2014-04-01/firewallRules.json @@ -190,35 +190,6 @@ } }, "definitions": { - "Resource":{ - "description":"ARM resource.", - "properties":{ - "id":{ - "readOnly":true, - "type":"string", - "description":"Resource ID." - }, - "name":{ - "readOnly":true, - "type":"string", - "description":"Resource name." - }, - "type":{ - "readOnly":true, - "type":"string", - "description":"Resource type." - } - }, - "x-ms-azure-resource": true - }, - "ProxyResource":{ - "description":"ARM proxy resource.", - "allOf":[ - { - "$ref":"#/definitions/Resource" - } - ] - }, "FirewallRuleProperties": { "properties": { "startIpAddress": { @@ -258,7 +229,7 @@ }, "allOf": [ { - "$ref": "#/definitions/ProxyResource" + "$ref": "../../../common/v1/types.json#/definitions/ProxyResource" } ], "description": "Represents a server firewall rule." diff --git a/specification/sql/resource-manager/Microsoft.Sql/stable/2014-04-01/geoBackupPolicies.json b/specification/sql/resource-manager/Microsoft.Sql/stable/2014-04-01/geoBackupPolicies.json index 2d0d5201cbba..440eadba4fbf 100644 --- a/specification/sql/resource-manager/Microsoft.Sql/stable/2014-04-01/geoBackupPolicies.json +++ b/specification/sql/resource-manager/Microsoft.Sql/stable/2014-04-01/geoBackupPolicies.json @@ -206,7 +206,7 @@ ], "allOf": [ { - "$ref": "#/definitions/ProxyResource" + "$ref": "../../../common/v1/types.json#/definitions/ProxyResource" } ], "description": "A database geo backup policy." @@ -222,35 +222,6 @@ } }, "description": "The response to a list geo backup policies request." - }, - "Resource":{ - "description":"ARM resource.", - "properties":{ - "id":{ - "readOnly":true, - "type":"string", - "description":"Resource ID." - }, - "name":{ - "readOnly":true, - "type":"string", - "description":"Resource name." - }, - "type":{ - "readOnly":true, - "type":"string", - "description":"Resource type." - } - }, - "x-ms-azure-resource": true - }, - "ProxyResource":{ - "description":"ARM proxy resource.", - "allOf":[ - { - "$ref":"#/definitions/Resource" - } - ] } }, "parameters": { diff --git a/specification/sql/resource-manager/Microsoft.Sql/stable/2014-04-01/importExport.json b/specification/sql/resource-manager/Microsoft.Sql/stable/2014-04-01/importExport.json index c55f12be4e06..b948e2c6f95a 100644 --- a/specification/sql/resource-manager/Microsoft.Sql/stable/2014-04-01/importExport.json +++ b/specification/sql/resource-manager/Microsoft.Sql/stable/2014-04-01/importExport.json @@ -194,68 +194,6 @@ } }, "definitions": { - "Resource":{ - "description":"ARM resource.", - "properties":{ - "id":{ - "readOnly":true, - "type":"string", - "description":"Resource ID." - }, - "name":{ - "readOnly":true, - "type":"string", - "description":"Resource name." - }, - "type":{ - "readOnly":true, - "type":"string", - "description":"Resource type." - } - }, - "x-ms-azure-resource": true - }, - "TrackedResource":{ - "description":"ARM tracked top level resource.", - "properties":{ - "tags":{ - "type":"object", - "additionalProperties":{ - "type":"string" - }, - "x-ms-mutability":[ - "read", - "create", - "update" - ], - "description":"Resource tags." - }, - "location":{ - "type":"string", - "x-ms-mutability":[ - "read", - "create" - ], - "description":"Resource location." - } - }, - "required":[ - "location" - ], - "allOf":[ - { - "$ref":"#/definitions/Resource" - } - ] - }, - "ProxyResource":{ - "description":"ARM proxy resource.", - "allOf":[ - { - "$ref":"#/definitions/Resource" - } - ] - }, "ImportExtensionProperties": { "properties": { "operationMode": { @@ -303,7 +241,7 @@ } }, "allOf": [{ - "$ref": "#/definitions/ProxyResource" + "$ref": "../../../common/v1/types.json#/definitions/ProxyResource" }], "description": "Response for Import/Export Get operation." }, diff --git a/specification/sql/resource-manager/Microsoft.Sql/stable/2014-04-01/metrics.json b/specification/sql/resource-manager/Microsoft.Sql/stable/2014-04-01/metrics.json index 409f6f5f5c87..7e7b74f2050f 100644 --- a/specification/sql/resource-manager/Microsoft.Sql/stable/2014-04-01/metrics.json +++ b/specification/sql/resource-manager/Microsoft.Sql/stable/2014-04-01/metrics.json @@ -208,35 +208,6 @@ } }, "definitions": { - "Resource":{ - "description":"ARM resource.", - "properties":{ - "id":{ - "readOnly":true, - "type":"string", - "description":"Resource ID." - }, - "name":{ - "readOnly":true, - "type":"string", - "description":"Resource name." - }, - "type":{ - "readOnly":true, - "type":"string", - "description":"Resource type." - } - }, - "x-ms-azure-resource": true - }, - "ProxyResource":{ - "description":"ARM proxy resource.", - "allOf":[ - { - "$ref":"#/definitions/Resource" - } - ] - }, "MetricValue": { "properties": { "count": { diff --git a/specification/sql/resource-manager/Microsoft.Sql/stable/2014-04-01/recommendedElasticPools.json b/specification/sql/resource-manager/Microsoft.Sql/stable/2014-04-01/recommendedElasticPools.json index be51abf75f75..3e5099890b7f 100644 --- a/specification/sql/resource-manager/Microsoft.Sql/stable/2014-04-01/recommendedElasticPools.json +++ b/specification/sql/resource-manager/Microsoft.Sql/stable/2014-04-01/recommendedElasticPools.json @@ -146,68 +146,6 @@ } }, "definitions": { - "Resource": { - "description": "ARM resource.", - "properties": { - "id": { - "readOnly": true, - "type": "string", - "description": "Resource ID." - }, - "name": { - "readOnly": true, - "type": "string", - "description": "Resource name." - }, - "type": { - "readOnly": true, - "type": "string", - "description": "Resource type." - } - }, - "x-ms-azure-resource": true - }, - "TrackedResource": { - "description": "ARM tracked top level resource.", - "properties": { - "tags": { - "type": "object", - "additionalProperties": { - "type": "string" - }, - "x-ms-mutability": [ - "read", - "create", - "update" - ], - "description": "Resource tags." - }, - "location": { - "type": "string", - "x-ms-mutability": [ - "read", - "create" - ], - "description": "Resource location." - } - }, - "required": [ - "location" - ], - "allOf": [ - { - "$ref": "#/definitions/Resource" - } - ] - }, - "ProxyResource": { - "description": "ARM proxy resource.", - "allOf": [ - { - "$ref": "#/definitions/Resource" - } - ] - }, "RecommendedElasticPoolMetric": { "properties": { "dateTime": { @@ -317,7 +255,7 @@ }, "allOf": [ { - "$ref": "#/definitions/ProxyResource" + "$ref": "../../../common/v1/types.json#/definitions/ProxyResource" } ], "description": "Represents a recommented elastic pool." diff --git a/specification/sql/resource-manager/Microsoft.Sql/stable/2014-04-01/recommendedElasticPoolsDecoupled.json b/specification/sql/resource-manager/Microsoft.Sql/stable/2014-04-01/recommendedElasticPoolsDecoupled.json index 4c65683994ee..87b5cee16cc1 100644 --- a/specification/sql/resource-manager/Microsoft.Sql/stable/2014-04-01/recommendedElasticPoolsDecoupled.json +++ b/specification/sql/resource-manager/Microsoft.Sql/stable/2014-04-01/recommendedElasticPoolsDecoupled.json @@ -146,68 +146,6 @@ } }, "definitions": { - "Resource": { - "description": "ARM resource.", - "properties": { - "id": { - "readOnly": true, - "type": "string", - "description": "Resource ID." - }, - "name": { - "readOnly": true, - "type": "string", - "description": "Resource name." - }, - "type": { - "readOnly": true, - "type": "string", - "description": "Resource type." - } - }, - "x-ms-azure-resource": true - }, - "TrackedResource": { - "description": "ARM tracked top level resource.", - "properties": { - "tags": { - "type": "object", - "additionalProperties": { - "type": "string" - }, - "x-ms-mutability": [ - "read", - "create", - "update" - ], - "description": "Resource tags." - }, - "location": { - "type": "string", - "x-ms-mutability": [ - "read", - "create" - ], - "description": "Resource location." - } - }, - "required": [ - "location" - ], - "allOf": [ - { - "$ref": "#/definitions/Resource" - } - ] - }, - "ProxyResource": { - "description": "ARM proxy resource.", - "allOf": [ - { - "$ref": "#/definitions/Resource" - } - ] - }, "RecommendedElasticPoolMetric": { "properties": { "dateTime": { @@ -292,7 +230,7 @@ "readOnly": true, "type": "array", "items": { - "$ref": "#/definitions/TrackedResource" + "$ref": "../../../common/v1/types.json#/definitions/TrackedResource" }, "description": "The list of databases in this pool. Expanded property" }, @@ -317,7 +255,7 @@ }, "allOf": [ { - "$ref": "#/definitions/ProxyResource" + "$ref": "../../../common/v1/types.json#/definitions/ProxyResource" } ], "description": "Represents a recommented elastic pool." diff --git a/specification/sql/resource-manager/Microsoft.Sql/stable/2014-04-01/replicationLinks.json b/specification/sql/resource-manager/Microsoft.Sql/stable/2014-04-01/replicationLinks.json index bdafeb301038..03f55bdef80b 100644 --- a/specification/sql/resource-manager/Microsoft.Sql/stable/2014-04-01/replicationLinks.json +++ b/specification/sql/resource-manager/Microsoft.Sql/stable/2014-04-01/replicationLinks.json @@ -254,35 +254,6 @@ } }, "definitions": { - "Resource":{ - "description":"ARM resource.", - "properties":{ - "id":{ - "readOnly":true, - "type":"string", - "description":"Resource ID." - }, - "name":{ - "readOnly":true, - "type":"string", - "description":"Resource name." - }, - "type":{ - "readOnly":true, - "type":"string", - "description":"Resource type." - } - }, - "x-ms-azure-resource": true - }, - "ProxyResource":{ - "description":"ARM proxy resource.", - "allOf":[ - { - "$ref":"#/definitions/Resource" - } - ] - }, "ReplicationLinkProperties": { "properties": { "isTerminationAllowed": { @@ -390,7 +361,7 @@ }, "allOf": [ { - "$ref": "#/definitions/ProxyResource" + "$ref": "../../../common/v1/types.json#/definitions/ProxyResource" } ], "description": "Represents a database replication link." diff --git a/specification/sql/resource-manager/Microsoft.Sql/stable/2014-04-01/restorePoints.json b/specification/sql/resource-manager/Microsoft.Sql/stable/2014-04-01/restorePoints.json index 3e2269dad36a..c6fd5043c343 100644 --- a/specification/sql/resource-manager/Microsoft.Sql/stable/2014-04-01/restorePoints.json +++ b/specification/sql/resource-manager/Microsoft.Sql/stable/2014-04-01/restorePoints.json @@ -102,7 +102,7 @@ }, "allOf": [ { - "$ref": "./backups.json#/definitions/ProxyResource" + "$ref": "../../../common/v1/types.json#/definitions/ProxyResource" } ], "description": "A database restore point." diff --git a/specification/sql/resource-manager/Microsoft.Sql/stable/2014-04-01/serverAzureADAdministrators.json b/specification/sql/resource-manager/Microsoft.Sql/stable/2014-04-01/serverAzureADAdministrators.json index b02250f591a5..41bde5bbc1dc 100644 --- a/specification/sql/resource-manager/Microsoft.Sql/stable/2014-04-01/serverAzureADAdministrators.json +++ b/specification/sql/resource-manager/Microsoft.Sql/stable/2014-04-01/serverAzureADAdministrators.json @@ -205,35 +205,6 @@ } }, "definitions":{ - "Resource":{ - "description":"ARM resource.", - "properties":{ - "id":{ - "readOnly":true, - "type":"string", - "description":"Resource ID." - }, - "name":{ - "readOnly":true, - "type":"string", - "description":"Resource name." - }, - "type":{ - "readOnly":true, - "type":"string", - "description":"Resource type." - } - }, - "x-ms-azure-resource": true - }, - "ProxyResource":{ - "description":"ARM proxy resource.", - "allOf":[ - { - "$ref":"#/definitions/Resource" - } - ] - }, "ServerAdministratorProperties":{ "properties":{ "administratorType":{ @@ -279,7 +250,7 @@ }, "allOf":[ { - "$ref":"#/definitions/ProxyResource" + "$ref":"../../../common/v1/types.json#/definitions/ProxyResource" } ], "description":"An server Active Directory Administrator." diff --git a/specification/sql/resource-manager/Microsoft.Sql/stable/2014-04-01/serverCommunicationLinks.json b/specification/sql/resource-manager/Microsoft.Sql/stable/2014-04-01/serverCommunicationLinks.json index d211debd067b..7d5b7c9b4338 100644 --- a/specification/sql/resource-manager/Microsoft.Sql/stable/2014-04-01/serverCommunicationLinks.json +++ b/specification/sql/resource-manager/Microsoft.Sql/stable/2014-04-01/serverCommunicationLinks.json @@ -223,7 +223,7 @@ }, "allOf": [ { - "$ref": "#/definitions/ProxyResource" + "$ref": "../../../common/v1/types.json#/definitions/ProxyResource" } ], "description": "Server communication link." @@ -239,35 +239,6 @@ } }, "description": "A list of server communication links." - }, - "Resource":{ - "description":"ARM resource.", - "properties":{ - "id":{ - "readOnly":true, - "type":"string", - "description":"Resource ID." - }, - "name":{ - "readOnly":true, - "type":"string", - "description":"Resource name." - }, - "type":{ - "readOnly":true, - "type":"string", - "description":"Resource type." - } - }, - "x-ms-azure-resource": true - }, - "ProxyResource":{ - "description":"ARM proxy resource.", - "allOf":[ - { - "$ref":"#/definitions/Resource" - } - ] } }, "parameters": { diff --git a/specification/sql/resource-manager/Microsoft.Sql/stable/2014-04-01/servers.json b/specification/sql/resource-manager/Microsoft.Sql/stable/2014-04-01/servers.json index bde6a4043862..f341c9f4d416 100644 --- a/specification/sql/resource-manager/Microsoft.Sql/stable/2014-04-01/servers.json +++ b/specification/sql/resource-manager/Microsoft.Sql/stable/2014-04-01/servers.json @@ -239,68 +239,6 @@ } }, "definitions": { - "Resource":{ - "description":"ARM resource.", - "properties":{ - "id":{ - "readOnly":true, - "type":"string", - "description":"Resource ID." - }, - "name":{ - "readOnly":true, - "type":"string", - "description":"Resource name." - }, - "type":{ - "readOnly":true, - "type":"string", - "description":"Resource type." - } - }, - "x-ms-azure-resource": true - }, - "TrackedResource":{ - "description":"ARM tracked top level resource.", - "properties":{ - "tags":{ - "type":"object", - "additionalProperties":{ - "type":"string" - }, - "x-ms-mutability":[ - "read", - "create", - "update" - ], - "description":"Resource tags." - }, - "location":{ - "type":"string", - "x-ms-mutability":[ - "read", - "create" - ], - "description":"Resource location." - } - }, - "required":[ - "location" - ], - "allOf":[ - { - "$ref":"#/definitions/Resource" - } - ] - }, - "ProxyResource":{ - "description":"ARM proxy resource.", - "allOf":[ - { - "$ref":"#/definitions/Resource" - } - ] - }, "ServerProperties": { "properties": { "fullyQualifiedDomainName": { @@ -365,7 +303,7 @@ }, "allOf": [ { - "$ref": "#/definitions/TrackedResource" + "$ref": "../../../common/v1/types.json#/definitions/TrackedResource" } ], "description": "Represents a server." @@ -387,7 +325,7 @@ }, "allOf": [ { - "$ref": "#/definitions/Resource" + "$ref": "../../../common/v1/types.json#/definitions/Resource" } ], "description": "Represents an update to a server." diff --git a/specification/sql/resource-manager/Microsoft.Sql/stable/2014-04-01/serviceObjectives.json b/specification/sql/resource-manager/Microsoft.Sql/stable/2014-04-01/serviceObjectives.json index 42be84471fb2..4472fd6acbd6 100644 --- a/specification/sql/resource-manager/Microsoft.Sql/stable/2014-04-01/serviceObjectives.json +++ b/specification/sql/resource-manager/Microsoft.Sql/stable/2014-04-01/serviceObjectives.json @@ -96,35 +96,6 @@ } }, "definitions": { - "Resource":{ - "description":"ARM resource.", - "properties":{ - "id":{ - "readOnly":true, - "type":"string", - "description":"Resource ID." - }, - "name":{ - "readOnly":true, - "type":"string", - "description":"Resource name." - }, - "type":{ - "readOnly":true, - "type":"string", - "description":"Resource type." - } - }, - "x-ms-azure-resource": true - }, - "ProxyResource":{ - "description":"ARM proxy resource.", - "allOf":[ - { - "$ref":"#/definitions/Resource" - } - ] - }, "ServiceObjective": { "properties": { "properties": { @@ -135,7 +106,7 @@ }, "allOf": [ { - "$ref": "#/definitions/ProxyResource" + "$ref": "../../../common/v1/types.json#/definitions/ProxyResource" } ], "description": "Represents a database service objective." diff --git a/specification/sql/resource-manager/Microsoft.Sql/stable/2014-04-01/sql.core.json b/specification/sql/resource-manager/Microsoft.Sql/stable/2014-04-01/sql.core.json index abf2348732b9..b4fd8b79dfe5 100644 --- a/specification/sql/resource-manager/Microsoft.Sql/stable/2014-04-01/sql.core.json +++ b/specification/sql/resource-manager/Microsoft.Sql/stable/2014-04-01/sql.core.json @@ -346,68 +346,6 @@ } }, "definitions": { - "Resource":{ - "description":"ARM resource.", - "properties":{ - "id":{ - "readOnly":true, - "type":"string", - "description":"Resource ID." - }, - "name":{ - "readOnly":true, - "type":"string", - "description":"Resource name." - }, - "type":{ - "readOnly":true, - "type":"string", - "description":"Resource type." - } - }, - "x-ms-azure-resource": true - }, - "TrackedResource":{ - "description":"ARM tracked top level resource.", - "properties":{ - "tags":{ - "type":"object", - "additionalProperties":{ - "type":"string" - }, - "x-ms-mutability":[ - "read", - "create", - "update" - ], - "description":"Resource tags." - }, - "location":{ - "type":"string", - "x-ms-mutability":[ - "read", - "create" - ], - "description":"Resource location." - } - }, - "required":[ - "location" - ], - "allOf":[ - { - "$ref":"#/definitions/Resource" - } - ] - }, - "ProxyResource":{ - "description":"ARM proxy resource.", - "allOf":[ - { - "$ref":"#/definitions/Resource" - } - ] - }, "ElasticPoolActivityProperties": { "properties": { "endTime": { @@ -546,7 +484,7 @@ }, "allOf": [ { - "$ref": "#/definitions/ProxyResource" + "$ref": "../../../common/v1/types.json#/definitions/ProxyResource" } ], "description": "Represents the activity on an elastic pool." @@ -669,7 +607,7 @@ }, "allOf": [ { - "$ref": "#/definitions/ProxyResource" + "$ref": "../../../common/v1/types.json#/definitions/ProxyResource" } ], "description": "Represents the activity on an elastic pool." @@ -810,7 +748,7 @@ }, "allOf": [ { - "$ref": "#/definitions/ProxyResource" + "$ref": "../../../common/v1/types.json#/definitions/ProxyResource" } ], "description": "Represents a database recommended index." @@ -846,7 +784,7 @@ }, "allOf": [ { - "$ref": "#/definitions/ProxyResource" + "$ref": "../../../common/v1/types.json#/definitions/ProxyResource" } ], "description": "Represents a database transparent data encryption configuration." @@ -979,7 +917,7 @@ }, "allOf": [ { - "$ref": "#/definitions/ProxyResource" + "$ref": "../../../common/v1/types.json#/definitions/ProxyResource" } ], "description": "Represents a Service Tier Advisor." @@ -1158,7 +1096,7 @@ }, "allOf": [ { - "$ref": "#/definitions/ProxyResource" + "$ref": "../../../common/v1/types.json#/definitions/ProxyResource" } ], "description": "Represents a database transparent data encryption Scan." diff --git a/specification/sql/resource-manager/Microsoft.Sql/stable/2014-04-01/tableAuditing.json b/specification/sql/resource-manager/Microsoft.Sql/stable/2014-04-01/tableAuditing.json index 6932e5519f76..0a0aebee3c58 100644 --- a/specification/sql/resource-manager/Microsoft.Sql/stable/2014-04-01/tableAuditing.json +++ b/specification/sql/resource-manager/Microsoft.Sql/stable/2014-04-01/tableAuditing.json @@ -502,7 +502,7 @@ "type": "object", "allOf": [ { - "$ref": "#/definitions/ProxyResource" + "$ref": "../../../common/v1/types.json#/definitions/ProxyResource" } ], "properties": { @@ -523,44 +523,12 @@ } } }, - "Resource": { - "description": "ARM resource.", - "type": "object", - "properties": { - "id": { - "description": "Resource ID.", - "type": "string", - "readOnly": true - }, - "name": { - "description": "Resource name.", - "type": "string", - "readOnly": true - }, - "type": { - "description": "Resource type.", - "type": "string", - "readOnly": true - } - }, - "x-ms-azure-resource": true - }, - "ProxyResource": { - "description": "ARM proxy resource.", - "type": "object", - "allOf": [ - { - "$ref": "#/definitions/Resource" - } - ], - "properties": {} - }, "DatabaseTableAuditingPolicy": { "description": "A database table auditing policy.", "type": "object", "allOf": [ { - "$ref": "#/definitions/ProxyResource" + "$ref": "../../../common/v1/types.json#/definitions/ProxyResource" } ], "properties": { @@ -586,7 +554,7 @@ "type": "object", "allOf": [ { - "$ref": "#/definitions/ProxyResource" + "$ref": "../../../common/v1/types.json#/definitions/ProxyResource" } ], "properties": { diff --git a/specification/sql/resource-manager/Microsoft.Sql/stable/2014-04-01/usages.json b/specification/sql/resource-manager/Microsoft.Sql/stable/2014-04-01/usages.json index 0b224c180ef3..a66695b44b16 100644 --- a/specification/sql/resource-manager/Microsoft.Sql/stable/2014-04-01/usages.json +++ b/specification/sql/resource-manager/Microsoft.Sql/stable/2014-04-01/usages.json @@ -99,35 +99,6 @@ } }, "definitions": { - "Resource":{ - "description":"ARM resource.", - "properties":{ - "id":{ - "readOnly":true, - "type":"string", - "description":"Resource ID." - }, - "name":{ - "readOnly":true, - "type":"string", - "description":"Resource name." - }, - "type":{ - "readOnly":true, - "type":"string", - "description":"Resource type." - } - }, - "x-ms-azure-resource": true - }, - "ProxyResource":{ - "description":"ARM proxy resource.", - "allOf":[ - { - "$ref":"#/definitions/Resource" - } - ] - }, "ServerUsage": { "properties": { "name": { diff --git a/specification/sql/resource-manager/Microsoft.Sql/stable/2015-05-01/usages.json b/specification/sql/resource-manager/Microsoft.Sql/stable/2015-05-01/usages.json index dafa493d398f..2cded2b4cee1 100644 --- a/specification/sql/resource-manager/Microsoft.Sql/stable/2015-05-01/usages.json +++ b/specification/sql/resource-manager/Microsoft.Sql/stable/2015-05-01/usages.json @@ -155,44 +155,12 @@ } } }, - "Resource": { - "description": "ARM resource.", - "type": "object", - "properties": { - "id": { - "description": "Resource ID.", - "type": "string", - "readOnly": true - }, - "name": { - "description": "Resource name.", - "type": "string", - "readOnly": true - }, - "type": { - "description": "Resource type.", - "type": "string", - "readOnly": true - } - }, - "x-ms-azure-resource": true - }, - "ProxyResource": { - "description": "ARM proxy resource.", - "type": "object", - "allOf": [ - { - "$ref": "#/definitions/Resource" - } - ], - "properties": {} - }, "SubscriptionUsage": { "description": "Usage Metric of a Subscription in a Location.", "type": "object", "allOf": [ { - "$ref": "#/definitions/ProxyResource" + "$ref": "../../../common/v1/types.json#/definitions/ProxyResource" } ], "properties": { diff --git a/specification/sql/resource-manager/common/v1/types.json b/specification/sql/resource-manager/common/v1/types.json new file mode 100644 index 000000000000..e77cf55c3574 --- /dev/null +++ b/specification/sql/resource-manager/common/v1/types.json @@ -0,0 +1,136 @@ +{ + "swagger":"2.0", + "info":{ + "version":"1.0", + "title":"Common types" + }, + "paths":{ + + }, + "definitions":{ + "Resource":{ + "description":"ARM resource.", + "type":"object", + "properties":{ + "id":{ + "description":"Resource ID.", + "type":"string", + "readOnly":true + }, + "name":{ + "description":"Resource name.", + "type":"string", + "readOnly":true + }, + "type":{ + "description":"Resource type.", + "type":"string", + "readOnly":true + } + }, + "x-ms-azure-resource":true + }, + "ProxyResource":{ + "description":"ARM proxy resource.", + "type":"object", + "allOf":[ + { + "$ref":"#/definitions/Resource" + } + ], + "properties":{ + + } + }, + "TrackedResource":{ + "description":"ARM tracked top level resource.", + "required":[ + "location" + ], + "type":"object", + "allOf":[ + { + "$ref":"#/definitions/Resource" + } + ], + "properties":{ + "location":{ + "description":"Resource location.", + "type":"string", + "x-ms-mutability":[ + "read", + "create" + ] + }, + "tags":{ + "description":"Resource tags.", + "type":"object", + "additionalProperties":{ + "type":"string" + } + } + } + }, + "Sku":{ + "description":"The resource model definition representing SKU", + "properties":{ + "name":{ + "type":"string", + "description":"The name of the SKU. Ex - P3. It is typically a letter+number code" + }, + "tier":{ + "type":"string", + "description":"This field is required to be implemented by the Resource Provider if the service has more than one tier, but is not required on a PUT." + }, + "size":{ + "type":"string", + "description":"The SKU size. When the name field is the combination of tier and some other value, this would be the standalone code. " + }, + "family":{ + "type":"string", + "description":"If the service has different generations of hardware, for the same SKU, then that can be captured here." + }, + "capacity":{ + "type":"integer", + "format":"int32", + "description":"If the SKU supports scale out/in then the capacity integer should be included. If scale out/in is not possible for the resource this may be omitted." + } + }, + "required":[ + "name" + ] + }, + "ResourceIdentity":{ + "description":"Azure Active Directory identity configuration for a resource.", + "type":"object", + "properties":{ + "principalId":{ + "format":"uuid", + "description":"The Azure Active Directory principal id.", + "type":"string", + "readOnly":true + }, + "type":{ + "description":"The identity type. Set this to 'SystemAssigned' in order to automatically create and assign an Azure Active Directory principal for the resource.", + "enum":[ + "SystemAssigned" + ], + "type":"string", + "x-ms-enum":{ + "name":"IdentityType", + "modelAsString":true + } + }, + "tenantId":{ + "format":"uuid", + "description":"The Azure Active Directory tenant id.", + "type":"string", + "readOnly":true + } + } + } + }, + "parameters":{ + + } + } \ No newline at end of file