diff --git a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/AzureBatchLinkedService.cs b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/AzureBatchLinkedService.cs index f50d7be0dde3..db57fa81a2a3 100644 --- a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/AzureBatchLinkedService.cs +++ b/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). - public AzureBatchLinkedService(object accountName, object batchUri, object poolName, LinkedServiceReference linkedServiceName, IDictionary additionalProperties = default(IDictionary), 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 additionalProperties = default(IDictionary), 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. /// [JsonProperty(PropertyName = "typeProperties.accessKey")] - public SecureString AccessKey { get; set; } + public SecretBase AccessKey { get; set; } /// /// 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(); diff --git a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/AzureDataLakeAnalyticsLinkedService.cs b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/AzureDataLakeAnalyticsLinkedService.cs index 7277a5d65814..3121002b52b9 100644 --- a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/AzureDataLakeAnalyticsLinkedService.cs +++ b/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). - public AzureDataLakeAnalyticsLinkedService(object accountName, object tenant, IDictionary additionalProperties = default(IDictionary), 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 additionalProperties = default(IDictionary), 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. /// [JsonProperty(PropertyName = "typeProperties.servicePrincipalKey")] - public SecureString ServicePrincipalKey { get; set; } + public SecretBase ServicePrincipalKey { get; set; } /// /// 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(); - } } } } diff --git a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/AzureMLLinkedService.cs b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/AzureMLLinkedService.cs index 2744b247ff2c..32f347861dc9 100644 --- a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/AzureMLLinkedService.cs +++ b/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). - public AzureMLLinkedService(object mlEndpoint, SecureString apiKey, IDictionary additionalProperties = default(IDictionary), 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 additionalProperties = default(IDictionary), 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. /// [JsonProperty(PropertyName = "typeProperties.apiKey")] - public SecureString ApiKey { get; set; } + public SecretBase ApiKey { get; set; } /// /// Gets or sets the Update Resource REST URL for an Azure ML Web @@ -115,7 +115,7 @@ public AzureMLLinkedService() /// service. /// [JsonProperty(PropertyName = "typeProperties.servicePrincipalKey")] - public SecureString ServicePrincipalKey { get; set; } + public SecretBase ServicePrincipalKey { get; set; } /// /// 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(); - } } } } diff --git a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/HDInsightLinkedService.cs b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/HDInsightLinkedService.cs index e4aca83d5a14..f4bb3b29a615 100644 --- a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/HDInsightLinkedService.cs +++ b/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). - public HDInsightLinkedService(object clusterUri, IDictionary additionalProperties = default(IDictionary), 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 additionalProperties = default(IDictionary), 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. /// [JsonProperty(PropertyName = "typeProperties.password")] - public SecureString Password { get; set; } + public SecretBase Password { get; set; } /// /// 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(); diff --git a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/HDInsightOnDemandLinkedService.cs b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/HDInsightOnDemandLinkedService.cs index 00f9c5f40ba0..d677bfb07d50 100644 --- a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/HDInsightOnDemandLinkedService.cs +++ b/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). - public HDInsightOnDemandLinkedService(object clusterSize, object timeToLive, object version, LinkedServiceReference linkedServiceName, object hostSubscriptionId, object tenant, object clusterResourceGroup, IDictionary additionalProperties = default(IDictionary), 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 additionalLinkedServiceNames = default(IList), 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 additionalProperties = default(IDictionary), 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 additionalLinkedServiceNames = default(IList), 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. /// [JsonProperty(PropertyName = "typeProperties.servicePrincipalKey")] - public SecureString ServicePrincipalKey { get; set; } + public SecretBase ServicePrincipalKey { get; set; } /// /// 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. /// [JsonProperty(PropertyName = "typeProperties.clusterPassword")] - public SecureString ClusterPassword { get; set; } + public SecretBase ClusterPassword { get; set; } /// /// Gets or sets the username to SSH remotely connect to cluster’s node @@ -251,7 +251,7 @@ public HDInsightOnDemandLinkedService() /// (for Linux). /// [JsonProperty(PropertyName = "typeProperties.clusterSshPassword")] - public SecureString ClusterSshPassword { get; set; } + public SecretBase ClusterSshPassword { get; set; } /// /// 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) diff --git a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/HiveLinkedService.cs b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/HiveLinkedService.cs index a8aae4e47a03..c22945beb375 100644 --- a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/HiveLinkedService.cs +++ b/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). - public HiveLinkedService(object host, string authenticationType, IDictionary additionalProperties = default(IDictionary), 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 additionalProperties = default(IDictionary), 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 /// [JsonProperty(PropertyName = "typeProperties.password")] - public SecureString Password { get; set; } + public SecretBase Password { get; set; } /// /// 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(); - } } } } diff --git a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/LinkedIntegrationRuntime.cs b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/LinkedIntegrationRuntime.cs index 94b29dbfc00c..4ec7da81daf2 100644 --- a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/LinkedIntegrationRuntime.cs +++ b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/LinkedIntegrationRuntime.cs @@ -31,14 +31,20 @@ public LinkedIntegrationRuntime() /// /// The name of the linked integration /// runtime. - /// The data factory name for which the + /// The subscription ID for which the /// linked integration runtime belong to. + /// The name of the data factory for + /// which the linked integration runtime belong to. + /// The location of the data factory + /// for which the linked integration runtime belong to. /// The creating time of the linked /// integration runtime. - 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; } /// - /// Gets the data factory name for which the linked integration runtime + /// Gets the subscription ID for which the linked integration runtime /// belong to. /// + [JsonProperty(PropertyName = "subscriptionId")] + public string SubscriptionId { get; private set; } + + /// + /// Gets the name of the data factory for which the linked integration + /// runtime belong to. + /// [JsonProperty(PropertyName = "dataFactoryName")] public string DataFactoryName { get; private set; } + /// + /// Gets the location of the data factory for which the linked + /// integration runtime belong to. + /// + [JsonProperty(PropertyName = "dataFactoryLocation")] + public string DataFactoryLocation { get; private set; } + /// /// Gets the creating time of the linked integration runtime. /// diff --git a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/WebBasicAuthentication.cs b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/WebBasicAuthentication.cs index 60bec93f71e2..739807b64a7d 100644 --- a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/WebBasicAuthentication.cs +++ b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/WebBasicAuthentication.cs @@ -39,7 +39,7 @@ public WebBasicAuthentication() /// string (or Expression with resultType string). /// The password for Basic /// authentication. - public WebBasicAuthentication(object url, object username, SecureString password) + public WebBasicAuthentication(object url, object username, SecretBase password) : base(url) { Username = username; @@ -63,7 +63,7 @@ public WebBasicAuthentication(object url, object username, SecureString password /// Gets or sets the password for Basic authentication. /// [JsonProperty(PropertyName = "password")] - public SecureString Password { get; set; } + public SecretBase Password { get; set; } /// /// Validate the object. @@ -82,10 +82,6 @@ public override void Validate() { throw new ValidationException(ValidationRules.CannotBeNull, "Password"); } - if (Password != null) - { - Password.Validate(); - } } } } diff --git a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/WebClientCertificateAuthentication.cs b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/WebClientCertificateAuthentication.cs index 056d93e1f667..47dd5ab229d4 100644 --- a/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/WebClientCertificateAuthentication.cs +++ b/src/SDKs/DataFactory/Management.DataFactory/Generated/Models/WebClientCertificateAuthentication.cs @@ -41,7 +41,7 @@ public WebClientCertificateAuthentication() /// resultType string). /// Base64-encoded contents of a PFX file. /// Password for the PFX file. - public WebClientCertificateAuthentication(object url, SecureString pfx, SecureString password) + public WebClientCertificateAuthentication(object url, SecretBase pfx, SecretBase password) : base(url) { Pfx = pfx; @@ -58,13 +58,13 @@ public WebClientCertificateAuthentication(object url, SecureString pfx, SecureSt /// Gets or sets base64-encoded contents of a PFX file. /// [JsonProperty(PropertyName = "pfx")] - public SecureString Pfx { get; set; } + public SecretBase Pfx { get; set; } /// /// Gets or sets password for the PFX file. /// [JsonProperty(PropertyName = "password")] - public SecureString Password { get; set; } + public SecretBase Password { get; set; } /// /// Validate the object. @@ -83,14 +83,6 @@ public override void Validate() { throw new ValidationException(ValidationRules.CannotBeNull, "Password"); } - if (Pfx != null) - { - Pfx.Validate(); - } - if (Password != null) - { - Password.Validate(); - } } } } diff --git a/src/SDKs/DataFactory/Management.DataFactory/changelog.md b/src/SDKs/DataFactory/Management.DataFactory/changelog.md index 2ecb5b3e9b9a..2ca96fefc79e 100644 --- a/src/SDKs/DataFactory/Management.DataFactory/changelog.md +++ b/src/SDKs/DataFactory/Management.DataFactory/changelog.md @@ -4,6 +4,8 @@ ### Feature Additions * Enable AAD auth via service principal and management service identity for Azure SQL DB/DW linked service types + * Support integration runtime sharing across subscription and data factory + * Enable Azure Key Vault for all compute linked service ## Version 0.4.0-preview diff --git a/src/SDKs/_metadata/datafactory_resource-manager.txt b/src/SDKs/_metadata/datafactory_resource-manager.txt index 9327390047d5..6298706b8d5c 100644 --- a/src/SDKs/_metadata/datafactory_resource-manager.txt +++ b/src/SDKs/_metadata/datafactory_resource-manager.txt @@ -1,11 +1,11 @@ -2018-02-02 07:13:12 UTC +2018-02-08 02:32:23 UTC 1) azure-rest-api-specs repository information GitHub user: Azure Branch: master -Commit: f9ec24015ab77a2d7a1dfd33ddd208824459a7ca +Commit: 24071a7c302f86686bec19f033ab7e13da3ebce7 2) AutoRest information Requested version: latest -Bootstrapper version: C:\Program Files\nodejs `-- autorest@2.0.4245 +Bootstrapper version: C:\Users\yanzhang\AppData\Roaming\npm `-- autorest@2.0.4245 Latest installed version: