Revert "[Az.Resources] Fix unexplicable error message when subscription and scope are both null. (#22730)"

This reverts commit 0e49447.

Author: isra-fel

src/Resources/Resources/ChangeLog.md

@@ -19,6 +19,7 @@
 -->
 
 ## Upcoming Release
+* Reverted commits that caused regression in `Get-AzRoleAssignment`. [#22863]
 
 ## Version 6.11.0
 * Supported `TemplateParameterFile` to accept a `.bicepparam` file.

src/Resources/Resources/Models.ResourceGroups/ResourcesBaseCmdlet.cs

@@ -17,8 +17,6 @@ namespace Microsoft.Azure.Commands.Resources.Models
 {
     using Authorization;
     using ResourceManager.Common;
-    using System.Management.Automation;
-    using System;
 
     /// <summary> 
     /// Base class for all resources cmdlets
@@ -116,10 +114,5 @@ public virtual string DetermineParameterSetName()
         {
             return ParameterSetName;
         }
-
-        protected void WriteTerminatingError(string message, params object[] args)
-        {
-            ThrowTerminatingError(new ErrorRecord(new Exception(String.Format(message, args)), "Error", ErrorCategory.NotSpecified, null));
-        }
     }
 }

src/Resources/Resources/Properties/Resources.Designer.cs

@@ -463,7 +463,4 @@ This means the role assignment was not able to be created. Please assign a role
   <data name="SuccessfullRARemove" xml:space="preserve">
     <value>Succesfully removed role assignment for AD object '{0}' on scope '{1}' with role definition '{2}'</value>
   </data>
-  <data name="ScopeAndSubscriptionNeitherProvided" xml:space="preserve">
-    <value>No subscription was found in the default profile and no scope was specified. Either specify a scope or use a tenant with a subscription to run the command.</value>
-  </data>
 </root>

src/Resources/Resources/Properties/Resources.resx

@@ -21,7 +21,6 @@
 using System;
 using System.Collections.Generic;
 using System.Management.Automation;
-using ProjectResources = Microsoft.Azure.Commands.Resources.Properties.Resources;
 
 namespace Microsoft.Azure.Commands.Resources
 {
@@ -246,11 +245,6 @@ public override void ExecuteCmdlet()
                 IncludeClassicAdministrators = IncludeClassicAdministrators.IsPresent,
             };
 
-            if (options.Scope == null && options.ResourceIdentifier.Subscription == null)
-            {
-                WriteTerminatingError(ProjectResources.ScopeAndSubscriptionNeitherProvided);
-            }
-
             AuthorizationClient.ValidateScope(options.Scope, true);
 
             List<PSRoleAssignment> ra = PoliciesClient.FilterRoleAssignments(options, DefaultProfile.DefaultContext.Subscription.Id);

src/Resources/Resources/RoleAssignments/GetAzureRoleAssignmentCommand.cs

@@ -24,7 +24,6 @@
 using System;
 using System.IO;
 using System.Management.Automation;
-using ProjectResources = Microsoft.Azure.Commands.Resources.Properties.Resources;
 
 namespace Microsoft.Azure.Commands.Resources
 {
@@ -324,19 +323,14 @@ public override void ExecuteCmdlet()
                     ResourceGroupName = ResourceGroupName,
                     ResourceName = ResourceName,
                     ResourceType = ResourceType,
-                    Subscription = DefaultProfile.DefaultContext.Subscription?.Id?.ToString(),
+                    Subscription = DefaultProfile.DefaultContext.Subscription != null ? DefaultProfile.DefaultContext.Subscription.Id : "",
                 },
                 CanDelegate = AllowDelegation.IsPresent ? true : false,
                 Description = Description,
                 Condition = Condition,
                 ConditionVersion = ConditionVersion,
             };
 
-            if (parameters.Scope == null && parameters.ResourceIdentifier.Subscription == null)
-            {
-                WriteTerminatingError(ProjectResources.ScopeAndSubscriptionNeitherProvided);
-            }
-
             AuthorizationClient.ValidateScope(parameters.Scope, true);
 
             WriteObject(PoliciesClient.CreateRoleAssignment(parameters, RoleAssignmentId));

src/Resources/Resources/RoleAssignments/NewAzureRoleAssignmentCommand.cs

@@ -188,19 +188,14 @@ public override void ExecuteCmdlet()
                     ResourceGroupName = ResourceGroupName,
                     ResourceName = ResourceName,
                     ResourceType = ResourceType,
-                    Subscription = DefaultProfile.DefaultContext.Subscription?.Id?.ToString()
+                    Subscription = DefaultProfile.DefaultContext.Subscription.Id
                 },
                 // we should never expand principal groups in the Delete scenario
                 ExpandPrincipalGroups = false,
                 // never include classic administrators in the Delete scenario
                 IncludeClassicAdministrators = false
             };
 
-            if (options.Scope == null && options.ResourceIdentifier.Subscription == null)
-            {
-                WriteTerminatingError(ProjectResources.ScopeAndSubscriptionNeitherProvided);
-            }
-
             AuthorizationClient.ValidateScope(options.Scope, true);
             ConfirmAction(
                 string.Format(ProjectResources.RemovingRoleAssignment, ObjectId, Scope, RoleDefinitionName),

src/Resources/Resources/RoleAssignments/RemoveAzureRoleAssignmentCommand.cs

@@ -21,7 +21,6 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Management.Automation;
-using ProjectResources = Microsoft.Azure.Commands.Resources.Properties.Resources;
 
 namespace Microsoft.Azure.Commands.Resources
 {
@@ -62,15 +61,15 @@ public override void ExecuteCmdlet()
                 Scope = Scope,
                 ResourceIdentifier = new ResourceIdentifier
                 {
-                    Subscription = DefaultProfile.DefaultContext.Subscription?.Id?.ToString()
+                    Subscription = DefaultProfile.DefaultContext.Subscription.Id?.ToString()
                 },
                 RoleDefinitionId = Id,
                 RoleDefinitionName = Name,
             };
 
             if (options.Scope == null && options.ResourceIdentifier.Subscription == null)
             {
-                WriteTerminatingError(ProjectResources.ScopeAndSubscriptionNeitherProvided);
+                WriteTerminatingError("No subscription was found in the default profile and no scope was specified. Either specify a scope or use a tenant with a subscription to run the command.");
             }
 
             AuthorizationClient.ValidateScope(options.Scope, true);
@@ -88,7 +87,10 @@ public override void ExecuteCmdlet()
                 WriteObject(filteredRoleDefinitions, enumerateCollection: true);
             }
         }
-        
-        
+
+        private void WriteTerminatingError(string message, params object[] args)
+        {
+            ThrowTerminatingError(new ErrorRecord(new Exception(String.Format(message, args)), "Error", ErrorCategory.NotSpecified, null));
+        }
     }
 }

src/Resources/Resources/RoleDefinitions/GetAzureRoleDefinitionCommand.cs

@@ -89,15 +89,10 @@ public override void ExecuteCmdlet()
                 Scope = Scope,
                 ResourceIdentifier = new ResourceIdentifier
                 {
-                    Subscription = DefaultProfile.DefaultContext.Subscription?.Id?.ToString()
+                    Subscription = DefaultProfile.DefaultContext.Subscription.Id.ToString()
                 }
             };
 
-            if (options.Scope == null && options.ResourceIdentifier.Subscription == null)
-            {
-                WriteTerminatingError(ProjectResources.ScopeAndSubscriptionNeitherProvided);
-            }
-
             AuthorizationClient.ValidateScope(options.Scope, true);
 
             ConfirmAction(