From 515979ad8a4a728feb04fcdcc61785c1f7895914 Mon Sep 17 00:00:00 2001 From: Jingshu Pan Date: Wed, 13 Nov 2019 15:45:21 +0800 Subject: [PATCH 1/7] Update MySqlLinkedServiceTypeProperties and PostgreSqlLinkedServiceTypeProperties connectionString type object --- .../preview/2017-09-01-preview/entityTypes/LinkedService.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/specification/datafactory/resource-manager/Microsoft.DataFactory/preview/2017-09-01-preview/entityTypes/LinkedService.json b/specification/datafactory/resource-manager/Microsoft.DataFactory/preview/2017-09-01-preview/entityTypes/LinkedService.json index fdd52c0e61b7..a66ee3b800e2 100644 --- a/specification/datafactory/resource-manager/Microsoft.DataFactory/preview/2017-09-01-preview/entityTypes/LinkedService.json +++ b/specification/datafactory/resource-manager/Microsoft.DataFactory/preview/2017-09-01-preview/entityTypes/LinkedService.json @@ -617,7 +617,7 @@ "properties": { "connectionString": { "description": "The connection string.", - "$ref": "../datafactory.json#/definitions/SecretBase" + "type": "object" }, "encryptedCredential": { "type": "object", @@ -653,7 +653,7 @@ "properties": { "connectionString": { "description": "The connection string.", - "$ref": "../datafactory.json#/definitions/SecretBase" + "type": "object" }, "encryptedCredential": { "type": "object", From 019b79b94986d65750a6f9cb07e91d942dbb3e21 Mon Sep 17 00:00:00 2001 From: Jingshu Pan Date: Wed, 13 Nov 2019 16:06:31 +0800 Subject: [PATCH 2/7] Update --- .../stable/2018-06-01/entityTypes/LinkedService.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/entityTypes/LinkedService.json b/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/entityTypes/LinkedService.json index 1a63a3fcebaf..b91fef4b4100 100644 --- a/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/entityTypes/LinkedService.json +++ b/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/entityTypes/LinkedService.json @@ -1100,7 +1100,7 @@ "properties": { "connectionString": { "description": "The connection string.", - "$ref": "../datafactory.json#/definitions/SecretBase" + "type": "object" }, "password": { "$ref": "../datafactory.json#/definitions/AzureKeyVaultSecretReference", @@ -1140,7 +1140,7 @@ "properties": { "connectionString": { "description": "The connection string.", - "$ref": "../datafactory.json#/definitions/SecretBase" + "type": "object" }, "password": { "$ref": "../datafactory.json#/definitions/AzureKeyVaultSecretReference", From a1ecfec4e43b84693ac05cf40b12edf707e13b28 Mon Sep 17 00:00:00 2001 From: Jingshu Pan Date: Wed, 13 Nov 2019 16:07:06 +0800 Subject: [PATCH 3/7] Update --- .../preview/2017-09-01-preview/entityTypes/LinkedService.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/specification/datafactory/resource-manager/Microsoft.DataFactory/preview/2017-09-01-preview/entityTypes/LinkedService.json b/specification/datafactory/resource-manager/Microsoft.DataFactory/preview/2017-09-01-preview/entityTypes/LinkedService.json index a66ee3b800e2..fdd52c0e61b7 100644 --- a/specification/datafactory/resource-manager/Microsoft.DataFactory/preview/2017-09-01-preview/entityTypes/LinkedService.json +++ b/specification/datafactory/resource-manager/Microsoft.DataFactory/preview/2017-09-01-preview/entityTypes/LinkedService.json @@ -617,7 +617,7 @@ "properties": { "connectionString": { "description": "The connection string.", - "type": "object" + "$ref": "../datafactory.json#/definitions/SecretBase" }, "encryptedCredential": { "type": "object", @@ -653,7 +653,7 @@ "properties": { "connectionString": { "description": "The connection string.", - "type": "object" + "$ref": "../datafactory.json#/definitions/SecretBase" }, "encryptedCredential": { "type": "object", From 7772ab28e64edffd20af1080be3affdf58e254d6 Mon Sep 17 00:00:00 2001 From: Jingshu Pan Date: Wed, 13 Nov 2019 17:06:03 +0800 Subject: [PATCH 4/7] Test require --- .../stable/2018-06-01/entityTypes/DataFlow.json | 5 ++++- 1 file changed, 4 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 3644a5838df0..46bc68a873c5 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 @@ -36,7 +36,10 @@ } } } - } + }, + "required": [ + "type" + ] }, "MappingDataFlow": { "x-ms-discriminator-value": "MappingDataFlow", From fa51bf27ac6fba20853553f1313c19dac4874d28 Mon Sep 17 00:00:00 2001 From: Jingshu Pan Date: Wed, 13 Nov 2019 17:16:21 +0800 Subject: [PATCH 5/7] Undo test --- .../stable/2018-06-01/entityTypes/DataFlow.json | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) 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 46bc68a873c5..3644a5838df0 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 @@ -36,10 +36,7 @@ } } } - }, - "required": [ - "type" - ] + } }, "MappingDataFlow": { "x-ms-discriminator-value": "MappingDataFlow", From 8cc61e0e0a5fdfaffb58f8ee1bb48cccfcdde90d Mon Sep 17 00:00:00 2001 From: Jingshu Pan Date: Wed, 13 Nov 2019 17:26:58 +0800 Subject: [PATCH 6/7] Add readme update --- specification/datafactory/resource-manager/readme.md | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/specification/datafactory/resource-manager/readme.md b/specification/datafactory/resource-manager/readme.md index 7961ef331280..29b6f3f0ba11 100644 --- a/specification/datafactory/resource-manager/readme.md +++ b/specification/datafactory/resource-manager/readme.md @@ -212,7 +212,11 @@ directive: reason: - toBeExportedForShoebox is property we send to Azure Monitor which requires the boolean type - The other properties are simple and self explanatory - + suppress: OAV131 # EnumInsteadOfBoolean + where: + - $(this-folder)/Microsoft.DataFactory/stable/2018-06-01/entityTypes/LinkedService.json + reason: + - DataFlow add type required ``` ## Multi-API/Profile support for AutoRest v3 generators From d0fb02aff104516fa122c7741517ec66115a4120 Mon Sep 17 00:00:00 2001 From: Jingshu Pan Date: Thu, 14 Nov 2019 09:37:17 +0800 Subject: [PATCH 7/7] Add - --- specification/datafactory/resource-manager/readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/specification/datafactory/resource-manager/readme.md b/specification/datafactory/resource-manager/readme.md index 29b6f3f0ba11..6ab27eaa4547 100644 --- a/specification/datafactory/resource-manager/readme.md +++ b/specification/datafactory/resource-manager/readme.md @@ -212,7 +212,7 @@ directive: reason: - toBeExportedForShoebox is property we send to Azure Monitor which requires the boolean type - The other properties are simple and self explanatory - suppress: OAV131 # EnumInsteadOfBoolean + - suppress: OAV131 # EnumInsteadOfBoolean where: - $(this-folder)/Microsoft.DataFactory/stable/2018-06-01/entityTypes/LinkedService.json reason: