Skip to content

Commit 39fa88e

Browse files
hyonholeehyonholee
committed
Merge branch 'dev' of https://github.com/Azure/azure-powershell into dev
2 parents 7fec93d + 6586a2b commit 39fa88e

File tree

22 files changed

+2078
-563
lines changed

22 files changed

+2078
-563
lines changed

‎src/ResourceManager/Common/Commands.ResourceManager.Common/Commands.ResourceManager.Common.csproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -268,6 +268,7 @@
268268
<Compile Include="Generated\TagOperationsExtensions.cs" />
269269
<Compile Include="Generated\TenantOperations.cs" />
270270
<Compile Include="Generated\TenantOperationsExtensions.cs" />
271+
<Compile Include="GlobalSuppressions.cs" />
271272
<Compile Include="Properties\AssemblyInfo.cs" />
272273
<Compile Include="Properties\Resources.Designer.cs">
273274
<AutoGen>True</AutoGen>

‎src/ResourceManager/Common/Commands.ResourceManager.Common/GlobalSuppressions.cs

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
// This file is used by Code Analysis to maintain SuppressMessage
2+
// attributes that are applied to this project.
3+
// Project-level suppressions either have no target or are given
4+
// a specific target and scoped to a namespace, type, member, etc.
5+
//
6+
// To add a suppression to this file, right-click the message in the
7+
// Code Analysis results, point to "Suppress Message", and click
8+
// "In Suppression File".
9+
// You do not need to add suppressions to this file manually.
10+
11+
[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Design", "CA1063:ImplementIDisposableCorrectly", Scope = "type", Target = "Microsoft.Azure.Management.Internal.Resources.AuthorizationClient")]
12+
[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Design", "CA1063:ImplementIDisposableCorrectly", Scope = "type", Target = "Microsoft.Azure.Management.Internal.Resources.FeatureClient")]
13+
[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Design", "CA1063:ImplementIDisposableCorrectly", Scope = "type", Target = "Microsoft.Azure.Management.Internal.Resources.ResourceManagementClient")]
14+
[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Design", "CA1063:ImplementIDisposableCorrectly", Scope = "type", Target = "Microsoft.Azure.Internal.Subscriptions.SubscriptionClient")]

‎src/ResourceManager/Profile/Commands.Profile.Test/AzureRMProfileTests.cs

Lines changed: 34 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -46,12 +46,12 @@ private static RMProfileClient SetupTestEnvironment(List<string> tenants, params
4646
mock.MoqClients = true;
4747
AzureSession.ClientFactory = mock;
4848
var context = new AzureContext(new AzureSubscription()
49-
{
50-
Account = DefaultAccount,
51-
Environment = EnvironmentName.AzureCloud,
52-
Id = DefaultSubscription,
53-
Name = DefaultSubscriptionName
54-
},
49+
{
50+
Account = DefaultAccount,
51+
Environment = EnvironmentName.AzureCloud,
52+
Id = DefaultSubscription,
53+
Name = DefaultSubscriptionName
54+
},
5555
new AzureAccount() { Id = DefaultAccount, Type = AzureAccount.AccountType.User },
5656
AzureEnvironment.PublicEnvironments[EnvironmentName.AzureCloud],
5757
new AzureTenant() { Domain = DefaultDomain, Id = DefaultTenant });
@@ -65,17 +65,24 @@ private static RMProfileClient SetupTestEnvironment(List<string> tenants, params
6565
public void MultipleTenantsAndSubscriptionsSucceed()
6666
{
6767
var tenants = new List<string> {Guid.NewGuid().ToString(), DefaultTenant.ToString()};
68-
var firstList = new List<string> { DefaultSubscription.ToString(), Guid.NewGuid().ToString() };
68+
var secondsubscriptionInTheFirstTenant = Guid.NewGuid().ToString();
69+
var firstList = new List<string> { DefaultSubscription.ToString(), secondsubscriptionInTheFirstTenant};
6970
var secondList = new List<string> { Guid.NewGuid().ToString()};
70-
var client = SetupTestEnvironment(tenants, firstList, secondList);
71+
var thirdList = new List<string> { DefaultSubscription.ToString(), secondsubscriptionInTheFirstTenant };
72+
var fourthList = new List<string> { DefaultSubscription.ToString(), secondsubscriptionInTheFirstTenant };
73+
var client = SetupTestEnvironment(tenants, firstList, secondList, thirdList, fourthList);
7174
var subResults = new List<AzureSubscription>(client.ListSubscriptions());
7275
Assert.Equal(3, subResults.Count);
7376
var tenantResults = client.ListTenants();
7477
Assert.Equal(2, tenantResults.Count());
7578
tenantResults = client.ListTenants(DefaultTenant.ToString());
7679
Assert.Equal(1, tenantResults.Count());
7780
AzureSubscription subValue;
78-
Assert.True(client.TryGetSubscription(DefaultTenant.ToString(), DefaultSubscription.ToString(), out subValue));
81+
Assert.True(client.TryGetSubscriptionById(DefaultTenant.ToString(), DefaultSubscription.ToString(), out subValue));
82+
Assert.Equal(DefaultSubscription.ToString(), subValue.Id.ToString());
83+
Assert.True(client.TryGetSubscriptionByName(DefaultTenant.ToString(),
84+
MockSubscriptionClientFactory.GetSubscriptionNameFromId(DefaultSubscription.ToString()),
85+
out subValue));
7986
Assert.Equal(DefaultSubscription.ToString(), subValue.Id.ToString());
8087
}
8188

@@ -84,16 +91,22 @@ public void MultipleTenantsAndSubscriptionsSucceed()
8491
public void SingleTenantAndSubscriptionSucceeds()
8592
{
8693
var tenants = new List<string> {DefaultTenant.ToString()};
87-
var subscriptions = new List<string> {DefaultSubscription.ToString()};
88-
var client = SetupTestEnvironment(tenants, subscriptions);
94+
var firstList = new List<string> {DefaultSubscription.ToString()};
95+
var secondList = firstList;
96+
var thirdList = firstList;
97+
var client = SetupTestEnvironment(tenants, firstList, secondList, thirdList);
8998
var subResults = new List<AzureSubscription>(client.ListSubscriptions());
9099
Assert.Equal(1, subResults.Count);
91100
var tenantResults = client.ListTenants();
92101
Assert.Equal(1, tenantResults.Count());
93102
tenantResults = client.ListTenants(DefaultTenant.ToString());
94103
Assert.Equal(1, tenantResults.Count());
95104
AzureSubscription subValue;
96-
Assert.True(client.TryGetSubscription(DefaultTenant.ToString(), DefaultSubscription.ToString(), out subValue));
105+
Assert.True(client.TryGetSubscriptionById(DefaultTenant.ToString(), DefaultSubscription.ToString(), out subValue));
106+
Assert.Equal(DefaultSubscription.ToString(), subValue.Id.ToString());
107+
Assert.True(client.TryGetSubscriptionByName(DefaultTenant.ToString(),
108+
MockSubscriptionClientFactory.GetSubscriptionNameFromId(DefaultSubscription.ToString()),
109+
out subValue));
97110
Assert.Equal(DefaultSubscription.ToString(), subValue.Id.ToString());
98111
}
99112

@@ -102,12 +115,15 @@ public void SingleTenantAndSubscriptionSucceeds()
102115
public void SubscriptionNotFoundDoesNotThrow()
103116
{
104117
var tenants = new List<string> { DefaultTenant.ToString() };
105-
var subscriptions = new List<string> { Guid.NewGuid().ToString() };
106-
var client = SetupTestEnvironment(tenants, subscriptions);
118+
string randomSubscriptionId = Guid.NewGuid().ToString();
119+
var firstList = new List<string> { randomSubscriptionId };
120+
var secondList = firstList;
121+
var client = SetupTestEnvironment(tenants, firstList, secondList);
107122
var subResults = new List<AzureSubscription>(client.ListSubscriptions());
108123
Assert.Equal(1, subResults.Count);
109124
AzureSubscription subValue;
110-
Assert.True(client.TryGetSubscription(DefaultTenant.ToString(), DefaultSubscription.ToString(), out subValue));
125+
Assert.False(client.TryGetSubscriptionById(DefaultTenant.ToString(), DefaultSubscription.ToString(), out subValue));
126+
Assert.False(client.TryGetSubscriptionByName("random-tenant", "random-subscription", out subValue));
111127
}
112128

113129
[Fact]
@@ -127,10 +143,11 @@ public void NoSubscriptionsInListDoesNotThrow()
127143
{
128144
var tenants = new List<string> { DefaultTenant.ToString() };
129145
var subscriptions = new List<string> () ;
130-
var client = SetupTestEnvironment(tenants, subscriptions);
146+
var client = SetupTestEnvironment(tenants, subscriptions, subscriptions);
131147
Assert.Equal(0, client.ListSubscriptions().Count());
132148
AzureSubscription subValue;
133-
Assert.True(client.TryGetSubscription(DefaultTenant.ToString(), DefaultSubscription.ToString(), out subValue));
149+
Assert.False(client.TryGetSubscriptionById(DefaultTenant.ToString(), DefaultSubscription.ToString(), out subValue));
150+
Assert.False(client.TryGetSubscriptionByName(DefaultTenant.ToString(), "random-name", out subValue));
134151
}
135152

136153
[Fact]

‎src/ResourceManager/Profile/Commands.Profile.Test/MockSubscriptionClientFactory.cs

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,11 @@ public MockSubscriptionClientFactory(List<string> tenants, Queue<List<string>> s
4444
}
4545
}
4646

47+
public static string GetSubscriptionNameFromId(string id)
48+
{
49+
return "Sub-" + id;
50+
}
51+
4752
public SubscriptionClient GetSubscriptionClient()
4853
{
4954
var tenantMock = new Mock<ITenantOperations>();
@@ -72,7 +77,7 @@ public SubscriptionClient GetSubscriptionClient()
7277
result.Subscription =
7378
new Subscription
7479
{
75-
DisplayName = "Returned Subscription",
80+
DisplayName = GetSubscriptionNameFromId(subId),
7681
Id = subId,
7782
State = "Active",
7883
SubscriptionId = subId
@@ -100,7 +105,7 @@ public SubscriptionClient GetSubscriptionClient()
100105
sub =>
101106
new Subscription
102107
{
103-
DisplayName = "Contoso Subscription",
108+
DisplayName = GetSubscriptionNameFromId(sub),
104109
Id = sub,
105110
State = "Active",
106111
SubscriptionId = sub

0 commit comments

Comments
 (0)