Add two properties into LinkedIntegrationRuntime and update to latest…

src/SDKs/DataFactory/Management.DataFactory/Generated/Models/AzureBatchLinkedService.cs

@@ -53,7 +53,7 @@ public AzureBatchLinkedService()
         /// authentication. Credentials are encrypted using the integration
         /// runtime credential manager. Type: string (or Expression with
         /// resultType string).</param>
-        public AzureBatchLinkedService(object accountName, object batchUri, object poolName, LinkedServiceReference linkedServiceName, IDictionary<string, object> additionalProperties = default(IDictionary<string, object>), IntegrationRuntimeReference connectVia = default(IntegrationRuntimeReference), string description = default(string), SecureString accessKey = default(SecureString), object encryptedCredential = default(object))
+        public AzureBatchLinkedService(object accountName, object batchUri, object poolName, LinkedServiceReference linkedServiceName, IDictionary<string, object> additionalProperties = default(IDictionary<string, object>), IntegrationRuntimeReference connectVia = default(IntegrationRuntimeReference), string description = default(string), SecretBase accessKey = default(SecretBase), object encryptedCredential = default(object))
             : base(additionalProperties, connectVia, description)
         {
             AccountName = accountName;
@@ -81,7 +81,7 @@ public AzureBatchLinkedService()
         /// Gets or sets the Azure Batch account access key.
         /// </summary>
         [JsonProperty(PropertyName = "typeProperties.accessKey")]
-        public SecureString AccessKey { get; set; }
+        public SecretBase AccessKey { get; set; }
 
         /// <summary>
         /// Gets or sets the Azure Batch URI. Type: string (or Expression with
@@ -136,10 +136,6 @@ public override void Validate()
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "LinkedServiceName");
             }
-            if (AccessKey != null)
-            {
-                AccessKey.Validate();
-            }
             if (LinkedServiceName != null)
             {
                 LinkedServiceName.Validate();

src/SDKs/DataFactory/Management.DataFactory/Generated/Models/AzureDataLakeAnalyticsLinkedService.cs

@@ -64,7 +64,7 @@ public AzureDataLakeAnalyticsLinkedService()
         /// authentication. Credentials are encrypted using the integration
         /// runtime credential manager. Type: string (or Expression with
         /// resultType string).</param>
-        public AzureDataLakeAnalyticsLinkedService(object accountName, object tenant, IDictionary<string, object> additionalProperties = default(IDictionary<string, object>), IntegrationRuntimeReference connectVia = default(IntegrationRuntimeReference), string description = default(string), object servicePrincipalId = default(object), SecureString servicePrincipalKey = default(SecureString), object subscriptionId = default(object), object resourceGroupName = default(object), object dataLakeAnalyticsUri = default(object), object encryptedCredential = default(object))
+        public AzureDataLakeAnalyticsLinkedService(object accountName, object tenant, IDictionary<string, object> additionalProperties = default(IDictionary<string, object>), IntegrationRuntimeReference connectVia = default(IntegrationRuntimeReference), string description = default(string), object servicePrincipalId = default(object), SecretBase servicePrincipalKey = default(SecretBase), object subscriptionId = default(object), object resourceGroupName = default(object), object dataLakeAnalyticsUri = default(object), object encryptedCredential = default(object))
             : base(additionalProperties, connectVia, description)
         {
             AccountName = accountName;
@@ -103,7 +103,7 @@ public AzureDataLakeAnalyticsLinkedService()
         /// against the Azure Data Lake Analytics account.
         /// </summary>
         [JsonProperty(PropertyName = "typeProperties.servicePrincipalKey")]
-        public SecureString ServicePrincipalKey { get; set; }
+        public SecretBase ServicePrincipalKey { get; set; }
 
         /// <summary>
         /// Gets or sets the name or ID of the tenant to which the service
@@ -161,10 +161,6 @@ public override void Validate()
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "Tenant");
             }
-            if (ServicePrincipalKey != null)
-            {
-                ServicePrincipalKey.Validate();
-            }
         }
     }
 }

src/SDKs/DataFactory/Management.DataFactory/Generated/Models/AzureMLLinkedService.cs

@@ -61,7 +61,7 @@ public AzureMLLinkedService()
         /// authentication. Credentials are encrypted using the integration
         /// runtime credential manager. Type: string (or Expression with
         /// resultType string).</param>
