Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[DataFactory & Synapse] Update GoogleAds #26480

Merged
merged 3 commits into from
Nov 6, 2023
Merged

[DataFactory & Synapse] Update GoogleAds #26480

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6b69c85
update google ads for adf and synapse
Yao725 Oct 31, 2023
5acd9e8
fix errors
Yao725 Oct 31, 2023
2c37e90
update the link used in description
Yao725 Nov 6, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 20 additions & 1 deletion ...y/resource-manager/Microsoft.DataFactory/stable/2018-06-01/entityTypes/LinkedService.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7045,6 +7045,10 @@
"description": "Google AdWords service linked service properties.",
"type": "object",
"properties": {
"connectionProperties": {
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

These properties were accidentally removed in the previous PR, which doesn't follow the best practice, so add them back here.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

generic property bags are not allowed in azure. pl remove them or give them a concrete defintiion.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In ADF this is by design to support both primitive type and object type. Btw, as my previous comment mentioned, these properties are not newly added, I remove them unintentional in my previous PR and add them back here to avoid breaking the customers.

"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",
Expand Down Expand Up @@ -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"
Expand All @@ -7094,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"
},
Expand Down
24 changes: 20 additions & 4 deletions ...ion/synapse/data-plane/Microsoft.Synapse/stable/2020-12-01/entityTypes/LinkedService.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand Down Expand Up @@ -6516,15 +6516,31 @@
"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": "../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": "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/release-notes.",
"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).",
"type": "object"
},
"encryptedCredential": {
Expand Down