diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/AzureSqlDatabaseLinkedService.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/AzureSqlDatabaseLinkedService.cs index adf8fc049fcc..61cd7f5fc6a4 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/AzureSqlDatabaseLinkedService.cs +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/AzureSqlDatabaseLinkedService.cs @@ -65,7 +65,9 @@ public AzureSqlDatabaseLinkedService() /// authentication. Credentials are encrypted using the integration /// runtime credential manager. Type: string (or Expression with /// resultType string). - public AzureSqlDatabaseLinkedService(object connectionString, IDictionary additionalProperties = default(IDictionary), IntegrationRuntimeReference connectVia = default(IntegrationRuntimeReference), string description = default(string), IDictionary parameters = default(IDictionary), IList annotations = default(IList), AzureKeyVaultSecretReference password = default(AzureKeyVaultSecretReference), object servicePrincipalId = default(object), SecretBase servicePrincipalKey = default(SecretBase), object tenant = default(object), object azureCloudType = default(object), object encryptedCredential = default(object)) + /// Sql always encrypted + /// properties. + public AzureSqlDatabaseLinkedService(object connectionString, IDictionary additionalProperties = default(IDictionary), IntegrationRuntimeReference connectVia = default(IntegrationRuntimeReference), string description = default(string), IDictionary parameters = default(IDictionary), IList annotations = default(IList), AzureKeyVaultSecretReference password = default(AzureKeyVaultSecretReference), object servicePrincipalId = default(object), SecretBase servicePrincipalKey = default(SecretBase), object tenant = default(object), object azureCloudType = default(object), object encryptedCredential = default(object), SqlAlwaysEncryptedProperties alwaysEncryptedSettings = default(SqlAlwaysEncryptedProperties)) : base(additionalProperties, connectVia, description, parameters, annotations) { ConnectionString = connectionString; @@ -75,6 +77,7 @@ public AzureSqlDatabaseLinkedService() Tenant = tenant; AzureCloudType = azureCloudType; EncryptedCredential = encryptedCredential; + AlwaysEncryptedSettings = alwaysEncryptedSettings; CustomInit(); } @@ -138,6 +141,12 @@ public AzureSqlDatabaseLinkedService() [JsonProperty(PropertyName = "typeProperties.encryptedCredential")] public object EncryptedCredential { get; set; } + /// + /// Gets or sets sql always encrypted properties. + /// + [JsonProperty(PropertyName = "typeProperties.alwaysEncryptedSettings")] + public SqlAlwaysEncryptedProperties AlwaysEncryptedSettings { get; set; } + /// /// Validate the object. /// @@ -155,6 +164,10 @@ public override void Validate() { Password.Validate(); } + if (AlwaysEncryptedSettings != null) + { + AlwaysEncryptedSettings.Validate(); + } } } } diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/AzureSqlMILinkedService.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/AzureSqlMILinkedService.cs index c3f7e2891d9c..9363409a926a 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/AzureSqlMILinkedService.cs +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/AzureSqlMILinkedService.cs @@ -63,7 +63,9 @@ public AzureSqlMILinkedService() /// authentication. Credentials are encrypted using the integration /// runtime credential manager. Type: string (or Expression with /// resultType string). - public AzureSqlMILinkedService(object connectionString, IDictionary additionalProperties = default(IDictionary), IntegrationRuntimeReference connectVia = default(IntegrationRuntimeReference), string description = default(string), IDictionary parameters = default(IDictionary), IList annotations = default(IList), AzureKeyVaultSecretReference password = default(AzureKeyVaultSecretReference), object servicePrincipalId = default(object), SecretBase servicePrincipalKey = default(SecretBase), object tenant = default(object), object azureCloudType = default(object), object encryptedCredential = default(object)) + /// Sql always encrypted + /// properties. + public AzureSqlMILinkedService(object connectionString, IDictionary additionalProperties = default(IDictionary), IntegrationRuntimeReference connectVia = default(IntegrationRuntimeReference), string description = default(string), IDictionary parameters = default(IDictionary), IList annotations = default(IList), AzureKeyVaultSecretReference password = default(AzureKeyVaultSecretReference), object servicePrincipalId = default(object), SecretBase servicePrincipalKey = default(SecretBase), object tenant = default(object), object azureCloudType = default(object), object encryptedCredential = default(object), SqlAlwaysEncryptedProperties alwaysEncryptedSettings = default(SqlAlwaysEncryptedProperties)) : base(additionalProperties, connectVia, description, parameters, annotations) { ConnectionString = connectionString; @@ -73,6 +75,7 @@ public AzureSqlMILinkedService() Tenant = tenant; AzureCloudType = azureCloudType; EncryptedCredential = encryptedCredential; + AlwaysEncryptedSettings = alwaysEncryptedSettings; CustomInit(); } @@ -136,6 +139,12 @@ public AzureSqlMILinkedService() [JsonProperty(PropertyName = "typeProperties.encryptedCredential")] public object EncryptedCredential { get; set; } + /// + /// Gets or sets sql always encrypted properties. + /// + [JsonProperty(PropertyName = "typeProperties.alwaysEncryptedSettings")] + public SqlAlwaysEncryptedProperties AlwaysEncryptedSettings { get; set; } + /// /// Validate the object. /// @@ -153,6 +162,10 @@ public override void Validate() { Password.Validate(); } + if (AlwaysEncryptedSettings != null) + { + AlwaysEncryptedSettings.Validate(); + } } } } diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/MongoDbAtlasSink.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/MongoDbAtlasSink.cs new file mode 100644 index 000000000000..7106c1a4db39 --- /dev/null +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/MongoDbAtlasSink.cs @@ -0,0 +1,77 @@ +// +// 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.Collections; + using System.Collections.Generic; + using System.Linq; + + /// + /// A copy activity MongoDB Atlas sink. + /// + public partial class MongoDbAtlasSink : CopySink + { + /// + /// Initializes a new instance of the MongoDbAtlasSink class. + /// + public MongoDbAtlasSink() + { + CustomInit(); + } + + /// + /// Initializes a new instance of the MongoDbAtlasSink class. + /// + /// Unmatched properties from the + /// message are deserialized this collection + /// Write batch size. Type: integer (or + /// Expression with resultType integer), minimum: 0. + /// Write batch timeout. Type: string + /// (or Expression with resultType string), pattern: + /// ((\d+)\.)?(\d\d):(60|([0-5][0-9])):(60|([0-5][0-9])). + /// Sink retry count. Type: integer (or + /// Expression with resultType integer). + /// Sink retry wait. Type: string (or + /// Expression with resultType string), pattern: + /// ((\d+)\.)?(\d\d):(60|([0-5][0-9])):(60|([0-5][0-9])). + /// The maximum concurrent + /// connection count for the sink data store. Type: integer (or + /// Expression with resultType integer). + /// Specifies whether the document with + /// same key to be overwritten (upsert) rather than throw exception + /// (insert). The default value is "insert". Type: string (or + /// Expression with resultType string). Type: string (or Expression + /// with resultType string). + public MongoDbAtlasSink(IDictionary additionalProperties = default(IDictionary), object writeBatchSize = default(object), object writeBatchTimeout = default(object), object sinkRetryCount = default(object), object sinkRetryWait = default(object), object maxConcurrentConnections = default(object), object writeBehavior = default(object)) + : base(additionalProperties, writeBatchSize, writeBatchTimeout, sinkRetryCount, sinkRetryWait, maxConcurrentConnections) + { + WriteBehavior = writeBehavior; + CustomInit(); + } + + /// + /// An initialization method that performs custom operations like setting defaults + /// + partial void CustomInit(); + + /// + /// Gets or sets specifies whether the document with same key to be + /// overwritten (upsert) rather than throw exception (insert). The + /// default value is "insert". Type: string (or Expression with + /// resultType string). Type: string (or Expression with resultType + /// string). + /// + [JsonProperty(PropertyName = "writeBehavior")] + public object WriteBehavior { get; set; } + + } +} diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/MongoDbV2Sink.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/MongoDbV2Sink.cs new file mode 100644 index 000000000000..9a21c9d9c42f --- /dev/null +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/MongoDbV2Sink.cs @@ -0,0 +1,77 @@ +// +// 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.Collections; + using System.Collections.Generic; + using System.Linq; + + /// + /// A copy activity MongoDB sink. + /// + public partial class MongoDbV2Sink : CopySink + { + /// + /// Initializes a new instance of the MongoDbV2Sink class. + /// + public MongoDbV2Sink() + { + CustomInit(); + } + + /// + /// Initializes a new instance of the MongoDbV2Sink class. + /// + /// Unmatched properties from the + /// message are deserialized this collection + /// Write batch size. Type: integer (or + /// Expression with resultType integer), minimum: 0. + /// Write batch timeout. Type: string + /// (or Expression with resultType string), pattern: + /// ((\d+)\.)?(\d\d):(60|([0-5][0-9])):(60|([0-5][0-9])). + /// Sink retry count. Type: integer (or + /// Expression with resultType integer). + /// Sink retry wait. Type: string (or + /// Expression with resultType string), pattern: + /// ((\d+)\.)?(\d\d):(60|([0-5][0-9])):(60|([0-5][0-9])). + /// The maximum concurrent + /// connection count for the sink data store. Type: integer (or + /// Expression with resultType integer). + /// Specifies whether the document with + /// same key to be overwritten (upsert) rather than throw exception + /// (insert). The default value is "insert". Type: string (or + /// Expression with resultType string). Type: string (or Expression + /// with resultType string). + public MongoDbV2Sink(IDictionary additionalProperties = default(IDictionary), object writeBatchSize = default(object), object writeBatchTimeout = default(object), object sinkRetryCount = default(object), object sinkRetryWait = default(object), object maxConcurrentConnections = default(object), object writeBehavior = default(object)) + : base(additionalProperties, writeBatchSize, writeBatchTimeout, sinkRetryCount, sinkRetryWait, maxConcurrentConnections) + { + WriteBehavior = writeBehavior; + CustomInit(); + } + + /// + /// An initialization method that performs custom operations like setting defaults + /// + partial void CustomInit(); + + /// + /// Gets or sets specifies whether the document with same key to be + /// overwritten (upsert) rather than throw exception (insert). The + /// default value is "insert". Type: string (or Expression with + /// resultType string). Type: string (or Expression with resultType + /// string). + /// + [JsonProperty(PropertyName = "writeBehavior")] + public object WriteBehavior { get; set; } + + } +} diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/SsisPackageLocation.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/SSISPackageLocation.cs similarity index 100% rename from sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/SsisPackageLocation.cs rename to sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/SSISPackageLocation.cs diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/SqlAlwaysEncryptedAkvAuthType.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/SqlAlwaysEncryptedAkvAuthType.cs new file mode 100644 index 000000000000..2072bf64d6d1 --- /dev/null +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/SqlAlwaysEncryptedAkvAuthType.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 SqlAlwaysEncryptedAkvAuthType. + /// + public static class SqlAlwaysEncryptedAkvAuthType + { + public const string ServicePrincipal = "ServicePrincipal"; + public const string ManagedIdentity = "ManagedIdentity"; + } +} diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/SqlAlwaysEncryptedProperties.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/SqlAlwaysEncryptedProperties.cs new file mode 100644 index 000000000000..2feba7093053 --- /dev/null +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/SqlAlwaysEncryptedProperties.cs @@ -0,0 +1,94 @@ +// +// 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 Newtonsoft.Json; + using System.Linq; + + /// + /// Sql always encrypted properties. + /// + public partial class SqlAlwaysEncryptedProperties + { + /// + /// Initializes a new instance of the SqlAlwaysEncryptedProperties + /// class. + /// + public SqlAlwaysEncryptedProperties() + { + CustomInit(); + } + + /// + /// Initializes a new instance of the SqlAlwaysEncryptedProperties + /// class. + /// + /// Sql always encrypted AKV + /// authentication type. Type: string (or Expression with resultType + /// string). Possible values include: 'ServicePrincipal', + /// 'ManagedIdentity' + /// The client ID of the application + /// in Azure Active Directory used for Azure Key Vault authentication. + /// Type: string (or Expression with resultType string). + /// The key of the service principal + /// used to authenticate against Azure Key Vault. + public SqlAlwaysEncryptedProperties(string alwaysEncryptedAkvAuthType, object servicePrincipalId = default(object), SecretBase servicePrincipalKey = default(SecretBase)) + { + AlwaysEncryptedAkvAuthType = alwaysEncryptedAkvAuthType; + ServicePrincipalId = servicePrincipalId; + ServicePrincipalKey = servicePrincipalKey; + CustomInit(); + } + + /// + /// An initialization method that performs custom operations like setting defaults + /// + partial void CustomInit(); + + /// + /// Gets or sets sql always encrypted AKV authentication type. Type: + /// string (or Expression with resultType string). Possible values + /// include: 'ServicePrincipal', 'ManagedIdentity' + /// + [JsonProperty(PropertyName = "alwaysEncryptedAkvAuthType")] + public string AlwaysEncryptedAkvAuthType { get; set; } + + /// + /// Gets or sets the client ID of the application in Azure Active + /// Directory used for Azure Key Vault authentication. Type: string (or + /// Expression with resultType string). + /// + [JsonProperty(PropertyName = "servicePrincipalId")] + public object ServicePrincipalId { get; set; } + + /// + /// Gets or sets the key of the service principal used to authenticate + /// against Azure Key Vault. + /// + [JsonProperty(PropertyName = "servicePrincipalKey")] + public SecretBase ServicePrincipalKey { get; set; } + + /// + /// Validate the object. + /// + /// + /// Thrown if validation fails + /// + public virtual void Validate() + { + if (AlwaysEncryptedAkvAuthType == null) + { + throw new ValidationException(ValidationRules.CannotBeNull, "AlwaysEncryptedAkvAuthType"); + } + } + } +} diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/SqlServerLinkedService.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/SqlServerLinkedService.cs index 25b3132c5d1e..35045e230c5a 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/SqlServerLinkedService.cs +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/SqlServerLinkedService.cs @@ -52,13 +52,16 @@ public SqlServerLinkedService() /// authentication. Credentials are encrypted using the integration /// runtime credential manager. Type: string (or Expression with /// resultType string). - 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)) + /// Sql always encrypted + /// properties. + 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), SqlAlwaysEncryptedProperties alwaysEncryptedSettings = default(SqlAlwaysEncryptedProperties)) : base(additionalProperties, connectVia, description, parameters, annotations) { ConnectionString = connectionString; UserName = userName; Password = password; EncryptedCredential = encryptedCredential; + AlwaysEncryptedSettings = alwaysEncryptedSettings; CustomInit(); } @@ -95,6 +98,12 @@ public SqlServerLinkedService() [JsonProperty(PropertyName = "typeProperties.encryptedCredential")] public object EncryptedCredential { get; set; } + /// + /// Gets or sets sql always encrypted properties. + /// + [JsonProperty(PropertyName = "typeProperties.alwaysEncryptedSettings")] + public SqlAlwaysEncryptedProperties AlwaysEncryptedSettings { get; set; } + /// /// Validate the object. /// @@ -108,6 +117,10 @@ public override void Validate() { throw new ValidationException(ValidationRules.CannotBeNull, "ConnectionString"); } + if (AlwaysEncryptedSettings != null) + { + AlwaysEncryptedSettings.Validate(); + } } } } diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/SdkInfo_DataFactoryManagementClient.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/SdkInfo_DataFactoryManagementClient.cs index 2011a9871690..ac665f5acd05 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/SdkInfo_DataFactoryManagementClient.cs +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/SdkInfo_DataFactoryManagementClient.cs @@ -34,22 +34,14 @@ public static IEnumerable> ApiInfo_DataFactoryMana new Tuple("DataFactory", "Operations", "2018-06-01"), new Tuple("DataFactory", "PipelineRuns", "2018-06-01"), new Tuple("DataFactory", "Pipelines", "2018-06-01"), + new Tuple("DataFactory", "PrivateEndpointConnection", "2018-06-01"), new Tuple("DataFactory", "TriggerRuns", "2018-06-01"), new Tuple("DataFactory", "Triggers", "2018-06-01"), new Tuple("DataFactory", "managedPrivateEndpoints", "2018-06-01"), + new Tuple("DataFactory", "privateEndPointConnections", "2018-06-01"), + new Tuple("DataFactory", "privateLinkResources", "2018-06-01"), }.AsEnumerable(); } } - // BEGIN: Code Generation Metadata Section - public static readonly String AutoRestVersion = "v2"; - public static readonly String AutoRestBootStrapperVersion = "autorest@2.0.4413"; - public static readonly String AutoRestCmdExecuted = "cmd.exe /c autorest.cmd https://github.com/Azure/azure-rest-api-specs/blob/master/specification/datafactory/resource-manager/readme.md --csharp --version=v2 --reflect-api-versions --tag=package-2018-06 --csharp-sdks-folder=D:\\Projects\\azure-sdk-for-net\\sdk"; - public static readonly String GithubForkName = "Azure"; - public static readonly String GithubBranchName = "master"; - public static readonly String GithubCommidId = "fce3400431eff281bddd04bed9727e63765b8da0"; - public static readonly String CodeGenerationErrors = ""; - public static readonly String GithubRepoName = "azure-rest-api-specs"; - // END: Code Generation Metadata Section } } -