diff --git a/src/SDKs/DataFactory/DataFactory.Tests/JsonSamples/TriggerJsonSamples.cs b/src/SDKs/DataFactory/DataFactory.Tests/JsonSamples/TriggerJsonSamples.cs index ec5412d84cdb0..c5615a7d9854b 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 = @" { diff --git a/src/SDKs/DataFactory/DataFactory.Tests/TestData/Factories_ConfigureRepo.json b/src/SDKs/DataFactory/DataFactory.Tests/TestData/Factories_ConfigureRepo.json new file mode 100644 index 0000000000000..f3bda133c3eeb --- /dev/null +++ b/src/SDKs/DataFactory/DataFactory.Tests/TestData/Factories_ConfigureRepo.json @@ -0,0 +1,54 @@ +{ + "parameters": { + "subscriptionId": "12345678-1234-1234-12345678abc", + "locationId": "eastus", + "factoryRepoUpdate": { + "factoryResourceId": "/subscriptions/12345678-1234-1234-12345678abc/resourceGroups/exampleResourceGroup/providers/Microsoft.DataFactory/factories/exampleFactoryName", + "ResourceGroupName": "exampleResourceGroup", + "vstsConfiguration": { + "AccountName": "ADF", + "ProjectName": "project", + "RepositoryName": "repo", + "CollaborationBranch": "master", + "RootFolder": "/", + "LastCommitId": "", + "TenantId": "" + } + }, + "api-version": "2017-09-01-preview" + }, + "responses": { + "200": { + "headers": { + "Date": "Wed, 13 Sep 2017 17:33:55 GMT", + "x-ms-request-id": "3223701f-ce33-4a58-bb14-d3d53569d4f0", + "X-Content-Type-Options": "nosniff", + "x-ms-ratelimit-remaining-subscription-writes": "1197", + "x-ms-correlation-request-id": "ec4ce622-a1dd-4c49-a324-17e8d4d1fe83" + }, + "body": { + "name": "exampleFactoryName", + "tags": { + "exampleTag": "exampleValue" + }, + "properties": { + "provisioningState": "Succeeded", + "createTime": "2017-09-13T17:33:54.0294655Z", + "version": "2017-09-01-preview", + "vstsConfiguration": { + "accountName": "ADF", + "projectName": "project", + "repositoryName": "repo", + "collaborationBranch": "master", + "rootFolder": "/", + "lastCommitId": "", + "tenantId": "" + } + }, + "id": "/subscriptions/12345678-1234-1234-12345678abc/resourceGroups/exampleresourcegroup/providers/Microsoft.DataFactory/factories/exampleFactoryName", + "type": "Microsoft.DataFactory/factories", + "location": "East US" + } + } + } +} diff --git a/src/SDKs/DataFactory/DataFactory.Tests/UnitTests/ExamplesUnitTest.cs b/src/SDKs/DataFactory/DataFactory.Tests/UnitTests/ExamplesUnitTest.cs index 1de6fd8f4a625..d3285c04cc31a 100644 --- a/src/SDKs/DataFactory/DataFactory.Tests/UnitTests/ExamplesUnitTest.cs +++ b/src/SDKs/DataFactory/DataFactory.Tests/UnitTests/ExamplesUnitTest.cs @@ -53,6 +53,16 @@ public void Factories_Update() }); } + [Fact] + public void Factories_ConfigureRepo() + { + RunTest("Factories_ConfigureRepo", (example, client, responseCode) => + { + Factory resource = client.Factories.ConfigureFactoryRepo(LN(example), GetTypedParameter(example, client, "factoryRepoUpdate")); + CheckResponseBody(example, client, responseCode, resource); + }); + } + [Fact] public void Factories_List() { @@ -676,6 +686,10 @@ private string PN(Example example) { return (string)example.Parameters["pipelineName"]; } + private string LN(Example example) + { + return (string)example.Parameters["locationId"]; + } private T GetTypedObject(IDataFactoryManagementClient client, object objectRaw) { diff --git a/src/SDKs/DataFactory/DataFactory.Tests/Utils/ExampleCapture.cs b/src/SDKs/DataFactory/DataFactory.Tests/Utils/ExampleCapture.cs index f92175043ce72..8828c07f28f81 100644 --- a/src/SDKs/DataFactory/DataFactory.Tests/Utils/ExampleCapture.cs +++ b/src/SDKs/DataFactory/DataFactory.Tests/Utils/ExampleCapture.cs @@ -57,6 +57,7 @@ public void CaptureAllExamples() // Start Factories operations, leaving factory available CaptureFactories_CreateOrUpdate(); // 200 CaptureFactories_Update(); // 200 + CaptureFactories_ConfigureRepo(); // 200 CaptureFactories_Get(); // 200 CaptureFactories_ListByResourceGroup(); // 200 CaptureFactories_List(); @@ -219,6 +220,27 @@ private void CaptureFactories_Update() Factory resource = client.Factories.Update(secrets.ResourceGroupName, secrets.FactoryName, new FactoryUpdateParameters { Tags = tags }); } + private void CaptureFactories_ConfigureRepo() + { + interceptor.CurrentExampleName = "Factories_Update"; + var repoUpdate = new FactoryRepoUpdate() + { + FactoryResourceId = string.Format("/subscriptions/{0}/resourceGroups/{1}/providers/Microsoft.DataFactory/factories/{2}", ExampleSecrets.ExampleSubId,ExampleSecrets.ExampleResourceGroupName, ExampleSecrets.ExampleFactoryName), + ResourceGroupName = ExampleSecrets.ExampleResourceGroupName, + VstsConfiguration = new FactoryVSTSConfiguration() + { + AccountName = "ADF", + ProjectName= "project", + RepositoryName= "repo", + CollaborationBranch= "master", + RootFolder= "/", + LastCommitId= "", + TenantId= "" + } + }; + Factory resource = client.Factories.ConfigureFactoryRepo(secrets.FactoryLocation, repoUpdate); + } + private void CaptureFactories_Get() { interceptor.CurrentExampleName = "Factories_Get"; diff --git a/src/SDKs/DataFactory/Management.DataFactory/Generated/FactoriesOperations.cs b/src/SDKs/DataFactory/Management.DataFactory/Generated/FactoriesOperations.cs index ac76005678153..16a08e8fdba36 100644 --- a/src/SDKs/DataFactory/Management.DataFactory/Generated/FactoriesOperations.cs +++ b/src/SDKs/DataFactory/Management.DataFactory/Generated/FactoriesOperations.cs @@ -223,6 +223,202 @@ internal FactoriesOperations(DataFactoryManagementClient client) return _result; } + /// + /// Updates a factory's repo information. + /// + /// + /// The location identifier. + /// + /// + /// Update factory repo request definition. + /// + /// + /// Headers that will be added to request. + /// + /// + /// The cancellation token. + /// + /// + /// Thrown when the operation returned an invalid status code + /// + /// + /// Thrown when unable to deserialize the response + /// + /// + /// Thrown when a required parameter is null + /// + /// + /// Thrown when a required parameter is null + /// + /// + /// A response object containing the response body and response headers. + /// + public async Task> ConfigureFactoryRepoWithHttpMessagesAsync(string locationId, FactoryRepoUpdate factoryRepoUpdate, Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)) + { + if (Client.SubscriptionId == null) + { + throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId"); + } + if (locationId == null) + { + throw new ValidationException(ValidationRules.CannotBeNull, "locationId"); + } + if (Client.ApiVersion == null) + { + throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion"); + } + if (factoryRepoUpdate == null) + { + throw new ValidationException(ValidationRules.CannotBeNull, "factoryRepoUpdate"); + } + // Tracing + bool _shouldTrace = ServiceClientTracing.IsEnabled; + string _invocationId = null; + if (_shouldTrace) + { + _invocationId = ServiceClientTracing.NextInvocationId.ToString(); + Dictionary tracingParameters = new Dictionary(); + tracingParameters.Add("locationId", locationId); + tracingParameters.Add("factoryRepoUpdate", factoryRepoUpdate); + tracingParameters.Add("cancellationToken", cancellationToken); + ServiceClientTracing.Enter(_invocationId, this, "ConfigureFactoryRepo", tracingParameters); + } + // Construct URL + var _baseUrl = Client.BaseUri.AbsoluteUri; + var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/providers/Microsoft.DataFactory/locations/{locationId}/configureFactoryRepo").ToString(); + _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId)); + _url = _url.Replace("{locationId}", System.Uri.EscapeDataString(locationId)); + List _queryParameters = new List(); + if (Client.ApiVersion != null) + { + _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion))); + } + if (_queryParameters.Count > 0) + { + _url += (_url.Contains("?") ? "&" : "?") + string.Join("&", _queryParameters); + } + // Create HTTP transport objects + var _httpRequest = new HttpRequestMessage(); + HttpResponseMessage _httpResponse = null; + _httpRequest.Method = new HttpMethod("POST"); + _httpRequest.RequestUri = new System.Uri(_url); + // Set Headers + if (Client.GenerateClientRequestId != null && Client.GenerateClientRequestId.Value) + { + _httpRequest.Headers.TryAddWithoutValidation("x-ms-client-request-id", System.Guid.NewGuid().ToString()); + } + if (Client.AcceptLanguage != null) + { + if (_httpRequest.Headers.Contains("accept-language")) + { + _httpRequest.Headers.Remove("accept-language"); + } + _httpRequest.Headers.TryAddWithoutValidation("accept-language", Client.AcceptLanguage); + } + + + if (customHeaders != null) + { + foreach(var _header in customHeaders) + { + if (_httpRequest.Headers.Contains(_header.Key)) + { + _httpRequest.Headers.Remove(_header.Key); + } + _httpRequest.Headers.TryAddWithoutValidation(_header.Key, _header.Value); + } + } + + // Serialize Request + string _requestContent = null; + if(factoryRepoUpdate != null) + { + _requestContent = Rest.Serialization.SafeJsonConvert.SerializeObject(factoryRepoUpdate, Client.SerializationSettings); + _httpRequest.Content = new StringContent(_requestContent, System.Text.Encoding.UTF8); + _httpRequest.Content.Headers.ContentType =System.Net.Http.Headers.MediaTypeHeaderValue.Parse("application/json; charset=utf-8"); + } + // Set Credentials + if (Client.Credentials != null) + { + cancellationToken.ThrowIfCancellationRequested(); + await Client.Credentials.ProcessHttpRequestAsync(_httpRequest, cancellationToken).ConfigureAwait(false); + } + // Send Request + if (_shouldTrace) + { + ServiceClientTracing.SendRequest(_invocationId, _httpRequest); + } + cancellationToken.ThrowIfCancellationRequested(); + _httpResponse = await Client.HttpClient.SendAsync(_httpRequest, cancellationToken).ConfigureAwait(false); + if (_shouldTrace) + { + ServiceClientTracing.ReceiveResponse(_invocationId, _httpResponse); + } + HttpStatusCode _statusCode = _httpResponse.StatusCode; + cancellationToken.ThrowIfCancellationRequested(); + string _responseContent = null; + if ((int)_statusCode != 200) + { + var ex = new ErrorResponseException(string.Format("Operation returned an invalid status code '{0}'", _statusCode)); + try + { + _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false); + ErrorResponse _errorBody = Rest.Serialization.SafeJsonConvert.DeserializeObject(_responseContent, Client.DeserializationSettings); + if (_errorBody != null) + { + ex.Body = _errorBody; + } + } + catch (JsonException) + { + // Ignore the exception + } + ex.Request = new HttpRequestMessageWrapper(_httpRequest, _requestContent); + ex.Response = new HttpResponseMessageWrapper(_httpResponse, _responseContent); + if (_shouldTrace) + { + ServiceClientTracing.Error(_invocationId, ex); + } + _httpRequest.Dispose(); + if (_httpResponse != null) + { + _httpResponse.Dispose(); + } + throw ex; + } + // Create Result + var _result = new AzureOperationResponse(); + _result.Request = _httpRequest; + _result.Response = _httpResponse; + if (_httpResponse.Headers.Contains("x-ms-request-id")) + { + _result.RequestId = _httpResponse.Headers.GetValues("x-ms-request-id").FirstOrDefault(); + } + // Deserialize Response + if ((int)_statusCode == 200) + { + _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false); + try + { + _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject(_responseContent, Client.DeserializationSettings); + } + catch (JsonException ex) + { + _httpRequest.Dispose(); + if (_httpResponse != null) + { + _httpResponse.Dispose(); + } + throw new SerializationException("Unable to deserialize the response.", _responseContent, ex); + } + } + if (_shouldTrace) + { + ServiceClientTracing.Exit(_invocationId, _result); + } + return _result; + } + /// /// Lists factories. /// diff --git a/src/SDKs/DataFactory/Management.DataFactory/Generated/FactoriesOperationsExtensions.cs b/src/SDKs/DataFactory/Management.DataFactory/Generated/FactoriesOperationsExtensions.cs index e3022e0ce5711..5add376d3a181 100644 --- a/src/SDKs/DataFactory/Management.DataFactory/Generated/FactoriesOperationsExtensions.cs +++ b/src/SDKs/DataFactory/Management.DataFactory/Generated/FactoriesOperationsExtensions.cs @@ -49,6 +49,46 @@ public static IPage List(this IFactoriesOperations operations) } } + /// + /// Updates a factory's repo information. + /// + /// + /// The operations group for this extension method. + /// + /// + /// The location identifier. + /// + /// + /// Update factory repo request definition. + /// + public static Factory ConfigureFactoryRepo(this IFactoriesOperations operations, string locationId, FactoryRepoUpdate factoryRepoUpdate) + { + return operations.ConfigureFactoryRepoAsync(locationId, factoryRepoUpdate).GetAwaiter().GetResult(); + } + + /// + /// Updates a factory's repo information. + /// + /// + /// The operations group for this extension method. + /// + /// + /// The location identifier. + /// + /// + /// Update factory repo request definition. + /// + /// + /// The cancellation token. + /// + public static async Task ConfigureFactoryRepoAsync(this IFactoriesOperations operations, string locationId, FactoryRepoUpdate factoryRepoUpdate, CancellationToken cancellationToken = default(CancellationToken)) + { + using (var _result = await operations.ConfigureFactoryRepoWithHttpMessagesAsync(locationId, factoryRepoUpdate, null, cancellationToken).ConfigureAwait(false)) + { + return _result.Body; + } + } + /// /// Lists factories. /// diff --git a/src/SDKs/DataFactory/Management.DataFactory/Generated/IFactoriesOperations.cs b/src/SDKs/DataFactory/Management.DataFactory/Generated/IFactoriesOperations.cs index 550b3dbc5b174..156e76dd98ae5 100644 --- a/src/SDKs/DataFactory/Management.DataFactory/Generated/IFactoriesOperations.cs +++ b/src/SDKs/DataFactory/Management.DataFactory/Generated/IFactoriesOperations.cs @@ -43,6 +43,31 @@ public partial interface IFactoriesOperations /// Task>> ListWithHttpMessagesAsync(Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)); /// + /// Updates a factory's repo information. + /// + /// + /// The location identifier. + /// + /// + /// Update factory repo request definition. + /// + /// + /// The headers that will be added to request. + /// + /// + /// The cancellation token. + /// + /// + /// Thrown when the operation returned an invalid status code + /// + /// + /// Thrown when unable to deserialize the response + /// + /// + /// Thrown when a required parameter is null + /// + Task> ConfigureFactoryRepoWithHttpMessagesAsync(string locationId, FactoryRepoUpdate factoryRepoUpdate, Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)); + /// /// Lists factories. /// /// diff --git a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/AzureMySqlLinkedService.cs b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/AzureMySqlLinkedService.cs index 5590606cdba0a..dbffc73a065af 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 8ab6645cb9e41..95b1b36d66ae7 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 7ef29ca78d911..e010b4a06a5b7 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 d041924579ebb..4d93641e51cb4 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 f871a8e030890..35205f97fba61 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 0000000000000..6c56e2e943d87 --- /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 0000000000000..e0a38877f28ac --- /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 83306d19f152b..d1189d40a9d1a 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 03997d523afd6..6e9b195925e78 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 15272f7042fc6..678086db4ea3a 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/Factory.cs b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/Factory.cs index 8ef14b2cc97d8..6cd5a26fe93a2 100644 --- a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/Factory.cs +++ b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/Factory.cs @@ -48,7 +48,9 @@ public Factory() /// Time the factory was created in ISO8601 /// format. /// Version of the factory. - public Factory(string id = default(string), string name = default(string), string type = default(string), string location = default(string), IDictionary tags = default(IDictionary), IDictionary additionalProperties = default(IDictionary), FactoryIdentity identity = default(FactoryIdentity), string provisioningState = default(string), System.DateTime? createTime = default(System.DateTime?), string version = default(string)) + /// VSTS repo information of the + /// factory. + public Factory(string id = default(string), string name = default(string), string type = default(string), string location = default(string), IDictionary tags = default(IDictionary), IDictionary additionalProperties = default(IDictionary), FactoryIdentity identity = default(FactoryIdentity), string provisioningState = default(string), System.DateTime? createTime = default(System.DateTime?), string version = default(string), FactoryVSTSConfiguration vstsConfiguration = default(FactoryVSTSConfiguration)) : base(id, name, type, location, tags) { AdditionalProperties = additionalProperties; @@ -56,6 +58,7 @@ public Factory() ProvisioningState = provisioningState; CreateTime = createTime; Version = version; + VstsConfiguration = vstsConfiguration; CustomInit(); } @@ -95,5 +98,11 @@ public Factory() [JsonProperty(PropertyName = "properties.version")] public string Version { get; private set; } + /// + /// Gets or sets VSTS repo information of the factory. + /// + [JsonProperty(PropertyName = "properties.vstsConfiguration")] + public FactoryVSTSConfiguration VstsConfiguration { get; set; } + } } diff --git a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/FactoryRepoUpdate.cs b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/FactoryRepoUpdate.cs new file mode 100644 index 0000000000000..7bd09fb5e4215 --- /dev/null +++ b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/FactoryRepoUpdate.cs @@ -0,0 +1,68 @@ +// +// 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 Newtonsoft.Json; + using System.Linq; + + /// + /// Factory's VSTS repo information. + /// + public partial class FactoryRepoUpdate + { + /// + /// Initializes a new instance of the FactoryRepoUpdate class. + /// + public FactoryRepoUpdate() + { + CustomInit(); + } + + /// + /// Initializes a new instance of the FactoryRepoUpdate class. + /// + /// The factory resource id. + /// The resource group name. + /// VSTS repo information of the + /// factory. + public FactoryRepoUpdate(string factoryResourceId = default(string), string resourceGroupName = default(string), FactoryVSTSConfiguration vstsConfiguration = default(FactoryVSTSConfiguration)) + { + FactoryResourceId = factoryResourceId; + ResourceGroupName = resourceGroupName; + VstsConfiguration = vstsConfiguration; + CustomInit(); + } + + /// + /// An initialization method that performs custom operations like setting defaults + /// + partial void CustomInit(); + + /// + /// Gets or sets the factory resource id. + /// + [JsonProperty(PropertyName = "factoryResourceId")] + public string FactoryResourceId { get; set; } + + /// + /// Gets or sets the resource group name. + /// + [JsonProperty(PropertyName = "resourceGroupName")] + public string ResourceGroupName { get; set; } + + /// + /// Gets or sets VSTS repo information of the factory. + /// + [JsonProperty(PropertyName = "vstsConfiguration")] + public FactoryVSTSConfiguration VstsConfiguration { get; set; } + + } +} diff --git a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/FactoryVSTSConfiguration.cs b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/FactoryVSTSConfiguration.cs new file mode 100644 index 0000000000000..1685d69411ce0 --- /dev/null +++ b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/FactoryVSTSConfiguration.cs @@ -0,0 +1,100 @@ +// +// 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 Newtonsoft.Json; + using System.Linq; + + /// + /// Factory's VSTS repo information. + /// + public partial class FactoryVSTSConfiguration + { + /// + /// Initializes a new instance of the FactoryVSTSConfiguration class. + /// + public FactoryVSTSConfiguration() + { + CustomInit(); + } + + /// + /// Initializes a new instance of the FactoryVSTSConfiguration class. + /// + /// VSTS account name. + /// VSTS project name. + /// VSTS repository name. + /// VSTS collaboration + /// branch. + /// VSTS root folder. + /// VSTS last commit id. + /// VSTS tenant id. + public FactoryVSTSConfiguration(string accountName = default(string), string projectName = default(string), string repositoryName = default(string), string collaborationBranch = default(string), string rootFolder = default(string), string lastCommitId = default(string), string tenantId = default(string)) + { + AccountName = accountName; + ProjectName = projectName; + RepositoryName = repositoryName; + CollaborationBranch = collaborationBranch; + RootFolder = rootFolder; + LastCommitId = lastCommitId; + TenantId = tenantId; + CustomInit(); + } + + /// + /// An initialization method that performs custom operations like setting defaults + /// + partial void CustomInit(); + + /// + /// Gets or sets VSTS account name. + /// + [JsonProperty(PropertyName = "accountName")] + public string AccountName { get; set; } + + /// + /// Gets or sets VSTS project name. + /// + [JsonProperty(PropertyName = "projectName")] + public string ProjectName { get; set; } + + /// + /// Gets or sets VSTS repository name. + /// + [JsonProperty(PropertyName = "repositoryName")] + public string RepositoryName { get; set; } + + /// + /// Gets or sets VSTS collaboration branch. + /// + [JsonProperty(PropertyName = "collaborationBranch")] + public string CollaborationBranch { get; set; } + + /// + /// Gets or sets VSTS root folder. + /// + [JsonProperty(PropertyName = "rootFolder")] + public string RootFolder { get; set; } + + /// + /// Gets or sets VSTS last commit id. + /// + [JsonProperty(PropertyName = "lastCommitId")] + public string LastCommitId { get; set; } + + /// + /// Gets or sets VSTS tenant id. + /// + [JsonProperty(PropertyName = "tenantId")] + public string TenantId { get; set; } + + } +} diff --git a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/GreenplumLinkedService.cs b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/GreenplumLinkedService.cs index 688fe288f5c56..9968d17421b2d 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 6be55794d4b68..821384e14f47c 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 f3f2e242683f0..98e9e7933af99 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 bcde8835ab57e..909eb2e98a992 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 80eae31b4b32d..5f7dc3a079454 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 59d5938c2c16f..ae142afd2958b 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 38aa62fd0f79b..4bfba90c50ee5 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 eecf1b5b83cfa..363a89da08f92 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/Microsoft.Azure.Management.DataFactory.csproj b/src/SDKs/DataFactory/Management.DataFactory/Microsoft.Azure.Management.DataFactory.csproj index 6152ff7695899..a4eeb698ee0b6 100644 --- a/src/SDKs/DataFactory/Management.DataFactory/Microsoft.Azure.Management.DataFactory.csproj +++ b/src/SDKs/DataFactory/Management.DataFactory/Microsoft.Azure.Management.DataFactory.csproj @@ -17,6 +17,9 @@ - Removed the schema from DB2 linked service - Removed schema property from Teradata linked service - Added LinkedService, Dataset, CopySource for Responsys + - Added Configure factory repository operation + - Updated Several models, updating types from SecretBase to Object + - Added Blob Events trigger ]]> diff --git a/src/SDKs/DataFactory/Management.DataFactory/changelog.md b/src/SDKs/DataFactory/Management.DataFactory/changelog.md index 56301d98f4d18..82444a85d77ae 100644 --- a/src/SDKs/DataFactory/Management.DataFactory/changelog.md +++ b/src/SDKs/DataFactory/Management.DataFactory/changelog.md @@ -4,7 +4,10 @@ ### Feature Additions +* Added Configure factory repository operation * Updated QuickBooks LinkedService to expose consumerKey and consumerSecret properties +* Updated Several models, updating types from SecretBase to Object +* Added Blob Events trigger ## Version 0.7.0-preview diff --git a/src/SDKs/DataFactory/Management.DataFactory/generate.ps1 b/src/SDKs/DataFactory/Management.DataFactory/generate.ps1 new file mode 100644 index 0000000000000..1bc4750ef9c09 --- /dev/null +++ b/src/SDKs/DataFactory/Management.DataFactory/generate.ps1 @@ -0,0 +1 @@ +powershell.exe -ExecutionPolicy Bypass -NoLogo -NonInteractive -NoProfile -File "$(split-path $SCRIPT:MyInvocation.MyCommand.Path -parent)\..\..\..\..\tools\generateTool.ps1" -ResourceProvider "datafactory/resource-manager" -PowershellInvoker -AutoRestVersion "latest" \ No newline at end of file diff --git a/src/SDKs/_metadata/datafactory_resource-manager.txt b/src/SDKs/_metadata/datafactory_resource-manager.txt index 8dc11e7921b67..399680c9bab5d 100644 --- a/src/SDKs/_metadata/datafactory_resource-manager.txt +++ b/src/SDKs/_metadata/datafactory_resource-manager.txt @@ -1,11 +1,17 @@ -2018-05-14 07:31:34 UTC - +Executing AutoRest command +cmd.exe /c autorest.cmd https://github.com/Azure/azure-rest-api-specs/blob/master/specification/datafactory/resource-manager/readme.md --csharp --version=latest --reflect-api-versions --csharp-sdks-folder=E:\ADF\azure-sdk-for-net\tools\..\src\SDKs\ +2018-05-23 20:04:22 UTC 1) azure-rest-api-specs repository information -GitHub user: Azure +GitHub fork: Azure Branch: master -Commit: eed831212786a36c6575fd6d20d2a970dc96cfa5 +Commit: 0d97bd1e397779473c8863fdf3ca66a6b075f9c2 2) AutoRest information Requested version: latest -Bootstrapper version: C:\Users\gadongji\AppData\Roaming\npm `-- autorest@2.0.4262 +Bootstrapper version: C:\Users\fgutierr\AppData\Roaming\npm +-- autorest@2.0.4262 `-- oad@0.1.7 `-- autorest@1.9.1 + + Latest installed version: +.\tools\generate.ps1 was invoked by generate.ps1 + +