From 0ea49435e92bc352684dc84e389de63466259684 Mon Sep 17 00:00:00 2001 From: Alex Aloni Date: Fri, 15 Jan 2021 00:14:23 -0500 Subject: [PATCH] Updating to use common types and fixing Service 360 violation. (#11902) * updating to common types * fixing prettier check error * addressing PR feedback * fixing prettier error Co-authored-by: Alex Dubinkov Co-authored-by: Arcturus Zhang --- .../2020-04-01-preview/changeanalysis.json | 80 +++++-------------- 1 file changed, 22 insertions(+), 58 deletions(-) diff --git a/specification/changeanalysis/resource-manager/Microsoft.ChangeAnalysis/preview/2020-04-01-preview/changeanalysis.json b/specification/changeanalysis/resource-manager/Microsoft.ChangeAnalysis/preview/2020-04-01-preview/changeanalysis.json index 5e9311a95e5a..1292c7a93dcc 100644 --- a/specification/changeanalysis/resource-manager/Microsoft.ChangeAnalysis/preview/2020-04-01-preview/changeanalysis.json +++ b/specification/changeanalysis/resource-manager/Microsoft.ChangeAnalysis/preview/2020-04-01-preview/changeanalysis.json @@ -22,13 +22,13 @@ ], "parameters": [ { - "$ref": "#/parameters/SubscriptionIdParameter" + "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/SubscriptionIdParameter" }, { "$ref": "#/parameters/ProfileNameParameter" }, { - "$ref": "#/parameters/ApiVersionParameter" + "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ApiVersionParameter" } ], "responses": { @@ -41,7 +41,7 @@ "default": { "description": "Error response describing why the operation failed", "schema": { - "$ref": "#/definitions/Error" + "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse" } } }, @@ -66,13 +66,13 @@ ], "parameters": [ { - "$ref": "#/parameters/SubscriptionIdParameter" + "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/SubscriptionIdParameter" }, { "$ref": "#/parameters/ProfileNameParameter" }, { - "$ref": "#/parameters/ApiVersionParameter" + "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ApiVersionParameter" }, { "in": "body", @@ -93,7 +93,7 @@ "default": { "description": "Error response describing why the operation failed", "schema": { - "$ref": "#/definitions/Error" + "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse" } } }, @@ -121,13 +121,13 @@ ], "parameters": [ { - "$ref": "#/parameters/SubscriptionIdParameter" + "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/SubscriptionIdParameter" }, { "$ref": "#/parameters/ProfileNameParameter" }, { - "$ref": "#/parameters/ApiVersionParameter" + "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ApiVersionParameter" }, { "in": "body", @@ -148,7 +148,7 @@ "default": { "description": "Error response describing why the operation failed", "schema": { - "$ref": "#/definitions/Error" + "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse" } } }, @@ -172,13 +172,13 @@ ], "parameters": [ { - "$ref": "#/parameters/SubscriptionIdParameter" + "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/SubscriptionIdParameter" }, { "$ref": "#/parameters/ProfileNameParameter" }, { - "$ref": "#/parameters/ApiVersionParameter" + "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ApiVersionParameter" } ], "responses": { @@ -191,7 +191,7 @@ "default": { "description": "Error response describing why the operation failed", "schema": { - "$ref": "#/definitions/Error" + "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse" } } }, @@ -215,7 +215,7 @@ ], "parameters": [ { - "$ref": "#/parameters/ApiVersionParameter" + "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ApiVersionParameter" }, { "in": "query", @@ -234,7 +234,7 @@ "default": { "description": "Error response describing why the operation failed", "schema": { - "$ref": "#/definitions/Error" + "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse" } } }, @@ -371,7 +371,7 @@ "type": "object", "allOf": [ { - "$ref": "#/definitions/ProxyResource" + "$ref": "#/definitions/ExtendedProxyResource" } ], "properties": { @@ -383,24 +383,15 @@ } } }, - "ProxyResource": { + "ExtendedProxyResource": { "description": "An Azure resource.", + "type": "object", + "allOf": [ + { + "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/ProxyResource" + } + ], "properties": { - "id": { - "description": "Fully qualified resource Id for the resource. Ex - /subscriptions/{subscriptionId}/providers/{resourceProviderNamespace}/{resourceType}/{resourceName}.", - "type": "string", - "readOnly": true - }, - "name": { - "description": "The name of the resource.", - "type": "string", - "readOnly": true - }, - "type": { - "description": "The type of the resource.", - "type": "string", - "readOnly": true - }, "systemData": { "$ref": "#/definitions/SystemData" } @@ -458,19 +449,6 @@ "type": "string" } } - }, - "Error": { - "description": "Unexpected Microsoft.ChangeAnalysis Resource Provider Error.", - "properties": { - "code": { - "description": "Error code.", - "type": "string" - }, - "message": { - "description": "Error message.", - "type": "string" - } - } } }, "parameters": { @@ -482,20 +460,6 @@ "type": "string", "pattern": "^(?!.*-$)[^-][a-zA-Z0-9-]*$", "x-ms-parameter-location": "method" - }, - "SubscriptionIdParameter": { - "in": "path", - "name": "subscriptionId", - "description": "The Microsoft Azure subscription ID.", - "required": true, - "type": "string" - }, - "ApiVersionParameter": { - "in": "query", - "name": "api-version", - "description": "The resource provider API version.", - "required": true, - "type": "string" } }, "securityDefinitions": {