-        public AzureMLLinkedService(object mlEndpoint, SecureString apiKey, IDictionary<string, object> additionalProperties = default(IDictionary<string, object>), IntegrationRuntimeReference connectVia = default(IntegrationRuntimeReference), string description = default(string), object updateResourceEndpoint = default(object), object servicePrincipalId = default(object), SecureString servicePrincipalKey = default(SecureString), object tenant = default(object), object encryptedCredential = default(object))
+        public AzureMLLinkedService(object mlEndpoint, SecretBase apiKey, IDictionary<string, object> additionalProperties = default(IDictionary<string, object>), IntegrationRuntimeReference connectVia = default(IntegrationRuntimeReference), string description = default(string), object updateResourceEndpoint = default(object), object servicePrincipalId = default(object), SecretBase servicePrincipalKey = default(SecretBase), object tenant = default(object), object encryptedCredential = default(object))
             : base(additionalProperties, connectVia, description)
         {
             MlEndpoint = mlEndpoint;
@@ -91,7 +91,7 @@ public AzureMLLinkedService()
         /// Gets or sets the API key for accessing the Azure ML model endpoint.
         /// </summary>
         [JsonProperty(PropertyName = "typeProperties.apiKey")]
-        public SecureString ApiKey { get; set; }
+        public SecretBase ApiKey { get; set; }
 
         /// <summary>
         /// Gets or sets the Update Resource REST URL for an Azure ML Web
@@ -115,7 +115,7 @@ public AzureMLLinkedService()
         /// service.
         /// </summary>
         [JsonProperty(PropertyName = "typeProperties.servicePrincipalKey")]
-        public SecureString ServicePrincipalKey { get; set; }
+        public SecretBase ServicePrincipalKey { get; set; }
 
         /// <summary>
         /// Gets or sets the name or ID of the tenant to which the service
@@ -150,14 +150,6 @@ public override void Validate()
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "ApiKey");
             }
-            if (ApiKey != null)
-            {
-                ApiKey.Validate();
-            }
-            if (ServicePrincipalKey != null)
-            {
-                ServicePrincipalKey.Validate();
-            }
         }
     }
 }

src/SDKs/DataFactory/Management.DataFactory/Generated/Models/HDInsightLinkedService.cs

@@ -52,7 +52,7 @@ public HDInsightLinkedService()
         /// authentication. Credentials are encrypted using the integration
         /// runtime credential manager. Type: string (or Expression with
         /// resultType string).</param>
-        public HDInsightLinkedService(object clusterUri, IDictionary<string, object> additionalProperties = default(IDictionary<string, object>), IntegrationRuntimeReference connectVia = default(IntegrationRuntimeReference), string description = default(string), object userName = default(object), SecureString password = default(SecureString), LinkedServiceReference linkedServiceName = default(LinkedServiceReference), LinkedServiceReference hcatalogLinkedServiceName = default(LinkedServiceReference), object encryptedCredential = default(object))
+        public HDInsightLinkedService(object clusterUri, IDictionary<string, object> additionalProperties = default(IDictionary<string, object>), IntegrationRuntimeReference connectVia = default(IntegrationRuntimeReference), string description = default(string), object userName = default(object), SecretBase password = default(SecretBase), LinkedServiceReference linkedServiceName = default(LinkedServiceReference), LinkedServiceReference hcatalogLinkedServiceName = default(LinkedServiceReference), object encryptedCredential = default(object))
             : base(additionalProperties, connectVia, description)
         {
             ClusterUri = clusterUri;
@@ -87,7 +87,7 @@ public HDInsightLinkedService()
         /// Gets or sets hDInsight cluster password.
         /// </summary>
         [JsonProperty(PropertyName = "typeProperties.password")]
-        public SecureString Password { get; set; }
+        public SecretBase Password { get; set; }
 
         /// <summary>
         /// Gets or sets the Azure Storage linked service reference.
@@ -123,10 +123,6 @@ public override void Validate()
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "ClusterUri");
             }
