Merge pull request #971 from jianghaolu/subname

[fixes #103937270] Add -SubscriptionName to Get-AzureRMSubscription

Author: ogail

src/ResourceManager/Common/Commands.ResourceManager.Common/RMProfileClient.cs

@@ -151,6 +151,19 @@ public bool TryGetSubscription(string tenantId, string subscriptionId, out Azure
                 tenantId, subscriptionId, out subscription, out tenant);
         }
 
+        public bool TryGetSubscriptionByName(string tenantId, string subscriptionName, out AzureSubscription subscription)
+        {
+            if (string.IsNullOrWhiteSpace(tenantId))
+            {
+                throw new ArgumentNullException("Please provide a valid tenant Id.");
+            }
+
+            IEnumerable<AzureSubscription> subscriptionList = ListSubscriptions(tenantId);
+            subscription = subscriptionList.FirstOrDefault(s => s.Name.Equals(subscriptionName, StringComparison.OrdinalIgnoreCase));
+
+            return subscription != null;
+        }
+
         public AzureEnvironment AddOrSetEnvironment(AzureEnvironment environment)
         {
             if (environment == null)

src/ResourceManager/Common/Commands.ScenarioTests.ResourceManager.Common/EnvironmentSetupHelper.cs

@@ -66,14 +66,7 @@ public EnvironmentSetupHelper()
             System.Net.ServicePointManager.ServerCertificateValidationCallback += (se, cert, chain, sslerror) => true;
 
             // Set RunningMocked
-            if (HttpMockServer.GetCurrentMode() == HttpRecorderMode.Playback)
-            {
-                TestMockSupport.RunningMocked = true;
-            }
-            else
-            {
-                TestMockSupport.RunningMocked = false;
-            }
+            TestMockSupport.RunningMocked = HttpMockServer.GetCurrentMode() == HttpRecorderMode.Playback;
         }
 
         /// <summary>
@@ -103,32 +96,29 @@ public void SetupEnvironment(AzureModule mode)
 
         private void SetupAzureEnvironmentFromEnvironmentVariables(AzureModule mode)
         {
-            TestEnvironment rdfeEnvironment = new RDFETestEnvironmentFactory().GetTestEnvironment();
-            TestEnvironment csmEnvironment = new CSMTestEnvironmentFactory().GetTestEnvironment();
-            TestEnvironment currentEnvironment = (mode == AzureModule.AzureResourceManager ? csmEnvironment : rdfeEnvironment);
+            TestEnvironment currentEnvironment = null;
+            if (mode == AzureModule.AzureResourceManager)
+            {
+                currentEnvironment = new CSMTestEnvironmentFactory().GetTestEnvironment();
+            } 
+            else
+            {
+                currentEnvironment = new RDFETestEnvironmentFactory().GetTestEnvironment();
+            }
 
             if (currentEnvironment.UserName == null)
             {
                 currentEnvironment.UserName = "[email protected]";
             }
 
-            SetAuthenticationFactory(mode, rdfeEnvironment, csmEnvironment);
+            SetAuthenticationFactory(mode, currentEnvironment);
 
             AzureEnvironment environment = new AzureEnvironment { Name = testEnvironmentName };
 
             Debug.Assert(currentEnvironment != null);
             environment.Endpoints[AzureEnvironment.Endpoint.ActiveDirectory] = currentEnvironment.Endpoints.AADAuthUri.AbsoluteUri;
             environment.Endpoints[AzureEnvironment.Endpoint.Gallery] = currentEnvironment.Endpoints.GalleryUri.AbsoluteUri;
-
-            if (csmEnvironment != null)
-            {
-                environment.Endpoints[AzureEnvironment.Endpoint.ResourceManager] = csmEnvironment.BaseUri.AbsoluteUri;
-            }
-
-            if (rdfeEnvironment != null)
-            {
-                environment.Endpoints[AzureEnvironment.Endpoint.ServiceManagement] = rdfeEnvironment.BaseUri.AbsoluteUri;
-            }
+            environment.Endpoints[AzureEnvironment.Endpoint.ServiceManagement] = currentEnvironment.BaseUri.AbsoluteUri;
 
             if (!ProfileClient.Profile.Environments.ContainsKey(testEnvironmentName))
             {
@@ -169,44 +159,29 @@ private void SetupAzureEnvironmentFromEnvironmentVariables(AzureModule mode)
             }
         }
 
-        private void SetAuthenticationFactory(AzureModule mode, TestEnvironment rdfeEnvironment, TestEnvironment csmEnvironment)
+        private void SetAuthenticationFactory(AzureModule mode, TestEnvironment environment)
         {
             string jwtToken = null;
             X509Certificate2 certificate = null;
-            TestEnvironment currentEnvironment = (mode == AzureModule.AzureResourceManager ? csmEnvironment : rdfeEnvironment);
 
-            if (mode == AzureModule.AzureServiceManagement)
+            if (environment.Credentials is TokenCloudCredentials)
             {
-                if (rdfeEnvironment.Credentials is TokenCloudCredentials)
-                {
-                    jwtToken = ((TokenCloudCredentials)rdfeEnvironment.Credentials).Token;
-                }
-                if (rdfeEnvironment.Credentials is CertificateCloudCredentials)
-                {
-                    certificate = ((CertificateCloudCredentials)rdfeEnvironment.Credentials).ManagementCertificate;
-                }
+                jwtToken = ((TokenCloudCredentials)environment.Credentials).Token;
             }
-            else
+            if (environment.Credentials is CertificateCloudCredentials)
             {
-                if (csmEnvironment.Credentials is TokenCloudCredentials)
-                {
-                    jwtToken = ((TokenCloudCredentials)csmEnvironment.Credentials).Token;
-                }
-                if (csmEnvironment.Credentials is CertificateCloudCredentials)
-                {
-                    certificate = ((CertificateCloudCredentials)csmEnvironment.Credentials).ManagementCertificate;
-                }
+                certificate = ((CertificateCloudCredentials)environment.Credentials).ManagementCertificate;
             }
 
 
             if (jwtToken != null)
             {
-                AzureSession.AuthenticationFactory = new MockTokenAuthenticationFactory(currentEnvironment.UserName,
+                AzureSession.AuthenticationFactory = new MockTokenAuthenticationFactory(environment.UserName,
                     jwtToken);
             }
             else if (certificate != null)
             {
-                AzureSession.AuthenticationFactory = new MockCertificateAuthenticationFactory(currentEnvironment.UserName,
+                AzureSession.AuthenticationFactory = new MockCertificateAuthenticationFactory(environment.UserName,
                     certificate);
             }
         }