Merge remote-tracking branch 'upstream/clu' into clu

Author: johanste

examples/lib/loginUser.sh

@@ -1,3 +1,2 @@
 #!/bin/bash
-echo "Logging in as user"
 azure account add -u "$azureUser" -p "$password" -s "$subscription"

examples/lib/testrunner.sh

@@ -6,6 +6,7 @@ export location="westus"
 export CmdletSessionID=1010
 export MSYS_NO_PATHCONV=1
 
+echo "Logging in as user"
 . $BASEDIR/loginUser.sh
 
 for d in $( ls $BASEDIR/.. --ignore=lib ); do

src/CLU/Commands.Common.ScenarioTest/ExampleScriptRunner.cs

@@ -39,10 +39,11 @@ public class ExampleScriptRunner
         ResourceManagementClient _client;
         const string DefaultLocation = "westus";
         const string ResourceGroupNameKey = "groupName";
-        const string locationKey = "location";
+        const string LocationKey = "location";
+        const string BaseDir = "BASEDIR";
         const string SessionKey = "CmdletSessionID";
-        const string storageAccountTypeKey = "storageAccountType";
-        const string storageAccountNameKey = "storageAccountName";
+        const string StorageAccountTypeKey = "storageAccountType";
+        const string StorageAccountNameKey = "storageAccountName";
         const string DefaultStorageAccountType = "Standard_GRS";
 
         public ExampleScriptRunner(string sessionId) : this(new Random(), sessionId)
@@ -106,11 +107,12 @@ public string RunScript(string testName)
                         DeployTemplate(deploymentTemplatePath, _resourceGroupName);
                     }
 
+                    process.EnvironmentVariables[BaseDir] = testDirectory;
                     process.EnvironmentVariables[SessionKey] = _sessionId;
                     process.EnvironmentVariables[ResourceGroupNameKey] = _resourceGroupName;
-                    process.EnvironmentVariables[locationKey] = DefaultLocation;
-                    process.EnvironmentVariables[storageAccountTypeKey] = DefaultStorageAccountType;
-                    process.EnvironmentVariables[storageAccountNameKey] = _storageAccountName;
+                    process.EnvironmentVariables[LocationKey] = DefaultLocation;
+                    process.EnvironmentVariables[StorageAccountTypeKey] = DefaultStorageAccountType;
+                    process.EnvironmentVariables[StorageAccountNameKey] = _storageAccountName;
                     foreach (var helper in _context.EnvironmentHelpers)
                     {
                         helper.TrySetupScriptEnvironment(_context, _clientFactory, process.EnvironmentVariables);

src/CLU/Commands.Common.ScenarioTest/ProcessHelper.cs

@@ -173,13 +173,16 @@ private void SetEnvironmentVariables(ProcessStartInfo startInfo)
 
         private void ProcessError(object sender, DataReceivedEventArgs e)
         {
-            Logger.Instance.WriteError(e.Data);
+            if (e.Data != null)
+            {
+                Logger.Instance.WriteError(e.Data);
+            }
         }
 
         private void ProcessOutput(object sender, DataReceivedEventArgs e)
         {
-            Logger.Instance.WriteMessage(e.Data);
             _processOutput.Append(e.Data);
+            Logger.Instance.WriteMessage(e.Data);
         }
 
         private void EndProcess()

src/CLU/Commands.Common.ScenarioTest/ScenarioTestFixture.cs

@@ -16,7 +16,6 @@
 using Microsoft.Azure.Commands.Common.Authentication.Models;
 using Microsoft.Azure.Commands.Common.ScenarioTest;
 using Microsoft.Azure.Commands.Models;
-using Moq.Protected;
 using Newtonsoft.Json;
 
 namespace Microsoft.Azure.Commands.Common.ScenarioTest
@@ -34,6 +33,10 @@ public ScenarioTestFixture()
             var helper = GetRunner("lib");
             var profileText = helper.RunScript(credentials.LoginScriptName);
             var profile = JsonConvert.DeserializeObject<PSAzureProfile>(profileText);
+            if (profile == null)
+            {
+                throw new ArgumentOutOfRangeException(nameof(profile), $"Deserialized profile is null: `{profileText}`");
+            }
             AzureContext = (AzureContext) (profile.Context);
         }
 

src/CLU/Commands.Common.ScenarioTest/project.json

@@ -20,7 +20,6 @@
     "Commands.Common": "",
     "Commands.Common.Authentication": "",
     "Commands.ResourceManager.Common": "",
-    "Commands.ScenarioTests.ResourceManager.Common": "",
     "Microsoft.Azure.Commands.Profile": "",
     "Microsoft.Azure.Management.Resources": "3.3.0-preview",
     "Microsoft.Extensions.Logging.Console": "1.0.0-rc1-final",

src/CLU/Microsoft.CLU/CommandBinder/CmdletBinderAndCommand.cs

@@ -342,6 +342,18 @@ private void BindDynamicParameters()
                 // If Cmdlet instance support dynamic parameters then rerun the parser to bind dynamic parameters.
                 _dynamicParameterBindInProgress = true;
                 this.ParserSeekBeginAndRun();
+                var psCmdlet = _cmdlet as PSCmdlet;
+                if (psCmdlet != null)
+                {
+                    // We need to add all dynamic parameters that were bound
+                    foreach (var boundParam in _cmdletMetadata.Instance.Parameters)
+                    {
+                        if (boundParam.Value.IsBound && boundParam.Value.IsDynamic && !psCmdlet.MyInvocation.BoundParameters.ContainsKey(boundParam.Value.Name))
+                        {
+                            psCmdlet.MyInvocation.BoundParameters[boundParam.Value.Name] = boundParam.Value;
+                        }
+                    }
+                }
                 _dynamicParameterBindInProgress = false;
             }
         }

