From 98088644119083797d83384f66b8751974ba12a6 Mon Sep 17 00:00:00 2001 From: Alan Feng Date: Thu, 17 Jun 2021 17:10:31 -0700 Subject: [PATCH 1/4] add schema definition fix from 2021-01-01-preview --- .../preview/2021-04-01-preview/definitions.json | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/definitions.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/definitions.json index 939373ed9cdc..c9fbd5fd627c 100644 --- a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/definitions.json +++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/definitions.json @@ -4998,16 +4998,7 @@ "description": "API Schema create or update contract Properties." }, "SchemaDocumentProperties": { - "properties": { - "value": { - "type": "string", - "description": "Json escaped string defining the document representing the Schema. Used for schemas other than Swagger/OpenAPI." - }, - "definitions": { - "type": "object", - "description": "Types definitions. Used for Swagger/OpenAPI schemas only, null otherwise." - } - }, + "type": "object", "description": "Schema Document Properties." }, "SubscriptionCollection": { From 84706f0c3f054535f689ad068518552051c88471 Mon Sep 17 00:00:00 2001 From: Alan Feng Date: Wed, 18 Aug 2021 17:38:11 -0700 Subject: [PATCH 2/4] added properties for SchemaDocumentProperties --- .../preview/2021-01-01-preview/definitions.json | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-01-01-preview/definitions.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-01-01-preview/definitions.json index d6d917f5d309..c242f9e5e0c1 100644 --- a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-01-01-preview/definitions.json +++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-01-01-preview/definitions.json @@ -4993,7 +4993,11 @@ }, "definitions": { "type": "object", - "description": "Types definitions. Used for Swagger/OpenAPI schemas only, null otherwise." + "description": "Types definitions. Used for Swagger/OpenAPI v1 schemas only, null otherwise." + }, + "components": { + "type": "object", + "description": "Types definitions. Used for Swagger/OpenAPI v2/v3 schemas only, null otherwise." } }, "description": "Schema Document Properties." From 0dfb249abbdabcc1b18d6f11859a3c562c11fc3b Mon Sep 17 00:00:00 2001 From: Alan Feng Date: Mon, 23 Aug 2021 14:10:58 -0700 Subject: [PATCH 3/4] updated the fix --- .../preview/2021-01-01-preview/definitions.json | 15 +-------------- .../preview/2021-04-01-preview/definitions.json | 15 ++++++++++++++- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-01-01-preview/definitions.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-01-01-preview/definitions.json index c242f9e5e0c1..e7cef40ed991 100644 --- a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-01-01-preview/definitions.json +++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-01-01-preview/definitions.json @@ -4986,20 +4986,7 @@ "description": "API Schema create or update contract Properties." }, "SchemaDocumentProperties": { - "properties": { - "value": { - "type": "string", - "description": "Json escaped string defining the document representing the Schema. Used for schemas other than Swagger/OpenAPI." - }, - "definitions": { - "type": "object", - "description": "Types definitions. Used for Swagger/OpenAPI v1 schemas only, null otherwise." - }, - "components": { - "type": "object", - "description": "Types definitions. Used for Swagger/OpenAPI v2/v3 schemas only, null otherwise." - } - }, + "type": "object", "description": "Schema Document Properties." }, "SubscriptionCollection": { diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/definitions.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/definitions.json index e7e23ab2461c..1a6b88ea1e05 100644 --- a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/definitions.json +++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/definitions.json @@ -5025,7 +5025,20 @@ "description": "API Schema create or update contract Properties." }, "SchemaDocumentProperties": { - "type": "object", + "properties": { + "value": { + "type": "string", + "description": "Json escaped string defining the document representing the Schema. Used for schemas other than Swagger/OpenAPI." + }, + "definitions": { + "type": "object", + "description": "Types definitions. Used for Swagger/OpenAPI v1 schemas only, null otherwise." + }, + "components": { + "type": "object", + "description": "Types definitions. Used for Swagger/OpenAPI v2/v3 schemas only, null otherwise." + } + }, "description": "Schema Document Properties." }, "SubscriptionCollection": { From 6b83d4620c890bd0cde30c1d470415c893c3b7c8 Mon Sep 17 00:00:00 2001 From: Alan Feng Date: Mon, 23 Aug 2021 14:11:45 -0700 Subject: [PATCH 4/4] updated fix --- .../preview/2021-01-01-preview/definitions.json | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-01-01-preview/definitions.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-01-01-preview/definitions.json index e7cef40ed991..d6d917f5d309 100644 --- a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-01-01-preview/definitions.json +++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-01-01-preview/definitions.json @@ -4986,7 +4986,16 @@ "description": "API Schema create or update contract Properties." }, "SchemaDocumentProperties": { - "type": "object", + "properties": { + "value": { + "type": "string", + "description": "Json escaped string defining the document representing the Schema. Used for schemas other than Swagger/OpenAPI." + }, + "definitions": { + "type": "object", + "description": "Types definitions. Used for Swagger/OpenAPI schemas only, null otherwise." + } + }, "description": "Schema Document Properties." }, "SubscriptionCollection": {