diff --git a/eng/mgmt/mgmtmetadata/datafactory_resource-manager.txt b/eng/mgmt/mgmtmetadata/datafactory_resource-manager.txt index 6b3317d3c0c5..f1ebacf86900 100644 --- a/eng/mgmt/mgmtmetadata/datafactory_resource-manager.txt +++ b/eng/mgmt/mgmtmetadata/datafactory_resource-manager.txt @@ -3,12 +3,12 @@ AutoRest installed successfully. Commencing code generation Generating CSharp code 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 --tag=package-2018-06 --csharp-sdks-folder=D:\Git\Azure\azure-sdk-for-net\sdk -2020-01-16 03:29:55 UTC +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 --tag=package-2018-06 --csharp-sdks-folder=D:\Projects\azure-sdk-for-net\sdk +2020-02-24 04:15:25 UTC Azure-rest-api-specs repository information GitHub fork: Azure Branch: master -Commit: e6a133198d4bc7e0cc8a3e42f8e10c5353a1d4ed +Commit: 7e6f562210b6223a186d22ed3d7f2b38e4efdfe2 AutoRest information Requested version: latest -Bootstrapper version: autorest@2.0.4407 +Bootstrapper version: autorest@2.0.4413 diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/Db2LinkedService.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/Db2LinkedService.cs index 382b0cb0468f..a7ee7e576d6b 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/Db2LinkedService.cs +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/Db2LinkedService.cs @@ -35,10 +35,6 @@ public Db2LinkedService() /// /// Initializes a new instance of the Db2LinkedService class. /// - /// Server name for connection. Type: string (or - /// Expression with resultType string). - /// Database name for connection. Type: string - /// (or Expression with resultType string). /// Unmatched properties from the /// message are deserialized this collection /// The integration runtime reference. @@ -46,24 +42,40 @@ public Db2LinkedService() /// Parameters for linked service. /// List of tags that can be used for /// describing the linked service. + /// The connection string. It is + /// mutually exclusive with server, database, authenticationType, + /// userName, packageCollection and certificateCommonName property. + /// Type: string, SecureString or AzureKeyVaultSecretReference. + /// Server name for connection. It is mutually + /// exclusive with connectionString property. Type: string (or + /// Expression with resultType string). + /// Database name for connection. It is mutually + /// exclusive with connectionString property. Type: string (or + /// Expression with resultType string). /// AuthenticationType to be used for - /// connection. Possible values include: 'Basic' - /// Username for authentication. Type: string - /// (or Expression with resultType string). + /// connection. It is mutually exclusive with connectionString + /// property. Possible values include: 'Basic' + /// Username for authentication. It is mutually + /// exclusive with connectionString property. Type: string (or + /// Expression with resultType string). /// Password for authentication. /// Under where packages are created - /// when querying database. Type: string (or Expression with resultType - /// string). + /// when querying database. It is mutually exclusive with + /// connectionString property. Type: string (or Expression with + /// resultType string). /// Certificate Common Name when - /// TLS is enabled. Type: string (or Expression with resultType + /// TLS is enabled. It is mutually exclusive with connectionString + /// property. Type: string (or Expression with resultType /// string). /// The encrypted credential used for /// authentication. Credentials are encrypted using the integration - /// runtime credential manager. Type: string (or Expression with + /// runtime credential manager. It is mutually exclusive with + /// connectionString property. Type: string (or Expression with /// resultType string). - public Db2LinkedService(object server, object database, IDictionary additionalProperties = default(IDictionary), IntegrationRuntimeReference connectVia = default(IntegrationRuntimeReference), string description = default(string), IDictionary parameters = default(IDictionary), IList annotations = default(IList), string authenticationType = default(string), object username = default(object), SecretBase password = default(SecretBase), object packageCollection = default(object), object certificateCommonName = default(object), object encryptedCredential = default(object)) + public Db2LinkedService(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 server = default(object), object database = default(object), string authenticationType = default(string), object username = default(object), SecretBase password = default(SecretBase), object packageCollection = default(object), object certificateCommonName = default(object), object encryptedCredential = default(object)) : base(additionalProperties, connectVia, description, parameters, annotations) { + ConnectionString = connectionString; Server = server; Database = database; AuthenticationType = authenticationType; @@ -81,29 +93,42 @@ public Db2LinkedService() partial void CustomInit(); /// - /// Gets or sets server name for connection. Type: string (or - /// Expression with resultType string). + /// Gets or sets the connection string. It is mutually exclusive with + /// server, database, authenticationType, userName, packageCollection + /// and certificateCommonName property. Type: string, SecureString or + /// AzureKeyVaultSecretReference. + /// + [JsonProperty(PropertyName = "typeProperties.connectionString")] + public object ConnectionString { get; set; } + + /// + /// Gets or sets server name for connection. It is mutually exclusive + /// with connectionString property. Type: string (or Expression with + /// resultType string). /// [JsonProperty(PropertyName = "typeProperties.server")] public object Server { get; set; } /// - /// Gets or sets database name for connection. Type: string (or - /// Expression with resultType string). + /// Gets or sets database name for connection. It is mutually exclusive + /// with connectionString property. Type: string (or Expression with + /// resultType string). /// [JsonProperty(PropertyName = "typeProperties.database")] public object Database { get; set; } /// - /// Gets or sets authenticationType to be used for connection. Possible - /// values include: 'Basic' + /// Gets or sets authenticationType to be used for connection. It is + /// mutually exclusive with connectionString property. Possible values + /// include: 'Basic' /// [JsonProperty(PropertyName = "typeProperties.authenticationType")] public string AuthenticationType { get; set; } /// - /// Gets or sets username for authentication. Type: string (or - /// Expression with resultType string). + /// Gets or sets username for authentication. It is mutually exclusive + /// with connectionString property. Type: string (or Expression with + /// resultType string). /// [JsonProperty(PropertyName = "typeProperties.username")] public object Username { get; set; } @@ -116,14 +141,16 @@ public Db2LinkedService() /// /// Gets or sets under where packages are created when querying - /// database. Type: string (or Expression with resultType string). + /// database. It is mutually exclusive with connectionString property. + /// Type: string (or Expression with resultType string). /// [JsonProperty(PropertyName = "typeProperties.packageCollection")] public object PackageCollection { get; set; } /// - /// Gets or sets certificate Common Name when TLS is enabled. Type: - /// string (or Expression with resultType string). + /// Gets or sets certificate Common Name when TLS is enabled. It is + /// mutually exclusive with connectionString property. Type: string (or + /// Expression with resultType string). /// [JsonProperty(PropertyName = "typeProperties.certificateCommonName")] public object CertificateCommonName { get; set; } @@ -131,7 +158,8 @@ public Db2LinkedService() /// /// Gets or sets the encrypted credential used for authentication. /// Credentials are encrypted using the integration runtime credential - /// manager. Type: string (or Expression with resultType string). + /// manager. It is mutually exclusive with connectionString property. + /// Type: string (or Expression with resultType string). /// [JsonProperty(PropertyName = "typeProperties.encryptedCredential")] public object EncryptedCredential { get; set; } @@ -145,14 +173,6 @@ public Db2LinkedService() public override void Validate() { base.Validate(); - if (Server == null) - { - throw new ValidationException(ValidationRules.CannotBeNull, "Server"); - } - if (Database == null) - { - throw new ValidationException(ValidationRules.CannotBeNull, "Database"); - } } } } diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/SftpWriteSettings.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/SftpWriteSettings.cs index b99aa58b910f..00727e5df994 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/SftpWriteSettings.cs +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/SftpWriteSettings.cs @@ -41,10 +41,15 @@ public SftpWriteSettings() /// Specifies the timeout for writing /// each chunk to SFTP server. Default value: 01:00:00 (one hour). /// Type: string (or Expression with resultType string). - public SftpWriteSettings(IDictionary additionalProperties = default(IDictionary), object maxConcurrentConnections = default(object), object copyBehavior = default(object), object operationTimeout = default(object)) + /// Upload to temporary file(s) and + /// rename. Disable this option if your SFTP server doesn't support + /// rename operation. Type: boolean (or Expression with resultType + /// boolean). + public SftpWriteSettings(IDictionary additionalProperties = default(IDictionary), object maxConcurrentConnections = default(object), object copyBehavior = default(object), object operationTimeout = default(object), object useTempFileRename = default(object)) : base(additionalProperties, maxConcurrentConnections, copyBehavior) { OperationTimeout = operationTimeout; + UseTempFileRename = useTempFileRename; CustomInit(); } @@ -61,5 +66,13 @@ public SftpWriteSettings() [JsonProperty(PropertyName = "operationTimeout")] public object OperationTimeout { get; set; } + /// + /// Gets or sets upload to temporary file(s) and rename. Disable this + /// option if your SFTP server doesn't support rename operation. Type: + /// boolean (or Expression with resultType boolean). + /// + [JsonProperty(PropertyName = "useTempFileRename")] + public object UseTempFileRename { get; set; } + } } diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/tests/JsonSamples/LinkedServiceJsonSamples.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/tests/JsonSamples/LinkedServiceJsonSamples.cs index 295620e4fa38..3da57c9b1374 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/tests/JsonSamples/LinkedServiceJsonSamples.cs +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/tests/JsonSamples/LinkedServiceJsonSamples.cs @@ -2425,6 +2425,23 @@ public class LinkedServiceJsonSamples : JsonSampleCollection;Database=;AuthenticationType=Basic;UserName=;PackageCollection=;CertificateCommonName="" + } + } +}"; + [JsonSample] public const string SapOpenHubLinkedService = @" { diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/tests/JsonSamples/PipelineJsonSamples.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/tests/JsonSamples/PipelineJsonSamples.cs index c643a58eb662..d52427faf96b 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/tests/JsonSamples/PipelineJsonSamples.cs +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/tests/JsonSamples/PipelineJsonSamples.cs @@ -6043,7 +6043,8 @@ public class PipelineJsonSamples : JsonSampleCollection ""type"": ""SftpWriteSettings"", ""maxConcurrentConnections"": 3, ""copyBehavior"": ""PreserveHierarchy"", - ""operationTimeout"": ""01:00:00"" + ""operationTimeout"": ""01:00:00"", + ""useTempFileRename"": true } } },