src/CLU/Microsoft.CLU/Metadata/CmdletMetadata.cs

@@ -17,7 +17,7 @@ internal class CmdletMetadata
         /// <summary>
         /// The metadata information of the cmdlet instance.
         /// </summary>
-        public InstanceMetadata Instance { get; set; }
+        public InstanceMetadata Instance { get; private set; }
 
         /// <summary>
         /// Creates an instance of CmdletMetadata.

src/CLU/Microsoft.CLU/Metadata/InstanceMetadata.cs

@@ -51,7 +51,7 @@ public ReadOnlyCollection<CommandParameterSetInfo> ParameterSets
             }
         }
 
-        Dictionary<string, ParameterMetadata> _dynamicParameters;
+        Dictionary<string, ParameterMetadata> _dynamicParameters = new Dictionary<string, ParameterMetadata>();
         /// <summary>
         /// Get dynamic parameter metadata dictionary. The key is name of the dynamic
         /// parameter and value is the dynamic parameter metadata.

src/CLU/Microsoft.CLU/System.Management.Automation/CmdletInfo.cs

@@ -1,6 +1,8 @@
-using System.Collections.ObjectModel;
+using Microsoft.CLU.Metadata;
+using System.Collections.ObjectModel;
 using System.Linq;
 using System.Reflection;
+using System.Collections.Generic;
 
 namespace System.Management.Automation
 {
@@ -25,6 +27,9 @@ internal CmdletInfo(Type cmdlet, PSModuleInfo module, ICommandRuntime runtime, s
                 cmdlet.GetTypeInfo().GetCustomAttributes(typeof(OutputTypeAttribute), true)
                 .Select(a => a as OutputTypeAttribute)
                 .SelectMany(ot => ot.Type).ToList());
+
+            _typeMetadata = new TypeMetadata(cmdlet);
+            _typeMetadata.Load();
         }
 
         public string Noun
@@ -37,6 +42,13 @@ public string Verb
             get; private set;
         }
 
+        public override Dictionary<string, ParameterMetadata> Parameters
+        {
+            get
+            {
+                return _typeMetadata.Parameters;
+            }
+        }
         public override ReadOnlyCollection<PSTypeName> OutputType
         {
             get
@@ -67,6 +79,7 @@ public override string ToString()
             return Name;
         }
 
+        private TypeMetadata _typeMetadata;
         private ReadOnlyCollection<PSTypeName> _outputTypes;
     }
 }

src/CLU/Microsoft.CLU/System.Management.Automation/CommandInfo.cs

@@ -8,8 +8,8 @@ public abstract class CommandInfo
         public CommandTypes CommandType { get { return CommandTypes.Cmdlet; } }
         public string Name { get; protected set; }
         public abstract ReadOnlyCollection<PSTypeName> OutputType { get;  }
-        public virtual Dictionary<string, ParameterMetadata> Parameters { get; private set; }
-        public ReadOnlyCollection<CommandParameterSetInfo> ParameterSets { get; protected set; }
+        public virtual Dictionary<string, ParameterMetadata> Parameters { get; }
+        public ReadOnlyCollection<CommandParameterSetInfo> ParameterSets { get; }
         public PSModuleInfo Module { get; protected set; }
         public string ModuleName { get { return Module.Name; } }
 

tools/CLU/BuildAndInstallClu.bat

@@ -42,8 +42,8 @@ copy /Y %root%\drop\clurun\win7-x64\azure.lx %root%\drop\clurun\osx.10.10-x64
 copy /Y %root%\drop\clurun\win7-x64\msclu.cfg %root%\drop\clurun\osx.10.10-x64
 
 REM: copy over the pre-cooked azure.sh and ensure correct line endings
-copy /Y %~dp0\azure.sh %root%\drop\clurun\osx.10.10-x64
-set azuresh=%root%\drop\clurun\osx.10.10-x64\azure.sh
+copy /Y %~dp0\azure.sh %root%\drop\clurun\osx.10.10-x64\azure
+set azuresh=%root%\drop\clurun\osx.10.10-x64\azure
 echo Get-ChildItem %azuresh% ^| ForEach-Object { >  %temp%\fixLineEndings.ps1
 echo $contents = [IO.File]::ReadAllText($_) -replace "`r`n?", "`n" >> %temp%\fixLineEndings.ps1 
 echo [IO.File]::WriteAllText($_, $contents) >> %temp%\fixLineEndings.ps1 
@@ -53,7 +53,7 @@ echo } >> %temp%\fixLineEndings.ps1
 xcopy %root%\drop\clurun\win7-x64\pkgs %root%\drop\clurun\ubuntu.14.04-x64\pkgs /S /Q /I /Y
 copy /Y %root%\drop\clurun\win7-x64\azure.lx %root%\drop\clurun\ubuntu.14.04-x64
 copy /Y %root%\drop\clurun\win7-x64\msclu.cfg %root%\drop\clurun\ubuntu.14.04-x64
-copy /Y %azuresh% %root%\drop\clurun\ubuntu.14.04-x64
+copy /Y %azuresh% %root%\drop\clurun\ubuntu.14.04-x64\azure
 
 REM, windows version also needs it for bash based testing
 copy /Y %~dp0\azure.win.sh %root%\drop\clurun\win7-x64\azure