From 6b69c855bee21666c7e69e56af4442b6b9ffce21 Mon Sep 17 00:00:00 2001 From: Yao Kou Date: Tue, 31 Oct 2023 10:42:54 +0800 Subject: [PATCH 1/3] update google ads for adf and synapse --- .../2018-06-01/entityTypes/LinkedService.json | 19 +++++++++++++ .../2020-12-01/entityTypes/LinkedService.json | 27 ++++++++++++++++--- 2 files changed, 42 insertions(+), 4 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 b49d340edbc3..867492380fd5 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 @@ -7045,6 +7045,10 @@ "description": "Google AdWords service linked service properties.", "type": "object", "properties": { + "connectionProperties": { + "description": "(Deprecated) Properties used to connect to GoogleAds. It is mutually exclusive with any other properties in the linked service. Type: object.", + "type": "object" + }, "clientCustomerID": { "description": "The Client customer ID of the AdWords account that you want to fetch report data for. Type: string (or Expression with resultType string).", "x-ms-format": "dfe-string", @@ -7084,6 +7088,21 @@ "x-ms-format": "dfe-string", "type": "object" }, + "keyFilePath": { + "description": "(Deprecated) The full path to the .p12 key file that is used to authenticate the service account email address and can only be used on self-hosted IR. Type: string (or Expression with resultType string).", + "x-ms-format": "dfe-string", + "type": "object" + }, + "trustedCertPath": { + "description": "(Deprecated) The full path of the .pem file containing trusted CA certificates for verifying the server when connecting over SSL. This property can only be set when using SSL on self-hosted IR. The default value is the cacerts.pem file installed with the IR. Type: string (or Expression with resultType string).", + "x-ms-format": "dfe-string", + "type": "object" + }, + "useSystemTrustStore": { + "description": "(Deprecated) Specifies whether to use a CA certificate from the system trust store or from a specified PEM file. The default value is false. Type: boolean (or Expression with resultType boolean).", + "x-ms-format": "dfe-bool", + "type": "object" + }, "privateKey": { "description": "The private key that is used to authenticate the service account email address and can only be used on self-hosted IR.", "$ref": "../datafactory.json#/definitions/SecretBase" diff --git a/specification/synapse/data-plane/Microsoft.Synapse/stable/2020-12-01/entityTypes/LinkedService.json b/specification/synapse/data-plane/Microsoft.Synapse/stable/2020-12-01/entityTypes/LinkedService.json index bbca978ede88..3e40e86da1aa 100644 --- a/specification/synapse/data-plane/Microsoft.Synapse/stable/2020-12-01/entityTypes/LinkedService.json +++ b/specification/synapse/data-plane/Microsoft.Synapse/stable/2020-12-01/entityTypes/LinkedService.json @@ -6476,7 +6476,7 @@ "type": "object", "properties": { "connectionProperties": { - "description": "Properties used to connect to GoogleAds. It is mutually exclusive with any other properties in the linked service. Type: object.", + "description": "(Deprecated) Properties used to connect to GoogleAds. It is mutually exclusive with any other properties in the linked service. Type: object.", "type": "object" }, "clientCustomerID": { @@ -6516,15 +6516,34 @@ "type": "object" }, "keyFilePath": { - "description": "The full path to the .p12 key file that is used to authenticate the service account email address and can only be used on self-hosted IR.", + "description": "(Deprecated) The full path to the .p12 key file that is used to authenticate the service account email address and can only be used on self-hosted IR.", "type": "object" }, "trustedCertPath": { - "description": "The full path of the .pem file containing trusted CA certificates for verifying the server when connecting over SSL. This property can only be set when using SSL on self-hosted IR. The default value is the cacerts.pem file installed with the IR.", + "description": "(Deprecated) The full path of the .pem file containing trusted CA certificates for verifying the server when connecting over SSL. This property can only be set when using SSL on self-hosted IR. The default value is the cacerts.pem file installed with the IR.", "type": "object" }, "useSystemTrustStore": { - "description": "Specifies whether to use a CA certificate from the system trust store or from a specified PEM file. The default value is false.", + "description": "(Deprecated) Specifies whether to use a CA certificate from the system trust store or from a specified PEM file. The default value is false.", + "type": "object" + }, + "privateKey": { + "description": "The private key that is used to authenticate the service account email address and can only be used on self-hosted IR.", + "$ref": "../datafactory.json#/definitions/SecretBase" + }, + "loginCustomerID": { + "description": "The customer ID of the Google Ads Manager account through which you want to fetch report data of specific Customer. Type: string (or Expression with resultType string).", + "x-ms-format": "dfe-string", + "type": "object" + }, + "googleAdsApiVersion": { + "description": "The Google Ads API major version such as v14. The supported major versions could be found on https://developers.google.com/google-ads/api/docs/sunset-dates#timetable. Type: string (or Expression with resultType string).", + "x-ms-format": "dfe-string", + "type": "object" + }, + "supportLegacyDataTypes": { + "description": "Specifies whether to use the legacy data type mappings, which maps float, int32 and int64 from Google to string. Do not set this to true unless you want to keep backward compatibility with legacy driver's data type mappings. Type: boolean (or Expression with resultType boolean).", + "x-ms-format": "dfe-bool", "type": "object" }, "encryptedCredential": { From 5acd9e891a48c66d4a0419fc4f62bacba50ba98d Mon Sep 17 00:00:00 2001 From: Yao Kou Date: Tue, 31 Oct 2023 11:11:51 +0800 Subject: [PATCH 2/3] fix errors --- .../stable/2020-12-01/entityTypes/LinkedService.json | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/specification/synapse/data-plane/Microsoft.Synapse/stable/2020-12-01/entityTypes/LinkedService.json b/specification/synapse/data-plane/Microsoft.Synapse/stable/2020-12-01/entityTypes/LinkedService.json index 3e40e86da1aa..019d0581c8d2 100644 --- a/specification/synapse/data-plane/Microsoft.Synapse/stable/2020-12-01/entityTypes/LinkedService.json +++ b/specification/synapse/data-plane/Microsoft.Synapse/stable/2020-12-01/entityTypes/LinkedService.json @@ -6529,21 +6529,18 @@ }, "privateKey": { "description": "The private key that is used to authenticate the service account email address and can only be used on self-hosted IR.", - "$ref": "../datafactory.json#/definitions/SecretBase" + "$ref": "../artifacts.json#/definitions/SecretBase" }, "loginCustomerID": { - "description": "The customer ID of the Google Ads Manager account through which you want to fetch report data of specific Customer. Type: string (or Expression with resultType string).", - "x-ms-format": "dfe-string", + "description": "The customer ID of the Google Ads Manager account through which you want to fetch report data of specific Customer.", "type": "object" }, "googleAdsApiVersion": { - "description": "The Google Ads API major version such as v14. The supported major versions could be found on https://developers.google.com/google-ads/api/docs/sunset-dates#timetable. Type: string (or Expression with resultType string).", - "x-ms-format": "dfe-string", + "description": "The Google Ads API major version such as v14. The supported major versions could be found on https://developers.google.com/google-ads/api/docs/sunset-dates#timetable.", "type": "object" }, "supportLegacyDataTypes": { "description": "Specifies whether to use the legacy data type mappings, which maps float, int32 and int64 from Google to string. Do not set this to true unless you want to keep backward compatibility with legacy driver's data type mappings. Type: boolean (or Expression with resultType boolean).", - "x-ms-format": "dfe-bool", "type": "object" }, "encryptedCredential": { From 2c37e900164aa457e440b99bc41d81270455fcc3 Mon Sep 17 00:00:00 2001 From: Yao Kou Date: Mon, 6 Nov 2023 10:14:49 +0800 Subject: [PATCH 3/3] update the link used in description --- .../stable/2018-06-01/entityTypes/LinkedService.json | 2 +- .../stable/2020-12-01/entityTypes/LinkedService.json | 2 +- 2 files 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 867492380fd5..548c9a78da7f 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 @@ -7113,7 +7113,7 @@ "type": "object" }, "googleAdsApiVersion": { - "description": "The Google Ads API major version such as v14. The supported major versions could be found on https://developers.google.com/google-ads/api/docs/sunset-dates#timetable. Type: string (or Expression with resultType string).", + "description": "The Google Ads API major version such as v14. The supported major versions could be found on https://developers.google.com/google-ads/api/docs/release-notes. Type: string (or Expression with resultType string).", "x-ms-format": "dfe-string", "type": "object" }, diff --git a/specification/synapse/data-plane/Microsoft.Synapse/stable/2020-12-01/entityTypes/LinkedService.json b/specification/synapse/data-plane/Microsoft.Synapse/stable/2020-12-01/entityTypes/LinkedService.json index 019d0581c8d2..fe05b3b0b298 100644 --- a/specification/synapse/data-plane/Microsoft.Synapse/stable/2020-12-01/entityTypes/LinkedService.json +++ b/specification/synapse/data-plane/Microsoft.Synapse/stable/2020-12-01/entityTypes/LinkedService.json @@ -6536,7 +6536,7 @@ "type": "object" }, "googleAdsApiVersion": { - "description": "The Google Ads API major version such as v14. The supported major versions could be found on https://developers.google.com/google-ads/api/docs/sunset-dates#timetable.", + "description": "The Google Ads API major version such as v14. The supported major versions could be found on https://developers.google.com/google-ads/api/docs/release-notes.", "type": "object" }, "supportLegacyDataTypes": {