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

Fix bug For Github Issues #24226

Merged
merged 4 commits into from
Jun 12, 2023
+47 −40
Merged

Fix bug For Github Issues #24226

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8589085
Merge pull request #1 from Azure/main
Jingshu923 May 31, 2023
e719684
Fix Bug For Github Issues
Jingshu918 May 31, 2023
655758d
fix
Jingshu918 May 31, 2023
be64441
fix
Jingshu918 May 31, 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
5 changes: 5 additions & 0 deletions ...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 @@ -1897,6 +1897,11 @@
"x-ms-format": "dfe-string",
"description": "Azure ML Service workspace name. Type: string (or Expression with resultType string)."
},
"authentication": {
"type": "object",
"x-ms-format": "dfe-string",
"description": "Type of authentication (Required to specify MSI) used to connect to AzureML. Type: string (or Expression with resultType string)."
},
"servicePrincipalId": {
"type": "object",
"x-ms-format": "dfe-string",
Expand Down
38 changes: 18 additions & 20 deletions ...actory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/entityTypes/Pipeline.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2271,16 +2271,9 @@
"description": "Database query. Type: string (or Expression with resultType string)."
},
"readBehavior": {
"description": "The read behavior for the operation. Default is Query.",
"type": "string",
"enum": [
"Query",
"QueryAll"
],
"x-ms-enum": {
"name": "SalesforceSourceReadBehavior",
"modelAsString": true
}
"description": "The read behavior for the operation. Default is Query. Type: string (or Expression with resultType string).",
Jingshu923 marked this conversation as resolved.
Show resolved Hide resolved
"type": "object",
"x-ms-format": "dfe-string"
}
}
},
Expand All @@ -2299,23 +2292,28 @@
"description": "Database query. Type: string (or Expression with resultType string)."
},
"readBehavior": {
"description": "The read behavior for the operation. Default is Query.",
"type": "string",
"enum": [
"Query",
"QueryAll"
],
"x-ms-enum": {
"name": "SalesforceSourceReadBehavior",
"modelAsString": true
}
"description": "The read behavior for the operation. Default is Query. Type: string (or Expression with resultType string).",
"type": "object",
"x-ms-format": "dfe-string"
},
"additionalColumns": {
"type": "object",
"description": "Specifies the additional columns to be added to source data. Type: array of objects(AdditionalColumns) (or Expression with resultType array of objects)."
}
}
},
"SalesforceSourceReadBehavior": {
"description": "The Salesforce read behavior for the operation",
"type": "string",
"enum": [
"Query",
"QueryAll"
],
"x-ms-enum": {
"name": "SalesforceSourceReadBehavior",
"modelAsString": true
}
},
"SapCloudForCustomerSource": {
"description": "A copy activity source for SAP Cloud for Customer source.",
"type": "object",
Expand Down
8 changes: 8 additions & 0 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 @@ -1616,6 +1616,10 @@
"encryptedCredential": {
"type": "object",
"description": "The encrypted credential used for authentication. Credentials are encrypted using the integration runtime credential manager. Type: string (or Expression with resultType string)."
},
"authentication": {
"type": "object",
"description": "Type of authentication (Required to specify MSI) used to connect to AzureML. Type: string (or Expression with resultType string)."
}
},
"required": [
Expand Down Expand Up @@ -1659,6 +1663,10 @@
"type": "object",
"description": "Azure ML Service workspace name. Type: string (or Expression with resultType string)."
},
"authentication": {
"type": "object",
"description": "Type of authentication (Required to specify MSI) used to connect to AzureML. Type: string (or Expression with resultType string)."
},
"servicePrincipalId": {
"type": "object",
"description": "The ID of the service principal used to authenticate against the endpoint of a published Azure ML Service pipeline. Type: string (or Expression with resultType string)."
Expand Down
36 changes: 16 additions & 20 deletions ...fication/synapse/data-plane/Microsoft.Synapse/stable/2020-12-01/entityTypes/Pipeline.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1900,16 +1900,8 @@
"description": "Database query. Type: string (or Expression with resultType string)."
},
"readBehavior": {
"description": "The read behavior for the operation. Default is Query.",
"type": "string",
"enum": [
"Query",
"QueryAll"
],
"x-ms-enum": {
"name": "SalesforceSourceReadBehavior",
"modelAsString": true
}
"description": "The read behavior for the operation. Default is Query. Type: string (or Expression with resultType string).",
"type": "object"
}
}
},
Expand All @@ -1927,23 +1919,27 @@
"description": "Database query. Type: string (or Expression with resultType string)."
},
"readBehavior": {
"description": "The read behavior for the operation. Default is Query.",
"type": "string",
"enum": [
"Query",
"QueryAll"
],
"x-ms-enum": {
"name": "SalesforceSourceReadBehavior",
"modelAsString": true
}
"description": "The read behavior for the operation. Default is Query. Type: string (or Expression with resultType string).",
"type": "object"
},
"additionalColumns": {
"type": "object",
"description": "Specifies the additional columns to be added to source data. Type: array of objects(AdditionalColumns) (or Expression with resultType array of objects)."
}
}
},
"SalesforceSourceReadBehavior": {
"description": "The Salesforce read behavior for the operation",
"type": "string",
"enum": [
"Query",
"QueryAll"
],
"x-ms-enum": {
"name": "SalesforceSourceReadBehavior",
"modelAsString": true
}
},
"SapCloudForCustomerSource": {
"description": "A copy activity source for SAP Cloud for Customer source.",
"type": "object",
Expand Down