-            if (Password != null)
-            {
-                Password.Validate();
-            }
             if (LinkedServiceName != null)
             {
                 LinkedServiceName.Validate();

src/SDKs/DataFactory/Management.DataFactory/Generated/Models/HDInsightOnDemandLinkedService.cs

@@ -115,7 +115,7 @@ public HDInsightOnDemandLinkedService()
         /// authentication. Credentials are encrypted using the integration
         /// runtime credential manager. Type: string (or Expression with
         /// resultType string).</param>
-        public HDInsightOnDemandLinkedService(object clusterSize, object timeToLive, object version, LinkedServiceReference linkedServiceName, object hostSubscriptionId, object tenant, object clusterResourceGroup, IDictionary<string, object> additionalProperties = default(IDictionary<string, object>), IntegrationRuntimeReference connectVia = default(IntegrationRuntimeReference), string description = default(string), object servicePrincipalId = default(object), SecureString servicePrincipalKey = default(SecureString), object clusterNamePrefix = default(object), object clusterUserName = default(object), SecureString clusterPassword = default(SecureString), object clusterSshUserName = default(object), SecureString clusterSshPassword = default(SecureString), IList<LinkedServiceReference> additionalLinkedServiceNames = default(IList<LinkedServiceReference>), LinkedServiceReference hcatalogLinkedServiceName = default(LinkedServiceReference), object clusterType = default(object), object sparkVersion = default(object), object coreConfiguration = default(object), object hBaseConfiguration = default(object), object hdfsConfiguration = default(object), object hiveConfiguration = default(object), object mapReduceConfiguration = default(object), object oozieConfiguration = default(object), object stormConfiguration = default(object), object yarnConfiguration = default(object), object encryptedCredential = default(object))
+        public HDInsightOnDemandLinkedService(object clusterSize, object timeToLive, object version, LinkedServiceReference linkedServiceName, object hostSubscriptionId, object tenant, object clusterResourceGroup, IDictionary<string, object> additionalProperties = default(IDictionary<string, object>), IntegrationRuntimeReference connectVia = default(IntegrationRuntimeReference), string description = default(string), object servicePrincipalId = default(object), SecretBase servicePrincipalKey = default(SecretBase), object clusterNamePrefix = default(object), object clusterUserName = default(object), SecretBase clusterPassword = default(SecretBase), object clusterSshUserName = default(object), SecretBase clusterSshPassword = default(SecretBase), IList<LinkedServiceReference> additionalLinkedServiceNames = default(IList<LinkedServiceReference>), LinkedServiceReference hcatalogLinkedServiceName = default(LinkedServiceReference), object clusterType = default(object), object sparkVersion = default(object), object coreConfiguration = default(object), object hBaseConfiguration = default(object), object hdfsConfiguration = default(object), object hiveConfiguration = default(object), object mapReduceConfiguration = default(object), object oozieConfiguration = default(object), object stormConfiguration = default(object), object yarnConfiguration = default(object), object encryptedCredential = default(object))
             : base(additionalProperties, connectVia, description)
         {
             ClusterSize = clusterSize;
@@ -202,7 +202,7 @@ public HDInsightOnDemandLinkedService()
         /// Gets or sets the key for the service principal id.
         /// </summary>
         [JsonProperty(PropertyName = "typeProperties.servicePrincipalKey")]
-        public SecureString ServicePrincipalKey { get; set; }
+        public SecretBase ServicePrincipalKey { get; set; }
 
         /// <summary>
         /// Gets or sets the Tenant id/name to which the service principal
@@ -237,7 +237,7 @@ public HDInsightOnDemandLinkedService()
         /// Gets or sets the password to access the cluster.
         /// </summary>
         [JsonProperty(PropertyName = "typeProperties.clusterPassword")]
-        public SecureString ClusterPassword { get; set; }
+        public SecretBase ClusterPassword { get; set; }
 
         /// <summary>
         /// Gets or sets the username to SSH remotely connect to cluster’s node
@@ -251,7 +251,7 @@ public HDInsightOnDemandLinkedService()
         /// (for Linux).
         /// </summary>
         [JsonProperty(PropertyName = "typeProperties.clusterSshPassword")]
-        public SecureString ClusterSshPassword { get; set; }
+        public SecretBase ClusterSshPassword { get; set; }
 
         /// <summary>
         /// Gets or sets specifies additional storage accounts for the
@@ -388,18 +388,6 @@ public override void Validate()
             {
                 LinkedServiceName.Validate();
             }
-            if (ServicePrincipalKey != null)
-            {
-                ServicePrincipalKey.Validate();
-            }
-            if (ClusterPassword != null)
-            {
-                ClusterPassword.Validate();
-            }
-            if (ClusterSshPassword != null)
-            {
-                ClusterSshPassword.Validate();
-            }
             if (AdditionalLinkedServiceNames != null)
             {
                 foreach (var element in AdditionalLinkedServiceNames)

src/SDKs/DataFactory/Management.DataFactory/Generated/Models/HiveLinkedService.cs

@@ -87,7 +87,7 @@ public HiveLinkedService()
         /// authentication. Credentials are encrypted using the integration
         /// runtime credential manager. Type: string (or Expression with
         /// resultType string).</param>
-        public HiveLinkedService(object host, string authenticationType, IDictionary<string, object> additionalProperties = default(IDictionary<string, object>), IntegrationRuntimeReference connectVia = default(IntegrationRuntimeReference), string description = default(string), object port = default(object), string serverType = default(string), string thriftTransportProtocol = default(string), object serviceDiscoveryMode = default(object), object zooKeeperNameSpace = default(object), object useNativeQuery = default(object), object username = default(object), SecureString password = default(SecureString), object httpPath = default(object), object enableSsl = default(object), object trustedCertPath = default(object), object useSystemTrustStore = default(object), object allowHostNameCNMismatch = default(object), object allowSelfSignedServerCert = default(object), object encryptedCredential = default(object))
+        public HiveLinkedService(object host, string authenticationType, IDictionary<string, object> additionalProperties = default(IDictionary<string, object>), IntegrationRuntimeReference connectVia = default(IntegrationRuntimeReference), string description = default(string), object port = default(object), string serverType = default(string), string thriftTransportProtocol = default(string), object serviceDiscoveryMode = default(object), object zooKeeperNameSpace = default(object), object useNativeQuery = default(object), object username = default(object), SecretBase password = default(SecretBase), object httpPath = default(object), object enableSsl = default(object), object trustedCertPath = default(object), object useSystemTrustStore = default(object), object allowHostNameCNMismatch = default(object), object allowSelfSignedServerCert = default(object), object encryptedCredential = default(object))
             : base(additionalProperties, connectVia, description)
         {
             Host = host;
@@ -184,7 +184,7 @@ public HiveLinkedService()
         /// provided in the Username field
         /// </summary>
         [JsonProperty(PropertyName = "typeProperties.password")]
-        public SecureString Password { get; set; }
+        public SecretBase Password { get; set; }
 
         /// <summary>
         /// Gets or sets the partial URL corresponding to the Hive server.
@@ -256,10 +256,6 @@ public override void Validate()
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "AuthenticationType");
             }
-            if (Password != null)
-            {
-                Password.Validate();
-            }
         }
     }
 }

