Skip to content

[SQL] Bugfix - Fix identity cmdlets #21086

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Mar 1, 2023
Merged

[SQL] Bugfix - Fix identity cmdlets #21086

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
5e5c632
[SQL] Fix identity for SetAzSqlDatabase cmdlet
viparek Mar 1, 2023
53d98b5
Fix changelog
viparek Mar 1, 2023
92b0390
Fix logic
strehan1993 Mar 1, 2023
edc1eca
Merge branch 'release-2023-03-07' into testfix
BethanyZhou Mar 1, 2023
390b843
Merge branch 'release-2023-03-07' into testfix
BethanyZhou Mar 1, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions src/Sql/Sql/ChangeLog.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
- Additional information about change #1
-->
## Upcoming Release
* Fixed identity assignment in `Set-AzSqlDatabase` cmdlet
* Added new parameters to `New-AzSqlDatabase`, `Get-AzSqlDatabase`, `Set-AzSqlDatabase`, `New-AzSqlDatabaseCopy`, `New-AzSqlDatabaseSecondary` cmdlets
- AssignIdentity
- EncryptionProtector
Expand Down
33 changes: 10 additions & 23 deletions src/Sql/Sql/Common/DatabaseIdentityAndKeysHelper.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,8 @@ public class DatabaseIdentityAndKeysHelper
/// </summary>
/// <param name="assignIdentityIsPresent">Flag to check if AssignIdentity flag is used in the cmdlet.</param>
/// <param name="userAssignedIdentities">User assigned identities</param>
/// <param name="existingIdentity">Existing identity on database</param>
/// <returns>Database Identity</returns>
public static DatabaseIdentity GetDatabaseIdentity(bool assignIdentityIsPresent, string[] userAssignedIdentities, Management.Sql.Models.DatabaseIdentity existingIdentity)
public static DatabaseIdentity GetDatabaseIdentity(bool assignIdentityIsPresent, string[] userAssignedIdentities)
{
DatabaseIdentity identityResult = null;
if (!assignIdentityIsPresent)
Expand All @@ -47,34 +46,22 @@ public static DatabaseIdentity GetDatabaseIdentity(bool assignIdentityIsPresent,

Dictionary<string, DatabaseUserIdentity> identityDict = new Dictionary<string, DatabaseUserIdentity>();

// Update an existing database identity
// Create identity on database
//
if (existingIdentity != null && userAssignedIdentities.Any() &&
existingIdentity.UserAssignedIdentities != null)
foreach (string identity in userAssignedIdentities)
{
foreach (string identity in userAssignedIdentities)
{
existingIdentity.UserAssignedIdentities.Add(identity, new DatabaseUserIdentity());
}

identityResult = existingIdentity;
}
else
{
// Create identity on database
//
foreach (string identity in userAssignedIdentities)
if (!identityDict.ContainsKey(identity))
{
identityDict.Add(identity, new DatabaseUserIdentity());
}

identityResult = new DatabaseIdentity()
{
Type = DatabaseIdentityType.UserAssigned,
UserAssignedIdentities = identityDict
};
}

identityResult = new DatabaseIdentity()
{
Type = DatabaseIdentityType.UserAssigned,
UserAssignedIdentities = identityDict
};

return identityResult;
}

Expand Down
2 changes: 1 addition & 1 deletion src/Sql/Sql/Database Backup/Cmdlet/RestoreAzureRMSqlDatabase.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -411,7 +411,7 @@ protected override AzureSqlDatabaseModel GetEntity()
Tags = TagsConversionHelper.CreateTagDictionary(Tag, validate: true),
ZoneRedundant = this.IsParameterBound(p => p.ZoneRedundant) ? ZoneRedundant.ToBool() : (bool?)null,
HighAvailabilityReplicaCount = HAReplicaCount,
Identity = DatabaseIdentityAndKeysHelper.GetDatabaseIdentity(this.AssignIdentity.IsPresent, this.UserAssignedIdentityId, null),
Identity = DatabaseIdentityAndKeysHelper.GetDatabaseIdentity(this.AssignIdentity.IsPresent, this.UserAssignedIdentityId),
Keys = DatabaseIdentityAndKeysHelper.GetDatabaseKeysDictionary(this.KeyList),
EncryptionProtector = this.EncryptionProtector,
FederatedClientId = this.FederatedClientId,
Expand Down
2 changes: 1 addition & 1 deletion src/Sql/Sql/Database/Cmdlet/NewAzureSqlDatabase.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -371,7 +371,7 @@ protected override AzureSqlDatabaseCreateOrUpdateModel ApplyUserInputToModel(Azu
MaintenanceConfigurationId = MaintenanceConfigurationId,
EnableLedger = this.IsParameterBound(p => p.EnableLedger) ? EnableLedger.ToBool() : (bool?)null,
PreferredEnclaveType = this.PreferredEnclaveType,
Identity = DatabaseIdentityAndKeysHelper.GetDatabaseIdentity(this.AssignIdentity.IsPresent, this.UserAssignedIdentityId, null),
Identity = DatabaseIdentityAndKeysHelper.GetDatabaseIdentity(this.AssignIdentity.IsPresent, this.UserAssignedIdentityId),
Keys = DatabaseIdentityAndKeysHelper.GetDatabaseKeysDictionary(this.KeyList),
EncryptionProtector = this.EncryptionProtector,
FederatedClientId = this.FederatedClientId
Expand Down
2 changes: 1 addition & 1 deletion src/Sql/Sql/Database/Cmdlet/SetAzureSqlDatabase.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -352,7 +352,7 @@ protected override IEnumerable<AzureSqlDatabaseModel> ApplyUserInputToModel(IEnu
SecondaryType = SecondaryType,
MaintenanceConfigurationId = MaintenanceConfigurationId,
PreferredEnclaveType = PreferredEnclaveType,
Identity = DatabaseIdentityAndKeysHelper.GetDatabaseIdentity(this.AssignIdentity.IsPresent, this.UserAssignedIdentityId, model.FirstOrDefault().Identity),
Identity = DatabaseIdentityAndKeysHelper.GetDatabaseIdentity(this.AssignIdentity.IsPresent, this.UserAssignedIdentityId),
EncryptionProtector = this.EncryptionProtector ?? model.FirstOrDefault().EncryptionProtector,
FederatedClientId = this.FederatedClientId ?? model.FirstOrDefault().FederatedClientId,
};
Expand Down
2 changes: 1 addition & 1 deletion src/Sql/Sql/Replication/Cmdlet/NewAzureSqlDatabaseCopy.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -262,7 +262,7 @@ protected override IEnumerable<AzureSqlDatabaseCopyModel> ApplyUserInputToModel(
LicenseType = LicenseType, // note: default license type is LicenseIncluded
RequestedBackupStorageRedundancy = BackupStorageRedundancy,
ZoneRedundant = this.IsParameterBound(p => p.ZoneRedundant) ? ZoneRedundant.ToBool() : (bool?)null,
Identity = Common.DatabaseIdentityAndKeysHelper.GetDatabaseIdentity(this.AssignIdentity.IsPresent, this.UserAssignedIdentityId, null),
Identity = Common.DatabaseIdentityAndKeysHelper.GetDatabaseIdentity(this.AssignIdentity.IsPresent, this.UserAssignedIdentityId),
Keys = Common.DatabaseIdentityAndKeysHelper.GetDatabaseKeysDictionary(this.KeyList),
EncryptionProtector = this.EncryptionProtector,
FederatedClientId = this.FederatedClientId
Expand Down
2 changes: 1 addition & 1 deletion src/Sql/Sql/Replication/Cmdlet/NewAzureSqlDatabaseSecondary.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -279,7 +279,7 @@ protected override IEnumerable<AzureReplicationLinkModel> ApplyUserInputToModel(
SecondaryType = SecondaryType,
HighAvailabilityReplicaCount = this.IsParameterBound(p => p.HighAvailabilityReplicaCount) ? HighAvailabilityReplicaCount : (int?)null,
ZoneRedundant = this.IsParameterBound(p => p.ZoneRedundant) ? ZoneRedundant.ToBool() : (bool?)null,
Identity = Common.DatabaseIdentityAndKeysHelper.GetDatabaseIdentity(this.AssignIdentity.IsPresent, this.UserAssignedIdentityId, null),
Identity = Common.DatabaseIdentityAndKeysHelper.GetDatabaseIdentity(this.AssignIdentity.IsPresent, this.UserAssignedIdentityId),
Keys = Common.DatabaseIdentityAndKeysHelper.GetDatabaseKeysDictionary(this.KeyList),
EncryptionProtector = this.EncryptionProtector,
FederatedClientId = this.FederatedClientId
Expand Down