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

Jump to bottom

[Az.Accounts] Fixed returning duplicate subscription ids. #19447

Closed

NoriZC wants to merge 5 commits into main from norizhang/sign

Contributor

NoriZC commented Sep 9, 2022

Description

Fix returning duplicate subscription ids while using Get-AzSubscription by SubscriptionName. #19427.

Checklist

Check this box to confirm: I have read the Submitting Changes section of CONTRIBUTING.md and reviewed the following information:

SHOULD select appropriate branch. Cmdlets from Autorest.PowerShell should go to generation branch.
SHOULD make the title of PR clear and informative, and in the present imperative tense.
SHOULD update ChangeLog.md file(s) appropriately
- For any service, the ChangeLog.md file can be found at src/{{SERVICE}}/{{SERVICE}}/ChangeLog.md
- A snippet outlining the change(s) made in the PR should be written under the ## Upcoming Release header in the past tense. Add changelog in description section if PR goes into generation branch.
- Should not change ChangeLog.md if no new release is required, such as fixing test case only.
SHOULD have approved design review for the changes in this repository (Microsoft internal only) with following situations
- Create new module from scratch
- Create new resource types which are not easy to conform to Azure PowerShell Design Guidelines
- Create new resource type which name doesn't use module name as prefix
- Have design question before implementation
SHOULD regenerate markdown help files if there is cmdlet API change. Instruction
SHOULD have proper test coverage for changes in pull request.
SHOULD NOT introduce breaking changes in Az minor release except preview version.
SHOULD NOT adjust version of module manually in pull request

Nori Zhang and others added 5 commits

September 9, 2022 09:58


          Fix the same subscription ids should not be returned in GetSubscripti…

33ca745

…onListByName issue.


          ChangLog update.

9852f51


          Merge branch 'main' of https://github.com/Azure/azure-powershell into…

c7ebbf8

… subid


          Bump version.

4cf99f4


          Fix returning duplicate subscription ids.

52006a6

Fix returning duplicate subscription ids.

NoriZC added the Do Not Merge 🚫 label

wyunchi-ms reviewed

View reviewed changes

src/Accounts/Accounts.Test/AzureRMProfileTests.cs

Comment on lines +528 to +532

+                          var tenants = new List<string> { DefaultTenant.ToString() };
+                          var firstList = new List<string> { subId1 };
+                          var secondList = new List<string> { subId2 };
+                          var thirdList = firstList;
+                          var fourthList = firstList;

Contributor

wyunchi-ms Sep 9, 2022

I think it will be better if use more meaningful variable name here.

src/Accounts/Accounts/ChangeLog.md

