diff --git a/eng/mgmt/mgmtmetadata/datafactory_resource-manager.txt b/eng/mgmt/mgmtmetadata/datafactory_resource-manager.txt index e08a8b87808d..8e82d2b5abc9 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=v2 --reflect-api-versions --tag=package-2018-06 --csharp-sdks-folder=D:\Projects\azure-sdk-for-net\sdk -2021-06-09 05:49:23 UTC +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-1\sdk +2021-07-16 06:45:57 UTC Azure-rest-api-specs repository information GitHub fork: Azure Branch: master -Commit: 50eae85eb163a45c70a516cb3ca1225605ca381b +Commit: 86b65a6f0e0b637a774b177b3206155d990242d4 AutoRest information Requested version: v2 Bootstrapper version: autorest@2.0.4413 diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/CHANGELOG.md b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/CHANGELOG.md index 8430358e5ce8..35c5f7376ee5 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/CHANGELOG.md +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/CHANGELOG.md @@ -1,5 +1,12 @@ # Changelog for the Azure Data Factory V2 .NET SDK +## Version 4.21.0 +### Feature Additions +- Added properties pipelineName and pipelineRunId to PipelineRunInvokedBy definition +- Updated avroCompressionCodec and orcCompressionCodec from string to object +- Supported UAMI in ADF IR/LS/Activity +- GitHub bring your own app swagger update for ADF/Synapse Dataplane only + ## Version 4.20.0 ### Feature Additions - Added disableMetricsCollection in read/wirte properties diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/DataFactoryManagementClient.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/DataFactoryManagementClient.cs index e43dae9a6908..19ce57683f0c 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/DataFactoryManagementClient.cs +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/DataFactoryManagementClient.cs @@ -485,6 +485,8 @@ private void Initialize() DeserializationSettings.Converters.Add(new PolymorphicDeserializeJsonConverter("type")); SerializationSettings.Converters.Add(new PolymorphicSerializeJsonConverter("type")); DeserializationSettings.Converters.Add(new PolymorphicDeserializeJsonConverter("type")); + SerializationSettings.Converters.Add(new PolymorphicSerializeJsonConverter("type")); + DeserializationSettings.Converters.Add(new PolymorphicDeserializeJsonConverter("type")); SerializationSettings.Converters.Add(new PolymorphicSerializeJsonConverter("authenticationType")); DeserializationSettings.Converters.Add(new PolymorphicDeserializeJsonConverter("authenticationType")); SerializationSettings.Converters.Add(new PolymorphicSerializeJsonConverter("type")); diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/AvroDataset.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/AvroDataset.cs index c655b1c4b9b9..a1f7615cf8cf 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/AvroDataset.cs +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/AvroDataset.cs @@ -52,9 +52,9 @@ public AvroDataset() /// describing the Dataset. /// The folder that this Dataset is in. If not /// specified, Dataset will appear at the root level. - /// Possible values include: 'none', - /// 'deflate', 'snappy', 'xz', 'bzip2' - public AvroDataset(LinkedServiceReference linkedServiceName, DatasetLocation location, IDictionary additionalProperties = default(IDictionary), string description = default(string), object structure = default(object), object schema = default(object), IDictionary parameters = default(IDictionary), IList annotations = default(IList), DatasetFolder folder = default(DatasetFolder), string avroCompressionCodec = default(string), int? avroCompressionLevel = default(int?)) + /// The data avroCompressionCodec. + /// Type: string (or Expression with resultType string). + public AvroDataset(LinkedServiceReference linkedServiceName, DatasetLocation location, IDictionary additionalProperties = default(IDictionary), string description = default(string), object structure = default(object), object schema = default(object), IDictionary parameters = default(IDictionary), IList annotations = default(IList), DatasetFolder folder = default(DatasetFolder), object avroCompressionCodec = default(object), int? avroCompressionLevel = default(int?)) : base(linkedServiceName, additionalProperties, description, structure, schema, parameters, annotations, folder) { Location = location; @@ -75,11 +75,11 @@ public AvroDataset() public DatasetLocation Location { get; set; } /// - /// Gets or sets possible values include: 'none', 'deflate', 'snappy', - /// 'xz', 'bzip2' + /// Gets or sets the data avroCompressionCodec. Type: string (or + /// Expression with resultType string). /// [JsonProperty(PropertyName = "typeProperties.avroCompressionCodec")] - public string AvroCompressionCodec { get; set; } + public object AvroCompressionCodec { get; set; } /// /// diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/AzureBatchLinkedService.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/AzureBatchLinkedService.cs index 0eb3ded5e205..da4ca8acbe69 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/AzureBatchLinkedService.cs +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/AzureBatchLinkedService.cs @@ -56,7 +56,9 @@ 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), IDictionary parameters = default(IDictionary), IList annotations = default(IList), SecretBase accessKey = default(SecretBase), object encryptedCredential = default(object)) + /// The credential reference containing + /// authentication information. + public AzureBatchLinkedService(object accountName, object batchUri, object poolName, LinkedServiceReference linkedServiceName, IDictionary additionalProperties = default(IDictionary), IntegrationRuntimeReference connectVia = default(IntegrationRuntimeReference), string description = default(string), IDictionary parameters = default(IDictionary), IList annotations = default(IList), SecretBase accessKey = default(SecretBase), object encryptedCredential = default(object), CredentialReference credential = default(CredentialReference)) : base(additionalProperties, connectVia, description, parameters, annotations) { AccountName = accountName; @@ -65,6 +67,7 @@ public AzureBatchLinkedService() PoolName = poolName; LinkedServiceName = linkedServiceName; EncryptedCredential = encryptedCredential; + Credential = credential; CustomInit(); } @@ -114,6 +117,13 @@ public AzureBatchLinkedService() [JsonProperty(PropertyName = "typeProperties.encryptedCredential")] public object EncryptedCredential { get; set; } + /// + /// Gets or sets the credential reference containing authentication + /// information. + /// + [JsonProperty(PropertyName = "typeProperties.credential")] + public CredentialReference Credential { get; set; } + /// /// Validate the object. /// @@ -143,6 +153,10 @@ public override void Validate() { LinkedServiceName.Validate(); } + if (Credential != null) + { + Credential.Validate(); + } } } } diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/AzureBlobFSLinkedService.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/AzureBlobFSLinkedService.cs index 53371190e54d..ec81f0322ca5 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/AzureBlobFSLinkedService.cs +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/AzureBlobFSLinkedService.cs @@ -66,7 +66,9 @@ public AzureBlobFSLinkedService() /// authentication. Credentials are encrypted using the integration /// runtime credential manager. Type: string (or Expression with /// resultType string). - public AzureBlobFSLinkedService(object url, IDictionary additionalProperties = default(IDictionary), IntegrationRuntimeReference connectVia = default(IntegrationRuntimeReference), string description = default(string), IDictionary parameters = default(IDictionary), IList annotations = default(IList), object accountKey = default(object), object servicePrincipalId = default(object), SecretBase servicePrincipalKey = default(SecretBase), object tenant = default(object), object azureCloudType = default(object), object encryptedCredential = default(object)) + /// The credential reference containing + /// authentication information. + public AzureBlobFSLinkedService(object url, IDictionary additionalProperties = default(IDictionary), IntegrationRuntimeReference connectVia = default(IntegrationRuntimeReference), string description = default(string), IDictionary parameters = default(IDictionary), IList annotations = default(IList), object accountKey = default(object), object servicePrincipalId = default(object), SecretBase servicePrincipalKey = default(SecretBase), object tenant = default(object), object azureCloudType = default(object), object encryptedCredential = default(object), CredentialReference credential = default(CredentialReference)) : base(additionalProperties, connectVia, description, parameters, annotations) { Url = url; @@ -76,6 +78,7 @@ public AzureBlobFSLinkedService() Tenant = tenant; AzureCloudType = azureCloudType; EncryptedCredential = encryptedCredential; + Credential = credential; CustomInit(); } @@ -139,6 +142,13 @@ public AzureBlobFSLinkedService() [JsonProperty(PropertyName = "typeProperties.encryptedCredential")] public object EncryptedCredential { get; set; } + /// + /// Gets or sets the credential reference containing authentication + /// information. + /// + [JsonProperty(PropertyName = "typeProperties.credential")] + public CredentialReference Credential { get; set; } + /// /// Validate the object. /// @@ -152,6 +162,10 @@ public override void Validate() { throw new ValidationException(ValidationRules.CannotBeNull, "Url"); } + if (Credential != null) + { + Credential.Validate(); + } } } } diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/AzureBlobStorageLinkedService.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/AzureBlobStorageLinkedService.cs index ac5982e17369..a6c32f5a87bf 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/AzureBlobStorageLinkedService.cs +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/AzureBlobStorageLinkedService.cs @@ -79,7 +79,9 @@ public AzureBlobStorageLinkedService() /// authentication. Credentials are encrypted using the integration /// runtime credential manager. Type: string (or Expression with /// resultType string). - public AzureBlobStorageLinkedService(IDictionary additionalProperties = default(IDictionary), IntegrationRuntimeReference connectVia = default(IntegrationRuntimeReference), string description = default(string), IDictionary parameters = default(IDictionary), IList annotations = default(IList), object connectionString = default(object), AzureKeyVaultSecretReference accountKey = default(AzureKeyVaultSecretReference), object sasUri = default(object), AzureKeyVaultSecretReference sasToken = default(AzureKeyVaultSecretReference), string serviceEndpoint = default(string), object servicePrincipalId = default(object), SecretBase servicePrincipalKey = default(SecretBase), object tenant = default(object), object azureCloudType = default(object), string accountKind = default(string), string encryptedCredential = default(string)) + /// The credential reference containing + /// authentication information. + public AzureBlobStorageLinkedService(IDictionary additionalProperties = default(IDictionary), IntegrationRuntimeReference connectVia = default(IntegrationRuntimeReference), string description = default(string), IDictionary parameters = default(IDictionary), IList annotations = default(IList), object connectionString = default(object), AzureKeyVaultSecretReference accountKey = default(AzureKeyVaultSecretReference), object sasUri = default(object), AzureKeyVaultSecretReference sasToken = default(AzureKeyVaultSecretReference), string serviceEndpoint = default(string), object servicePrincipalId = default(object), SecretBase servicePrincipalKey = default(SecretBase), object tenant = default(object), object azureCloudType = default(object), string accountKind = default(string), string encryptedCredential = default(string), CredentialReference credential = default(CredentialReference)) : base(additionalProperties, connectVia, description, parameters, annotations) { ConnectionString = connectionString; @@ -93,6 +95,7 @@ public AzureBlobStorageLinkedService() AzureCloudType = azureCloudType; AccountKind = accountKind; EncryptedCredential = encryptedCredential; + Credential = credential; CustomInit(); } @@ -189,6 +192,13 @@ public AzureBlobStorageLinkedService() [JsonProperty(PropertyName = "typeProperties.encryptedCredential")] public string EncryptedCredential { get; set; } + /// + /// Gets or sets the credential reference containing authentication + /// information. + /// + [JsonProperty(PropertyName = "typeProperties.credential")] + public CredentialReference Credential { get; set; } + /// /// Validate the object. /// @@ -206,6 +216,10 @@ public override void Validate() { SasToken.Validate(); } + if (Credential != null) + { + Credential.Validate(); + } } } } diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/AzureDataExplorerLinkedService.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/AzureDataExplorerLinkedService.cs index bdfc0334dcca..b18eb9b3bc0d 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/AzureDataExplorerLinkedService.cs +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/AzureDataExplorerLinkedService.cs @@ -58,7 +58,9 @@ public AzureDataExplorerLinkedService() /// The name or ID of the tenant to which the /// service principal belongs. Type: string (or Expression with /// resultType string). - public AzureDataExplorerLinkedService(object endpoint, object database, IDictionary additionalProperties = default(IDictionary), IntegrationRuntimeReference connectVia = default(IntegrationRuntimeReference), string description = default(string), IDictionary parameters = default(IDictionary), IList annotations = default(IList), object servicePrincipalId = default(object), SecretBase servicePrincipalKey = default(SecretBase), object tenant = default(object)) + /// The credential reference containing + /// authentication information. + public AzureDataExplorerLinkedService(object endpoint, object database, IDictionary additionalProperties = default(IDictionary), IntegrationRuntimeReference connectVia = default(IntegrationRuntimeReference), string description = default(string), IDictionary parameters = default(IDictionary), IList annotations = default(IList), object servicePrincipalId = default(object), SecretBase servicePrincipalKey = default(SecretBase), object tenant = default(object), CredentialReference credential = default(CredentialReference)) : base(additionalProperties, connectVia, description, parameters, annotations) { Endpoint = endpoint; @@ -66,6 +68,7 @@ public AzureDataExplorerLinkedService() ServicePrincipalKey = servicePrincipalKey; Database = database; Tenant = tenant; + Credential = credential; CustomInit(); } @@ -113,6 +116,13 @@ public AzureDataExplorerLinkedService() [JsonProperty(PropertyName = "typeProperties.tenant")] public object Tenant { get; set; } + /// + /// Gets or sets the credential reference containing authentication + /// information. + /// + [JsonProperty(PropertyName = "typeProperties.credential")] + public CredentialReference Credential { get; set; } + /// /// Validate the object. /// @@ -130,6 +140,10 @@ public override void Validate() { throw new ValidationException(ValidationRules.CannotBeNull, "Database"); } + if (Credential != null) + { + Credential.Validate(); + } } } } diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/AzureDataLakeStoreLinkedService.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/AzureDataLakeStoreLinkedService.cs index 007781598e44..a4c863d53046 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/AzureDataLakeStoreLinkedService.cs +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/AzureDataLakeStoreLinkedService.cs @@ -71,7 +71,9 @@ public AzureDataLakeStoreLinkedService() /// authentication. Credentials are encrypted using the integration /// runtime credential manager. Type: string (or Expression with /// resultType string). - public AzureDataLakeStoreLinkedService(object dataLakeStoreUri, IDictionary additionalProperties = default(IDictionary), IntegrationRuntimeReference connectVia = default(IntegrationRuntimeReference), string description = default(string), IDictionary parameters = default(IDictionary), IList annotations = default(IList), object servicePrincipalId = default(object), SecretBase servicePrincipalKey = default(SecretBase), object tenant = default(object), object azureCloudType = default(object), object accountName = default(object), object subscriptionId = default(object), object resourceGroupName = default(object), object encryptedCredential = default(object)) + /// The credential reference containing + /// authentication information. + public AzureDataLakeStoreLinkedService(object dataLakeStoreUri, IDictionary additionalProperties = default(IDictionary), IntegrationRuntimeReference connectVia = default(IntegrationRuntimeReference), string description = default(string), IDictionary parameters = default(IDictionary), IList annotations = default(IList), object servicePrincipalId = default(object), SecretBase servicePrincipalKey = default(SecretBase), object tenant = default(object), object azureCloudType = default(object), object accountName = default(object), object subscriptionId = default(object), object resourceGroupName = default(object), object encryptedCredential = default(object), CredentialReference credential = default(CredentialReference)) : base(additionalProperties, connectVia, description, parameters, annotations) { DataLakeStoreUri = dataLakeStoreUri; @@ -83,6 +85,7 @@ public AzureDataLakeStoreLinkedService() SubscriptionId = subscriptionId; ResourceGroupName = resourceGroupName; EncryptedCredential = encryptedCredential; + Credential = credential; CustomInit(); } @@ -162,6 +165,13 @@ public AzureDataLakeStoreLinkedService() [JsonProperty(PropertyName = "typeProperties.encryptedCredential")] public object EncryptedCredential { get; set; } + /// + /// Gets or sets the credential reference containing authentication + /// information. + /// + [JsonProperty(PropertyName = "typeProperties.credential")] + public CredentialReference Credential { get; set; } + /// /// Validate the object. /// @@ -175,6 +185,10 @@ public override void Validate() { throw new ValidationException(ValidationRules.CannotBeNull, "DataLakeStoreUri"); } + if (Credential != null) + { + Credential.Validate(); + } } } } diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/AzureDatabricksLinkedService.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/AzureDatabricksLinkedService.cs index 1a9b875cf53a..d174e7000c08 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/AzureDatabricksLinkedService.cs +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/AzureDatabricksLinkedService.cs @@ -111,7 +111,9 @@ public AzureDatabricksLinkedService() /// The policy id for limiting the ability to /// configure clusters based on a user defined set of rules. Type: /// string (or Expression with resultType string). - public AzureDatabricksLinkedService(object domain, IDictionary additionalProperties = default(IDictionary), IntegrationRuntimeReference connectVia = default(IntegrationRuntimeReference), string description = default(string), IDictionary parameters = default(IDictionary), IList annotations = default(IList), SecretBase accessToken = default(SecretBase), object authentication = default(object), object workspaceResourceId = default(object), object existingClusterId = default(object), object instancePoolId = default(object), object newClusterVersion = default(object), object newClusterNumOfWorker = default(object), object newClusterNodeType = default(object), IDictionary newClusterSparkConf = default(IDictionary), IDictionary newClusterSparkEnvVars = default(IDictionary), IDictionary newClusterCustomTags = default(IDictionary), object newClusterLogDestination = default(object), object newClusterDriverNodeType = default(object), object newClusterInitScripts = default(object), object newClusterEnableElasticDisk = default(object), object encryptedCredential = default(object), object policyId = default(object)) + /// The credential reference containing + /// authentication information. + public AzureDatabricksLinkedService(object domain, IDictionary additionalProperties = default(IDictionary), IntegrationRuntimeReference connectVia = default(IntegrationRuntimeReference), string description = default(string), IDictionary parameters = default(IDictionary), IList annotations = default(IList), SecretBase accessToken = default(SecretBase), object authentication = default(object), object workspaceResourceId = default(object), object existingClusterId = default(object), object instancePoolId = default(object), object newClusterVersion = default(object), object newClusterNumOfWorker = default(object), object newClusterNodeType = default(object), IDictionary newClusterSparkConf = default(IDictionary), IDictionary newClusterSparkEnvVars = default(IDictionary), IDictionary newClusterCustomTags = default(IDictionary), object newClusterLogDestination = default(object), object newClusterDriverNodeType = default(object), object newClusterInitScripts = default(object), object newClusterEnableElasticDisk = default(object), object encryptedCredential = default(object), object policyId = default(object), CredentialReference credential = default(CredentialReference)) : base(additionalProperties, connectVia, description, parameters, annotations) { Domain = domain; @@ -132,6 +134,7 @@ public AzureDatabricksLinkedService() NewClusterEnableElasticDisk = newClusterEnableElasticDisk; EncryptedCredential = encryptedCredential; PolicyId = policyId; + Credential = credential; CustomInit(); } @@ -289,6 +292,13 @@ public AzureDatabricksLinkedService() [JsonProperty(PropertyName = "typeProperties.policyId")] public object PolicyId { get; set; } + /// + /// Gets or sets the credential reference containing authentication + /// information. + /// + [JsonProperty(PropertyName = "typeProperties.credential")] + public CredentialReference Credential { get; set; } + /// /// Validate the object. /// @@ -302,6 +312,10 @@ public override void Validate() { throw new ValidationException(ValidationRules.CannotBeNull, "Domain"); } + if (Credential != null) + { + Credential.Validate(); + } } } } diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/AzureFunctionLinkedService.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/AzureFunctionLinkedService.cs index 9ba0ba409246..628961278213 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/AzureFunctionLinkedService.cs +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/AzureFunctionLinkedService.cs @@ -51,12 +51,22 @@ public AzureFunctionLinkedService() /// authentication. Credentials are encrypted using the integration /// runtime credential manager. Type: string (or Expression with /// resultType string). - public AzureFunctionLinkedService(object functionAppUrl, IDictionary additionalProperties = default(IDictionary), IntegrationRuntimeReference connectVia = default(IntegrationRuntimeReference), string description = default(string), IDictionary parameters = default(IDictionary), IList annotations = default(IList), SecretBase functionKey = default(SecretBase), object encryptedCredential = default(object)) + /// The credential reference containing + /// authentication information. + /// Allowed token audiences for azure + /// function. + /// Type of authentication (Required to + /// specify MSI) used to connect to AzureFunction. Type: string (or + /// Expression with resultType string). + public AzureFunctionLinkedService(object functionAppUrl, IDictionary additionalProperties = default(IDictionary), IntegrationRuntimeReference connectVia = default(IntegrationRuntimeReference), string description = default(string), IDictionary parameters = default(IDictionary), IList annotations = default(IList), SecretBase functionKey = default(SecretBase), object encryptedCredential = default(object), CredentialReference credential = default(CredentialReference), object resourceId = default(object), object authentication = default(object)) : base(additionalProperties, connectVia, description, parameters, annotations) { FunctionAppUrl = functionAppUrl; FunctionKey = functionKey; EncryptedCredential = encryptedCredential; + Credential = credential; + ResourceId = resourceId; + Authentication = authentication; CustomInit(); } @@ -86,6 +96,27 @@ public AzureFunctionLinkedService() [JsonProperty(PropertyName = "typeProperties.encryptedCredential")] public object EncryptedCredential { get; set; } + /// + /// Gets or sets the credential reference containing authentication + /// information. + /// + [JsonProperty(PropertyName = "typeProperties.credential")] + public CredentialReference Credential { get; set; } + + /// + /// Gets or sets allowed token audiences for azure function. + /// + [JsonProperty(PropertyName = "typeProperties.resourceId")] + public object ResourceId { get; set; } + + /// + /// Gets or sets type of authentication (Required to specify MSI) used + /// to connect to AzureFunction. Type: string (or Expression with + /// resultType string). + /// + [JsonProperty(PropertyName = "typeProperties.authentication")] + public object Authentication { get; set; } + /// /// Validate the object. /// @@ -99,6 +130,10 @@ public override void Validate() { throw new ValidationException(ValidationRules.CannotBeNull, "FunctionAppUrl"); } + if (Credential != null) + { + Credential.Validate(); + } } } } diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/AzureKeyVaultLinkedService.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/AzureKeyVaultLinkedService.cs index 9ce4d1bc5022..a30434c8b84a 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/AzureKeyVaultLinkedService.cs +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/AzureKeyVaultLinkedService.cs @@ -45,10 +45,13 @@ public AzureKeyVaultLinkedService() /// Parameters for linked service. /// List of tags that can be used for /// describing the linked service. - public AzureKeyVaultLinkedService(object baseUrl, IDictionary additionalProperties = default(IDictionary), IntegrationRuntimeReference connectVia = default(IntegrationRuntimeReference), string description = default(string), IDictionary parameters = default(IDictionary), IList annotations = default(IList)) + /// The credential reference containing + /// authentication information. + public AzureKeyVaultLinkedService(object baseUrl, IDictionary additionalProperties = default(IDictionary), IntegrationRuntimeReference connectVia = default(IntegrationRuntimeReference), string description = default(string), IDictionary parameters = default(IDictionary), IList annotations = default(IList), CredentialReference credential = default(CredentialReference)) : base(additionalProperties, connectVia, description, parameters, annotations) { BaseUrl = baseUrl; + Credential = credential; CustomInit(); } @@ -65,6 +68,13 @@ public AzureKeyVaultLinkedService() [JsonProperty(PropertyName = "typeProperties.baseUrl")] public object BaseUrl { get; set; } + /// + /// Gets or sets the credential reference containing authentication + /// information. + /// + [JsonProperty(PropertyName = "typeProperties.credential")] + public CredentialReference Credential { get; set; } + /// /// Validate the object. /// @@ -78,6 +88,10 @@ public override void Validate() { throw new ValidationException(ValidationRules.CannotBeNull, "BaseUrl"); } + if (Credential != null) + { + Credential.Validate(); + } } } } diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/AzureMLLinkedService.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/AzureMLLinkedService.cs index 0d0c1692f44d..dac69b8977bc 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/AzureMLLinkedService.cs +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/AzureMLLinkedService.cs @@ -64,7 +64,10 @@ public AzureMLLinkedService() /// authentication. Credentials are encrypted using the integration /// runtime credential manager. Type: string (or Expression with /// resultType string). - public AzureMLLinkedService(object mlEndpoint, SecretBase apiKey, IDictionary additionalProperties = default(IDictionary), IntegrationRuntimeReference connectVia = default(IntegrationRuntimeReference), string description = default(string), IDictionary parameters = default(IDictionary), IList annotations = default(IList), object updateResourceEndpoint = default(object), object servicePrincipalId = default(object), SecretBase servicePrincipalKey = default(SecretBase), object tenant = default(object), object encryptedCredential = default(object)) + /// Type of authentication (Required to + /// specify MSI) used to connect to AzureML. Type: string (or + /// Expression with resultType string). + public AzureMLLinkedService(object mlEndpoint, SecretBase apiKey, IDictionary additionalProperties = default(IDictionary), IntegrationRuntimeReference connectVia = default(IntegrationRuntimeReference), string description = default(string), IDictionary parameters = default(IDictionary), IList annotations = default(IList), object updateResourceEndpoint = default(object), object servicePrincipalId = default(object), SecretBase servicePrincipalKey = default(SecretBase), object tenant = default(object), object encryptedCredential = default(object), object authentication = default(object)) : base(additionalProperties, connectVia, description, parameters, annotations) { MlEndpoint = mlEndpoint; @@ -74,6 +77,7 @@ public AzureMLLinkedService() ServicePrincipalKey = servicePrincipalKey; Tenant = tenant; EncryptedCredential = encryptedCredential; + Authentication = authentication; CustomInit(); } @@ -136,6 +140,14 @@ public AzureMLLinkedService() [JsonProperty(PropertyName = "typeProperties.encryptedCredential")] public object EncryptedCredential { get; set; } + /// + /// Gets or sets type of authentication (Required to specify MSI) used + /// to connect to AzureML. Type: string (or Expression with resultType + /// string). + /// + [JsonProperty(PropertyName = "typeProperties.authentication")] + public object Authentication { get; set; } + /// /// Validate the object. /// diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/AzureSqlDWLinkedService.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/AzureSqlDWLinkedService.cs index b6a653a0227c..13cf4706b585 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/AzureSqlDWLinkedService.cs +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/AzureSqlDWLinkedService.cs @@ -64,7 +64,9 @@ public AzureSqlDWLinkedService() /// authentication. Credentials are encrypted using the integration /// runtime credential manager. Type: string (or Expression with /// resultType string). - public AzureSqlDWLinkedService(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)) + /// The credential reference containing + /// authentication information. + public AzureSqlDWLinkedService(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), CredentialReference credential = default(CredentialReference)) : base(additionalProperties, connectVia, description, parameters, annotations) { ConnectionString = connectionString; @@ -74,6 +76,7 @@ public AzureSqlDWLinkedService() Tenant = tenant; AzureCloudType = azureCloudType; EncryptedCredential = encryptedCredential; + Credential = credential; CustomInit(); } @@ -138,6 +141,13 @@ public AzureSqlDWLinkedService() [JsonProperty(PropertyName = "typeProperties.encryptedCredential")] public object EncryptedCredential { get; set; } + /// + /// Gets or sets the credential reference containing authentication + /// information. + /// + [JsonProperty(PropertyName = "typeProperties.credential")] + public CredentialReference Credential { get; set; } + /// /// Validate the object. /// @@ -155,6 +165,10 @@ public override void Validate() { Password.Validate(); } + if (Credential != null) + { + Credential.Validate(); + } } } } 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 61cd7f5fc6a4..69095f6ca690 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 @@ -67,7 +67,9 @@ public AzureSqlDatabaseLinkedService() /// resultType string). /// 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)) + /// The credential reference containing + /// authentication information. + 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), CredentialReference credential = default(CredentialReference)) : base(additionalProperties, connectVia, description, parameters, annotations) { ConnectionString = connectionString; @@ -78,6 +80,7 @@ public AzureSqlDatabaseLinkedService() AzureCloudType = azureCloudType; EncryptedCredential = encryptedCredential; AlwaysEncryptedSettings = alwaysEncryptedSettings; + Credential = credential; CustomInit(); } @@ -147,6 +150,13 @@ public AzureSqlDatabaseLinkedService() [JsonProperty(PropertyName = "typeProperties.alwaysEncryptedSettings")] public SqlAlwaysEncryptedProperties AlwaysEncryptedSettings { get; set; } + /// + /// Gets or sets the credential reference containing authentication + /// information. + /// + [JsonProperty(PropertyName = "typeProperties.credential")] + public CredentialReference Credential { get; set; } + /// /// Validate the object. /// @@ -168,6 +178,10 @@ public override void Validate() { AlwaysEncryptedSettings.Validate(); } + if (Credential != null) + { + Credential.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 9363409a926a..6e5de1425085 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 @@ -65,7 +65,9 @@ public AzureSqlMILinkedService() /// resultType string). /// 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)) + /// The credential reference containing + /// authentication information. + 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), CredentialReference credential = default(CredentialReference)) : base(additionalProperties, connectVia, description, parameters, annotations) { ConnectionString = connectionString; @@ -76,6 +78,7 @@ public AzureSqlMILinkedService() AzureCloudType = azureCloudType; EncryptedCredential = encryptedCredential; AlwaysEncryptedSettings = alwaysEncryptedSettings; + Credential = credential; CustomInit(); } @@ -145,6 +148,13 @@ public AzureSqlMILinkedService() [JsonProperty(PropertyName = "typeProperties.alwaysEncryptedSettings")] public SqlAlwaysEncryptedProperties AlwaysEncryptedSettings { get; set; } + /// + /// Gets or sets the credential reference containing authentication + /// information. + /// + [JsonProperty(PropertyName = "typeProperties.credential")] + public CredentialReference Credential { get; set; } + /// /// Validate the object. /// @@ -166,6 +176,10 @@ public override void Validate() { AlwaysEncryptedSettings.Validate(); } + if (Credential != null) + { + Credential.Validate(); + } } } } diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/Credential.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/Credential.cs new file mode 100644 index 000000000000..b29d0d3c46d2 --- /dev/null +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/Credential.cs @@ -0,0 +1,75 @@ +// +// 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; + + /// + /// The Azure Data Factory nested object which contains the information and + /// credential which can be used to connect with related store or compute + /// resource. + /// + public partial class Credential + { + /// + /// Initializes a new instance of the Credential class. + /// + public Credential() + { + CustomInit(); + } + + /// + /// Initializes a new instance of the Credential class. + /// + /// Unmatched properties from the + /// message are deserialized this collection + /// Credential description. + /// List of tags that can be used for + /// describing the Credential. + public Credential(IDictionary additionalProperties = default(IDictionary), string description = default(string), IList annotations = default(IList)) + { + AdditionalProperties = additionalProperties; + Description = description; + Annotations = annotations; + CustomInit(); + } + + /// + /// An initialization method that performs custom operations like setting defaults + /// + partial void CustomInit(); + + /// + /// Gets or sets unmatched properties from the message are deserialized + /// this collection + /// + [JsonExtensionData] + public IDictionary AdditionalProperties { get; set; } + + /// + /// Gets or sets credential description. + /// + [JsonProperty(PropertyName = "description")] + public string Description { get; set; } + + /// + /// Gets or sets list of tags that can be used for describing the + /// Credential. + /// + [JsonProperty(PropertyName = "annotations")] + public IList Annotations { get; set; } + + } +} diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/CredentialReference.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/CredentialReference.cs new file mode 100644 index 000000000000..297507c3b4c5 --- /dev/null +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/CredentialReference.cs @@ -0,0 +1,90 @@ +// +// 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.Collections; + using System.Collections.Generic; + using System.Linq; + + /// + /// Credential reference type. + /// + public partial class CredentialReference + { + /// + /// Initializes a new instance of the CredentialReference class. + /// + public CredentialReference() + { + CustomInit(); + } + + /// + /// Initializes a new instance of the CredentialReference class. + /// + /// Reference credential name. + /// Unmatched properties from the + /// message are deserialized this collection + public CredentialReference(string referenceName, IDictionary additionalProperties = default(IDictionary)) + { + AdditionalProperties = additionalProperties; + ReferenceName = referenceName; + CustomInit(); + } + /// + /// Static constructor for CredentialReference class. + /// + static CredentialReference() + { + Type = "CredentialReference"; + } + + /// + /// An initialization method that performs custom operations like setting defaults + /// + partial void CustomInit(); + + /// + /// Gets or sets unmatched properties from the message are deserialized + /// this collection + /// + [JsonExtensionData] + public IDictionary AdditionalProperties { get; set; } + + /// + /// Gets or sets reference credential name. + /// + [JsonProperty(PropertyName = "referenceName")] + public string ReferenceName { get; set; } + + /// + /// Credential reference type. + /// + [JsonProperty(PropertyName = "type")] + public static string Type { get; private set; } + + /// + /// Validate the object. + /// + /// + /// Thrown if validation fails + /// + public virtual void Validate() + { + if (ReferenceName == null) + { + throw new ValidationException(ValidationRules.CannotBeNull, "ReferenceName"); + } + } + } +} diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/CredentialResource.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/CredentialResource.cs new file mode 100644 index 000000000000..68aed210eb0e --- /dev/null +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/CredentialResource.cs @@ -0,0 +1,70 @@ +// +// 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; + + /// + /// Credential resource type. + /// + public partial class CredentialResource : SubResource + { + /// + /// Initializes a new instance of the CredentialResource class. + /// + public CredentialResource() + { + CustomInit(); + } + + /// + /// Initializes a new instance of the CredentialResource class. + /// + /// Properties of credentials. + /// The resource identifier. + /// The resource name. + /// The resource type. + /// Etag identifies change in the resource. + public CredentialResource(Credential properties, string id = default(string), string name = default(string), string type = default(string), string etag = default(string)) + : base(id, name, type, etag) + { + Properties = properties; + CustomInit(); + } + + /// + /// An initialization method that performs custom operations like setting defaults + /// + partial void CustomInit(); + + /// + /// Gets or sets properties of credentials. + /// + [JsonProperty(PropertyName = "properties")] + public Credential Properties { get; set; } + + /// + /// Validate the object. + /// + /// + /// Thrown if validation fails + /// + public virtual void Validate() + { + if (Properties == null) + { + throw new ValidationException(ValidationRules.CannotBeNull, "Properties"); + } + } + } +} diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/EntityReference.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/EntityReference.cs index 11c52c9cad13..426eaad1140a 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/EntityReference.cs +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/EntityReference.cs @@ -31,7 +31,7 @@ public EntityReference() /// /// The type of this referenced entity. Possible /// values include: 'IntegrationRuntimeReference', - /// 'LinkedServiceReference', 'CredentialReference' + /// 'LinkedServiceReference' /// The name of this referenced /// entity. public EntityReference(string type = default(string), string referenceName = default(string)) @@ -48,8 +48,7 @@ public EntityReference() /// /// Gets or sets the type of this referenced entity. Possible values - /// include: 'IntegrationRuntimeReference', 'LinkedServiceReference', - /// 'CredentialReference' + /// include: 'IntegrationRuntimeReference', 'LinkedServiceReference' /// [JsonProperty(PropertyName = "type")] public string Type { get; set; } diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/GitHubAccessTokenRequest.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/GitHubAccessTokenRequest.cs index 0a1426b0be17..3a198ef6ce34 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/GitHubAccessTokenRequest.cs +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/GitHubAccessTokenRequest.cs @@ -34,10 +34,13 @@ public GitHubAccessTokenRequest() /// GitHub access token base /// URL. /// GitHub application client ID. - public GitHubAccessTokenRequest(string gitHubAccessCode, string gitHubAccessTokenBaseUrl, string gitHubClientId = default(string)) + /// GitHub bring your own app client + /// secret information. + public GitHubAccessTokenRequest(string gitHubAccessCode, string gitHubAccessTokenBaseUrl, string gitHubClientId = default(string), GitHubClientSecret gitHubClientSecret = default(GitHubClientSecret)) { GitHubAccessCode = gitHubAccessCode; GitHubClientId = gitHubClientId; + GitHubClientSecret = gitHubClientSecret; GitHubAccessTokenBaseUrl = gitHubAccessTokenBaseUrl; CustomInit(); } @@ -59,6 +62,12 @@ public GitHubAccessTokenRequest() [JsonProperty(PropertyName = "gitHubClientId")] public string GitHubClientId { get; set; } + /// + /// Gets or sets gitHub bring your own app client secret information. + /// + [JsonProperty(PropertyName = "gitHubClientSecret")] + public GitHubClientSecret GitHubClientSecret { get; set; } + /// /// Gets or sets gitHub access token base URL. /// diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/GitHubClientSecret.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/GitHubClientSecret.cs new file mode 100644 index 000000000000..5704f0e681a2 --- /dev/null +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/GitHubClientSecret.cs @@ -0,0 +1,62 @@ +// +// 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.Linq; + + /// + /// Client secret information for factory's bring your own app repository + /// configuration. + /// + public partial class GitHubClientSecret + { + /// + /// Initializes a new instance of the GitHubClientSecret class. + /// + public GitHubClientSecret() + { + CustomInit(); + } + + /// + /// Initializes a new instance of the GitHubClientSecret class. + /// + /// Bring your own app client secret AKV + /// URL. + /// Bring your own app client secret name + /// in AKV. + public GitHubClientSecret(string byoaSecretAkvUrl = default(string), string byoaSecretName = default(string)) + { + ByoaSecretAkvUrl = byoaSecretAkvUrl; + ByoaSecretName = byoaSecretName; + CustomInit(); + } + + /// + /// An initialization method that performs custom operations like setting defaults + /// + partial void CustomInit(); + + /// + /// Gets or sets bring your own app client secret AKV URL. + /// + [JsonProperty(PropertyName = "byoaSecretAkvUrl")] + public string ByoaSecretAkvUrl { get; set; } + + /// + /// Gets or sets bring your own app client secret name in AKV. + /// + [JsonProperty(PropertyName = "byoaSecretName")] + public string ByoaSecretName { get; set; } + + } +} diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/HDInsightOnDemandLinkedService.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/HDInsightOnDemandLinkedService.cs index 1ad9874197fa..7608b8dc35a5 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/HDInsightOnDemandLinkedService.cs +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/HDInsightOnDemandLinkedService.cs @@ -134,7 +134,9 @@ public HDInsightOnDemandLinkedService() /// vNet. If virtualNetworkId was specified, then this property is /// required. 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), IDictionary parameters = default(IDictionary), IList annotations = default(IList), 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), object headNodeSize = default(object), object dataNodeSize = default(object), object zookeeperNodeSize = default(object), IList scriptActions = default(IList), object virtualNetworkId = default(object), object subnetName = default(object)) + /// The credential reference containing + /// authentication information. + 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), IDictionary parameters = default(IDictionary), IList annotations = default(IList), 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), object headNodeSize = default(object), object dataNodeSize = default(object), object zookeeperNodeSize = default(object), IList scriptActions = default(IList), object virtualNetworkId = default(object), object subnetName = default(object), CredentialReference credential = default(CredentialReference)) : base(additionalProperties, connectVia, description, parameters, annotations) { ClusterSize = clusterSize; @@ -170,6 +172,7 @@ public HDInsightOnDemandLinkedService() ScriptActions = scriptActions; VirtualNetworkId = virtualNetworkId; SubnetName = subnetName; + Credential = credential; CustomInit(); } @@ -417,6 +420,13 @@ public HDInsightOnDemandLinkedService() [JsonProperty(PropertyName = "typeProperties.subnetName")] public object SubnetName { get; set; } + /// + /// Gets or sets the credential reference containing authentication + /// information. + /// + [JsonProperty(PropertyName = "typeProperties.credential")] + public CredentialReference Credential { get; set; } + /// /// Validate the object. /// @@ -482,6 +492,10 @@ public override void Validate() } } } + if (Credential != null) + { + Credential.Validate(); + } } } } diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/IntegrationRuntimeEntityReferenceType.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/IntegrationRuntimeEntityReferenceType.cs index 5651c1f48d6e..590bfe94be08 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/IntegrationRuntimeEntityReferenceType.cs +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/IntegrationRuntimeEntityReferenceType.cs @@ -18,6 +18,5 @@ public static class IntegrationRuntimeEntityReferenceType { public const string IntegrationRuntimeReference = "IntegrationRuntimeReference"; public const string LinkedServiceReference = "LinkedServiceReference"; - public const string CredentialReference = "CredentialReference"; } } diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/IntegrationRuntimeSsisProperties.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/IntegrationRuntimeSsisProperties.cs index b423a3142696..a59d25d20f92 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/IntegrationRuntimeSsisProperties.cs +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/IntegrationRuntimeSsisProperties.cs @@ -50,9 +50,9 @@ public IntegrationRuntimeSsisProperties() /// script properties for a SSIS integration runtime. /// Package stores for the SSIS Integration /// Runtime. - /// The user-assigned managed identity - /// reference. - public IntegrationRuntimeSsisProperties(IDictionary additionalProperties = default(IDictionary), IntegrationRuntimeSsisCatalogInfo catalogInfo = default(IntegrationRuntimeSsisCatalogInfo), string licenseType = default(string), IntegrationRuntimeCustomSetupScriptProperties customSetupScriptProperties = default(IntegrationRuntimeCustomSetupScriptProperties), IntegrationRuntimeDataProxyProperties dataProxyProperties = default(IntegrationRuntimeDataProxyProperties), string edition = default(string), IList expressCustomSetupProperties = default(IList), IList packageStores = default(IList), EntityReference managedCredential = default(EntityReference)) + /// The credential reference containing + /// authentication information. + public IntegrationRuntimeSsisProperties(IDictionary additionalProperties = default(IDictionary), IntegrationRuntimeSsisCatalogInfo catalogInfo = default(IntegrationRuntimeSsisCatalogInfo), string licenseType = default(string), IntegrationRuntimeCustomSetupScriptProperties customSetupScriptProperties = default(IntegrationRuntimeCustomSetupScriptProperties), IntegrationRuntimeDataProxyProperties dataProxyProperties = default(IntegrationRuntimeDataProxyProperties), string edition = default(string), IList expressCustomSetupProperties = default(IList), IList packageStores = default(IList), CredentialReference credential = default(CredentialReference)) { AdditionalProperties = additionalProperties; CatalogInfo = catalogInfo; @@ -62,7 +62,7 @@ public IntegrationRuntimeSsisProperties() Edition = edition; ExpressCustomSetupProperties = expressCustomSetupProperties; PackageStores = packageStores; - ManagedCredential = managedCredential; + Credential = credential; CustomInit(); } @@ -127,10 +127,11 @@ public IntegrationRuntimeSsisProperties() public IList PackageStores { get; set; } /// - /// Gets or sets the user-assigned managed identity reference. + /// Gets or sets the credential reference containing authentication + /// information. /// - [JsonProperty(PropertyName = "managedCredential")] - public EntityReference ManagedCredential { get; set; } + [JsonProperty(PropertyName = "credential")] + public CredentialReference Credential { get; set; } /// /// Validate the object. @@ -158,6 +159,10 @@ public virtual void Validate() } } } + if (Credential != null) + { + Credential.Validate(); + } } } } diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/ManagedIdentityCredential.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/ManagedIdentityCredential.cs new file mode 100644 index 000000000000..d926ee473306 --- /dev/null +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/ManagedIdentityCredential.cs @@ -0,0 +1,64 @@ +// +// 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 Microsoft.Rest.Serialization; + using Newtonsoft.Json; + using System.Collections; + using System.Collections.Generic; + using System.Linq; + + /// + /// Managed identity credential. + /// + [Newtonsoft.Json.JsonObject("ManagedIdentity")] + [Rest.Serialization.JsonTransformation] + public partial class ManagedIdentityCredential : Credential + { + /// + /// Initializes a new instance of the ManagedIdentityCredential class. + /// + public ManagedIdentityCredential() + { + CustomInit(); + } + + /// + /// Initializes a new instance of the ManagedIdentityCredential class. + /// + /// Unmatched properties from the + /// message are deserialized this collection + /// Credential description. + /// List of tags that can be used for + /// describing the Credential. + /// The resource id of user assigned managed + /// identity + public ManagedIdentityCredential(IDictionary additionalProperties = default(IDictionary), string description = default(string), IList annotations = default(IList), string resourceId = default(string)) + : base(additionalProperties, description, annotations) + { + ResourceId = resourceId; + CustomInit(); + } + + /// + /// An initialization method that performs custom operations like setting defaults + /// + partial void CustomInit(); + + /// + /// Gets or sets the resource id of user assigned managed identity + /// + [JsonProperty(PropertyName = "typeProperties.resourceId")] + public string ResourceId { get; set; } + + } +} diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/OrcDataset.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/OrcDataset.cs index 8a368a17b352..05b8c537a2ba 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/OrcDataset.cs +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/OrcDataset.cs @@ -53,9 +53,9 @@ public OrcDataset() /// describing the Dataset. /// The folder that this Dataset is in. If not /// specified, Dataset will appear at the root level. - /// Possible values include: 'none', - /// 'zlib', 'snappy', 'lzo' - public OrcDataset(LinkedServiceReference linkedServiceName, DatasetLocation location, IDictionary additionalProperties = default(IDictionary), string description = default(string), object structure = default(object), object schema = default(object), IDictionary parameters = default(IDictionary), IList annotations = default(IList), DatasetFolder folder = default(DatasetFolder), string orcCompressionCodec = default(string)) + /// The data orcCompressionCodec. + /// Type: string (or Expression with resultType string). + public OrcDataset(LinkedServiceReference linkedServiceName, DatasetLocation location, IDictionary additionalProperties = default(IDictionary), string description = default(string), object structure = default(object), object schema = default(object), IDictionary parameters = default(IDictionary), IList annotations = default(IList), DatasetFolder folder = default(DatasetFolder), object orcCompressionCodec = default(object)) : base(linkedServiceName, additionalProperties, description, structure, schema, parameters, annotations, folder) { Location = location; @@ -75,11 +75,11 @@ public OrcDataset() public DatasetLocation Location { get; set; } /// - /// Gets or sets possible values include: 'none', 'zlib', 'snappy', - /// 'lzo' + /// Gets or sets the data orcCompressionCodec. Type: string (or + /// Expression with resultType string). /// [JsonProperty(PropertyName = "typeProperties.orcCompressionCodec")] - public string OrcCompressionCodec { get; set; } + public object OrcCompressionCodec { get; set; } /// /// Validate the object. diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/PipelineRunInvokedBy.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/PipelineRunInvokedBy.cs index 2f94c1e336c7..7c34f6171063 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/PipelineRunInvokedBy.cs +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/PipelineRunInvokedBy.cs @@ -34,11 +34,17 @@ public PipelineRunInvokedBy() /// The ID of the entity that started the run. /// The type of the entity that started the /// run. - public PipelineRunInvokedBy(string name = default(string), string id = default(string), string invokedByType = default(string)) + /// The name of the pipeline that triggered + /// the run, if any. + /// The run id of the pipeline that + /// triggered the run, if any. + public PipelineRunInvokedBy(string name = default(string), string id = default(string), string invokedByType = default(string), string pipelineName = default(string), string pipelineRunId = default(string)) { Name = name; Id = id; InvokedByType = invokedByType; + PipelineName = pipelineName; + PipelineRunId = pipelineRunId; CustomInit(); } @@ -65,5 +71,17 @@ public PipelineRunInvokedBy() [JsonProperty(PropertyName = "invokedByType")] public string InvokedByType { get; private set; } + /// + /// Gets the name of the pipeline that triggered the run, if any. + /// + [JsonProperty(PropertyName = "pipelineName")] + public string PipelineName { get; private set; } + + /// + /// Gets the run id of the pipeline that triggered the run, if any. + /// + [JsonProperty(PropertyName = "pipelineRunId")] + public string PipelineRunId { get; private set; } + } } diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/RestServiceLinkedService.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/RestServiceLinkedService.cs index 9d01c779f3fb..189c59e656fb 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/RestServiceLinkedService.cs +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/RestServiceLinkedService.cs @@ -75,7 +75,9 @@ public RestServiceLinkedService() /// authentication. Credentials are encrypted using the integration /// runtime credential manager. Type: string (or Expression with /// resultType string). - public RestServiceLinkedService(object url, string authenticationType, IDictionary additionalProperties = default(IDictionary), IntegrationRuntimeReference connectVia = default(IntegrationRuntimeReference), string description = default(string), IDictionary parameters = default(IDictionary), IList annotations = default(IList), object enableServerCertificateValidation = default(object), object userName = default(object), SecretBase password = default(SecretBase), object authHeaders = default(object), object servicePrincipalId = default(object), SecretBase servicePrincipalKey = default(SecretBase), object tenant = default(object), object azureCloudType = default(object), object aadResourceId = default(object), object encryptedCredential = default(object)) + /// The credential reference containing + /// authentication information. + public RestServiceLinkedService(object url, string authenticationType, IDictionary additionalProperties = default(IDictionary), IntegrationRuntimeReference connectVia = default(IntegrationRuntimeReference), string description = default(string), IDictionary parameters = default(IDictionary), IList annotations = default(IList), object enableServerCertificateValidation = default(object), object userName = default(object), SecretBase password = default(SecretBase), object authHeaders = default(object), object servicePrincipalId = default(object), SecretBase servicePrincipalKey = default(SecretBase), object tenant = default(object), object azureCloudType = default(object), object aadResourceId = default(object), object encryptedCredential = default(object), CredentialReference credential = default(CredentialReference)) : base(additionalProperties, connectVia, description, parameters, annotations) { Url = url; @@ -90,6 +92,7 @@ public RestServiceLinkedService() AzureCloudType = azureCloudType; AadResourceId = aadResourceId; EncryptedCredential = encryptedCredential; + Credential = credential; CustomInit(); } @@ -186,6 +189,13 @@ public RestServiceLinkedService() [JsonProperty(PropertyName = "typeProperties.encryptedCredential")] public object EncryptedCredential { get; set; } + /// + /// Gets or sets the credential reference containing authentication + /// information. + /// + [JsonProperty(PropertyName = "typeProperties.credential")] + public CredentialReference Credential { get; set; } + /// /// Validate the object. /// @@ -203,6 +213,10 @@ public override void Validate() { throw new ValidationException(ValidationRules.CannotBeNull, "AuthenticationType"); } + if (Credential != null) + { + Credential.Validate(); + } } } } diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/ServicePrincipalCredential.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/ServicePrincipalCredential.cs new file mode 100644 index 000000000000..82099cf020a8 --- /dev/null +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/ServicePrincipalCredential.cs @@ -0,0 +1,97 @@ +// +// 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 Microsoft.Rest.Serialization; + using Newtonsoft.Json; + using System.Collections; + using System.Collections.Generic; + using System.Linq; + + /// + /// Service principal credential. + /// + [Newtonsoft.Json.JsonObject("ServicePrincipal")] + [Rest.Serialization.JsonTransformation] + public partial class ServicePrincipalCredential : Credential + { + /// + /// Initializes a new instance of the ServicePrincipalCredential class. + /// + public ServicePrincipalCredential() + { + CustomInit(); + } + + /// + /// Initializes a new instance of the ServicePrincipalCredential class. + /// + /// Unmatched properties from the + /// message are deserialized this collection + /// Credential description. + /// List of tags that can be used for + /// describing the Credential. + /// The app ID of the service + /// principal used to authenticate + /// The key of the service principal + /// used to authenticate. + /// The ID of the tenant to which the service + /// principal belongs + public ServicePrincipalCredential(IDictionary additionalProperties = default(IDictionary), string description = default(string), IList annotations = default(IList), object servicePrincipalId = default(object), AzureKeyVaultSecretReference servicePrincipalKey = default(AzureKeyVaultSecretReference), object tenant = default(object)) + : base(additionalProperties, description, annotations) + { + ServicePrincipalId = servicePrincipalId; + ServicePrincipalKey = servicePrincipalKey; + Tenant = tenant; + CustomInit(); + } + + /// + /// An initialization method that performs custom operations like setting defaults + /// + partial void CustomInit(); + + /// + /// Gets or sets the app ID of the service principal used to + /// authenticate + /// + [JsonProperty(PropertyName = "typeProperties.servicePrincipalId")] + public object ServicePrincipalId { get; set; } + + /// + /// Gets or sets the key of the service principal used to authenticate. + /// + [JsonProperty(PropertyName = "typeProperties.servicePrincipalKey")] + public AzureKeyVaultSecretReference ServicePrincipalKey { get; set; } + + /// + /// Gets or sets the ID of the tenant to which the service principal + /// belongs + /// + [JsonProperty(PropertyName = "typeProperties.tenant")] + public object Tenant { get; set; } + + /// + /// Validate the object. + /// + /// + /// Thrown if validation fails + /// + public virtual void Validate() + { + if (ServicePrincipalKey != null) + { + ServicePrincipalKey.Validate(); + } + } + } +} diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/WebActivityAuthentication.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/WebActivityAuthentication.cs index 1d2537faa65f..9b2b951350d0 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/WebActivityAuthentication.cs +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/WebActivityAuthentication.cs @@ -10,7 +10,6 @@ namespace Microsoft.Azure.Management.DataFactory.Models { - using Microsoft.Rest; using Newtonsoft.Json; using System.Linq; @@ -45,7 +44,9 @@ public WebActivityAuthentication() /// TenantId for which Azure Auth token will /// be requested when using ServicePrincipal Authentication. Type: /// string (or Expression with resultType string). - public WebActivityAuthentication(string type, SecretBase pfx = default(SecretBase), object username = default(object), SecretBase password = default(SecretBase), object resource = default(object), object userTenant = default(object)) + /// The credential reference containing + /// authentication information. + public WebActivityAuthentication(string type = default(string), SecretBase pfx = default(SecretBase), object username = default(object), SecretBase password = default(SecretBase), object resource = default(object), object userTenant = default(object), CredentialReference credential = default(CredentialReference)) { Type = type; Pfx = pfx; @@ -53,6 +54,7 @@ public WebActivityAuthentication() Password = password; Resource = resource; UserTenant = userTenant; + Credential = credential; CustomInit(); } @@ -106,17 +108,24 @@ public WebActivityAuthentication() [JsonProperty(PropertyName = "userTenant")] public object UserTenant { get; set; } + /// + /// Gets or sets the credential reference containing authentication + /// information. + /// + [JsonProperty(PropertyName = "credential")] + public CredentialReference Credential { get; set; } + /// /// Validate the object. /// - /// + /// /// Thrown if validation fails /// public virtual void Validate() { - if (Type == null) + if (Credential != null) { - throw new ValidationException(ValidationRules.CannotBeNull, "Type"); + Credential.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..fcaa64287cb3 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,19 +34,22 @@ 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 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-1\\sdk"; public static readonly String GithubForkName = "Azure"; public static readonly String GithubBranchName = "master"; - public static readonly String GithubCommidId = "fce3400431eff281bddd04bed9727e63765b8da0"; + public static readonly String GithubCommidId = "2a8a9a79b23c72c6092d5b1212acf6d69b1b3850"; public static readonly String CodeGenerationErrors = ""; public static readonly String GithubRepoName = "azure-rest-api-specs"; // END: Code Generation Metadata Section diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Microsoft.Azure.Management.DataFactory.csproj b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Microsoft.Azure.Management.DataFactory.csproj index b2ab3797afe3..b770177806e7 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Microsoft.Azure.Management.DataFactory.csproj +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Microsoft.Azure.Management.DataFactory.csproj @@ -5,12 +5,15 @@ Microsoft.Azure.Management.DataFactory Azure Data Factory V2 is the data integration platform that goes beyond Azure Data Factory V1's orchestration and batch-processing of time-series data, with a general purpose app model supporting modern data warehousing patterns and scenarios, lift-and-shift SSIS, and data-driven SaaS applications. Compose and manage reliable and secure data integration workflows at scale. Use native ADF data connectors and Integration Runtimes to move and transform cloud and on-premises data that can be unstructured, semi-structured, and structured with Hadoop, Azure Data Lake, Spark, SQL Server, Cosmos DB and many other data platforms. - 4.20.0 + 4.21.0 Microsoft.Azure.Management.DataFactory Microsoft Azure resource management;Data Factory;ADF; diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Properties/AssemblyInfo.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Properties/AssemblyInfo.cs index ccfe7a42a430..a67de1d2171d 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Properties/AssemblyInfo.cs +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Properties/AssemblyInfo.cs @@ -6,8 +6,8 @@ [assembly: AssemblyTitle("Microsoft Azure Data Factory Management Library")] [assembly: AssemblyDescription("Provides management functionality for Microsoft Azure Data Factory Resources.")] -[assembly: AssemblyVersion("4.20.0.0")] -[assembly: AssemblyFileVersion("4.20.0.0")] +[assembly: AssemblyVersion("4.21.0.0")] +[assembly: AssemblyFileVersion("4.21.0.0")] [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("Microsoft")] [assembly: AssemblyProduct("Microsoft Azure .NET SDK")] 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 106182ada0aa..0802e111f0d5 100644 --- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/tests/JsonSamples/LinkedServiceJsonSamples.cs +++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/tests/JsonSamples/LinkedServiceJsonSamples.cs @@ -31,6 +31,38 @@ public class LinkedServiceJsonSamples : JsonSampleCollection