Az 10.4.1 hotfix (#22866)

msJinLei · web-flow · commit 49a512dfa369 · 2023-09-27T14:25:06.000+08:00
diff --git a/ChangeLog.md b/ChangeLog.md
@@ -1,3 +1,7 @@
+## 10.4.1 - September 2023
+#### Az.Resources 6.11.1
+* Reverted commits that caused regression in 'Get-AzRoleAssignment'. [#22863]
+
 ## 10.4.0 - September 2023
 #### Az.Accounts 2.13.1
 * Added the module name in breaking change messages 
diff --git a/src/Resources/Authorization.Autorest/Properties/AssemblyInfo.cs b/src/Resources/Authorization.Autorest/Properties/AssemblyInfo.cs
@@ -24,5 +24,5 @@
 [assembly: ComVisible(false)]
 [assembly: CLSCompliant(false)]
 [assembly: Guid("b2f7fb23-24cf-4e26-840e-db4360603829")]
-[assembly: AssemblyVersion("6.11.0")]
-[assembly: AssemblyFileVersion("6.11.0")]
+[assembly: AssemblyVersion("6.11.1")]
+[assembly: AssemblyFileVersion("6.11.1")]
diff --git a/src/Resources/MSGraph.Autorest/Properties/AssemblyInfo.cs b/src/Resources/MSGraph.Autorest/Properties/AssemblyInfo.cs
@@ -24,5 +24,5 @@
 [assembly: ComVisible(false)]
 [assembly: CLSCompliant(false)]
 [assembly: Guid("113AD566-7045-45C4-8D01-BCFF72F4CE7B")]
-[assembly: AssemblyVersion("6.11.0")]
-[assembly: AssemblyFileVersion("6.11.0")]
+[assembly: AssemblyVersion("6.11.1")]
+[assembly: AssemblyFileVersion("6.11.1")]
diff --git a/src/Resources/ResourceManager/Properties/AssemblyInfo.cs b/src/Resources/ResourceManager/Properties/AssemblyInfo.cs
@@ -25,8 +25,8 @@
 [assembly: ComVisible(false)]
 [assembly: CLSCompliant(false)]
 [assembly: Guid("e8f34267-c461-4eae-b156-5f3528553d10")]
-[assembly: AssemblyVersion("6.11.0")]
-[assembly: AssemblyFileVersion("6.11.0")]
+[assembly: AssemblyVersion("6.11.1")]
+[assembly: AssemblyFileVersion("6.11.1")]
 #if !SIGN
 [assembly: InternalsVisibleTo("Microsoft.Azure.PowerShell.Cmdlets.Resources.Test")]
 [assembly: InternalsVisibleTo("Microsoft.Azure.PowerShell.Cmdlets.MachineLearning.Test")]
diff --git a/src/Resources/Resources.Sdk/Properties/AssemblyInfo.cs b/src/Resources/Resources.Sdk/Properties/AssemblyInfo.cs
@@ -7,8 +7,8 @@
 [assembly: AssemblyTitle("Microsoft Azure Resource Management Library")]
 [assembly: AssemblyDescription("Provides Microsoft Azure resource management operations including Resource Groups.")]
 
-[assembly: AssemblyVersion("6.11.0")]
-[assembly: AssemblyFileVersion("6.11.0")]
+[assembly: AssemblyVersion("6.11.1")]
+[assembly: AssemblyFileVersion("6.11.1")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("Microsoft")]
 [assembly: AssemblyProduct("Azure .NET SDK")]
diff --git a/src/Resources/Resources/Az.Resources.psd1 b/src/Resources/Resources/Az.Resources.psd1
@@ -3,7 +3,7 @@
 #
 # Generated by: Microsoft Corporation
 #
-# Generated on: 9/20/2023
+# Generated on: 9/27/2023
 #
 
 @{
@@ -12,7 +12,7 @@
 # RootModule = ''
 
 # Version number of this module.
-ModuleVersion = '6.11.0'
+ModuleVersion = '6.11.1'
 
 # Supported PSEditions
 CompatiblePSEditions = 'Core', 'Desktop'
@@ -252,8 +252,7 @@ PrivateData = @{
         # IconUri = ''
 
         # ReleaseNotes of this module
-        ReleaseNotes = '* Supported ''TemplateParameterFile'' to accept a ''.bicepparam'' file.
-* Fixed inexplicable error message when subscription and scope are neither provided in ''Get-AzRoleDefinition''. [#22716]'
+        ReleaseNotes = '* Reverted commits that caused regression in ''Get-AzRoleAssignment''. [#22863]'
 
         # Prerelease string of this module
         # Prerelease = ''
diff --git a/src/Resources/Resources/ChangeLog.md b/src/Resources/Resources/ChangeLog.md
@@ -20,6 +20,9 @@
 
 ## Upcoming Release
 
+## Version 6.11.1
+* Reverted commits that caused regression in `Get-AzRoleAssignment`. [#22863]
+
 ## Version 6.11.0
 * Supported `TemplateParameterFile` to accept a `.bicepparam` file.
 * Fixed inexplicable error message when subscription and scope are neither provided in `Get-AzRoleDefinition`. [#22716]
diff --git a/src/Resources/Resources/Models.ResourceGroups/ResourcesBaseCmdlet.cs b/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));
-        }
     }
 }
diff --git a/src/Resources/Resources/Properties/AssemblyInfo.cs b/src/Resources/Resources/Properties/AssemblyInfo.cs
@@ -25,8 +25,8 @@
 [assembly: ComVisible(false)]
 [assembly: CLSCompliant(false)]
 [assembly: Guid("e386b843-f3f0-4db3-8664-37d16b860dde")]
-[assembly: AssemblyVersion("6.11.0")]
-[assembly: AssemblyFileVersion("6.11.0")]
+[assembly: AssemblyVersion("6.11.1")]
+[assembly: AssemblyFileVersion("6.11.1")]
 #if !SIGN
 [assembly: InternalsVisibleTo("Microsoft.Azure.PowerShell.Cmdlets.Resources.Test")]
 #endif
diff --git a/src/Resources/Resources/Properties/Resources.Designer.cs b/src/Resources/Resources/Properties/Resources.Designer.cs
diff --git a/src/Resources/Resources/Properties/Resources.resx b/src/Resources/Resources/Properties/Resources.resx
@@ -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>
diff --git a/src/Resources/Resources/RoleAssignments/GetAzureRoleAssignmentCommand.cs b/src/Resources/Resources/RoleAssignments/GetAzureRoleAssignmentCommand.cs
@@ -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
 {
@@ -240,17 +239,12 @@ public override void ExecuteCmdlet()
                     ResourceGroupName = ResourceGroupName,
                     ResourceName = ResourceName,
                     ResourceType = ResourceType,
-                    Subscription = string.IsNullOrEmpty(ResourceGroupName) ? null : DefaultProfile.DefaultContext.Subscription?.Id?.ToString()
+                    Subscription = string.IsNullOrEmpty(ResourceGroupName) ? null : DefaultProfile.DefaultContext.Subscription.Id
                 },
                 ExpandPrincipalGroups = ExpandPrincipalGroups.IsPresent,
                 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);
diff --git a/src/Resources/Resources/RoleAssignments/NewAzureRoleAssignmentCommand.cs b/src/Resources/Resources/RoleAssignments/NewAzureRoleAssignmentCommand.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));
diff --git a/src/Resources/Resources/RoleAssignments/RemoveAzureRoleAssignmentCommand.cs b/src/Resources/Resources/RoleAssignments/RemoveAzureRoleAssignmentCommand.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),
diff --git a/src/Resources/Resources/RoleDefinitions/GetAzureRoleDefinitionCommand.cs b/src/Resources/Resources/RoleDefinitions/GetAzureRoleDefinitionCommand.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));
+        }
     }
 }
