From 6f0ebed0297d17f8be432a93db96af7d4e1de927 Mon Sep 17 00:00:00 2001 From: Cesar Hernandez Date: Thu, 10 May 2018 11:22:03 -0700 Subject: [PATCH 1/2] blob events trigger sample json --- .../JsonSamples/TriggerJsonSamples.cs | 35 +++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/src/SDKs/DataFactory/DataFactory.Tests/JsonSamples/TriggerJsonSamples.cs b/src/SDKs/DataFactory/DataFactory.Tests/JsonSamples/TriggerJsonSamples.cs index ec5412d84cdb..c5615a7d9854 100644 --- a/src/SDKs/DataFactory/DataFactory.Tests/JsonSamples/TriggerJsonSamples.cs +++ b/src/SDKs/DataFactory/DataFactory.Tests/JsonSamples/TriggerJsonSamples.cs @@ -44,6 +44,41 @@ public class TriggerJsonSamples : JsonSampleCollection } }"; + [JsonSample] + public const string BlobEventsTriggerSample = @" +{ + name: ""myDemoBlobEventsTrigger"", + properties: { + type: ""BlobEventsTrigger"", + typeProperties: { + blobPathBeginsWith: ""/containerName/blobs/folderName"", + events: [ + ""Microsoft.Storage.BlobCreated"" + ], + scope: ""/subscriptions/297556dc-ea2f-4d52-b390-084a6fc53194/resourceGroups/testresourcegroup/providers/Microsoft.Storage/storageAccounts/teststorageaccount"", + }, + pipelines: [ + { + pipelineReference: { + type: ""PipelineReference"", + referenceName: ""myCopyPipeline"" + }, + parameters: { + mySinkDatasetFolderPath: ""sinkcontainer"", + mySourceDatasetFolderPath: { + type: ""Expression"", + value: ""@triggerBody().folderPath"" + }, + mySourceDatasetFilePath: { + type: ""Expression"", + value: ""@triggerBody().fileName"" + } + } + } + ] + } +}"; + [JsonSample] public const string ScheduleTriggerSample = @" { From 816f6df9c0d422b6acf8b2eb5200e1b42b3b22b9 Mon Sep 17 00:00:00 2001 From: Cesar Hernandez Date: Thu, 17 May 2018 10:20:12 -0700 Subject: [PATCH 2/2] generated sdk and updated changelog --- .../Models/AzureMySqlLinkedService.cs | 10 +- .../Models/AzurePostgreSqlLinkedService.cs | 10 +- .../Models/AzureSqlDWLinkedService.cs | 12 +- .../Models/AzureSqlDatabaseLinkedService.cs | 10 +- .../Models/AzureStorageLinkedService.cs | 10 +- .../Generated/Models/BlobEventTypes.cs | 22 ++++ .../Generated/Models/BlobEventsTrigger.cs | 124 ++++++++++++++++++ .../Generated/Models/CosmosDbLinkedService.cs | 10 +- .../Models/CouchbaseLinkedService.cs | 10 +- .../Generated/Models/DrillLinkedService.cs | 10 +- .../Models/GreenplumLinkedService.cs | 10 +- .../Generated/Models/MariaDBLinkedService.cs | 10 +- .../Generated/Models/NetezzaLinkedService.cs | 10 +- .../Generated/Models/OdbcLinkedService.cs | 11 +- .../Generated/Models/OracleLinkedService.cs | 10 +- .../Models/SqlServerLinkedService.cs | 10 +- .../Generated/Models/VerticaLinkedService.cs | 10 +- .../SdkInfo_DataFactoryManagementClient.cs | 35 +++-- .../Management.DataFactory/changelog.md | 1 + 19 files changed, 261 insertions(+), 74 deletions(-) create mode 100644 src/SDKs/DataFactory/Management.DataFactory/Generated/Models/BlobEventTypes.cs create mode 100644 src/SDKs/DataFactory/Management.DataFactory/Generated/Models/BlobEventsTrigger.cs diff --git a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/AzureMySqlLinkedService.cs b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/AzureMySqlLinkedService.cs index 5590606cdba0..dbffc73a065a 100644 --- a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/AzureMySqlLinkedService.cs +++ b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/AzureMySqlLinkedService.cs @@ -35,7 +35,8 @@ public AzureMySqlLinkedService() /// /// Initializes a new instance of the AzureMySqlLinkedService class. /// - /// The connection string. + /// The connection string. Type: string, + /// SecureString or AzureKeyVaultSecretReference. /// Unmatched properties from the /// message are deserialized this collection /// The integration runtime reference. @@ -47,7 +48,7 @@ public AzureMySqlLinkedService() /// authentication. Credentials are encrypted using the integration /// runtime credential manager. Type: string (or Expression with /// resultType string). - public AzureMySqlLinkedService(SecretBase connectionString, IDictionary additionalProperties = default(IDictionary), IntegrationRuntimeReference connectVia = default(IntegrationRuntimeReference), string description = default(string), IDictionary parameters = default(IDictionary), IList annotations = default(IList), object encryptedCredential = default(object)) + public AzureMySqlLinkedService(object connectionString, IDictionary additionalProperties = default(IDictionary), IntegrationRuntimeReference connectVia = default(IntegrationRuntimeReference), string description = default(string), IDictionary parameters = default(IDictionary), IList annotations = default(IList), object encryptedCredential = default(object)) : base(additionalProperties, connectVia, description, parameters, annotations) { ConnectionString = connectionString; @@ -61,10 +62,11 @@ public AzureMySqlLinkedService() partial void CustomInit(); /// - /// Gets or sets the connection string. + /// Gets or sets the connection string. Type: string, SecureString or + /// AzureKeyVaultSecretReference. /// [JsonProperty(PropertyName = "typeProperties.connectionString")] - public SecretBase ConnectionString { get; set; } + public object ConnectionString { get; set; } /// /// Gets or sets the encrypted credential used for authentication. diff --git a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/AzurePostgreSqlLinkedService.cs b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/AzurePostgreSqlLinkedService.cs index 8ab6645cb9e4..95b1b36d66ae 100644 --- a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/AzurePostgreSqlLinkedService.cs +++ b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/AzurePostgreSqlLinkedService.cs @@ -44,12 +44,13 @@ public AzurePostgreSqlLinkedService() /// Parameters for linked service. /// List of tags that can be used for /// describing the Dataset. - /// An ODBC connection string. + /// An ODBC connection string. Type: + /// string, SecureString or AzureKeyVaultSecretReference. /// The encrypted credential used for /// authentication. Credentials are encrypted using the integration /// runtime credential manager. Type: string (or Expression with /// resultType string). - public AzurePostgreSqlLinkedService(IDictionary additionalProperties = default(IDictionary), IntegrationRuntimeReference connectVia = default(IntegrationRuntimeReference), string description = default(string), IDictionary parameters = default(IDictionary), IList annotations = default(IList), SecretBase connectionString = default(SecretBase), object encryptedCredential = default(object)) + public AzurePostgreSqlLinkedService(IDictionary additionalProperties = default(IDictionary), IntegrationRuntimeReference connectVia = default(IntegrationRuntimeReference), string description = default(string), IDictionary parameters = default(IDictionary), IList annotations = default(IList), object connectionString = default(object), object encryptedCredential = default(object)) : base(additionalProperties, connectVia, description, parameters, annotations) { ConnectionString = connectionString; @@ -63,10 +64,11 @@ public AzurePostgreSqlLinkedService() partial void CustomInit(); /// - /// Gets or sets an ODBC connection string. + /// Gets or sets an ODBC connection string. Type: string, SecureString + /// or AzureKeyVaultSecretReference. /// [JsonProperty(PropertyName = "typeProperties.connectionString")] - public SecretBase ConnectionString { get; set; } + public object ConnectionString { get; set; } /// /// Gets or sets the encrypted credential used for authentication. diff --git a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/AzureSqlDWLinkedService.cs b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/AzureSqlDWLinkedService.cs index 7ef29ca78d91..e010b4a06a5b 100644 --- a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/AzureSqlDWLinkedService.cs +++ b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/AzureSqlDWLinkedService.cs @@ -35,7 +35,9 @@ public AzureSqlDWLinkedService() /// /// Initializes a new instance of the AzureSqlDWLinkedService class. /// - /// The connection string. + /// The connection string. Type: string, + /// SecureString or AzureKeyVaultSecretReference. Type: string, + /// SecureString or AzureKeyVaultSecretReference. /// Unmatched properties from the /// message are deserialized this collection /// The integration runtime reference. @@ -55,7 +57,7 @@ public AzureSqlDWLinkedService() /// authentication. Credentials are encrypted using the integration /// runtime credential manager. Type: string (or Expression with /// resultType string). - public AzureSqlDWLinkedService(SecretBase connectionString, IDictionary additionalProperties = default(IDictionary), IntegrationRuntimeReference connectVia = default(IntegrationRuntimeReference), string description = default(string), IDictionary parameters = default(IDictionary), IList annotations = default(IList), object servicePrincipalId = default(object), SecretBase servicePrincipalKey = default(SecretBase), object tenant = default(object), object encryptedCredential = default(object)) + public AzureSqlDWLinkedService(object connectionString, IDictionary additionalProperties = default(IDictionary), IntegrationRuntimeReference connectVia = default(IntegrationRuntimeReference), string description = default(string), IDictionary parameters = default(IDictionary), IList annotations = default(IList), object servicePrincipalId = default(object), SecretBase servicePrincipalKey = default(SecretBase), object tenant = default(object), object encryptedCredential = default(object)) : base(additionalProperties, connectVia, description, parameters, annotations) { ConnectionString = connectionString; @@ -72,10 +74,12 @@ public AzureSqlDWLinkedService() partial void CustomInit(); /// - /// Gets or sets the connection string. + /// Gets or sets the connection string. Type: string, SecureString or + /// AzureKeyVaultSecretReference. Type: string, SecureString or + /// AzureKeyVaultSecretReference. /// [JsonProperty(PropertyName = "typeProperties.connectionString")] - public SecretBase ConnectionString { get; set; } + public object ConnectionString { get; set; } /// /// Gets or sets the ID of the service principal used to authenticate diff --git a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/AzureSqlDatabaseLinkedService.cs b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/AzureSqlDatabaseLinkedService.cs index d041924579eb..4d93641e51cb 100644 --- a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/AzureSqlDatabaseLinkedService.cs +++ b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/AzureSqlDatabaseLinkedService.cs @@ -37,7 +37,8 @@ public AzureSqlDatabaseLinkedService() /// Initializes a new instance of the AzureSqlDatabaseLinkedService /// class. /// - /// The connection string. + /// The connection string. Type: string, + /// SecureString or AzureKeyVaultSecretReference. /// Unmatched properties from the /// message are deserialized this collection /// The integration runtime reference. @@ -57,7 +58,7 @@ public AzureSqlDatabaseLinkedService() /// authentication. Credentials are encrypted using the integration /// runtime credential manager. Type: string (or Expression with /// resultType string). - public AzureSqlDatabaseLinkedService(SecretBase connectionString, IDictionary additionalProperties = default(IDictionary), IntegrationRuntimeReference connectVia = default(IntegrationRuntimeReference), string description = default(string), IDictionary parameters = default(IDictionary), IList annotations = default(IList), object servicePrincipalId = default(object), SecretBase servicePrincipalKey = default(SecretBase), object tenant = default(object), object encryptedCredential = default(object)) + public AzureSqlDatabaseLinkedService(object connectionString, IDictionary additionalProperties = default(IDictionary), IntegrationRuntimeReference connectVia = default(IntegrationRuntimeReference), string description = default(string), IDictionary parameters = default(IDictionary), IList annotations = default(IList), object servicePrincipalId = default(object), SecretBase servicePrincipalKey = default(SecretBase), object tenant = default(object), object encryptedCredential = default(object)) : base(additionalProperties, connectVia, description, parameters, annotations) { ConnectionString = connectionString; @@ -74,10 +75,11 @@ public AzureSqlDatabaseLinkedService() partial void CustomInit(); /// - /// Gets or sets the connection string. + /// Gets or sets the connection string. Type: string, SecureString or + /// AzureKeyVaultSecretReference. /// [JsonProperty(PropertyName = "typeProperties.connectionString")] - public SecretBase ConnectionString { get; set; } + public object ConnectionString { get; set; } /// /// Gets or sets the ID of the service principal used to authenticate diff --git a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/AzureStorageLinkedService.cs b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/AzureStorageLinkedService.cs index f871a8e03089..35205f97fba6 100644 --- a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/AzureStorageLinkedService.cs +++ b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/AzureStorageLinkedService.cs @@ -43,14 +43,15 @@ public AzureStorageLinkedService() /// List of tags that can be used for /// describing the Dataset. /// The connection string. It is - /// mutually exclusive with sasUri property. + /// mutually exclusive with sasUri property. Type: string, SecureString + /// or AzureKeyVaultSecretReference. /// SAS URI of the Azure Storage resource. It is /// mutually exclusive with connectionString property. /// The encrypted credential used for /// authentication. Credentials are encrypted using the integration /// runtime credential manager. Type: string (or Expression with /// resultType string). - public AzureStorageLinkedService(IDictionary additionalProperties = default(IDictionary), IntegrationRuntimeReference connectVia = default(IntegrationRuntimeReference), string description = default(string), IDictionary parameters = default(IDictionary), IList annotations = default(IList), SecretBase connectionString = default(SecretBase), SecretBase sasUri = default(SecretBase), object encryptedCredential = default(object)) + public AzureStorageLinkedService(IDictionary additionalProperties = default(IDictionary), IntegrationRuntimeReference connectVia = default(IntegrationRuntimeReference), string description = default(string), IDictionary parameters = default(IDictionary), IList annotations = default(IList), object connectionString = default(object), SecretBase sasUri = default(SecretBase), object encryptedCredential = default(object)) : base(additionalProperties, connectVia, description, parameters, annotations) { ConnectionString = connectionString; @@ -66,10 +67,11 @@ public AzureStorageLinkedService() /// /// Gets or sets the connection string. It is mutually exclusive with - /// sasUri property. + /// sasUri property. Type: string, SecureString or + /// AzureKeyVaultSecretReference. /// [JsonProperty(PropertyName = "typeProperties.connectionString")] - public SecretBase ConnectionString { get; set; } + public object ConnectionString { get; set; } /// /// Gets or sets SAS URI of the Azure Storage resource. It is mutually diff --git a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/BlobEventTypes.cs b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/BlobEventTypes.cs new file mode 100644 index 000000000000..6c56e2e943d8 --- /dev/null +++ b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/BlobEventTypes.cs @@ -0,0 +1,22 @@ +// +// 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. +// + +namespace Microsoft.Azure.Management.DataFactory.Models +{ + + /// + /// Defines values for BlobEventTypes. + /// + public static class BlobEventTypes + { + public const string MicrosoftStorageBlobCreated = "Microsoft.Storage.BlobCreated"; + public const string MicrosoftStorageBlobDeleted = "Microsoft.Storage.BlobDeleted"; + } +} diff --git a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/BlobEventsTrigger.cs b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/BlobEventsTrigger.cs new file mode 100644 index 000000000000..e0a38877f28a --- /dev/null +++ b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/BlobEventsTrigger.cs @@ -0,0 +1,124 @@ +// +// 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. +// + +namespace Microsoft.Azure.Management.DataFactory.Models +{ + using Microsoft.Rest; + using Microsoft.Rest.Serialization; + using Newtonsoft.Json; + using System.Collections; + using System.Collections.Generic; + using System.Linq; + + /// + /// Trigger that runs everytime a Blob event occurs. + /// + [Rest.Serialization.JsonTransformation] + public partial class BlobEventsTrigger : MultiplePipelineTrigger + { + /// + /// Initializes a new instance of the BlobEventsTrigger class. + /// + public BlobEventsTrigger() + { + CustomInit(); + } + + /// + /// Initializes a new instance of the BlobEventsTrigger class. + /// + /// The type of events that cause this trigger to + /// fire. + /// The ARM resource ID of the Storage + /// Account. + /// Unmatched properties from the + /// message are deserialized this collection + /// Trigger description. + /// Indicates if trigger is running or not. + /// Updated when Start/Stop APIs are called on the Trigger. Possible + /// values include: 'Started', 'Stopped', 'Disabled' + /// Pipelines that need to be started. + /// 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. + /// 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. + public BlobEventsTrigger(IList events, string scope, IDictionary additionalProperties = default(IDictionary), string description = default(string), string runtimeState = default(string), IList pipelines = default(IList), string blobPathBeginsWith = default(string), string blobPathEndsWith = default(string)) + : base(additionalProperties, description, runtimeState, pipelines) + { + BlobPathBeginsWith = blobPathBeginsWith; + BlobPathEndsWith = blobPathEndsWith; + Events = events; + Scope = scope; + CustomInit(); + } + + /// + /// An initialization method that performs custom operations like setting defaults + /// + partial void CustomInit(); + + /// + /// Gets or sets 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. + /// + [JsonProperty(PropertyName = "typeProperties.blobPathBeginsWith")] + public string BlobPathBeginsWith { get; set; } + + /// + /// Gets or sets 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. + /// + [JsonProperty(PropertyName = "typeProperties.blobPathEndsWith")] + public string BlobPathEndsWith { get; set; } + + /// + /// Gets or sets the type of events that cause this trigger to fire. + /// + [JsonProperty(PropertyName = "typeProperties.events")] + public IList Events { get; set; } + + /// + /// Gets or sets the ARM resource ID of the Storage Account. + /// + [JsonProperty(PropertyName = "typeProperties.scope")] + public string Scope { get; set; } + + /// + /// Validate the object. + /// + /// + /// Thrown if validation fails + /// + public virtual void Validate() + { + if (Events == null) + { + throw new ValidationException(ValidationRules.CannotBeNull, "Events"); + } + if (Scope == null) + { + throw new ValidationException(ValidationRules.CannotBeNull, "Scope"); + } + } + } +} diff --git a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/CosmosDbLinkedService.cs b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/CosmosDbLinkedService.cs index 83306d19f152..d1189d40a9d1 100644 --- a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/CosmosDbLinkedService.cs +++ b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/CosmosDbLinkedService.cs @@ -35,7 +35,8 @@ public CosmosDbLinkedService() /// /// Initializes a new instance of the CosmosDbLinkedService class. /// - /// The connection string. + /// The connection string. Type: string, + /// SecureString or AzureKeyVaultSecretReference. /// Unmatched properties from the /// message are deserialized this collection /// The integration runtime reference. @@ -47,7 +48,7 @@ public CosmosDbLinkedService() /// authentication. Credentials are encrypted using the integration /// runtime credential manager. Type: string (or Expression with /// resultType string). - public CosmosDbLinkedService(SecretBase connectionString, IDictionary additionalProperties = default(IDictionary), IntegrationRuntimeReference connectVia = default(IntegrationRuntimeReference), string description = default(string), IDictionary parameters = default(IDictionary), IList annotations = default(IList), object encryptedCredential = default(object)) + public CosmosDbLinkedService(object connectionString, IDictionary additionalProperties = default(IDictionary), IntegrationRuntimeReference connectVia = default(IntegrationRuntimeReference), string description = default(string), IDictionary parameters = default(IDictionary), IList annotations = default(IList), object encryptedCredential = default(object)) : base(additionalProperties, connectVia, description, parameters, annotations) { ConnectionString = connectionString; @@ -61,10 +62,11 @@ public CosmosDbLinkedService() partial void CustomInit(); /// - /// Gets or sets the connection string. + /// Gets or sets the connection string. Type: string, SecureString or + /// AzureKeyVaultSecretReference. /// [JsonProperty(PropertyName = "typeProperties.connectionString")] - public SecretBase ConnectionString { get; set; } + public object ConnectionString { get; set; } /// /// Gets or sets the encrypted credential used for authentication. diff --git a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/CouchbaseLinkedService.cs b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/CouchbaseLinkedService.cs index 03997d523afd..6e9b195925e7 100644 --- a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/CouchbaseLinkedService.cs +++ b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/CouchbaseLinkedService.cs @@ -42,12 +42,13 @@ public CouchbaseLinkedService() /// Parameters for linked service. /// List of tags that can be used for /// describing the Dataset. - /// An ODBC connection string. + /// An ODBC connection string. Type: + /// string, SecureString or AzureKeyVaultSecretReference. /// The encrypted credential used for /// authentication. Credentials are encrypted using the integration /// runtime credential manager. Type: string (or Expression with /// resultType string). - public CouchbaseLinkedService(IDictionary additionalProperties = default(IDictionary), IntegrationRuntimeReference connectVia = default(IntegrationRuntimeReference), string description = default(string), IDictionary parameters = default(IDictionary), IList annotations = default(IList), SecretBase connectionString = default(SecretBase), object encryptedCredential = default(object)) + public CouchbaseLinkedService(IDictionary additionalProperties = default(IDictionary), IntegrationRuntimeReference connectVia = default(IntegrationRuntimeReference), string description = default(string), IDictionary parameters = default(IDictionary), IList annotations = default(IList), object connectionString = default(object), object encryptedCredential = default(object)) : base(additionalProperties, connectVia, description, parameters, annotations) { ConnectionString = connectionString; @@ -61,10 +62,11 @@ public CouchbaseLinkedService() partial void CustomInit(); /// - /// Gets or sets an ODBC connection string. + /// Gets or sets an ODBC connection string. Type: string, SecureString + /// or AzureKeyVaultSecretReference. /// [JsonProperty(PropertyName = "typeProperties.connectionString")] - public SecretBase ConnectionString { get; set; } + public object ConnectionString { get; set; } /// /// Gets or sets the encrypted credential used for authentication. diff --git a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/DrillLinkedService.cs b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/DrillLinkedService.cs index 15272f7042fc..678086db4ea3 100644 --- a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/DrillLinkedService.cs +++ b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/DrillLinkedService.cs @@ -42,12 +42,13 @@ public DrillLinkedService() /// Parameters for linked service. /// List of tags that can be used for /// describing the Dataset. - /// An ODBC connection string. + /// An ODBC connection string. Type: + /// string, SecureString or AzureKeyVaultSecretReference. /// The encrypted credential used for /// authentication. Credentials are encrypted using the integration /// runtime credential manager. Type: string (or Expression with /// resultType string). - public DrillLinkedService(IDictionary additionalProperties = default(IDictionary), IntegrationRuntimeReference connectVia = default(IntegrationRuntimeReference), string description = default(string), IDictionary parameters = default(IDictionary), IList annotations = default(IList), SecretBase connectionString = default(SecretBase), object encryptedCredential = default(object)) + public DrillLinkedService(IDictionary additionalProperties = default(IDictionary), IntegrationRuntimeReference connectVia = default(IntegrationRuntimeReference), string description = default(string), IDictionary parameters = default(IDictionary), IList annotations = default(IList), object connectionString = default(object), object encryptedCredential = default(object)) : base(additionalProperties, connectVia, description, parameters, annotations) { ConnectionString = connectionString; @@ -61,10 +62,11 @@ public DrillLinkedService() partial void CustomInit(); /// - /// Gets or sets an ODBC connection string. + /// Gets or sets an ODBC connection string. Type: string, SecureString + /// or AzureKeyVaultSecretReference. /// [JsonProperty(PropertyName = "typeProperties.connectionString")] - public SecretBase ConnectionString { get; set; } + public object ConnectionString { get; set; } /// /// Gets or sets the encrypted credential used for authentication. diff --git a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/GreenplumLinkedService.cs b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/GreenplumLinkedService.cs index 688fe288f5c5..9968d17421b2 100644 --- a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/GreenplumLinkedService.cs +++ b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/GreenplumLinkedService.cs @@ -42,12 +42,13 @@ public GreenplumLinkedService() /// Parameters for linked service. /// List of tags that can be used for /// describing the Dataset. - /// An ODBC connection string. + /// An ODBC connection string. Type: + /// string, SecureString or AzureKeyVaultSecretReference. /// The encrypted credential used for /// authentication. Credentials are encrypted using the integration /// runtime credential manager. Type: string (or Expression with /// resultType string). - public GreenplumLinkedService(IDictionary additionalProperties = default(IDictionary), IntegrationRuntimeReference connectVia = default(IntegrationRuntimeReference), string description = default(string), IDictionary parameters = default(IDictionary), IList annotations = default(IList), SecretBase connectionString = default(SecretBase), object encryptedCredential = default(object)) + public GreenplumLinkedService(IDictionary additionalProperties = default(IDictionary), IntegrationRuntimeReference connectVia = default(IntegrationRuntimeReference), string description = default(string), IDictionary parameters = default(IDictionary), IList annotations = default(IList), object connectionString = default(object), object encryptedCredential = default(object)) : base(additionalProperties, connectVia, description, parameters, annotations) { ConnectionString = connectionString; @@ -61,10 +62,11 @@ public GreenplumLinkedService() partial void CustomInit(); /// - /// Gets or sets an ODBC connection string. + /// Gets or sets an ODBC connection string. Type: string, SecureString + /// or AzureKeyVaultSecretReference. /// [JsonProperty(PropertyName = "typeProperties.connectionString")] - public SecretBase ConnectionString { get; set; } + public object ConnectionString { get; set; } /// /// Gets or sets the encrypted credential used for authentication. diff --git a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/MariaDBLinkedService.cs b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/MariaDBLinkedService.cs index 6be55794d4b6..821384e14f47 100644 --- a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/MariaDBLinkedService.cs +++ b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/MariaDBLinkedService.cs @@ -42,12 +42,13 @@ public MariaDBLinkedService() /// Parameters for linked service. /// List of tags that can be used for /// describing the Dataset. - /// An ODBC connection string. + /// An ODBC connection string. Type: + /// string, SecureString or AzureKeyVaultSecretReference. /// The encrypted credential used for /// authentication. Credentials are encrypted using the integration /// runtime credential manager. Type: string (or Expression with /// resultType string). - public MariaDBLinkedService(IDictionary additionalProperties = default(IDictionary), IntegrationRuntimeReference connectVia = default(IntegrationRuntimeReference), string description = default(string), IDictionary parameters = default(IDictionary), IList annotations = default(IList), SecretBase connectionString = default(SecretBase), object encryptedCredential = default(object)) + public MariaDBLinkedService(IDictionary additionalProperties = default(IDictionary), IntegrationRuntimeReference connectVia = default(IntegrationRuntimeReference), string description = default(string), IDictionary parameters = default(IDictionary), IList annotations = default(IList), object connectionString = default(object), object encryptedCredential = default(object)) : base(additionalProperties, connectVia, description, parameters, annotations) { ConnectionString = connectionString; @@ -61,10 +62,11 @@ public MariaDBLinkedService() partial void CustomInit(); /// - /// Gets or sets an ODBC connection string. + /// Gets or sets an ODBC connection string. Type: string, SecureString + /// or AzureKeyVaultSecretReference. /// [JsonProperty(PropertyName = "typeProperties.connectionString")] - public SecretBase ConnectionString { get; set; } + public object ConnectionString { get; set; } /// /// Gets or sets the encrypted credential used for authentication. diff --git a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/NetezzaLinkedService.cs b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/NetezzaLinkedService.cs index f3f2e242683f..98e9e7933af9 100644 --- a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/NetezzaLinkedService.cs +++ b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/NetezzaLinkedService.cs @@ -42,12 +42,13 @@ public NetezzaLinkedService() /// Parameters for linked service. /// List of tags that can be used for /// describing the Dataset. - /// An ODBC connection string. + /// An ODBC connection string. Type: + /// string, SecureString or AzureKeyVaultSecretReference. /// The encrypted credential used for /// authentication. Credentials are encrypted using the integration /// runtime credential manager. Type: string (or Expression with /// resultType string). - public NetezzaLinkedService(IDictionary additionalProperties = default(IDictionary), IntegrationRuntimeReference connectVia = default(IntegrationRuntimeReference), string description = default(string), IDictionary parameters = default(IDictionary), IList annotations = default(IList), SecretBase connectionString = default(SecretBase), object encryptedCredential = default(object)) + public NetezzaLinkedService(IDictionary additionalProperties = default(IDictionary), IntegrationRuntimeReference connectVia = default(IntegrationRuntimeReference), string description = default(string), IDictionary parameters = default(IDictionary), IList annotations = default(IList), object connectionString = default(object), object encryptedCredential = default(object)) : base(additionalProperties, connectVia, description, parameters, annotations) { ConnectionString = connectionString; @@ -61,10 +62,11 @@ public NetezzaLinkedService() partial void CustomInit(); /// - /// Gets or sets an ODBC connection string. + /// Gets or sets an ODBC connection string. Type: string, SecureString + /// or AzureKeyVaultSecretReference. /// [JsonProperty(PropertyName = "typeProperties.connectionString")] - public SecretBase ConnectionString { get; set; } + public object ConnectionString { get; set; } /// /// Gets or sets the encrypted credential used for authentication. diff --git a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/OdbcLinkedService.cs b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/OdbcLinkedService.cs index bcde8835ab57..909eb2e98a99 100644 --- a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/OdbcLinkedService.cs +++ b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/OdbcLinkedService.cs @@ -36,8 +36,8 @@ public OdbcLinkedService() /// Initializes a new instance of the OdbcLinkedService class. /// /// The non-access credential portion of - /// the connection string as well as an optional encrypted - /// credential. + /// the connection string as well as an optional encrypted credential. + /// Type: string, SecureString or AzureKeyVaultSecretReference. /// Unmatched properties from the /// message are deserialized this collection /// The integration runtime reference. @@ -58,7 +58,7 @@ public OdbcLinkedService() /// authentication. Credentials are encrypted using the integration /// runtime credential manager. Type: string (or Expression with /// resultType string). - public OdbcLinkedService(SecretBase connectionString, IDictionary additionalProperties = default(IDictionary), IntegrationRuntimeReference connectVia = default(IntegrationRuntimeReference), string description = default(string), IDictionary parameters = default(IDictionary), IList annotations = default(IList), object authenticationType = default(object), SecretBase credential = default(SecretBase), object userName = default(object), SecretBase password = default(SecretBase), object encryptedCredential = default(object)) + public OdbcLinkedService(object connectionString, IDictionary additionalProperties = default(IDictionary), IntegrationRuntimeReference connectVia = default(IntegrationRuntimeReference), string description = default(string), IDictionary parameters = default(IDictionary), IList annotations = default(IList), object authenticationType = default(object), SecretBase credential = default(SecretBase), object userName = default(object), SecretBase password = default(SecretBase), object encryptedCredential = default(object)) : base(additionalProperties, connectVia, description, parameters, annotations) { ConnectionString = connectionString; @@ -77,10 +77,11 @@ public OdbcLinkedService() /// /// Gets or sets the non-access credential portion of the connection - /// string as well as an optional encrypted credential. + /// string as well as an optional encrypted credential. Type: string, + /// SecureString or AzureKeyVaultSecretReference. /// [JsonProperty(PropertyName = "typeProperties.connectionString")] - public SecretBase ConnectionString { get; set; } + public object ConnectionString { get; set; } /// /// Gets or sets type of authentication used to connect to the ODBC diff --git a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/OracleLinkedService.cs b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/OracleLinkedService.cs index 80eae31b4b32..5f7dc3a07945 100644 --- a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/OracleLinkedService.cs +++ b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/OracleLinkedService.cs @@ -35,7 +35,8 @@ public OracleLinkedService() /// /// Initializes a new instance of the OracleLinkedService class. /// - /// The connection string. + /// The connection string. Type: string, + /// SecureString or AzureKeyVaultSecretReference. /// Unmatched properties from the /// message are deserialized this collection /// The integration runtime reference. @@ -47,7 +48,7 @@ public OracleLinkedService() /// authentication. Credentials are encrypted using the integration /// runtime credential manager. Type: string (or Expression with /// resultType string). - public OracleLinkedService(SecretBase connectionString, IDictionary additionalProperties = default(IDictionary), IntegrationRuntimeReference connectVia = default(IntegrationRuntimeReference), string description = default(string), IDictionary parameters = default(IDictionary), IList annotations = default(IList), object encryptedCredential = default(object)) + public OracleLinkedService(object connectionString, IDictionary additionalProperties = default(IDictionary), IntegrationRuntimeReference connectVia = default(IntegrationRuntimeReference), string description = default(string), IDictionary parameters = default(IDictionary), IList annotations = default(IList), object encryptedCredential = default(object)) : base(additionalProperties, connectVia, description, parameters, annotations) { ConnectionString = connectionString; @@ -61,10 +62,11 @@ public OracleLinkedService() partial void CustomInit(); /// - /// Gets or sets the connection string. + /// Gets or sets the connection string. Type: string, SecureString or + /// AzureKeyVaultSecretReference. /// [JsonProperty(PropertyName = "typeProperties.connectionString")] - public SecretBase ConnectionString { get; set; } + public object ConnectionString { get; set; } /// /// Gets or sets the encrypted credential used for authentication. diff --git a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/SqlServerLinkedService.cs b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/SqlServerLinkedService.cs index 59d5938c2c16..ae142afd2958 100644 --- a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/SqlServerLinkedService.cs +++ b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/SqlServerLinkedService.cs @@ -35,7 +35,8 @@ public SqlServerLinkedService() /// /// Initializes a new instance of the SqlServerLinkedService class. /// - /// The connection string. + /// The connection string. Type: string, + /// SecureString or AzureKeyVaultSecretReference. /// Unmatched properties from the /// message are deserialized this collection /// The integration runtime reference. @@ -51,7 +52,7 @@ public SqlServerLinkedService() /// authentication. Credentials are encrypted using the integration /// runtime credential manager. Type: string (or Expression with /// resultType string). - public SqlServerLinkedService(SecretBase connectionString, IDictionary additionalProperties = default(IDictionary), IntegrationRuntimeReference connectVia = default(IntegrationRuntimeReference), string description = default(string), IDictionary parameters = default(IDictionary), IList annotations = default(IList), object userName = default(object), SecretBase password = default(SecretBase), object encryptedCredential = default(object)) + public SqlServerLinkedService(object connectionString, IDictionary additionalProperties = default(IDictionary), IntegrationRuntimeReference connectVia = default(IntegrationRuntimeReference), string description = default(string), IDictionary parameters = default(IDictionary), IList annotations = default(IList), object userName = default(object), SecretBase password = default(SecretBase), object encryptedCredential = default(object)) : base(additionalProperties, connectVia, description, parameters, annotations) { ConnectionString = connectionString; @@ -67,10 +68,11 @@ public SqlServerLinkedService() partial void CustomInit(); /// - /// Gets or sets the connection string. + /// Gets or sets the connection string. Type: string, SecureString or + /// AzureKeyVaultSecretReference. /// [JsonProperty(PropertyName = "typeProperties.connectionString")] - public SecretBase ConnectionString { get; set; } + public object ConnectionString { get; set; } /// /// Gets or sets the on-premises Windows authentication user name. diff --git a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/VerticaLinkedService.cs b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/VerticaLinkedService.cs index 38aa62fd0f79..4bfba90c50ee 100644 --- a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/VerticaLinkedService.cs +++ b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/VerticaLinkedService.cs @@ -42,12 +42,13 @@ public VerticaLinkedService() /// Parameters for linked service. /// List of tags that can be used for /// describing the Dataset. - /// An ODBC connection string. + /// An ODBC connection string. Type: + /// string, SecureString or AzureKeyVaultSecretReference. /// The encrypted credential used for /// authentication. Credentials are encrypted using the integration /// runtime credential manager. Type: string (or Expression with /// resultType string). - public VerticaLinkedService(IDictionary additionalProperties = default(IDictionary), IntegrationRuntimeReference connectVia = default(IntegrationRuntimeReference), string description = default(string), IDictionary parameters = default(IDictionary), IList annotations = default(IList), SecretBase connectionString = default(SecretBase), object encryptedCredential = default(object)) + public VerticaLinkedService(IDictionary additionalProperties = default(IDictionary), IntegrationRuntimeReference connectVia = default(IntegrationRuntimeReference), string description = default(string), IDictionary parameters = default(IDictionary), IList annotations = default(IList), object connectionString = default(object), object encryptedCredential = default(object)) : base(additionalProperties, connectVia, description, parameters, annotations) { ConnectionString = connectionString; @@ -61,10 +62,11 @@ public VerticaLinkedService() partial void CustomInit(); /// - /// Gets or sets an ODBC connection string. + /// Gets or sets an ODBC connection string. Type: string, SecureString + /// or AzureKeyVaultSecretReference. /// [JsonProperty(PropertyName = "typeProperties.connectionString")] - public SecretBase ConnectionString { get; set; } + public object ConnectionString { get; set; } /// /// Gets or sets the encrypted credential used for authentication. diff --git a/src/SDKs/DataFactory/Management.DataFactory/Generated/SdkInfo_DataFactoryManagementClient.cs b/src/SDKs/DataFactory/Management.DataFactory/Generated/SdkInfo_DataFactoryManagementClient.cs index eecf1b5b83cf..363a89da08f9 100644 --- a/src/SDKs/DataFactory/Management.DataFactory/Generated/SdkInfo_DataFactoryManagementClient.cs +++ b/src/SDKs/DataFactory/Management.DataFactory/Generated/SdkInfo_DataFactoryManagementClient.cs @@ -1,16 +1,24 @@ -using System; -using System.Collections.Generic; -using System.Linq; +// +// Code generated by Microsoft (R) AutoRest Code Generator. +// Changes may cause incorrect behavior and will be lost if the code is +// regenerated. +// -internal static partial class SdkInfo +namespace Microsoft.Azure.Management.DataFactory { - public static IEnumerable> ApiInfo_DataFactoryManagementClient - { - get - { - return new Tuple[] - { + using System; + using System.Collections.Generic; + using System.Linq; + + internal static partial class SdkInfo + { + public static IEnumerable> ApiInfo_DataFactoryManagementClient + { + get + { + return new Tuple[] + { new Tuple("DataFactory", "ActivityRuns", "2017-09-01-preview"), new Tuple("DataFactory", "Datasets", "2017-09-01-preview"), new Tuple("DataFactory", "Factories", "2017-09-01-preview"), @@ -21,7 +29,8 @@ public static IEnumerable> ApiInfo_DataFactoryMana new Tuple("DataFactory", "PipelineRuns", "2017-09-01-preview"), new Tuple("DataFactory", "Pipelines", "2017-09-01-preview"), new Tuple("DataFactory", "Triggers", "2017-09-01-preview"), - }.AsEnumerable(); - } - } + }.AsEnumerable(); + } + } + } } diff --git a/src/SDKs/DataFactory/Management.DataFactory/changelog.md b/src/SDKs/DataFactory/Management.DataFactory/changelog.md index 56301d98f4d1..7e6e67fc0fe2 100644 --- a/src/SDKs/DataFactory/Management.DataFactory/changelog.md +++ b/src/SDKs/DataFactory/Management.DataFactory/changelog.md @@ -5,6 +5,7 @@ ### Feature Additions * Updated QuickBooks LinkedService to expose consumerKey and consumerSecret properties +* Added Blob Events Trigger ## Version 0.7.0-preview