diff --git a/lib/services/datafactoryManagement/lib/models/deleteActivity.js b/lib/services/datafactoryManagement/lib/models/deleteActivity.js index 0d05c22a64..ca12b1cea1 100644 --- a/lib/services/datafactoryManagement/lib/models/deleteActivity.js +++ b/lib/services/datafactoryManagement/lib/models/deleteActivity.js @@ -20,9 +20,25 @@ const models = require('./index'); class DeleteActivity extends models['ExecutionActivity'] { /** * Create a DeleteActivity. - * @property {object} [recursive] If true, files under the folder path will - * be deleted recursively. Default is true. Type: boolean (or Expression with - * resultType boolean). + * @property {object} [recursive] If true, files or sub-folders under current + * folder path will be deleted recursively. Default is false. Type: boolean + * (or Expression with resultType boolean). + * @property {number} [maxConcurrentConnections] The max concurrent + * connections to connect data source at the same time. + * @property {object} [enableLogging] Whether to record detailed logs of + * delete-activity execution. Default value is false. Type: boolean (or + * Expression with resultType boolean). + * @property {object} [logStorageSettings] Log storage settings customer need + * to provide when enableLogging is true. + * @property {object} [logStorageSettings.linkedServiceName] Log storage + * linked service reference. + * @property {string} [logStorageSettings.linkedServiceName.referenceName] + * Reference LinkedService name. + * @property {object} [logStorageSettings.linkedServiceName.parameters] + * Arguments for LinkedService. + * @property {object} [logStorageSettings.path] The path to storage for + * storing detailed logs of activity execution. Type: string (or Expression + * with resultType string). * @property {object} dataset Delete activity dataset reference. * @property {string} [dataset.referenceName] Reference dataset name. * @property {object} [dataset.parameters] Arguments for dataset. @@ -149,6 +165,43 @@ class DeleteActivity extends models['ExecutionActivity'] { name: 'Object' } }, + maxConcurrentConnections: { + required: false, + serializedName: 'typeProperties.maxConcurrentConnections', + constraints: { + InclusiveMinimum: 1 + }, + type: { + name: 'Number' + } + }, + enableLogging: { + required: false, + serializedName: 'typeProperties.enableLogging', + type: { + name: 'Object' + } + }, + logStorageSettings: { + required: false, + serializedName: 'typeProperties.logStorageSettings', + type: { + name: 'Composite', + additionalProperties: { + type: { + name: 'Dictionary', + value: { + required: false, + serializedName: 'ObjectElementType', + type: { + name: 'Object' + } + } + } + }, + className: 'LogStorageSettings' + } + }, dataset: { required: true, serializedName: 'typeProperties.dataset', diff --git a/lib/services/datafactoryManagement/lib/models/hDInsightHiveActivity.js b/lib/services/datafactoryManagement/lib/models/hDInsightHiveActivity.js index ea1f8c5f70..dc2d3047b3 100644 --- a/lib/services/datafactoryManagement/lib/models/hDInsightHiveActivity.js +++ b/lib/services/datafactoryManagement/lib/models/hDInsightHiveActivity.js @@ -35,6 +35,11 @@ class HDInsightHiveActivity extends models['ExecutionActivity'] { * LinkedService. * @property {object} [defines] Allows user to specify defines for Hive job * request. + * @property {array} [variables] User specified arguments under hivevar + * namespace. + * @property {number} [queryTimeout] Query timeout value (in minutes). + * Effective when the HDInsight culster is with ESP (Enterprise Security + * Package) */ constructor() { super(); @@ -215,6 +220,27 @@ class HDInsightHiveActivity extends models['ExecutionActivity'] { } } } + }, + variables: { + required: false, + serializedName: 'typeProperties.variables', + type: { + name: 'Sequence', + element: { + required: false, + serializedName: 'ObjectElementType', + type: { + name: 'Object' + } + } + } + }, + queryTimeout: { + required: false, + serializedName: 'typeProperties.queryTimeout', + type: { + name: 'Number' + } } } } diff --git a/lib/services/datafactoryManagement/lib/models/hDInsightLinkedService.js b/lib/services/datafactoryManagement/lib/models/hDInsightLinkedService.js index c8be0e5e11..fe768bb4aa 100644 --- a/lib/services/datafactoryManagement/lib/models/hDInsightLinkedService.js +++ b/lib/services/datafactoryManagement/lib/models/hDInsightLinkedService.js @@ -41,6 +41,8 @@ class HDInsightLinkedService extends models['LinkedService'] { * @property {object} [encryptedCredential] The encrypted credential used for * authentication. Credentials are encrypted using the integration runtime * credential manager. Type: string (or Expression with resultType string). + * @property {object} [isEspEnabled] Specify if the HDInsight is created with + * ESP (Enterprise Security Package). Type: Boolean. */ constructor() { super(); @@ -166,6 +168,13 @@ class HDInsightLinkedService extends models['LinkedService'] { type: { name: 'Object' } + }, + isEspEnabled: { + required: false, + serializedName: 'typeProperties.isEspEnabled', + type: { + name: 'Object' + } } } } diff --git a/lib/services/datafactoryManagement/lib/models/index.d.ts b/lib/services/datafactoryManagement/lib/models/index.d.ts index e29f9b2aa2..60ef729788 100644 --- a/lib/services/datafactoryManagement/lib/models/index.d.ts +++ b/lib/services/datafactoryManagement/lib/models/index.d.ts @@ -4020,6 +4020,10 @@ export interface HDInsightLinkedService extends LinkedService { * integration runtime credential manager. Type: string (or Expression with resultType string). */ encryptedCredential?: any; + /** + * Specify if the HDInsight is created with ESP (Enterprise Security Package). Type: Boolean. + */ + isEspEnabled?: any; } /** @@ -6102,15 +6106,47 @@ export interface LookupActivity extends ExecutionActivity { firstRowOnly?: any; } +/** + * Log storage settings. + */ +export interface LogStorageSettings { + /** + * Log storage linked service reference. + */ + linkedServiceName: LinkedServiceReference; + /** + * The path to storage for storing detailed logs of activity execution. Type: string (or + * Expression with resultType string). + */ + path?: any; + /** + * Describes unknown properties. The value of an unknown property can be of "any" type. + */ + [additionalPropertyName: string]: any; +} + /** * Delete activity. */ export interface DeleteActivity extends ExecutionActivity { /** - * If true, files under the folder path will be deleted recursively. Default is true. Type: - * boolean (or Expression with resultType boolean). + * If true, files or sub-folders under current folder path will be deleted recursively. Default + * is false. Type: boolean (or Expression with resultType boolean). */ recursive?: any; + /** + * The max concurrent connections to connect data source at the same time. + */ + maxConcurrentConnections?: number; + /** + * Whether to record detailed logs of delete-activity execution. Default value is false. Type: + * boolean (or Expression with resultType boolean). + */ + enableLogging?: any; + /** + * Log storage settings customer need to provide when enableLogging is true. + */ + logStorageSettings?: LogStorageSettings; /** * Delete activity dataset reference. */ @@ -6447,6 +6483,15 @@ export interface HDInsightHiveActivity extends ExecutionActivity { * Allows user to specify defines for Hive job request. */ defines?: { [propertyName: string]: any }; + /** + * User specified arguments under hivevar namespace. + */ + variables?: any[]; + /** + * Query timeout value (in minutes). Effective when the HDInsight culster is with ESP + * (Enterprise Security Package) + */ + queryTimeout?: number; } /** diff --git a/lib/services/datafactoryManagement/lib/models/index.js b/lib/services/datafactoryManagement/lib/models/index.js index 68f4533586..004d1a8d80 100644 --- a/lib/services/datafactoryManagement/lib/models/index.js +++ b/lib/services/datafactoryManagement/lib/models/index.js @@ -306,6 +306,7 @@ exports.DocumentDbCollectionSource = require('./documentDbCollectionSource'); exports.BlobSource = require('./blobSource'); exports.AzureTableSource = require('./azureTableSource'); exports.LookupActivity = require('./lookupActivity'); +exports.LogStorageSettings = require('./logStorageSettings'); exports.DeleteActivity = require('./deleteActivity'); exports.SqlServerStoredProcedureActivity = require('./sqlServerStoredProcedureActivity'); exports.CustomActivityReferenceObject = require('./customActivityReferenceObject'); diff --git a/lib/services/datafactoryManagement/lib/models/logStorageSettings.js b/lib/services/datafactoryManagement/lib/models/logStorageSettings.js new file mode 100644 index 0000000000..9260ff952f --- /dev/null +++ b/lib/services/datafactoryManagement/lib/models/logStorageSettings.js @@ -0,0 +1,79 @@ +/* + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for + * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. + * Changes may cause incorrect behavior and will be lost if the code is + * regenerated. + */ + +'use strict'; + +/** + * Log storage settings. + * + */ +class LogStorageSettings { + /** + * Create a LogStorageSettings. + * @property {object} linkedServiceName Log storage linked service reference. + * @property {string} [linkedServiceName.referenceName] Reference + * LinkedService name. + * @property {object} [linkedServiceName.parameters] Arguments for + * LinkedService. + * @property {object} [path] The path to storage for storing detailed logs of + * activity execution. Type: string (or Expression with resultType string). + */ + constructor() { + } + + /** + * Defines the metadata of LogStorageSettings + * + * @returns {object} metadata of LogStorageSettings + * + */ + mapper() { + return { + required: false, + serializedName: 'LogStorageSettings', + type: { + name: 'Composite', + additionalProperties: { + type: { + name: 'Dictionary', + value: { + required: false, + serializedName: 'ObjectElementType', + type: { + name: 'Object' + } + } + } + }, + className: 'LogStorageSettings', + modelProperties: { + linkedServiceName: { + required: true, + serializedName: 'linkedServiceName', + defaultValue: {}, + type: { + name: 'Composite', + className: 'LinkedServiceReference' + } + }, + path: { + required: false, + serializedName: 'path', + type: { + name: 'Object' + } + } + } + } + }; + } +} + +module.exports = LogStorageSettings;