From 238e4bd34fd676e9f71c72cd7580d3112aa7702f Mon Sep 17 00:00:00 2001 From: 804873052 <804873052@qq.com> Date: Thu, 28 Oct 2021 17:24:06 +0800 Subject: [PATCH 1/8] require DataFlow --- .../stable/2018-06-01/entityTypes/DataFlow.json | 1 + 1 file changed, 1 insertion(+) diff --git a/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/entityTypes/DataFlow.json b/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/entityTypes/DataFlow.json index f7b280011422..1bb68a8bf6d9 100644 --- a/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/entityTypes/DataFlow.json +++ b/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/entityTypes/DataFlow.json @@ -21,6 +21,7 @@ "description": "Azure Data Factory nested object which contains a flow with data movements and transformations.", "type": "object", "discriminator": "type", + "required": ["type"], "properties": { "type": { "type": "string", From 9079b6b832d3d299a5524735ececb0a4234a0c91 Mon Sep 17 00:00:00 2001 From: 804873052 <804873052@qq.com> Date: Thu, 28 Oct 2021 17:44:17 +0800 Subject: [PATCH 2/8] ManagedPrivateEndpoint,ManagedVirtualNetwork --- .../stable/2018-06-01/entityTypes/ManagedPrivateEndpoint.json | 3 +++ .../stable/2018-06-01/entityTypes/ManagedVirtualNetwork.json | 1 - 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/entityTypes/ManagedPrivateEndpoint.json b/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/entityTypes/ManagedPrivateEndpoint.json index 068ad1370cda..212fd4e391fb 100644 --- a/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/entityTypes/ManagedPrivateEndpoint.json +++ b/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/entityTypes/ManagedPrivateEndpoint.json @@ -21,6 +21,9 @@ "description": "Properties of a managed private endpoint", "type": "object", "discriminator": "type", + "required": [ + "groupId" + ], "properties": { "connectionState": { "description": "The managed private endpoint connection state", diff --git a/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/entityTypes/ManagedVirtualNetwork.json b/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/entityTypes/ManagedVirtualNetwork.json index 486abeced71c..ea70992a92dc 100644 --- a/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/entityTypes/ManagedVirtualNetwork.json +++ b/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/entityTypes/ManagedVirtualNetwork.json @@ -20,7 +20,6 @@ "ManagedVirtualNetwork": { "description": "A managed Virtual Network associated with the Azure Data Factory", "type": "object", - "discriminator": "type", "properties": { "vNetId": { "description": "Managed Virtual Network ID.", From 5a8249dd13cb9184acf300b000fed5943c46cd61 Mon Sep 17 00:00:00 2001 From: 804873052 <804873052@qq.com> Date: Thu, 28 Oct 2021 17:46:33 +0800 Subject: [PATCH 3/8] fix --- .../stable/2018-06-01/entityTypes/ManagedPrivateEndpoint.json | 4 ---- 1 file changed, 4 deletions(-) diff --git a/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/entityTypes/ManagedPrivateEndpoint.json b/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/entityTypes/ManagedPrivateEndpoint.json index 212fd4e391fb..a8a177f99a6f 100644 --- a/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/entityTypes/ManagedPrivateEndpoint.json +++ b/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/entityTypes/ManagedPrivateEndpoint.json @@ -20,10 +20,6 @@ "ManagedPrivateEndpoint": { "description": "Properties of a managed private endpoint", "type": "object", - "discriminator": "type", - "required": [ - "groupId" - ], "properties": { "connectionState": { "description": "The managed private endpoint connection state", From 83a339d5bacb38e4f0812fddcfcdb32a1ed9fb14 Mon Sep 17 00:00:00 2001 From: 804873052 <804873052@qq.com> Date: Thu, 28 Oct 2021 17:50:15 +0800 Subject: [PATCH 4/8] xx --- .../stable/2018-06-01/entityTypes/ManagedPrivateEndpoint.json | 2 ++ 1 file changed, 2 insertions(+) diff --git a/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/entityTypes/ManagedPrivateEndpoint.json b/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/entityTypes/ManagedPrivateEndpoint.json index a8a177f99a6f..58f249db8237 100644 --- a/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/entityTypes/ManagedPrivateEndpoint.json +++ b/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/entityTypes/ManagedPrivateEndpoint.json @@ -20,6 +20,8 @@ "ManagedPrivateEndpoint": { "description": "Properties of a managed private endpoint", "type": "object", + "discriminator": "type", + "required": ["type"], "properties": { "connectionState": { "description": "The managed private endpoint connection state", From 1da6923d38709fdb0b533bad4dce67a000151de2 Mon Sep 17 00:00:00 2001 From: 804873052 <804873052@qq.com> Date: Thu, 28 Oct 2021 17:52:42 +0800 Subject: [PATCH 5/8] ManagedPrivateEndpoint delete discriminator --- .../stable/2018-06-01/entityTypes/ManagedPrivateEndpoint.json | 2 -- 1 file changed, 2 deletions(-) diff --git a/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/entityTypes/ManagedPrivateEndpoint.json b/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/entityTypes/ManagedPrivateEndpoint.json index 58f249db8237..a8a177f99a6f 100644 --- a/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/entityTypes/ManagedPrivateEndpoint.json +++ b/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/entityTypes/ManagedPrivateEndpoint.json @@ -20,8 +20,6 @@ "ManagedPrivateEndpoint": { "description": "Properties of a managed private endpoint", "type": "object", - "discriminator": "type", - "required": ["type"], "properties": { "connectionState": { "description": "The managed private endpoint connection state", From d71857de1f1be7030d7bb0a202415f85bbd7e615 Mon Sep 17 00:00:00 2001 From: 804873052 <804873052@qq.com> Date: Thu, 28 Oct 2021 17:59:33 +0800 Subject: [PATCH 6/8] Duplicate Schema named 'BlobEventTypes' --- .../stable/2018-06-01/entityTypes/Trigger.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/entityTypes/Trigger.json b/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/entityTypes/Trigger.json index 2fe816aded5a..ca384dd05d6e 100644 --- a/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/entityTypes/Trigger.json +++ b/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/entityTypes/Trigger.json @@ -346,7 +346,7 @@ "Microsoft.Storage.BlobDeleted" ], "x-ms-enum": { - "name": "BlobEventTypes", + "name": "BlobEventType", "modelAsString": true } }, From 6b42ef8871f91a871837618e88c74222305d984e Mon Sep 17 00:00:00 2001 From: 804873052 <804873052@qq.com> Date: Tue, 2 Nov 2021 14:31:36 +0800 Subject: [PATCH 7/8] prettier --- .../stable/2018-06-01/entityTypes/DataFlow.json | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/entityTypes/DataFlow.json b/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/entityTypes/DataFlow.json index 1bb68a8bf6d9..2ed2dd6b4e60 100644 --- a/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/entityTypes/DataFlow.json +++ b/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/entityTypes/DataFlow.json @@ -21,7 +21,9 @@ "description": "Azure Data Factory nested object which contains a flow with data movements and transformations.", "type": "object", "discriminator": "type", - "required": ["type"], + "required": [ + "type" + ], "properties": { "type": { "type": "string", From faceb9b5e7811dc8ec283ba80412e393f87cd323 Mon Sep 17 00:00:00 2001 From: ArcturusZhang Date: Wed, 8 Dec 2021 14:09:42 +0800 Subject: [PATCH 8/8] keep the enum type unchanged --- .../stable/2018-06-01/entityTypes/Trigger.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/entityTypes/Trigger.json b/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/entityTypes/Trigger.json index ca384dd05d6e..90468475954c 100644 --- a/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/entityTypes/Trigger.json +++ b/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/entityTypes/Trigger.json @@ -320,7 +320,7 @@ }, "events": { "description": "The type of events that cause this trigger to fire.", - "$ref": "#/definitions/BlobEventTypes" + "$ref": "#/definitions/BlobEventTypeArray" }, "scope": { "description": "The ARM resource ID of the Storage Account.", @@ -337,7 +337,7 @@ "typeProperties" ] }, - "BlobEventTypes": { + "BlobEventTypeArray": { "type": "array", "items": { "type": "string", @@ -346,7 +346,7 @@ "Microsoft.Storage.BlobDeleted" ], "x-ms-enum": { - "name": "BlobEventType", + "name": "BlobEventTypes", "modelAsString": true } },