Comment on lines +23 to +24

		## Version 2.10.1
		* Fixed returning duplicate Ids for one subscription while using `Get-AzSubscription` with parameter `SubscriptionName`. [#19427]

Contributor

wyunchi-ms Sep 9, 2022

We don't need to update the version manually. Just add changelog content under Upcoming Release section is fine.

src/Accounts/Accounts/Az.Accounts.psd1

    
            @@ -3,7 +3,7 @@
          
              #

              # Generated by: Microsoft Corporation

              #

              # Generated on: 2022/9/2

              # Generated on: 9/9/2022

Contributor

wyunchi-ms Sep 9, 2022

Don't need to update this file manually.

src/Accounts/Accounts/Properties/AssemblyInfo.cs

@@ @@ -43,8 +43,8 @@ @@
               // You can specify all the values or you can default the Build and Revision Numbers
               // by using the '*' as shown below:
-              [assembly: AssemblyVersion("2.10.0")]
-              [assembly: AssemblyFileVersion("2.10.0")]

Contributor

wyunchi-ms Sep 9, 2022

Don't need to update this file manually.

src/Accounts/Accounts/Utilities/CommandMappings.json

                     "Get-AzSentinelDataConnector": {},
-                    "New-AzSentinelDataConnector": {},
-                    "Remove-AzSentinelDataConnector": {},

Contributor

wyunchi-ms Sep 9, 2022

Don't need to update this file manually.

src/Accounts/Authentication/Properties/AssemblyInfo.cs

    
              [assembly: AssemblyVersion("2.10.0")]

              [assembly: AssemblyFileVersion("2.10.0")]

              [assembly: AssemblyVersion("2.10.1")]

              [assembly: AssemblyFileVersion("2.10.1")]

Contributor

wyunchi-ms Sep 9, 2022

Don't need to update this file manually.

src/Accounts/Authenticators/Properties/AssemblyInfo.cs

@@ @@ -48,5 +48,5 @@ @@
               // You can specify all the values or you can default the Build and Revision Numbers
               // by using the '*' as shown below:
               // [assembly: AssemblyVersion("1.0.*")]
-              [assembly: AssemblyVersion("2.10.0")]
-              [assembly: AssemblyFileVersion("2.10.0")]
+              [assembly: AssemblyVersion("2.10.1")]

Contributor

wyunchi-ms Sep 9, 2022

Don't need to update this file manually.

tools/Az/Az.psd1

@@ @@ -52,7 +52,7 @@ DotNetFrameworkVersion = '4.7.2' @@
               # ProcessorArchitecture = ''
               # Modules that must be imported into the global environment prior to importing this module
-              RequiredModules = @(@{ModuleName = 'Az.Accounts'; ModuleVersion = '2.10.0'; },
+              RequiredModules = @(@{ModuleName = 'Az.Accounts'; ModuleVersion = '2.10.1'; },

Contributor

wyunchi-ms Sep 9, 2022

Don't need to update this file manually.

tools/AzPreview/AzPreview.psd1

@@ @@ -52,7 +52,7 @@ DotNetFrameworkVersion = '4.7.2' @@
               # ProcessorArchitecture = ''
               # Modules that must be imported into the global environment prior to importing this module
-              RequiredModules = @(@{ModuleName = 'Az.Accounts'; ModuleVersion = '2.10.0'; },
+              RequiredModules = @(@{ModuleName = 'Az.Accounts'; ModuleVersion = '2.10.1'; },
                           @{ModuleName = 'Az.ADDomainServices'; RequiredVersion = '0.2.0'; },
                           @{ModuleName = 'Az.Advisor'; RequiredVersion = '1.1.2'; },

Contributor

wyunchi-ms Sep 9, 2022

Don't need to update this file manually.

tools/Docs/az-ps-latest.csv

               pac117,[ps=true;customSource=https://www.powershellgallery.com/api/v2/]Az.Resources,6.2.0
               pac118,[ps=true;customSource=https://www.powershellgallery.com/api/v2/]Az.Search,0.8.0
               pac119,[ps=true;customSource=https://www.powershellgallery.com/api/v2/]Az.Security,1.3.0

Contributor

wyunchi-ms Sep 9, 2022

Don't need to update this file manually.

wyunchi-ms reviewed

View reviewed changes

src/Accounts/Accounts/Models/RMProfileClient.cs

+                          }
+                          foreach (IAzureSubscription subscription in subscriptions)
+                          {
+                              if (subscriptionIds.Add(subscription.GetId()))

Contributor

wyunchi-ms Sep 9, 2022

Do you mean Contains here?

wyunchi-ms reviewed

View reviewed changes

src/Accounts/Accounts/Models/RMProfileClient.cs

+                          {
+                              if(subscription is PSAzureSubscription && subscription.GetTenant() != null
+                                  && subscription.GetHomeTenant().Equals(subscription.GetTenant()) && subscriptionIds.Add(subscription.GetId()))

Contributor

wyunchi-ms Sep 9, 2022 •

edited

Loading

Do you mean !subscriptionIds.Contains(subscription.GetId()) here?

NoriZC closed this

NoriZC deleted the norizhang/sign branch

September 13, 2022 08:27

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Do Not Merge 🚫