diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/SsisPackageLocation.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/SSISPackageLocation.cs
similarity index 100%
rename from sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/SsisPackageLocation.cs
rename to sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/SSISPackageLocation.cs
diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/SqlAlwaysEncryptedAkvAuthType.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/SqlAlwaysEncryptedAkvAuthType.cs
index 2072bf64d6d1..b0dc3e353f24 100644
--- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/SqlAlwaysEncryptedAkvAuthType.cs
+++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/SqlAlwaysEncryptedAkvAuthType.cs
@@ -18,5 +18,6 @@ public static class SqlAlwaysEncryptedAkvAuthType
{
public const string ServicePrincipal = "ServicePrincipal";
public const string ManagedIdentity = "ManagedIdentity";
+ public const string UserAssignedManagedIdentity = "UserAssignedManagedIdentity";
}
}
diff --git a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/SqlAlwaysEncryptedProperties.cs b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/SqlAlwaysEncryptedProperties.cs
index 2feba7093053..70dbf4f4b8f9 100644
--- a/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/SqlAlwaysEncryptedProperties.cs
+++ b/sdk/datafactory/Microsoft.Azure.Management.DataFactory/src/Generated/Models/SqlAlwaysEncryptedProperties.cs
@@ -35,17 +35,20 @@ public SqlAlwaysEncryptedProperties()
/// Sql always encrypted AKV
/// authentication type. Type: string (or Expression with resultType
/// string). Possible values include: 'ServicePrincipal',
- /// 'ManagedIdentity'
+ /// 'ManagedIdentity', 'UserAssignedManagedIdentity'
/// The client ID of the application
/// in Azure Active Directory used for Azure Key Vault authentication.
/// Type: string (or Expression with resultType string).
/// The key of the service principal
/// used to authenticate against Azure Key Vault.
- public SqlAlwaysEncryptedProperties(string alwaysEncryptedAkvAuthType, object servicePrincipalId = default(object), SecretBase servicePrincipalKey = default(SecretBase))
+ /// The credential reference containing
+ /// authentication information.
+ public SqlAlwaysEncryptedProperties(string alwaysEncryptedAkvAuthType, object servicePrincipalId = default(object), SecretBase servicePrincipalKey = default(SecretBase), CredentialReference credential = default(CredentialReference))
{
AlwaysEncryptedAkvAuthType = alwaysEncryptedAkvAuthType;
ServicePrincipalId = servicePrincipalId;
ServicePrincipalKey = servicePrincipalKey;
+ Credential = credential;
CustomInit();
}
@@ -57,7 +60,8 @@ public SqlAlwaysEncryptedProperties()
///
/// Gets or sets sql always encrypted AKV authentication type. Type:
/// string (or Expression with resultType string). Possible values
- /// include: 'ServicePrincipal', 'ManagedIdentity'
+ /// include: 'ServicePrincipal', 'ManagedIdentity',
+ /// 'UserAssignedManagedIdentity'
///
[JsonProperty(PropertyName = "alwaysEncryptedAkvAuthType")]
public string AlwaysEncryptedAkvAuthType { get; set; }
@@ -77,6 +81,13 @@ public SqlAlwaysEncryptedProperties()
[JsonProperty(PropertyName = "servicePrincipalKey")]
public SecretBase ServicePrincipalKey { get; set; }
+ ///
+ /// Gets or sets the credential reference containing authentication
+ /// information.
+ ///
+ [JsonProperty(PropertyName = "credential")]
+ public CredentialReference Credential { get; set; }
+
///
/// Validate the object.
///
@@ -89,6 +100,10 @@ public virtual void Validate()
{
throw new ValidationException(ValidationRules.CannotBeNull, "AlwaysEncryptedAkvAuthType");
}
+ if (Credential != null)
+ {
+ 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 fcaa64287cb3..ac665f5acd05 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
@@ -43,16 +43,5 @@ public static IEnumerable> ApiInfo_DataFactoryMana
}.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-1\\sdk";
- public static readonly String GithubForkName = "Azure";
- public static readonly String GithubBranchName = "master";
- 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
}
}
-