src/SDKs/DataFactory/Management.DataFactory/Generated/Models/LinkedIntegrationRuntime.cs

@@ -31,14 +31,20 @@ public LinkedIntegrationRuntime()
         /// </summary>
         /// <param name="name">The name of the linked integration
         /// runtime.</param>
-        /// <param name="dataFactoryName">The data factory name for which the
+        /// <param name="subscriptionId">The subscription ID for which the
         /// linked integration runtime belong to.</param>
+        /// <param name="dataFactoryName">The name of the data factory for
+        /// which the linked integration runtime belong to.</param>
+        /// <param name="dataFactoryLocation">The location of the data factory
+        /// for which the linked integration runtime belong to.</param>
         /// <param name="createTime">The creating time of the linked
         /// integration runtime.</param>
-        public LinkedIntegrationRuntime(string name = default(string), string dataFactoryName = default(string), System.DateTime? createTime = default(System.DateTime?))
+        public LinkedIntegrationRuntime(string name = default(string), string subscriptionId = default(string), string dataFactoryName = default(string), string dataFactoryLocation = default(string), System.DateTime? createTime = default(System.DateTime?))
         {
             Name = name;
+            SubscriptionId = subscriptionId;
             DataFactoryName = dataFactoryName;
+            DataFactoryLocation = dataFactoryLocation;
             CreateTime = createTime;
             CustomInit();
         }
@@ -55,12 +61,26 @@ public LinkedIntegrationRuntime()
         public string Name { get; private set; }
 
         /// <summary>
-        /// Gets the data factory name for which the linked integration runtime
+        /// Gets the subscription ID for which the linked integration runtime
         /// belong to.
         /// </summary>
+        [JsonProperty(PropertyName = "subscriptionId")]
+        public string SubscriptionId { get; private set; }
+
+        /// <summary>
+        /// Gets the name of the data factory for which the linked integration
+        /// runtime belong to.
+        /// </summary>
         [JsonProperty(PropertyName = "dataFactoryName")]
         public string DataFactoryName { get; private set; }
 
+        /// <summary>
+        /// Gets the location of the data factory for which the linked
+        /// integration runtime belong to.
+        /// </summary>
+        [JsonProperty(PropertyName = "dataFactoryLocation")]
+        public string DataFactoryLocation { get; private set; }
+
         /// <summary>
         /// Gets the creating time of the linked integration runtime.
         /// </summary>