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

[AutoPR datafactory] [Hub Generated] Review request for Microsoft.DataFactory to add version stable/2018-06-01 #5337

Closed
wants to merge 1 commit into from
Closed

[AutoPR datafactory] [Hub Generated] Review request for Microsoft.DataFactory to add version stable/2018-06-01 #5337

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
125 changes: 120 additions & 5 deletions schemas/2018-06-01/Microsoft.DataFactory.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2369,6 +2369,22 @@
"properties": {},
"description": "The encrypted credential used for authentication. Credentials are encrypted using the integration runtime credential manager. Type: string (or Expression with resultType string)."
},
"servicePrincipalCredential": {
"oneOf": [
{
"$ref": "#/definitions/SecretBase"
},
{
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
}
],
"description": "The base definition of a secret type."
},
"servicePrincipalCredentialType": {
"type": "object",
"properties": {},
"description": "The service principal credential type to use in Server-To-Server authentication. 'ServicePrincipalKey' for key/secret, 'ServicePrincipalCert' for certificate. Type: string (or Expression with resultType string)."
},
"servicePrincipalId": {
"type": "object",
"properties": {},
Expand Down Expand Up @@ -3010,6 +3026,17 @@
"properties": {},
"description": "The id of an existing interactive cluster that will be used for all runs of this job. Type: string (or Expression with resultType string)."
},
"credential": {
"oneOf": [
{
"$ref": "#/definitions/CredentialReference"
},
{
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
}
],
"description": "Credential reference type."
},
"domain": {
"type": "object",
"properties": {},
Expand All @@ -3019,6 +3046,11 @@
"type": "object",
"properties": {},
"description": "The encrypted credential used for authentication. Credentials are encrypted using the integration runtime credential manager. Type: string (or Expression with resultType string)."
},
"workspaceResourceId": {
"type": "object",
"properties": {},
"description": "Workspace resource id for databricks REST API. Type: string (or Expression with resultType string)."
}
},
"required": [
Expand Down Expand Up @@ -7081,6 +7113,9 @@
{
"$ref": "#/definitions/WaitActivity"
},
{
"$ref": "#/definitions/FailActivity"
},
{
"$ref": "#/definitions/UntilActivity"
},
Expand Down Expand Up @@ -7728,6 +7763,17 @@
"properties": {},
"description": "The connection string. Type: string, SecureString or AzureKeyVaultSecretReference."
},
"credential": {
"oneOf": [
{
"$ref": "#/definitions/CredentialReference"
},
{
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
}
],
"description": "Credential reference type."
},
"database": {
"type": "object",
"properties": {},
Expand Down Expand Up @@ -10852,6 +10898,17 @@
"properties": {},
"description": "The authentication type to connect to Dynamics server. 'Office365' for online scenario, 'Ifd' for on-premises with Ifd scenario, 'AADServicePrincipal' for Server-To-Server authentication in online scenario. Type: string (or Expression with resultType string)."
},
"credential": {
"oneOf": [
{
"$ref": "#/definitions/CredentialReference"
},
{
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
}
],
"description": "Credential reference type."
},
"deploymentType": {
"type": "object",
"properties": {},
Expand Down Expand Up @@ -12594,6 +12651,53 @@
],
"description": "Factory's VSTS repo information."
},
"FailActivity": {
"type": "object",
"properties": {
"type": {
"type": "string",
"enum": [
"Fail"
]
},
"typeProperties": {
"oneOf": [
{
"$ref": "#/definitions/FailActivityTypeProperties"
},
{
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
}
],
"description": "Fail activity properties."
}
},
"required": [
"type",
"typeProperties"
],
"description": "This activity will fail within its own scope and output a custom error message and error code. The error message and code can provided either as a string literal or as an expression that can be evaluated to a string at runtime. The activity scope can be the whole pipeline or a control activity (e.g. foreach, switch, until), if the fail activity is contained in it."
},
"FailActivityTypeProperties": {
"type": "object",
"properties": {
"errorCode": {
"type": "object",
"properties": {},
"description": "The error code that categorizes the error type of the Fail activity. It can be dynamic content that's evaluated to a non empty/blank string at runtime. Type: string (or Expression with resultType string)."
},
"message": {
"type": "object",
"properties": {},
"description": "The error message that surfaced in the Fail activity. It can be dynamic content that's evaluated to a non empty/blank string at runtime. Type: string (or Expression with resultType string)."
}
},
"required": [
"errorCode",
"message"
],
"description": "Fail activity properties."
},
"FileServerLinkedService": {
"type": "object",
"properties": {
Expand Down Expand Up @@ -13541,6 +13645,11 @@
],
"description": "The base definition of a secret type."
},
"connectionProperties": {
"type": "object",
"properties": {},
"description": "Properties used to connect to GoogleAds. It is mutually exclusive with any other properties in the linked service. Type: object."
},
"developerToken": {
"oneOf": [
{
Expand Down Expand Up @@ -13589,11 +13698,6 @@
"description": "Specifies whether to use a CA certificate from the system trust store or from a specified PEM file. The default value is false."
}
},
"required": [
"authenticationType",
"clientCustomerID",
"developerToken"
],
"description": "Google AdWords service linked service properties."
},
"GoogleAdWordsObjectDataset": {
Expand Down Expand Up @@ -17463,6 +17567,17 @@
"RBAC"
]
},
"credential": {
"oneOf": [
{
"$ref": "#/definitions/CredentialReference"
},
{
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
}
],
"description": "Credential reference type."
},
"resourceId": {
"type": "string",
"description": "The resource identifier of the integration runtime to be shared."
Expand Down