From 34794597fbc00bce96fe834f566ae499e8e63c15 Mon Sep 17 00:00:00 2001 From: Azure SDK for Python bot Date: Thu, 3 May 2018 22:32:58 +0000 Subject: [PATCH 1/5] Generated from ce3cce80a8ae6434caf934e7baa601ba36c41874 blob events trigger --- .../lib/models/blobEventsTrigger.js | 133 ++++++++++++++++++ .../lib/models/db2LinkedService.js | 9 -- .../lib/models/index.d.ts | 63 ++++----- .../datafactoryManagement/lib/models/index.js | 2 + .../lib/models/mySqlLinkedService.js | 44 +----- .../lib/models/postgreSqlLinkedService.js | 44 +----- .../lib/models/teradataLinkedService.js | 9 -- 7 files changed, 170 insertions(+), 134 deletions(-) create mode 100644 lib/services/datafactoryManagement/lib/models/blobEventsTrigger.js diff --git a/lib/services/datafactoryManagement/lib/models/blobEventsTrigger.js b/lib/services/datafactoryManagement/lib/models/blobEventsTrigger.js new file mode 100644 index 0000000000..b160f3fda6 --- /dev/null +++ b/lib/services/datafactoryManagement/lib/models/blobEventsTrigger.js @@ -0,0 +1,133 @@ +/* + * 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'; + +const models = require('./index'); + +/** + * Trigger that runs everytime a Blob event occurs. + * + * @extends models['MultiplePipelineTrigger'] + */ +class BlobEventsTrigger extends models['MultiplePipelineTrigger'] { + /** + * Create a BlobEventsTrigger. + * @member {string} blobPath path to container, folder, blob, or file + * extension for which events can trigger the pipeline. + * @member {array} events the type of events for which we want to trigger the + * pipeline. + * @member {string} scope the resource id of the Storage Account. + * @member {number} maxConcurrency the max number of parallel events to + * handle when it is triggered. + */ + constructor() { + super(); + } + + /** + * Defines the metadata of BlobEventsTrigger + * + * @returns {object} metadata of BlobEventsTrigger + * + */ + mapper() { + return { + required: false, + serializedName: 'BlobEventsTrigger', + type: { + name: 'Composite', + polymorphicDiscriminator: { + serializedName: 'type', + clientName: 'type' + }, + uberParent: 'Trigger', + className: 'BlobEventsTrigger', + modelProperties: { + description: { + required: false, + serializedName: 'description', + type: { + name: 'String' + } + }, + runtimeState: { + required: false, + readOnly: true, + serializedName: 'runtimeState', + type: { + name: 'String' + } + }, + type: { + required: true, + serializedName: 'type', + isPolymorphicDiscriminator: true, + type: { + name: 'String' + } + }, + pipelines: { + required: false, + serializedName: 'pipelines', + type: { + name: 'Sequence', + element: { + required: false, + serializedName: 'TriggerPipelineReferenceElementType', + type: { + name: 'Composite', + className: 'TriggerPipelineReference' + } + } + } + }, + blobPath: { + required: true, + serializedName: 'typeProperties.blobPath', + type: { + name: 'String' + } + }, + events: { + required: true, + serializedName: 'typeProperties.events', + type: { + name: 'Sequence', + element: { + required: false, + serializedName: 'StringElementType', + type: { + name: 'String' + } + } + } + }, + scope: { + required: true, + serializedName: 'typeProperties.scope', + type: { + name: 'String' + } + }, + maxConcurrency: { + required: true, + serializedName: 'typeProperties.maxConcurrency', + type: { + name: 'Number' + } + } + } + } + }; + } +} + +module.exports = BlobEventsTrigger; diff --git a/lib/services/datafactoryManagement/lib/models/db2LinkedService.js b/lib/services/datafactoryManagement/lib/models/db2LinkedService.js index 795a381322..49f54f616b 100644 --- a/lib/services/datafactoryManagement/lib/models/db2LinkedService.js +++ b/lib/services/datafactoryManagement/lib/models/db2LinkedService.js @@ -24,8 +24,6 @@ class Db2LinkedService extends models['LinkedService'] { * Expression with resultType string). * @member {object} database Database name for connection. Type: string (or * Expression with resultType string). - * @member {object} [schema] Schema name for connection. Type: string (or - * Expression with resultType string). * @member {string} [authenticationType] AuthenticationType to be used for * connection. Possible values include: 'Basic' * @member {object} [username] Username for authentication. Type: string (or @@ -125,13 +123,6 @@ class Db2LinkedService extends models['LinkedService'] { name: 'Object' } }, - schema: { - required: false, - serializedName: 'typeProperties.schema', - type: { - name: 'Object' - } - }, authenticationType: { required: false, serializedName: 'typeProperties.authenticationType', diff --git a/lib/services/datafactoryManagement/lib/models/index.d.ts b/lib/services/datafactoryManagement/lib/models/index.d.ts index bc150597d5..c403a344f0 100644 --- a/lib/services/datafactoryManagement/lib/models/index.d.ts +++ b/lib/services/datafactoryManagement/lib/models/index.d.ts @@ -2927,8 +2927,6 @@ export interface AzureMLLinkedService extends LinkedService { * * @member {object} server Server name for connection. Type: string (or * Expression with resultType string). - * @member {object} [schema] Schema name for connection. Type: string (or - * Expression with resultType string). * @member {string} [authenticationType] AuthenticationType to be used for * connection. Possible values include: 'Basic', 'Windows' * @member {object} [username] Username for authentication. Type: string (or @@ -2941,7 +2939,6 @@ export interface AzureMLLinkedService extends LinkedService { */ export interface TeradataLinkedService extends LinkedService { server: any; - schema?: any; authenticationType?: string; username?: any; password?: SecretBase; @@ -2958,8 +2955,6 @@ export interface TeradataLinkedService extends LinkedService { * Expression with resultType string). * @member {object} database Database name for connection. Type: string (or * Expression with resultType string). - * @member {object} [schema] Schema name for connection. Type: string (or - * Expression with resultType string). * @member {string} [authenticationType] AuthenticationType to be used for * connection. Possible values include: 'Basic' * @member {object} [username] Username for authentication. Type: string (or @@ -2973,7 +2968,6 @@ export interface TeradataLinkedService extends LinkedService { export interface Db2LinkedService extends LinkedService { server: any; database: any; - schema?: any; authenticationType?: string; username?: any; password?: SecretBase; @@ -3018,26 +3012,14 @@ export interface SybaseLinkedService extends LinkedService { * @constructor * Linked service for PostgreSQL data source. * - * @member {object} server Server name for connection. Type: string (or - * Expression with resultType string). - * @member {object} database Database name for connection. Type: string (or - * Expression with resultType string). - * @member {object} [schema] Schema name for connection. Type: string (or - * Expression with resultType string). - * @member {object} [username] Username for authentication. Type: string (or - * Expression with resultType string). - * @member {object} [password] Password for authentication. - * @member {string} [password.type] Polymorphic Discriminator + * @member {object} connectionString The connection string. + * @member {string} [connectionString.type] Polymorphic Discriminator * @member {object} [encryptedCredential] The encrypted credential used for * authentication. Credentials are encrypted using the integration runtime * credential manager. Type: string (or Expression with resultType string). */ export interface PostgreSqlLinkedService extends LinkedService { - server: any; - database: any; - schema?: any; - username?: any; - password?: SecretBase; + connectionString: SecretBase; encryptedCredential?: any; } @@ -3047,26 +3029,14 @@ export interface PostgreSqlLinkedService extends LinkedService { * @constructor * Linked service for MySQL data source. * - * @member {object} server Server name for connection. Type: string (or - * Expression with resultType string). - * @member {object} database Database name for connection. Type: string (or - * Expression with resultType string). - * @member {object} [schema] Schema name for connection. Type: string (or - * Expression with resultType string). - * @member {object} [username] Username for authentication. Type: string (or - * Expression with resultType string). - * @member {object} [password] Password for authentication. - * @member {string} [password.type] Polymorphic Discriminator + * @member {object} connectionString The connection string. + * @member {string} [connectionString.type] Polymorphic Discriminator * @member {object} [encryptedCredential] The encrypted credential used for * authentication. Credentials are encrypted using the integration runtime * credential manager. Type: string (or Expression with resultType string). */ export interface MySqlLinkedService extends LinkedService { - server: any; - database: any; - schema?: any; - username?: any; - password?: SecretBase; + connectionString: SecretBase; encryptedCredential?: any; } @@ -4349,6 +4319,27 @@ export interface MultiplePipelineTrigger extends Trigger { pipelines?: TriggerPipelineReference[]; } +/** + * @class + * Initializes a new instance of the BlobEventsTrigger class. + * @constructor + * Trigger that runs everytime a Blob event occurs. + * + * @member {string} blobPath path to container, folder, blob, or file extension + * for which events can trigger the pipeline. + * @member {array} events the type of events for which we want to trigger the + * pipeline. + * @member {string} scope the resource id of the Storage Account. + * @member {number} maxConcurrency the max number of parallel events to handle + * when it is triggered. + */ +export interface BlobEventsTrigger extends MultiplePipelineTrigger { + blobPath: string; + events: string[]; + scope: string; + maxConcurrency: number; +} + /** * @class * Initializes a new instance of the BlobTrigger class. diff --git a/lib/services/datafactoryManagement/lib/models/index.js b/lib/services/datafactoryManagement/lib/models/index.js index 6f94a786b1..7fb9d05e28 100644 --- a/lib/services/datafactoryManagement/lib/models/index.js +++ b/lib/services/datafactoryManagement/lib/models/index.js @@ -207,6 +207,7 @@ exports.AmazonS3Dataset = require('./amazonS3Dataset'); exports.RetryPolicy = require('./retryPolicy'); exports.TumblingWindowTrigger = require('./tumblingWindowTrigger'); exports.MultiplePipelineTrigger = require('./multiplePipelineTrigger'); +exports.BlobEventsTrigger = require('./blobEventsTrigger'); exports.BlobTrigger = require('./blobTrigger'); exports.RecurrenceScheduleOccurrence = require('./recurrenceScheduleOccurrence'); exports.RecurrenceSchedule = require('./recurrenceSchedule'); @@ -498,6 +499,7 @@ exports.discriminators = { 'Dataset.AzureBlob' : exports.AzureBlobDataset, 'Dataset.AmazonS3Object' : exports.AmazonS3Dataset, 'Trigger.TumblingWindowTrigger' : exports.TumblingWindowTrigger, + 'Trigger.BlobEventsTrigger' : exports.BlobEventsTrigger, 'Trigger.BlobTrigger' : exports.BlobTrigger, 'Trigger.ScheduleTrigger' : exports.ScheduleTrigger, 'Trigger.MultiplePipelineTrigger' : exports.MultiplePipelineTrigger, diff --git a/lib/services/datafactoryManagement/lib/models/mySqlLinkedService.js b/lib/services/datafactoryManagement/lib/models/mySqlLinkedService.js index e903497fca..ce64b3ca47 100644 --- a/lib/services/datafactoryManagement/lib/models/mySqlLinkedService.js +++ b/lib/services/datafactoryManagement/lib/models/mySqlLinkedService.js @@ -20,16 +20,8 @@ const models = require('./index'); class MySqlLinkedService extends models['LinkedService'] { /** * Create a MySqlLinkedService. - * @member {object} server Server name for connection. Type: string (or - * Expression with resultType string). - * @member {object} database Database name for connection. Type: string (or - * Expression with resultType string). - * @member {object} [schema] Schema name for connection. Type: string (or - * Expression with resultType string). - * @member {object} [username] Username for authentication. Type: string (or - * Expression with resultType string). - * @member {object} [password] Password for authentication. - * @member {string} [password.type] Polymorphic Discriminator + * @member {object} connectionString The connection string. + * @member {string} [connectionString.type] Polymorphic Discriminator * @member {object} [encryptedCredential] The encrypted credential used for * authentication. Credentials are encrypted using the integration runtime * credential manager. Type: string (or Expression with resultType string). @@ -109,37 +101,9 @@ class MySqlLinkedService extends models['LinkedService'] { name: 'String' } }, - server: { + connectionString: { required: true, - serializedName: 'typeProperties.server', - type: { - name: 'Object' - } - }, - database: { - required: true, - serializedName: 'typeProperties.database', - type: { - name: 'Object' - } - }, - schema: { - required: false, - serializedName: 'typeProperties.schema', - type: { - name: 'Object' - } - }, - username: { - required: false, - serializedName: 'typeProperties.username', - type: { - name: 'Object' - } - }, - password: { - required: false, - serializedName: 'typeProperties.password', + serializedName: 'typeProperties.connectionString', type: { name: 'Composite', polymorphicDiscriminator: { diff --git a/lib/services/datafactoryManagement/lib/models/postgreSqlLinkedService.js b/lib/services/datafactoryManagement/lib/models/postgreSqlLinkedService.js index 3861cbb581..0f62b51576 100644 --- a/lib/services/datafactoryManagement/lib/models/postgreSqlLinkedService.js +++ b/lib/services/datafactoryManagement/lib/models/postgreSqlLinkedService.js @@ -20,16 +20,8 @@ const models = require('./index'); class PostgreSqlLinkedService extends models['LinkedService'] { /** * Create a PostgreSqlLinkedService. - * @member {object} server Server name for connection. Type: string (or - * Expression with resultType string). - * @member {object} database Database name for connection. Type: string (or - * Expression with resultType string). - * @member {object} [schema] Schema name for connection. Type: string (or - * Expression with resultType string). - * @member {object} [username] Username for authentication. Type: string (or - * Expression with resultType string). - * @member {object} [password] Password for authentication. - * @member {string} [password.type] Polymorphic Discriminator + * @member {object} connectionString The connection string. + * @member {string} [connectionString.type] Polymorphic Discriminator * @member {object} [encryptedCredential] The encrypted credential used for * authentication. Credentials are encrypted using the integration runtime * credential manager. Type: string (or Expression with resultType string). @@ -109,37 +101,9 @@ class PostgreSqlLinkedService extends models['LinkedService'] { name: 'String' } }, - server: { + connectionString: { required: true, - serializedName: 'typeProperties.server', - type: { - name: 'Object' - } - }, - database: { - required: true, - serializedName: 'typeProperties.database', - type: { - name: 'Object' - } - }, - schema: { - required: false, - serializedName: 'typeProperties.schema', - type: { - name: 'Object' - } - }, - username: { - required: false, - serializedName: 'typeProperties.username', - type: { - name: 'Object' - } - }, - password: { - required: false, - serializedName: 'typeProperties.password', + serializedName: 'typeProperties.connectionString', type: { name: 'Composite', polymorphicDiscriminator: { diff --git a/lib/services/datafactoryManagement/lib/models/teradataLinkedService.js b/lib/services/datafactoryManagement/lib/models/teradataLinkedService.js index 253b87cbe9..cbf57161a4 100644 --- a/lib/services/datafactoryManagement/lib/models/teradataLinkedService.js +++ b/lib/services/datafactoryManagement/lib/models/teradataLinkedService.js @@ -22,8 +22,6 @@ class TeradataLinkedService extends models['LinkedService'] { * Create a TeradataLinkedService. * @member {object} server Server name for connection. Type: string (or * Expression with resultType string). - * @member {object} [schema] Schema name for connection. Type: string (or - * Expression with resultType string). * @member {string} [authenticationType] AuthenticationType to be used for * connection. Possible values include: 'Basic', 'Windows' * @member {object} [username] Username for authentication. Type: string (or @@ -116,13 +114,6 @@ class TeradataLinkedService extends models['LinkedService'] { name: 'Object' } }, - schema: { - required: false, - serializedName: 'typeProperties.schema', - type: { - name: 'Object' - } - }, authenticationType: { required: false, serializedName: 'typeProperties.authenticationType', From d8b5802184f01a3c2861fd9ae60ebc2587bb1db0 Mon Sep 17 00:00:00 2001 From: Azure SDK for Python bot Date: Thu, 3 May 2018 23:42:58 +0000 Subject: [PATCH 2/5] Generated from 8f703fbbae01ca72cfc3d1025f774125c0cc3540 address review feedback --- .../lib/models/blobEventsTrigger.js | 14 ++++++++------ .../datafactoryManagement/lib/models/index.d.ts | 11 +++++------ 2 files changed, 13 insertions(+), 12 deletions(-) diff --git a/lib/services/datafactoryManagement/lib/models/blobEventsTrigger.js b/lib/services/datafactoryManagement/lib/models/blobEventsTrigger.js index b160f3fda6..2513e126b7 100644 --- a/lib/services/datafactoryManagement/lib/models/blobEventsTrigger.js +++ b/lib/services/datafactoryManagement/lib/models/blobEventsTrigger.js @@ -20,13 +20,12 @@ const models = require('./index'); class BlobEventsTrigger extends models['MultiplePipelineTrigger'] { /** * Create a BlobEventsTrigger. - * @member {string} blobPath path to container, folder, blob, or file + * @member {string} blobPath Path to container, folder, blob, or file * extension for which events can trigger the pipeline. - * @member {array} events the type of events for which we want to trigger the - * pipeline. - * @member {string} scope the resource id of the Storage Account. - * @member {number} maxConcurrency the max number of parallel events to - * handle when it is triggered. + * @member {array} events The type of events that cause this trigger to fire. + * @member {string} scope The ARM resource ID of the Storage Account. + * @member {number} maxConcurrency The max number of parallel events to + * handle when triggered. */ constructor() { super(); @@ -120,6 +119,9 @@ class BlobEventsTrigger extends models['MultiplePipelineTrigger'] { maxConcurrency: { required: true, serializedName: 'typeProperties.maxConcurrency', + constraints: { + InclusiveMinimum: 1 + }, type: { name: 'Number' } diff --git a/lib/services/datafactoryManagement/lib/models/index.d.ts b/lib/services/datafactoryManagement/lib/models/index.d.ts index c403a344f0..756b51ef35 100644 --- a/lib/services/datafactoryManagement/lib/models/index.d.ts +++ b/lib/services/datafactoryManagement/lib/models/index.d.ts @@ -4325,13 +4325,12 @@ export interface MultiplePipelineTrigger extends Trigger { * @constructor * Trigger that runs everytime a Blob event occurs. * - * @member {string} blobPath path to container, folder, blob, or file extension + * @member {string} blobPath Path to container, folder, blob, or file extension * for which events can trigger the pipeline. - * @member {array} events the type of events for which we want to trigger the - * pipeline. - * @member {string} scope the resource id of the Storage Account. - * @member {number} maxConcurrency the max number of parallel events to handle - * when it is triggered. + * @member {array} events The type of events that cause this trigger to fire. + * @member {string} scope The ARM resource ID of the Storage Account. + * @member {number} maxConcurrency The max number of parallel events to handle + * when triggered. */ export interface BlobEventsTrigger extends MultiplePipelineTrigger { blobPath: string; From 62e59b69e85cc021be097a656e432edc04df87e9 Mon Sep 17 00:00:00 2001 From: Azure SDK for Python bot Date: Thu, 3 May 2018 23:52:19 +0000 Subject: [PATCH 3/5] Generated from 764ab738e12c8a7d388ec9f216230f664a102681 address review feedback --- .../lib/models/blobEventsTrigger.js | 12 ------------ .../datafactoryManagement/lib/models/index.d.ts | 3 --- 2 files changed, 15 deletions(-) diff --git a/lib/services/datafactoryManagement/lib/models/blobEventsTrigger.js b/lib/services/datafactoryManagement/lib/models/blobEventsTrigger.js index 2513e126b7..98255a24cb 100644 --- a/lib/services/datafactoryManagement/lib/models/blobEventsTrigger.js +++ b/lib/services/datafactoryManagement/lib/models/blobEventsTrigger.js @@ -24,8 +24,6 @@ class BlobEventsTrigger extends models['MultiplePipelineTrigger'] { * extension for which events can trigger the pipeline. * @member {array} events The type of events that cause this trigger to fire. * @member {string} scope The ARM resource ID of the Storage Account. - * @member {number} maxConcurrency The max number of parallel events to - * handle when triggered. */ constructor() { super(); @@ -115,16 +113,6 @@ class BlobEventsTrigger extends models['MultiplePipelineTrigger'] { type: { name: 'String' } - }, - maxConcurrency: { - required: true, - serializedName: 'typeProperties.maxConcurrency', - constraints: { - InclusiveMinimum: 1 - }, - type: { - name: 'Number' - } } } } diff --git a/lib/services/datafactoryManagement/lib/models/index.d.ts b/lib/services/datafactoryManagement/lib/models/index.d.ts index 756b51ef35..1a3e0141be 100644 --- a/lib/services/datafactoryManagement/lib/models/index.d.ts +++ b/lib/services/datafactoryManagement/lib/models/index.d.ts @@ -4329,14 +4329,11 @@ export interface MultiplePipelineTrigger extends Trigger { * for which events can trigger the pipeline. * @member {array} events The type of events that cause this trigger to fire. * @member {string} scope The ARM resource ID of the Storage Account. - * @member {number} maxConcurrency The max number of parallel events to handle - * when triggered. */ export interface BlobEventsTrigger extends MultiplePipelineTrigger { blobPath: string; events: string[]; scope: string; - maxConcurrency: number; } /** From 3e7c375eb875ce1f88731ff0e3ef334b87de9a32 Mon Sep 17 00:00:00 2001 From: Azure SDK for Python bot Date: Fri, 4 May 2018 00:13:52 +0000 Subject: [PATCH 4/5] Generated from af2af5124c1789a46dce1086f97b9e7a6e2b2928 address review feedback --- .../datafactoryManagement/lib/models/blobEventsTrigger.js | 5 +++-- lib/services/datafactoryManagement/lib/models/index.d.ts | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/lib/services/datafactoryManagement/lib/models/blobEventsTrigger.js b/lib/services/datafactoryManagement/lib/models/blobEventsTrigger.js index 98255a24cb..829b94ea2b 100644 --- a/lib/services/datafactoryManagement/lib/models/blobEventsTrigger.js +++ b/lib/services/datafactoryManagement/lib/models/blobEventsTrigger.js @@ -20,8 +20,9 @@ const models = require('./index'); class BlobEventsTrigger extends models['MultiplePipelineTrigger'] { /** * Create a BlobEventsTrigger. - * @member {string} blobPath Path to container, folder, blob, or file - * extension for which events can trigger the pipeline. + * @member {string} blobPath Expression to determine if trigger should fire. + * For example, @startswith('/records/blobs/december/') will only fire the + * trigger for blobs in the december folder under the records container. * @member {array} events The type of events that cause this trigger to fire. * @member {string} scope The ARM resource ID of the Storage Account. */ diff --git a/lib/services/datafactoryManagement/lib/models/index.d.ts b/lib/services/datafactoryManagement/lib/models/index.d.ts index 1a3e0141be..0c8b732199 100644 --- a/lib/services/datafactoryManagement/lib/models/index.d.ts +++ b/lib/services/datafactoryManagement/lib/models/index.d.ts @@ -4325,8 +4325,9 @@ export interface MultiplePipelineTrigger extends Trigger { * @constructor * Trigger that runs everytime a Blob event occurs. * - * @member {string} blobPath Path to container, folder, blob, or file extension - * for which events can trigger the pipeline. + * @member {string} blobPath Expression to determine if trigger should fire. + * For example, @startswith('/records/blobs/december/') will only fire the + * trigger for blobs in the december folder under the records container. * @member {array} events The type of events that cause this trigger to fire. * @member {string} scope The ARM resource ID of the Storage Account. */ From 83f8b9caa8101bc24bf7d6f58267644d140f7fb1 Mon Sep 17 00:00:00 2001 From: Azure SDK for Python bot Date: Wed, 16 May 2018 19:58:52 +0000 Subject: [PATCH 5/5] Generated from 31a95abf24bd5a79c06d22c611e949e83d0d41c2 resolve blob path property issue --- .../lib/models/blobEventsTrigger.js | 25 ++++++++++++++----- .../lib/models/index.d.ts | 15 ++++++++--- .../datafactoryManagement/package.json | 7 ++++-- 3 files changed, 35 insertions(+), 12 deletions(-) diff --git a/lib/services/datafactoryManagement/lib/models/blobEventsTrigger.js b/lib/services/datafactoryManagement/lib/models/blobEventsTrigger.js index 829b94ea2b..17edbd6e65 100644 --- a/lib/services/datafactoryManagement/lib/models/blobEventsTrigger.js +++ b/lib/services/datafactoryManagement/lib/models/blobEventsTrigger.js @@ -20,9 +20,15 @@ const models = require('./index'); class BlobEventsTrigger extends models['MultiplePipelineTrigger'] { /** * Create a BlobEventsTrigger. - * @member {string} blobPath Expression to determine if trigger should fire. - * For example, @startswith('/records/blobs/december/') will only fire the - * trigger for blobs in the december folder under the records container. + * @member {string} [blobPathBeginsWith] The blob path must begin with the + * pattern provided for trigger to fire. For example, + * '/records/blobs/december/' will only fire the trigger for blobs in the + * december folder under the records container. At least one of these must be + * provided: blobPathBeginsWith, blobPathEndsWith. + * @member {string} [blobPathEndsWith] The blob path must end with the + * pattern provided for trigger to fire. For example, 'december/boxes.csv' + * will only fire the trigger for blobs named boxes in a december folder. At + * least one of these must be provided: blobPathBeginsWith, blobPathEndsWith. * @member {array} events The type of events that cause this trigger to fire. * @member {string} scope The ARM resource ID of the Storage Account. */ @@ -87,9 +93,16 @@ class BlobEventsTrigger extends models['MultiplePipelineTrigger'] { } } }, - blobPath: { - required: true, - serializedName: 'typeProperties.blobPath', + blobPathBeginsWith: { + required: false, + serializedName: 'typeProperties.blobPathBeginsWith', + type: { + name: 'String' + } + }, + blobPathEndsWith: { + required: false, + serializedName: 'typeProperties.blobPathEndsWith', type: { name: 'String' } diff --git a/lib/services/datafactoryManagement/lib/models/index.d.ts b/lib/services/datafactoryManagement/lib/models/index.d.ts index 0c8b732199..ca99c2edb4 100644 --- a/lib/services/datafactoryManagement/lib/models/index.d.ts +++ b/lib/services/datafactoryManagement/lib/models/index.d.ts @@ -4325,14 +4325,21 @@ export interface MultiplePipelineTrigger extends Trigger { * @constructor * Trigger that runs everytime a Blob event occurs. * - * @member {string} blobPath Expression to determine if trigger should fire. - * For example, @startswith('/records/blobs/december/') will only fire the - * trigger for blobs in the december folder under the records container. + * @member {string} [blobPathBeginsWith] The blob path must begin with the + * pattern provided for trigger to fire. For example, + * '/records/blobs/december/' will only fire the trigger for blobs in the + * december folder under the records container. At least one of these must be + * provided: blobPathBeginsWith, blobPathEndsWith. + * @member {string} [blobPathEndsWith] The blob path must end with the pattern + * provided for trigger to fire. For example, 'december/boxes.csv' will only + * fire the trigger for blobs named boxes in a december folder. At least one of + * these must be provided: blobPathBeginsWith, blobPathEndsWith. * @member {array} events The type of events that cause this trigger to fire. * @member {string} scope The ARM resource ID of the Storage Account. */ export interface BlobEventsTrigger extends MultiplePipelineTrigger { - blobPath: string; + blobPathBeginsWith?: string; + blobPathEndsWith?: string; events: string[]; scope: string; } diff --git a/lib/services/datafactoryManagement/package.json b/lib/services/datafactoryManagement/package.json index f152cd8b68..3de6e15545 100644 --- a/lib/services/datafactoryManagement/package.json +++ b/lib/services/datafactoryManagement/package.json @@ -4,10 +4,13 @@ "description": "DataFactoryManagementClient Library with typescript type definitions for node", "version": "2.0.0-preview", "dependencies": { - "ms-rest": "^2.3.2", + "ms-rest": "^2.3.3", "ms-rest-azure": "^2.5.5" }, - "keywords": [ "node", "azure" ], + "keywords": [ + "node", + "azure" + ], "license": "MIT", "main": "./lib/dataFactoryManagementClient.js", "types": "./lib/dataFactoryManagementClient.d.ts",