diff --git a/src/Resources/Resources/RoleDefinitions/RemoveAzureRoleDefinitionCommand.cs b/src/Resources/Resources/RoleDefinitions/RemoveAzureRoleDefinitionCommand.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(
diff --git a/src/Resources/Tags/Properties/AssemblyInfo.cs b/src/Resources/Tags/Properties/AssemblyInfo.cs
@@ -25,8 +25,8 @@
 [assembly: ComVisible(false)]
 [assembly: CLSCompliant(false)]
 [assembly: Guid("e386b843-f3f0-4db3-8664-37d16b860dde")]
-[assembly: AssemblyVersion("6.11.0")]
-[assembly: AssemblyFileVersion("6.11.0")]
+[assembly: AssemblyVersion("6.11.1")]
+[assembly: AssemblyFileVersion("6.11.1")]
 #if !SIGN
 [assembly: InternalsVisibleTo("Microsoft.Azure.PowerShell.Cmdlets.Resources.Test")]
 #endif
diff --git a/tools/Az/Az.psd1 b/tools/Az/Az.psd1
@@ -3,7 +3,7 @@
 #
 # Generated by: Microsoft Corporation
 #
-# Generated on: 9/20/2023
+# Generated on: 9/27/2023
 #
 
 @{
@@ -12,7 +12,7 @@
 # RootModule = ''
 
 # Version number of this module.
-ModuleVersion = '10.4.0'
+ModuleVersion = '10.4.1'
 
 # Supported PSEditions
 CompatiblePSEditions = 'Core', 'Desktop'
@@ -117,7 +117,7 @@ RequiredModules = @(@{ModuleName = 'Az.Accounts'; ModuleVersion = '2.13.1'; },
                @{ModuleName = 'Az.RedisEnterpriseCache'; RequiredVersion = '1.2.0'; }, 
                @{ModuleName = 'Az.Relay'; RequiredVersion = '2.0.0'; }, 
                @{ModuleName = 'Az.ResourceMover'; RequiredVersion = '1.2.0'; }, 
-               @{ModuleName = 'Az.Resources'; RequiredVersion = '6.11.0'; }, 
+               @{ModuleName = 'Az.Resources'; RequiredVersion = '6.11.1'; }, 
                @{ModuleName = 'Az.Security'; RequiredVersion = '1.4.0'; }, 
                @{ModuleName = 'Az.SecurityInsights'; RequiredVersion = '3.1.0'; }, 
                @{ModuleName = 'Az.ServiceBus'; RequiredVersion = '3.0.0'; }, 
@@ -189,53 +189,9 @@ PrivateData = @{
         # IconUri = ''
 
         # ReleaseNotes of this module
-        ReleaseNotes = '10.4.0 - September 2023
-Az.Accounts
-* Added the module name in breaking change messages 
-* Upgraded Microsoft.ApplicationInsights version from 2.13.1 to 2.18.0 
-
-Az.Cdn
-* Customized output property for ''Get-AzCdnEdgeNode'' command
-
-Az.ContainerInstance
-* Added breaking change warning message for ''Get/New/Remove-ContainerGroup'', ''New-ContainerInstanceInitDefinitionObject'', ''New-ContainerInstanceObject'' [#22268]
-    - Output properties starting with ''PreviouState'' will be corrected to ''PreviousState''
-
-Az.DataProtection
-* Added soft delete and MUA feature for Backup vaults
-
-Az.KeyVault
-* Supported splitting ''Import-AzKeyVaultSecurityDomain'' process into three steps to allow keys to be hidden offline.
-    - Added ''DownloadExchangeKey'', ''RestoreBlob'' and ''ImportRestoredBlob'' in ''Import-AzKeyVaultSecurityDomain''.
-
-Az.RecoveryServices
-* Added support for custom RG with suffix while creating or modifying policy for workload type AzureVM.
-* Added TLaD warning https://aka.ms/TLaD for Azure Site Recovery and Backup.
-* Added support for setting AlwaysON soft delete state for recovery services vault.
-
-Az.ResourceMover
-* Upgraded API version to 2023-08-01.
-* Improved error reporting to the customer using custom cmdlets to handle the error in a better manner.
-
+        ReleaseNotes = '10.4.1 - September 2023
 Az.Resources
-* Supported ''TemplateParameterFile'' to accept a ''.bicepparam'' file.
-* Fixed inexplicable error message when subscription and scope are neither provided in ''Get-AzRoleDefinition''. [#22716]
-
-Az.SecurityInsights
-* Fixed parameters'' issues for ''New-AzSentinelAlertRule'' and ''Update-AzSentinelAlertRule'' [#21181][#21217][#22318]
-
-Az.StackHCI
-* Bug fixes for Attestation commands.
-* Added support for installing mandatory extensions on HCI OS 22H2 and removed confirmation prompt for consent.
-* Added ability to customize the location of logs generated during registration.
-    - Custom log location can be specified by specifying an optional ''-LogsDirectory'' parameter in ''Register-AzStackHCI''.
-    - ''Get-AzStackHCILogsDirectory'' can be used to obtain the log location.
-* Increased retry count for setting up ARC integration.
-
-Az.Storage
-* Added warning messages for an upcoming breaking change that the output Permissions will be changed to a string when creating and updating a Queue access policy
-    - ''Get-AzStorageQueueStoredAccessPolicy''
-    - ''Set-AzStorageQueueStoredAccessPolicy''
+* Reverted commits that caused regression in ''Get-AzRoleAssignment''. [#22863]
 '
 
         # Prerelease string of this module
diff --git a/tools/AzPreview/AzPreview.psd1 b/tools/AzPreview/AzPreview.psd1
@@ -12,7 +12,7 @@
 # RootModule = ''
 
 # Version number of this module.
-ModuleVersion = '10.4.0'
+ModuleVersion = '10.4.1'
 
 # Supported PSEditions
 CompatiblePSEditions = 'Core', 'Desktop'
@@ -186,7 +186,7 @@ RequiredModules = @(@{ModuleName = 'Az.Accounts'; ModuleVersion = '2.13.1'; },
             @{ModuleName = 'Az.Reservations'; RequiredVersion = '0.12.0'; }, 
             @{ModuleName = 'Az.ResourceGraph'; RequiredVersion = '0.13.0'; }, 
             @{ModuleName = 'Az.ResourceMover'; RequiredVersion = '1.2.0'; }, 
-            @{ModuleName = 'Az.Resources'; RequiredVersion = '6.11.0'; }, 
+            @{ModuleName = 'Az.Resources'; RequiredVersion = '6.11.1'; }, 
             @{ModuleName = 'Az.Search'; RequiredVersion = '0.9.0'; }, 
             @{ModuleName = 'Az.Security'; RequiredVersion = '1.4.0'; }, 
             @{ModuleName = 'Az.SecurityInsights'; RequiredVersion = '3.1.0'; }, 
diff --git a/tools/Docs/az-ps-latest.csv b/tools/Docs/az-ps-latest.csv
@@ -132,7 +132,7 @@ pac130,[ps=true;customSource=https://azpspackage.blob.core.windows.net/docs-rele
 pac131,[ps=true;customSource=https://azpspackage.blob.core.windows.net/docs-release/Az.Reservations.0.12.0.nupkg;sourceType=sa]Az.Reservations,0.12.0
 pac132,[ps=true;customSource=https://azpspackage.blob.core.windows.net/docs-release/Az.ResourceGraph.0.13.0.nupkg;sourceType=sa]Az.ResourceGraph,0.13.0
 pac133,[ps=true;customSource=https://azpspackage.blob.core.windows.net/docs-release/Az.ResourceMover.1.2.0.nupkg;sourceType=sa]Az.ResourceMover,1.2.0
-pac134,[ps=true;customSource=https://azpspackage.blob.core.windows.net/docs-release/Az.Resources.6.11.0.nupkg;sourceType=sa]Az.Resources,6.11.0
+pac134,[ps=true;customSource=https://azpspackage.blob.core.windows.net/docs-release/Az.Resources.6.11.1.nupkg;sourceType=sa]Az.Resources,6.11.1
 pac135,[ps=true;customSource=https://azpspackage.blob.core.windows.net/docs-release/Az.Search.0.9.0.nupkg;sourceType=sa]Az.Search,0.9.0
 pac136,[ps=true;customSource=https://azpspackage.blob.core.windows.net/docs-release/Az.Security.1.4.0.nupkg;sourceType=sa]Az.Security,1.4.0
 pac137,[ps=true;customSource=https://azpspackage.blob.core.windows.net/docs-release/Az.SecurityInsights.3.1.0.nupkg;sourceType=sa]Az.SecurityInsights,3.1.0
diff --git a/tools/Tools.Common/SerializedCmdlets/Az.Resources.json b/tools/Tools.Common/SerializedCmdlets/Az.Resources.json

Original file line number	Diff line number	Diff line change
`@@ -17,8 +17,6 @@ namespace Microsoft.Azure.Commands.Resources.Models`
`17`	`17`	`{`
`18`	`18`	`using Authorization;`
`19`	`19`	`using ResourceManager.Common;`
`20`		`- using System.Management.Automation;`
`21`		`- using System;`
`22`	`20`
`23`	`21`	`/// <summary>`
`24`	`22`	`/// Base class for all resources cmdlets`
`@@ -116,10 +114,5 @@ public virtual string DetermineParameterSetName()`
`116`	`114`	`{`
`117`	`115`	`return ParameterSetName;`
`118`	`116`	`}`
`119`		`-`
`120`		`- protected void WriteTerminatingError(string message, params object[] args)`
`121`		`- {`
`122`		`- ThrowTerminatingError(new ErrorRecord(new Exception(String.Format(message, args)), "Error", ErrorCategory.NotSpecified, null));`
`123`		`- }`
`124`	`117`	`}`
`125`	`118`	`}`