Removing dynamic parameters from Set-AzureRMContext cmdlet, fixes #2554 (#2712)

Author: markcowl

src/ResourceManager/Profile/Commands.Profile.Test/ContextCmdletTests.cs

@@ -89,13 +89,7 @@ public void SelectAzureContextWithNoSubscriptionAndTenant()
             account.SetProperty(AzureAccount.Property.Tenants, allowedTenants);
             account.SetProperty(AzureAccount.Property.Subscriptions, new string[0]);
 
-            var paramDictionary =
-                ((RuntimeDefinedParameterDictionary)cmdlt.GetDynamicParameters());
-            var tenantParam = paramDictionary["TenantId"];
-            Assert.True(tenantParam.Attributes.Any(a => a is ValidateSetAttribute 
-              && ((ValidateSetAttribute)a).ValidValues.Any(v => string.Equals(v, tenantToSet, StringComparison.OrdinalIgnoreCase))));
-            Assert.False(paramDictionary["SubscriptionId"].Attributes.Any(a => a is ValidateSetAttribute));
-            tenantParam.Value = tenantToSet;
+            cmdlt.TenantId = tenantToSet;
 
             // Act
             cmdlt.InvokeBeginProcessing();
@@ -110,50 +104,6 @@ public void SelectAzureContextWithNoSubscriptionAndTenant()
             Assert.NotEqual(tenantToSet, context.Tenant.TenantId);
         }
 
-        [Theory]
-        [InlineData(null, null)]
-        [InlineData(new string[0], new string[0])]
-        [InlineData(new string[] { guid1}, new string[] {guid2})]
-        [InlineData(new string[] { guid1, guid2 }, new string[] { guid3, guid4 })]
-        [Trait(Category.AcceptanceType, Category.CheckIn)]
-        public void SetsDynamicParametersForContext(string[] subscriptions, string[] tenants)
-        {
-            var cmdlt = new SetAzureRMContextCommand();
-
-            // Setup
-            cmdlt.CommandRuntime = commandRuntimeMock;
-
-            // Make sure that the tenant ID we are attempting to set is
-            // valid for the account
-            var account = AzureRmProfileProvider.Instance.Profile.Context.Account;
-            account.SetProperty(AzureAccount.Property.Tenants, tenants);
-            account.SetProperty(AzureAccount.Property.Subscriptions, subscriptions);
-
-            var paramDictionary =
-                ((RuntimeDefinedParameterDictionary)cmdlt.GetDynamicParameters());
-            var subscriptionParams = paramDictionary["SubscriptionId"];
-            VerifyValidationAttribute(subscriptionParams, subscriptions);
-            var tenantParams = paramDictionary["TenantId"];
-            VerifyValidationAttribute(tenantParams, tenants);
-        }
-
-        private void VerifyValidationAttribute(RuntimeDefinedParameter parameter, string[] expectedValues)
-        {
-            if (expectedValues != null && expectedValues.Length > 0)
-            {
-                var validateAttribute = parameter.Attributes.First(a => a is ValidateSetAttribute) as ValidateSetAttribute;
-                Assert.NotNull(validateAttribute);
-                foreach (var expectedValue in expectedValues)
-                {
-                    Assert.Contains(expectedValue, validateAttribute.ValidValues, StringComparer.OrdinalIgnoreCase);
-                }
-            }
-            else
-            {
-                Assert.False(parameter.Attributes.Any(a => a is ValidateSetAttribute));
-            }
-        }
-
         [Fact]
         [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void SelectAzureContextWithNoSubscriptionAndNoTenant()
@@ -173,7 +123,5 @@ public void SelectAzureContextWithNoSubscriptionAndNoTenant()
             var context = (PSAzureContext)commandRuntimeMock.OutputPipeline[0];
             Assert.NotNull(context);
         }
-
-
     }
 }

src/ResourceManager/Profile/Commands.Profile.Test/SubscriptionCmdletTests.ps1

@@ -81,7 +81,7 @@ function Test-SetAzureRmContextEndToEnd
     $context = Get-AzureRmContext
     Assert-AreEqual $context.Subscription.SubscriptionId $secondSubscription.SubscriptionId
     $junkSubscriptionId = "49BC3D95-9A30-40F8-81E0-3CDEF0C3F8A5"
-    Assert-ThrowsContains {Set-AzureRmContext -SubscriptionId $junkSubscriptionId} "does not belong"
+    Assert-ThrowsContains {Set-AzureRmContext -SubscriptionId $junkSubscriptionId} "does not exist"
 }
 
 function Test-SetAzureRmContextWithoutSubscription

src/ResourceManager/Profile/Commands.Profile/Context/SetAzureRMContext.cs

@@ -31,13 +31,11 @@ namespace Microsoft.Azure.Commands.Profile
         SupportsShouldProcess=true)]
     [Alias("Select-AzureRmSubscription")]
     [OutputType(typeof(PSAzureContext))]
