Db2 add connectionString and sftp add UseTempFileRename

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

sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/Db2LinkedService.cs

@@ -35,35 +35,47 @@ public Db2LinkedService()
         /// <summary>
         /// Initializes a new instance of the Db2LinkedService class.
         /// </summary>
-        /// <param name="server">Server name for connection. Type: string (or
-        /// Expression with resultType string).</param>
-        /// <param name="database">Database name for connection. Type: string
-        /// (or Expression with resultType string).</param>
         /// <param name="additionalProperties">Unmatched properties from the
         /// message are deserialized this collection</param>
         /// <param name="connectVia">The integration runtime reference.</param>
         /// <param name="description">Linked service description.</param>
         /// <param name="parameters">Parameters for linked service.</param>
         /// <param name="annotations">List of tags that can be used for
         /// describing the linked service.</param>
+        /// <param name="connectionString">The connection string. It is
+        /// mutually exclusive with server, database, authenticationType,
+        /// userName, packageCollection and certificateCommonName property.
+        /// Type: string, SecureString or AzureKeyVaultSecretReference.</param>
+        /// <param name="server">Server name for connection. It is mutually
+        /// exclusive with connectionString property. Type: string (or
+        /// Expression with resultType string).</param>
+        /// <param name="database">Database name for connection. It is mutually
+        /// exclusive with connectionString property. Type: string (or
+        /// Expression with resultType string).</param>
         /// <param name="authenticationType">AuthenticationType to be used for
-        /// connection. Possible values include: 'Basic'</param>
-        /// <param name="username">Username for authentication. Type: string
-        /// (or Expression with resultType string).</param>
+        /// connection. It is mutually exclusive with connectionString
+        /// property. Possible values include: 'Basic'</param>
+        /// <param name="username">Username for authentication. It is mutually
+        /// exclusive with connectionString property. Type: string (or
+        /// Expression with resultType string).</param>
         /// <param name="password">Password for authentication.</param>
         /// <param name="packageCollection">Under where packages are created
-        /// when querying database. Type: string (or Expression with resultType
-        /// string).</param>
+        /// when querying database. It is mutually exclusive with
+        /// connectionString property. Type: string (or Expression with
+        /// resultType string).</param>
         /// <param name="certificateCommonName">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).</param>
         /// <param name="encryptedCredential">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).</param>
-        public Db2LinkedService(object server, object database, IDictionary<string, object> additionalProperties = default(IDictionary<string, object>), IntegrationRuntimeReference connectVia = default(IntegrationRuntimeReference), string description = default(string), IDictionary<string, ParameterSpecification> parameters = default(IDictionary<string, ParameterSpecification>), IList<object> annotations = default(IList<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))
+        public Db2LinkedService(IDictionary<string, object> additionalProperties = default(IDictionary<string, object>), IntegrationRuntimeReference connectVia = default(IntegrationRuntimeReference), string description = default(string), IDictionary<string, ParameterSpecification> parameters = default(IDictionary<string, ParameterSpecification>), IList<object> annotations = default(IList<object>), 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();
 
         /// <summary>
-        /// 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.
+        /// </summary>
+        [JsonProperty(PropertyName = "typeProperties.connectionString")]
+        public object ConnectionString { get; set; }
+
+        /// <summary>
+        /// Gets or sets server name for connection. It is mutually exclusive
+        /// with connectionString property. Type: string (or Expression with
+        /// resultType string).
         /// </summary>
         [JsonProperty(PropertyName = "typeProperties.server")]
         public object Server { get; set; }
 
         /// <summary>
-        /// 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).
         /// </summary>
         [JsonProperty(PropertyName = "typeProperties.database")]
         public object Database { get; set; }
 
         /// <summary>
-        /// 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'
         /// </summary>
         [JsonProperty(PropertyName = "typeProperties.authenticationType")]
         public string AuthenticationType { get; set; }
 
         /// <summary>
-        /// 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).
         /// </summary>
         [JsonProperty(PropertyName = "typeProperties.username")]
         public object Username { get; set; }
@@ -116,22 +141,25 @@ public Db2LinkedService()
 
         /// <summary>
         /// 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).
         /// </summary>
         [JsonProperty(PropertyName = "typeProperties.packageCollection")]
         public object PackageCollection { get; set; }
 
         /// <summary>
-        /// 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).
         /// </summary>
         [JsonProperty(PropertyName = "typeProperties.certificateCommonName")]
         public object CertificateCommonName { get; set; }
 
         /// <summary>
         /// 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).
         /// </summary>
         [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");
-            }
         }
     }
 }

sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/SftpWriteSettings.cs

@@ -41,10 +41,15 @@ public SftpWriteSettings()
         /// <param name="operationTimeout">Specifies the timeout for writing
         /// each chunk to SFTP server. Default value: 01:00:00 (one hour).
         /// Type: string (or Expression with resultType string).</param>
-        public SftpWriteSettings(IDictionary<string, object> additionalProperties = default(IDictionary<string, object>), object maxConcurrentConnections = default(object), object copyBehavior = default(object), object operationTimeout = default(object))
+        /// <param name="useTempFileRename">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).</param>
+        public SftpWriteSettings(IDictionary<string, object> additionalProperties = default(IDictionary<string, object>), 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; }
 
+        /// <summary>
+        /// 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).
+        /// </summary>
+        [JsonProperty(PropertyName = "useTempFileRename")]
+        public object UseTempFileRename { get; set; }
+
     }
 }

sdk/datafactory/Microsoft.Azure.Management.DataFactory/tests/JsonSamples/LinkedServiceJsonSamples.cs

@@ -2425,6 +2425,23 @@ public class LinkedServiceJsonSamples : JsonSampleCollection<LinkedServiceJsonSa
     }
 }";
 
+        [JsonSample]
+        public const string Db2LinkedServiceWithConnectionString = @"
+{
+    name: ""Db2LinkedService"",
+    properties:
+    {
+        type: ""Db2"",
+        connectVia: {
+            referenceName : ""MSourceDemoIR"",
+            type : ""IntegrationRuntimeReference""
+        },
+        typeProperties: {
+            connectionString : ""Server=<server>;Database=<database>;AuthenticationType=Basic;UserName=<username>;PackageCollection=<packageCollection>;CertificateCommonName=<certificateCommonName>""
+        }
+    }
+}";
+
         [JsonSample]
         public const string SapOpenHubLinkedService = @"
 {

sdk/datafactory/Microsoft.Azure.Management.DataFactory/tests/JsonSamples/PipelineJsonSamples.cs

@@ -6043,7 +6043,8 @@ public class PipelineJsonSamples : JsonSampleCollection<PipelineJsonSamples>
                         ""type"": ""SftpWriteSettings"",
                         ""maxConcurrentConnections"": 3,
                         ""copyBehavior"": ""PreserveHierarchy"",
-                        ""operationTimeout"": ""01:00:00""
+                        ""operationTimeout"": ""01:00:00"",
+                        ""useTempFileRename"": true
                       }
                     }
                   },