diff --git a/src/Sql/Sql/ChangeLog.md b/src/Sql/Sql/ChangeLog.md index 509549fcc2cd..475fcd6e576a 100644 --- a/src/Sql/Sql/ChangeLog.md +++ b/src/Sql/Sql/ChangeLog.md @@ -21,6 +21,7 @@ * Added UsePrivateLinkConnection to `New-AzSqlSyncGroup`, `Update-AzSqlSyncGroup`, `New-AzSqlSyncMember` and `Update-AzSqlSyncMember` * Added SyncMemberAzureDatabaseResourceId to `New-AzSqlSyncMember` and `Update-AzSqlSyncMember` * Added Guest user lookup support to Set SQL Server Azure Active Directory Admin cmdlet +* Remove IsAzureADOnlyAuthentication parameter from Set-AzSqlServerActiveDirectoryAdministrator as it is not usable. ## Version 2.6.1 * Enhance performance of: diff --git a/src/Sql/Sql/ServerActiveDirectoryAdministrator/Cmdlet/SetAzureSqlServerActiveDirectoryAdministrator.cs b/src/Sql/Sql/ServerActiveDirectoryAdministrator/Cmdlet/SetAzureSqlServerActiveDirectoryAdministrator.cs index 764d591d2238..3a196df3ee1f 100644 --- a/src/Sql/Sql/ServerActiveDirectoryAdministrator/Cmdlet/SetAzureSqlServerActiveDirectoryAdministrator.cs +++ b/src/Sql/Sql/ServerActiveDirectoryAdministrator/Cmdlet/SetAzureSqlServerActiveDirectoryAdministrator.cs @@ -46,16 +46,6 @@ public class SetAzureSqlServerActiveDirectoryAdministrator : AzureSqlServerActiv [ValidateNotNullOrEmpty()] public Guid ObjectId { get; set; } - /// - /// Only Azure Active Directory authentication allowed - /// - [Parameter(Mandatory = false, - ValueFromPipelineByPropertyName = true, - Position = 4, - HelpMessage = "Specifies if only Azure Active Directory authentication is allowed.")] - [Alias("IsAzureOnlyAuthentication")] - public bool? IsAzureADOnlyAuthentication { get; set; } - /// /// Get the entities from the service /// @@ -107,8 +97,7 @@ protected override IEnumerable ResourceGroupName = ResourceGroupName, ServerName = ServerName, DisplayName = DisplayName, - ObjectId = ObjectId, - IsAzureADOnlyAuthentication = IsAzureADOnlyAuthentication, + ObjectId = ObjectId }); return newEntity; } diff --git a/src/Sql/Sql/ServerActiveDirectoryAdministrator/Services/AzureSqlServerActiveDirectoryAdministratorAdapter.cs b/src/Sql/Sql/ServerActiveDirectoryAdministrator/Services/AzureSqlServerActiveDirectoryAdministratorAdapter.cs index ba2685860797..87b900f59a45 100644 --- a/src/Sql/Sql/ServerActiveDirectoryAdministrator/Services/AzureSqlServerActiveDirectoryAdministratorAdapter.cs +++ b/src/Sql/Sql/ServerActiveDirectoryAdministrator/Services/AzureSqlServerActiveDirectoryAdministratorAdapter.cs @@ -114,7 +114,7 @@ internal ICollection ListServer /// The upserted Azure SQL Server Active Directory administrator internal AzureSqlServerActiveDirectoryAdministratorModel UpsertServerActiveDirectoryAdministrator(string resourceGroup, string serverName, AzureSqlServerActiveDirectoryAdministratorModel model) { - var resp = Communicator.CreateOrUpdate(resourceGroup, serverName, GetActiveDirectoryInformation(model.DisplayName, model.ObjectId, model.IsAzureADOnlyAuthentication)); + var resp = Communicator.CreateOrUpdate(resourceGroup, serverName, GetActiveDirectoryInformation(model.DisplayName, model.ObjectId)); return CreateServerActiveDirectoryAdministratorModelFromResponse(resourceGroup, serverName, resp); } @@ -171,9 +171,8 @@ public static AzureSqlServerActiveDirectoryAdministratorModel CreateServerActive /// /// Azure Active Directory user or group display name /// Azure Active Directory user or group object id - /// Allow only Azure Active Directory authentication /// - protected ServerAzureADAdministrator GetActiveDirectoryInformation(string displayName, Guid objectId, bool? isAzureADOnlyAuthentication) + protected ServerAzureADAdministrator GetActiveDirectoryInformation(string displayName, Guid objectId) { // Gets the default Tenant id for the subscriptions Guid tenantId = GetTenantId(); @@ -248,8 +247,7 @@ protected ServerAzureADAdministrator GetActiveDirectoryInformation(string displa { Login = displayName, Sid = app.ApplicationId, - TenantId = tenantId, - AzureADOnlyAuthentication = isAzureADOnlyAuthentication, + TenantId = tenantId }; } @@ -259,8 +257,7 @@ protected ServerAzureADAdministrator GetActiveDirectoryInformation(string displa { Login = group.DisplayName, Sid = group.Id, - TenantId = tenantId, - AzureADOnlyAuthentication = isAzureADOnlyAuthentication, + TenantId = tenantId }; } @@ -322,8 +319,7 @@ protected ServerAzureADAdministrator GetActiveDirectoryInformation(string displa { Login = displayName, Sid = obj.Id, - TenantId = tenantId, - AzureADOnlyAuthentication = isAzureADOnlyAuthentication, + TenantId = tenantId }; } } diff --git a/src/Sql/Sql/help/Set-AzSqlServerActiveDirectoryAdministrator.md b/src/Sql/Sql/help/Set-AzSqlServerActiveDirectoryAdministrator.md index 4c2590e17338..70a1a15b93b4 100644 --- a/src/Sql/Sql/help/Set-AzSqlServerActiveDirectoryAdministrator.md +++ b/src/Sql/Sql/help/Set-AzSqlServerActiveDirectoryAdministrator.md @@ -14,9 +14,9 @@ Provisions an Azure AD administrator for SQL Server. ## SYNTAX ``` -Set-AzSqlServerActiveDirectoryAdministrator [-DisplayName] [[-ObjectId] ] - [[-IsAzureADOnlyAuthentication] ] [-ServerName] [-ResourceGroupName] - [-DefaultProfile ] [-WhatIf] [-Confirm] [] +Set-AzSqlServerActiveDirectoryAdministrator [-DisplayName] [[-ObjectId] ] [-ServerName] + [-ResourceGroupName] [-DefaultProfile ] [-WhatIf] [-Confirm] + [] ``` ## DESCRIPTION @@ -98,21 +98,6 @@ Accept pipeline input: True (ByPropertyName) Accept wildcard characters: False ``` -### -IsAzureADOnlyAuthentication -Specifies if only Azure Active Directory authentication is allowed. - -```yaml -Type: System.Nullable`1[System.Boolean] -Parameter Sets: (All) -Aliases: - -Required: False -Position: 4 -Default value: None -Accept pipeline input: True (ByPropertyName) -Accept wildcard characters: False -``` - ### -ObjectId Specifies the unique ID of the Azure AD administrator that this cmdlet provisions. If the display name is not unique, you must specify a value for this parameter. diff --git a/tools/StaticAnalysis/Exceptions/Az.Sql/BreakingChangeIssues.csv b/tools/StaticAnalysis/Exceptions/Az.Sql/BreakingChangeIssues.csv new file mode 100644 index 000000000000..f85231ecb1ee --- /dev/null +++ b/tools/StaticAnalysis/Exceptions/Az.Sql/BreakingChangeIssues.csv @@ -0,0 +1,3 @@ +"AssemblyFileName","ClassName","Target","Severity","ProblemId","Description","Remediation" +"Microsoft.Azure.PowerShell.Cmdlets.Sql.dll","Microsoft.Azure.Commands.Sql.ServerActiveDirectoryAdministrator.Cmdlet.SetAzureSqlServerActiveDirectoryAdministrator","Set-AzSqlServerActiveDirectoryAdministrator","0","2000","The cmdlet 'Set-AzSqlServerActiveDirectoryAdministrator' no longer supports the parameter 'IsAzureADOnlyAuthentication' and no alias was found for the original parameter name.","Add the parameter 'IsAzureADOnlyAuthentication' back to the cmdlet 'Set-AzSqlServerActiveDirectoryAdministrator', or add an alias to the original parameter name." +"Microsoft.Azure.PowerShell.Cmdlets.Sql.dll","Microsoft.Azure.Commands.Sql.ServerActiveDirectoryAdministrator.Cmdlet.SetAzureSqlServerActiveDirectoryAdministrator","Set-AzSqlServerActiveDirectoryAdministrator","0","1050","The parameter set '__AllParameterSets' for cmdlet 'Set-AzSqlServerActiveDirectoryAdministrator' has been removed.","Add parameter set '__AllParameterSets' back to cmdlet 'Set-AzSqlServerActiveDirectoryAdministrator'."