-    public class SetAzureRMContextCommand : AzureRMCmdlet, IDynamicParameters
+    public class SetAzureRMContextCommand : AzureRMCmdlet
     {
         private const string SubscriptionNameParameterSet = "SubscriptionName";
         private const string SubscriptionIdParameterSet = "SubscriptionId";
         private const string ContextParameterSet = "Context";
-        private RuntimeDefinedParameter _tenantId;
-        private RuntimeDefinedParameter _subscriptionId;
 
         [Parameter(ParameterSetName = SubscriptionNameParameterSet, Mandatory = false, HelpMessage = "Subscription Name", ValueFromPipelineByPropertyName = true)]
         [ValidateNotNullOrEmpty]
@@ -46,21 +44,16 @@ public class SetAzureRMContextCommand : AzureRMCmdlet, IDynamicParameters
         [Parameter(ParameterSetName = ContextParameterSet, Mandatory = true, HelpMessage = "Context", ValueFromPipeline = true)]
         public PSAzureContext Context { get; set; }
 
-        private string TenantId
-        {
-            get
-            {
-                return _tenantId == null ? null : (string)_tenantId.Value;
-            }
-        }
+        [Parameter(ParameterSetName = SubscriptionNameParameterSet, Mandatory = false,
+                    HelpMessage = "Tenant name or ID", ValueFromPipelineByPropertyName = true)]
+        [Parameter(ParameterSetName = SubscriptionIdParameterSet, Mandatory = false,
+                    HelpMessage = "Tenant name or ID", ValueFromPipelineByPropertyName = true)]
+        [Alias("Domain")]
+        public string TenantId { get; set; }
 
-        private string SubscriptionId
-        {
-            get
-            {
-                return _subscriptionId == null ? null : (string)_subscriptionId.Value;
-            }
-        }
+        [Parameter(ParameterSetName = SubscriptionIdParameterSet, Mandatory = false,
+                    HelpMessage = "Subscription Identifer (GUID)", ValueFromPipelineByPropertyName = true)]
+        public string SubscriptionId { get; set; }
 
         public override void ExecuteCmdlet()
         {
@@ -127,79 +120,5 @@ private void CompleteContextProcessing()
             }
             WriteObject((PSAzureContext)AzureRmProfileProvider.Instance.Profile.Context);
         }
-
-        public object GetDynamicParameters()
-        {
-            return CreateDynamicParameterDictionary();
-        }
-
-        private RuntimeDefinedParameterDictionary CreateDynamicParameterDictionary()
-        {
-            var runtimeDefinedParameterDictionary = new RuntimeDefinedParameterDictionary();
-
-            var subscriptionIdAttributes = new Collection<Attribute>
-            {
-                new ParameterAttribute
-                {
-                    ParameterSetName = SubscriptionIdParameterSet,
-                    Mandatory = false,
-                    HelpMessage = "Subscription",
-                    ValueFromPipelineByPropertyName = true
-                }
-            };
-
-            var tenantIdAttributes = new Collection<Attribute>
-            {
-                new ParameterAttribute
-                {
-                    ParameterSetName = SubscriptionNameParameterSet,
-                    Mandatory = false,
-                    HelpMessage = "Tenant name or ID",
-                    ValueFromPipelineByPropertyName = true
-                },
-                new ParameterAttribute
-                {
-                    ParameterSetName = SubscriptionIdParameterSet,
-                    Mandatory = false,
-                    HelpMessage = "Tenant name or ID",
-                    ValueFromPipelineByPropertyName = true
-                },
-                new AliasAttribute("Domain")
-            };
-
-            if (AzureRmProfileProvider.Instance != null
-                && AzureRmProfileProvider.Instance.Profile != null
-                && AzureRmProfileProvider.Instance.Profile.Context != null
-                && AzureRmProfileProvider.Instance.Profile.Context.Account != null)
-            {
-                var account = AzureRmProfileProvider.Instance.Profile.Context.Account;
-                if (account.IsPropertySet(AzureAccount.Property.Subscriptions))
-                {
-                    var subscriptions = account.GetPropertyAsArray(AzureAccount.Property.Subscriptions);
-                    if (subscriptions != null && subscriptions.Length > 0)
-                    {
-                        subscriptionIdAttributes.Add(
-                            new ValidateSetAttribute(subscriptions));
-                    }
-                }
-                if (account.IsPropertySet(AzureAccount.Property.Tenants))
-                {
-                    var tenants = account.GetPropertyAsArray(AzureAccount.Property.Tenants);
-                    if (tenants != null && tenants.Length > 0)
-                    {
-                        tenantIdAttributes.Add(
-                            new ValidateSetAttribute(tenants));
-                    }
-                }
-            }
-
-            _tenantId = new RuntimeDefinedParameter("TenantId", typeof(string), tenantIdAttributes);
-            _subscriptionId = new RuntimeDefinedParameter("SubscriptionId", typeof(string), subscriptionIdAttributes);
-
-            runtimeDefinedParameterDictionary.Add("SubscriptionId", _subscriptionId);
-            runtimeDefinedParameterDictionary.Add("TenantId", _tenantId);
-
-            return runtimeDefinedParameterDictionary;
-        }
     }
 }