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.

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

add 2 storage linked service type: AzureBlobStorage, AzureTableStorage and support aad auth for AzureBlobStorage #3331

Merged
merged 2 commits into from
Aug 1, 2018
Merged
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,46 @@
"typeProperties"
]
},
"AzureBlobStorageLinkedService": {
"x-ms-discriminator-value": "AzureBlobStorage",
"description": "The azure blob storage linked service.",
"type": "object",
"allOf": [
{
"$ref": "#/definitions/LinkedService"
}
],
"properties": {
"typeProperties": {
"description": "Azure Blob Storage linked service properties.",
"x-ms-client-flatten": true,
"$ref": "#/definitions/AzureBlobStorageLinkedServiceTypeProperties"
}
},
"required": [
"typeProperties"
]
},
"AzureTableStorageLinkedService": {
"x-ms-discriminator-value": "AzureTableStorage",
"description": "The azure table storage linked service.",
"type": "object",
"allOf": [
{
"$ref": "#/definitions/LinkedService"
}
],
"properties": {
"typeProperties": {
"description": "Azure Table Storage linked service properties.",
"x-ms-client-flatten": true,
"$ref": "#/definitions/AzureStorageLinkedServiceTypeProperties"
}
},
"required": [
"typeProperties"
]
},
"AzureStorageLinkedServiceTypeProperties": {
"description": "Azure Storage linked service properties.",
"properties": {
Expand All @@ -74,7 +114,40 @@
"$ref": "../datafactory.json#/definitions/SecretBase"
},
"encryptedCredential": {
"type": "string",
"description": "The encrypted credential used for authentication. Credentials are encrypted using the integration runtime credential manager. Type: string (or Expression with resultType string)."
}
}
},
"AzureBlobStorageLinkedServiceTypeProperties": {
"description": "Azure Blob Storage linked service properties.",
"properties": {
"connectionString": {
"type": "object",
"description": "The connection string. It is mutually exclusive with sasUri, serviceEndpoint property. Type: string, SecureString or AzureKeyVaultSecretReference."
},
"sasUri": {
"description": "SAS URI of the Azure Blob Storage resource. It is mutually exclusive with connectionString, serviceEndpoint property.",
"$ref": "../datafactory.json#/definitions/SecretBase"
},
"serviceEndpoint": {
"type": "string",
"description": "Blob service endpoint of the Azure Blob Storage resource. It is mutually exclusive with connectionString, sasUri property."
},
"servicePrincipalId": {
"type": "object",
"description": "The ID of the service principal used to authenticate against Azure SQL Data Warehouse. Type: string (or Expression with resultType string)."
},
"servicePrincipalKey": {
"$ref": "../datafactory.json#/definitions/SecretBase",
"description": "The key of the service principal used to authenticate against Azure SQL Data Warehouse."
},
"tenant": {
"type": "object",
"description": "The name or ID of the tenant to which the service principal belongs. Type: string (or Expression with resultType string)."
},
"encryptedCredential": {
"type": "string",
"description": "The encrypted credential used for authentication. Credentials are encrypted using the integration runtime credential manager. Type: string (or Expression with resultType string)."
}
}
Expand Down