From cc2a7ffb6cba8a5ad44c9d4c6d13653d39254acf Mon Sep 17 00:00:00 2001 From: SDKAuto Date: Thu, 11 Mar 2021 03:40:27 +0000 Subject: [PATCH] CodeGen from PR 13368 in Azure/azure-rest-api-specs Merge 2fe8dbdb95085d377dfd4895d2884cdff94e12e8 into ff541d84da3e56318de42e92222e9501a9ccb632 --- .../Microsoft.DataFactory.json | 2 +- schemas/2018-06-01/Microsoft.DataFactory.json | 420 +++++++++++++++++- 2 files changed, 414 insertions(+), 8 deletions(-) diff --git a/schemas/2017-09-01-preview/Microsoft.DataFactory.json b/schemas/2017-09-01-preview/Microsoft.DataFactory.json index bdfc2aa0e4..51ef6d0139 100644 --- a/schemas/2017-09-01-preview/Microsoft.DataFactory.json +++ b/schemas/2017-09-01-preview/Microsoft.DataFactory.json @@ -12175,4 +12175,4 @@ "description": "Zoho server dataset." } } -} \ No newline at end of file +} diff --git a/schemas/2018-06-01/Microsoft.DataFactory.json b/schemas/2018-06-01/Microsoft.DataFactory.json index 41891e6a92..4793400c92 100644 --- a/schemas/2018-06-01/Microsoft.DataFactory.json +++ b/schemas/2018-06-01/Microsoft.DataFactory.json @@ -1015,6 +1015,166 @@ }, "description": "Amazon Redshift table dataset properties." }, + "AmazonS3CompatibleLinkedService": { + "type": "object", + "properties": { + "type": { + "type": "string", + "enum": [ + "AmazonS3Compatible" + ] + }, + "typeProperties": { + "oneOf": [ + { + "$ref": "#/definitions/AmazonS3CompatibleLinkedServiceTypeProperties" + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "Amazon S3 Compatible linked service properties." + } + }, + "required": [ + "type", + "typeProperties" + ], + "description": "Linked service for Amazon S3 Compatible." + }, + "AmazonS3CompatibleLinkedServiceTypeProperties": { + "type": "object", + "properties": { + "accessKeyId": { + "type": "object", + "properties": {}, + "description": "The access key identifier of the Amazon S3 Compatible Identity and Access Management (IAM) user. Type: string (or Expression with resultType string)." + }, + "encryptedCredential": { + "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)." + }, + "forcePathStyle": { + "type": "object", + "properties": {}, + "description": "If true, use S3 path-style access instead of virtual hosted-style access. Default value is false. Type: boolean (or Expression with resultType boolean)." + }, + "secretAccessKey": { + "oneOf": [ + { + "$ref": "#/definitions/SecretBase" + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "The base definition of a secret type." + }, + "serviceUrl": { + "type": "object", + "properties": {}, + "description": "This value specifies the endpoint to access with the Amazon S3 Compatible Connector. This is an optional property; change it only if you want to try a different service endpoint or want to switch between https and http. Type: string (or Expression with resultType string)." + } + }, + "description": "Amazon S3 Compatible linked service properties." + }, + "AmazonS3CompatibleLocation": { + "type": "object", + "properties": { + "bucketName": { + "type": "object", + "properties": {}, + "description": "Specify the bucketName of Amazon S3 Compatible. Type: string (or Expression with resultType string)" + }, + "type": { + "type": "string", + "enum": [ + "AmazonS3CompatibleLocation" + ] + }, + "version": { + "type": "object", + "properties": {}, + "description": "Specify the version of Amazon S3 Compatible. Type: string (or Expression with resultType string)." + } + }, + "required": [ + "type" + ], + "description": "The location of Amazon S3 Compatible dataset." + }, + "AmazonS3CompatibleReadSettings": { + "type": "object", + "properties": { + "deleteFilesAfterCompletion": { + "type": "object", + "properties": {}, + "description": "Indicates whether the source files need to be deleted after copy completion. Default is false. Type: boolean (or Expression with resultType boolean)." + }, + "enablePartitionDiscovery": { + "oneOf": [ + { + "type": "boolean" + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "Indicates whether to enable partition discovery." + }, + "fileListPath": { + "type": "object", + "properties": {}, + "description": "Point to a text file that lists each file (relative path to the path configured in the dataset) that you want to copy. Type: string (or Expression with resultType string)." + }, + "modifiedDatetimeEnd": { + "type": "object", + "properties": {}, + "description": "The end of file's modified datetime. Type: string (or Expression with resultType string)." + }, + "modifiedDatetimeStart": { + "type": "object", + "properties": {}, + "description": "The start of file's modified datetime. Type: string (or Expression with resultType string)." + }, + "partitionRootPath": { + "type": "object", + "properties": {}, + "description": "Specify the root path where partition discovery starts from. Type: string (or Expression with resultType string)." + }, + "prefix": { + "type": "object", + "properties": {}, + "description": "The prefix filter for the S3 Compatible object name. Type: string (or Expression with resultType string)." + }, + "recursive": { + "type": "object", + "properties": {}, + "description": "If true, files under the folder path will be read recursively. Default is true. Type: boolean (or Expression with resultType boolean)." + }, + "type": { + "type": "string", + "enum": [ + "AmazonS3CompatibleReadSettings" + ] + }, + "wildcardFileName": { + "type": "object", + "properties": {}, + "description": "Amazon S3 Compatible wildcardFileName. Type: string (or Expression with resultType string)." + }, + "wildcardFolderPath": { + "type": "object", + "properties": {}, + "description": "Amazon S3 Compatible wildcardFolderPath. Type: string (or Expression with resultType string)." + } + }, + "required": [ + "type" + ], + "description": "Amazon S3 Compatible read settings." + }, "AmazonS3Dataset": { "type": "object", "properties": { @@ -1272,7 +1432,7 @@ "required": [ "type" ], - "description": "Azure data lake store read settings." + "description": "Amazon S3 read settings." }, "AppendVariableActivity": { "type": "object", @@ -2061,6 +2221,10 @@ ], "description": "Azure Key Vault secret reference." }, + "accountKind": { + "type": "string", + "description": "Specify the kind of your storage account. Allowed values are: Storage (general purpose v1), StorageV2 (general purpose v2), BlobStorage, or BlockBlobStorage. Type: string (or Expression with resultType string)." + }, "azureCloudType": { "type": "object", "properties": {}, @@ -2746,10 +2910,7 @@ }, "required": [ "database", - "endpoint", - "servicePrincipalId", - "servicePrincipalKey", - "tenant" + "endpoint" ], "description": "Azure Data Explorer (Kusto) linked service properties." }, @@ -7000,6 +7161,26 @@ ], "description": "The base definition of a secret type." }, + "azureCloudType": { + "type": "object", + "properties": {}, + "description": "Indicates the azure cloud type of the service principle auth. Allowed values are AzurePublic, AzureChina, AzureUsGovernment, AzureGermany. Default value is the data factory regions’ cloud type. Type: string (or Expression with resultType string)." + }, + "connectionMode": { + "oneOf": [ + { + "type": "string", + "enum": [ + "Gateway", + "Direct" + ] + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "The connection mode used to access CosmosDB account. Type: string (or Expression with resultType string)." + }, "connectionString": { "type": "object", "properties": {}, @@ -7014,6 +7195,42 @@ "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)." + }, + "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": { + "oneOf": [ + { + "type": "string", + "enum": [ + "ServicePrincipalKey", + "ServicePrincipalCert" + ] + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "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": {}, + "description": "The client ID of the application in Azure Active Directory used for Server-To-Server authentication. Type: string (or Expression with resultType string)." + }, + "tenant": { + "type": "object", + "properties": {}, + "description": "The name or ID of the tenant to which the service principal belongs. Type: string (or Expression with resultType string)." } }, "description": "CosmosDB linked service properties." @@ -8680,6 +8897,12 @@ { "$ref": "#/definitions/AzureFileStorageLocation" }, + { + "$ref": "#/definitions/AmazonS3CompatibleLocation" + }, + { + "$ref": "#/definitions/OracleCloudStorageLocation" + }, { "$ref": "#/definitions/GoogleCloudStorageLocation" }, @@ -14879,6 +15102,11 @@ ], "description": "The authentication type to be used to connect to the HTTP server." }, + "authHeaders": { + "type": "object", + "properties": {}, + "description": "The additional HTTP headers in the request to RESTful API used for authorization. Type: object (or Expression with resultType object)." + }, "certThumbprint": { "type": "object", "properties": {}, @@ -16585,6 +16813,12 @@ { "$ref": "#/definitions/AzureFileStorageLinkedService" }, + { + "$ref": "#/definitions/AmazonS3CompatibleLinkedService" + }, + { + "$ref": "#/definitions/OracleCloudStorageLinkedService" + }, { "$ref": "#/definitions/GoogleCloudStorageLinkedService" }, @@ -18766,6 +19000,11 @@ ], "description": "Type of authentication used to connect to the OData service." }, + "authHeaders": { + "type": "object", + "properties": {}, + "description": "The additional HTTP headers in the request to RESTful API used for authorization. Type: object (or Expression with resultType object)." + }, "azureCloudType": { "type": "object", "properties": {}, @@ -19238,6 +19477,161 @@ ], "description": "A copy activity source for an Office 365 service." }, + "OracleCloudStorageLinkedService": { + "type": "object", + "properties": { + "type": { + "type": "string", + "enum": [ + "OracleCloudStorage" + ] + }, + "typeProperties": { + "oneOf": [ + { + "$ref": "#/definitions/OracleCloudStorageLinkedServiceTypeProperties" + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "Oracle Cloud Storage linked service properties." + } + }, + "required": [ + "type", + "typeProperties" + ], + "description": "Linked service for Oracle Cloud Storage." + }, + "OracleCloudStorageLinkedServiceTypeProperties": { + "type": "object", + "properties": { + "accessKeyId": { + "type": "object", + "properties": {}, + "description": "The access key identifier of the Oracle Cloud Storage Identity and Access Management (IAM) user. Type: string (or Expression with resultType string)." + }, + "encryptedCredential": { + "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)." + }, + "secretAccessKey": { + "oneOf": [ + { + "$ref": "#/definitions/SecretBase" + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "The base definition of a secret type." + }, + "serviceUrl": { + "type": "object", + "properties": {}, + "description": "This value specifies the endpoint to access with the Oracle Cloud Storage Connector. This is an optional property; change it only if you want to try a different service endpoint or want to switch between https and http. Type: string (or Expression with resultType string)." + } + }, + "description": "Oracle Cloud Storage linked service properties." + }, + "OracleCloudStorageLocation": { + "type": "object", + "properties": { + "bucketName": { + "type": "object", + "properties": {}, + "description": "Specify the bucketName of Oracle Cloud Storage. Type: string (or Expression with resultType string)" + }, + "type": { + "type": "string", + "enum": [ + "OracleCloudStorageLocation" + ] + }, + "version": { + "type": "object", + "properties": {}, + "description": "Specify the version of Oracle Cloud Storage. Type: string (or Expression with resultType string)." + } + }, + "required": [ + "type" + ], + "description": "The location of Oracle Cloud Storage dataset." + }, + "OracleCloudStorageReadSettings": { + "type": "object", + "properties": { + "deleteFilesAfterCompletion": { + "type": "object", + "properties": {}, + "description": "Indicates whether the source files need to be deleted after copy completion. Default is false. Type: boolean (or Expression with resultType boolean)." + }, + "enablePartitionDiscovery": { + "oneOf": [ + { + "type": "boolean" + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "Indicates whether to enable partition discovery." + }, + "fileListPath": { + "type": "object", + "properties": {}, + "description": "Point to a text file that lists each file (relative path to the path configured in the dataset) that you want to copy. Type: string (or Expression with resultType string)." + }, + "modifiedDatetimeEnd": { + "type": "object", + "properties": {}, + "description": "The end of file's modified datetime. Type: string (or Expression with resultType string)." + }, + "modifiedDatetimeStart": { + "type": "object", + "properties": {}, + "description": "The start of file's modified datetime. Type: string (or Expression with resultType string)." + }, + "partitionRootPath": { + "type": "object", + "properties": {}, + "description": "Specify the root path where partition discovery starts from. Type: string (or Expression with resultType string)." + }, + "prefix": { + "type": "object", + "properties": {}, + "description": "The prefix filter for the Oracle Cloud Storage object name. Type: string (or Expression with resultType string)." + }, + "recursive": { + "type": "object", + "properties": {}, + "description": "If true, files under the folder path will be read recursively. Default is true. Type: boolean (or Expression with resultType boolean)." + }, + "type": { + "type": "string", + "enum": [ + "OracleCloudStorageReadSettings" + ] + }, + "wildcardFileName": { + "type": "object", + "properties": {}, + "description": "Oracle Cloud Storage wildcardFileName. Type: string (or Expression with resultType string)." + }, + "wildcardFolderPath": { + "type": "object", + "properties": {}, + "description": "Oracle Cloud Storage wildcardFolderPath. Type: string (or Expression with resultType string)." + } + }, + "required": [ + "type" + ], + "description": "Oracle Cloud Storage read settings." + }, "OracleLinkedService": { "type": "object", "properties": { @@ -21595,6 +21989,11 @@ ], "description": "Type of authentication used to connect to the REST service." }, + "authHeaders": { + "type": "object", + "properties": {}, + "description": "The additional HTTP headers in the request to RESTful API used for authorization. Type: object (or Expression with resultType object)." + }, "azureCloudType": { "type": "object", "properties": {}, @@ -23884,7 +24283,8 @@ "type": "string", "enum": [ "Basic", - "SshPublicKey" + "SshPublicKey", + "MultiFactor" ] }, { @@ -25912,6 +26312,12 @@ { "$ref": "#/definitions/AzureFileStorageReadSettings" }, + { + "$ref": "#/definitions/AmazonS3CompatibleReadSettings" + }, + { + "$ref": "#/definitions/OracleCloudStorageReadSettings" + }, { "$ref": "#/definitions/GoogleCloudStorageReadSettings" }, @@ -28339,4 +28745,4 @@ "description": "A copy activity Zoho server source." } } -} \ No newline at end of file +}