diff --git a/schemas/2017-09-01-preview/Microsoft.DataFactory.json b/schemas/2017-09-01-preview/Microsoft.DataFactory.json index bdfc2aa0e4..a435d66f1b 100644 --- a/schemas/2017-09-01-preview/Microsoft.DataFactory.json +++ b/schemas/2017-09-01-preview/Microsoft.DataFactory.json @@ -3318,8 +3318,18 @@ "type": "object", "properties": { "level": { - "type": "object", - "properties": {}, + "oneOf": [ + { + "type": "string", + "enum": [ + "Optimal", + "Fastest" + ] + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], "description": "The Deflate compression level." }, "type": { @@ -3338,8 +3348,18 @@ "type": "object", "properties": { "level": { - "type": "object", - "properties": {}, + "oneOf": [ + { + "type": "string", + "enum": [ + "Optimal", + "Fastest" + ] + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], "description": "The GZip compression level." }, "type": { @@ -3434,8 +3454,18 @@ "type": "object", "properties": { "level": { - "type": "object", - "properties": {}, + "oneOf": [ + { + "type": "string", + "enum": [ + "Optimal", + "Fastest" + ] + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], "description": "The ZipDeflate compression level." }, "type": { @@ -3700,13 +3730,33 @@ "type": "object", "properties": { "authenticationType": { - "type": "object", - "properties": {}, + "oneOf": [ + { + "type": "string", + "enum": [ + "Office365", + "Ifd" + ] + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], "description": "The authentication type to connect to Dynamics server. 'Office365' for online scenario, 'Ifd' for on-premises with Ifd scenario. Type: string (or Expression with resultType string)." }, "deploymentType": { - "type": "object", - "properties": {}, + "oneOf": [ + { + "type": "string", + "enum": [ + "Online", + "OnPremisesWithIfd" + ] + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], "description": "The deployment type of the Dynamics instance. 'Online' for Dynamics Online and 'OnPremisesWithIfd' for Dynamics on-premises with Ifd. Type: string (or Expression with resultType string)." }, "encryptedCredential": { @@ -11237,8 +11287,23 @@ "type": "object", "properties": { "type": { - "type": "object", - "properties": {}, + "oneOf": [ + { + "type": "string", + "enum": [ + "String", + "Int", + "Int64", + "Decimal", + "Guid", + "Boolean", + "Date" + ] + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], "description": "Stored procedure parameter type." }, "value": { @@ -12175,4 +12240,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..e057971b29 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." }, @@ -6085,8 +6246,18 @@ "description": "The base definition of a secret type." }, "servicePrincipalCredentialType": { - "type": "object", - "properties": {}, + "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": { @@ -7000,6 +7171,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 +7205,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." @@ -8613,8 +8840,18 @@ "type": "object", "properties": { "level": { - "type": "object", - "properties": {}, + "oneOf": [ + { + "type": "string", + "enum": [ + "Optimal", + "Fastest" + ] + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], "description": "The Deflate compression level." }, "type": { @@ -8643,8 +8880,18 @@ "type": "object", "properties": { "level": { - "type": "object", - "properties": {}, + "oneOf": [ + { + "type": "string", + "enum": [ + "Optimal", + "Fastest" + ] + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], "description": "The GZip compression level." }, "type": { @@ -8680,6 +8927,12 @@ { "$ref": "#/definitions/AzureFileStorageLocation" }, + { + "$ref": "#/definitions/AmazonS3CompatibleLocation" + }, + { + "$ref": "#/definitions/OracleCloudStorageLocation" + }, { "$ref": "#/definitions/GoogleCloudStorageLocation" }, @@ -8838,8 +9091,18 @@ "type": "object", "properties": { "level": { - "type": "object", - "properties": {}, + "oneOf": [ + { + "type": "string", + "enum": [ + "Optimal", + "Fastest" + ] + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], "description": "The TarGZip compression level." }, "type": { @@ -8858,8 +9121,18 @@ "type": "object", "properties": { "level": { - "type": "object", - "properties": {}, + "oneOf": [ + { + "type": "string", + "enum": [ + "Optimal", + "Fastest" + ] + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], "description": "The ZipDeflate compression level." }, "type": { @@ -9182,8 +9455,18 @@ ] }, "compressionLevel": { - "type": "object", - "properties": {}, + "oneOf": [ + { + "type": "string", + "enum": [ + "Optimal", + "Fastest" + ] + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], "description": "The data compression method used for DelimitedText." }, "encodingName": { @@ -10016,8 +10299,18 @@ "description": "The base definition of a secret type." }, "servicePrincipalCredentialType": { - "type": "object", - "properties": {}, + "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": { @@ -10257,8 +10550,18 @@ "description": "The base definition of a secret type." }, "servicePrincipalCredentialType": { - "type": "object", - "properties": {}, + "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": { @@ -14879,6 +15182,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": {}, @@ -16252,8 +16560,18 @@ "description": "The code page name of the preferred encoding. If not provided, the default value is 'utf-8', unless the byte order mark (BOM) denotes another Unicode encoding. The full list of supported values can be found in the 'Name' column of the table of encodings in the following reference: https://go.microsoft.com/fwlink/?linkid=861078. Type: string (or Expression with resultType string)." }, "filePattern": { - "type": "object", - "properties": {}, + "oneOf": [ + { + "type": "string", + "enum": [ + "setOfObjects", + "arrayOfObjects" + ] + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], "description": "File pattern of JSON. To be more specific, the way of separating a collection of JSON objects. The default value is 'setOfObjects'. It is case-sensitive." }, "jsonNodeReference": { @@ -16585,6 +16903,12 @@ { "$ref": "#/definitions/AzureFileStorageLinkedService" }, + { + "$ref": "#/definitions/AmazonS3CompatibleLinkedService" + }, + { + "$ref": "#/definitions/OracleCloudStorageLinkedService" + }, { "$ref": "#/definitions/GoogleCloudStorageLinkedService" }, @@ -18766,6 +19090,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 +19567,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 +22079,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": {}, @@ -23434,8 +23923,19 @@ "description": "The parameters for the script action." }, "roles": { - "type": "object", - "properties": {}, + "oneOf": [ + { + "type": "string", + "enum": [ + "Headnode", + "Workernode", + "Zookeeper" + ] + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], "description": "The node types on which the script action should be executed." }, "uri": { @@ -23884,7 +24384,8 @@ "type": "string", "enum": [ "Basic", - "SshPublicKey" + "SshPublicKey", + "MultiFactor" ] }, { @@ -25912,6 +26413,12 @@ { "$ref": "#/definitions/AzureFileStorageReadSettings" }, + { + "$ref": "#/definitions/AmazonS3CompatibleReadSettings" + }, + { + "$ref": "#/definitions/OracleCloudStorageReadSettings" + }, { "$ref": "#/definitions/GoogleCloudStorageReadSettings" }, @@ -28339,4 +28846,4 @@ "description": "A copy activity Zoho server source." } } -} \ No newline at end of file +}