Sync and merge conflicts

Author: deepakswifty

clu-getstart.md

@@ -118,13 +118,13 @@ Testing will consist of scenario tests and unit tests. Scenario tests should be
     ```
     - Set the environment variable 'TestCredentials' to a connection string providing the credentials to use during test execution. Possible fields include:
 
-      |  Field        |  Description  |
+      |  Field (case sensitive) |  Description  |
       | ------------- |:-------------|
       |  Username     | an OrgId user name |
       | ServicePrincipal | a service principal name |
       | Password      | the password or application secret to sue for authentication |
       | TenantId      | (required for Service authentication) The tenant guid to authenticate against |
-      | SubscriptionID | (optional) Selects a particular subscription by id.  If not provided, the first listed subscription will be selected |
+      | SubscriptionId | (optional) Selects a particular subscription by id.  If not provided, the first listed subscription will be selected |
     - The infrastructure automatically generates a resource group name and assigns the value to the bash variable ```"$resourceGroupName"```.  If your scripts require additional variables, you can add these to your environment before running tests, or you can generate values using the ScriptRunner (for the tests using that runner).
     ```C#
         runner.EnvironmentVariables.Add("myVariableName", runner.GenerateName("myres"));

examples/lib/setup.sh

@@ -1,18 +1,24 @@
 #!/bin/bash
 export BASEDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
-. $BASEDIR/assert.sh
 . $BASEDIR/helper.sh
-. $BASEDIR/setup.sh
 export groupName=`randomName testrg`
 export location="westus"
+export CmdletSessionID=1010
+export MSYS_NO_PATHCONV=1
 
-login
+echo "Logging in as user"
+. $BASEDIR/loginUser.sh
 
 for d in $( ls $BASEDIR/.. --ignore=lib ); do
     for f in $( ls $BASEDIR/../$d/*.sh ); do
         echo "running: $f"
         . $f
-        cleanup
+        set +e
+        printf "\nCleanup: removing resource group: %s\n" $groupName
+        azure group remove --name "$groupName" --force
+        set -e
         echo "success: $f"
     done
-done
+done
+
+export MSYS_NO_PATHCONV=

examples/lib/testrunner.sh

@@ -0,0 +1,6 @@
+Param(
+  [string]$resourceGroupName,
+  [string]$resourceGroupLocation
+)
+
+Write-Host "Skip"

examples/virtual-hard-disk/01-VirtualHardDisks.ps1

@@ -0,0 +1,27 @@
+#!/bin/bash
+set -e
+printf "\n=== Managing Virtual Hard Disks in Azure Compute ===\n"
+
+printf "\n1. Creating a new resource group: %s and location: %s.\n" "$groupName" "$location"
+azure group create -n "$groupName" --location "$location"
+
+printf "\n2. Creating a new storage account '%s' in type '%s'.\n" "$storageAccountName" "$storageAccountType"
+azure storage account new --resourcegroupname "$groupName" --name "$storageAccountName" --location "$location" --type "$storageAccountType"
+
+printf "\n3. Uploading a virtual hard disk to: %s.\n" "$storageAccountName"
+azure vhd add -o --resourcegroupname "$groupName" --destination https://"$storageAccountName".blob.core.windows.net/test/test.vhd --localfilepath $BASEDIR/test.vhd
+
+printf "\n4. Downloading a virtual hard disk"
+azure vhd save -o --resourcegroupname "$groupName" --sourceuri https://"$storageAccountName".blob.core.windows.net/test/test.vhd --localfilepath ./test_downloaded_by_clu.vhd
+
+printf "\n5. Validating the downloaded file is the same.\n"
+diffResult=`diff ./test_downloaded_by_clu.vhd $BASEDIR/test_uploaded_byps.vhd`
+if [ "$diffResult" = "" ]; then
+    echo "Checked"
+else
+    echo "Different!" 1>&2
+    exit 1
+fi
+
+printf "\n6. Removing resource group: %s.\n" "$groupName"
+azure group remove -n "$groupName" -f

examples/virtual-hard-disk/01-VirtualHardDisks.sh

@@ -57,6 +57,13 @@ Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.Azure.Commands.Co
 EndProject
 Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.ScenarioTest.CLU", "Microsoft.ScenarioTests.CLU\Microsoft.ScenarioTest.CLU.xproj", "{91422B55-28A5-48DE-BCA0-30C3E30FFB1C}"
 EndProject
+Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "VhdManagement", "VhdManagement\VhdManagement.xproj", "{094A32EA-BABC-4A0C-9B6C-3CF7F6EABEC9}"
+EndProject
+Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Sync", "Sync\Sync.xproj", "{6EDCB32A-8420-48FC-99CE-94BEA12D2FD2}"
+	ProjectSection(ProjectDependencies) = postProject
+		{094A32EA-BABC-4A0C-9B6C-3CF7F6EABEC9} = {094A32EA-BABC-4A0C-9B6C-3CF7F6EABEC9}
+	EndProjectSection
+EndProject
 Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.Azure.Commands.Network", "Microsoft.Azure.Commands.Network\Microsoft.Azure.Commands.Network.xproj", "{C4DCF4EA-62E7-431E-ADB5-16FD6CFEA5D6}"
 EndProject
 Global
@@ -241,6 +248,14 @@ Global
 		{C4DCF4EA-62E7-431E-ADB5-16FD6CFEA5D6}.Release|Any CPU.Build.0 = Release|Any CPU
 		{C4DCF4EA-62E7-431E-ADB5-16FD6CFEA5D6}.Release|x64.ActiveCfg = Release|Any CPU
 		{C4DCF4EA-62E7-431E-ADB5-16FD6CFEA5D6}.Release|x64.Build.0 = Release|Any CPU
+		{094A32EA-BABC-4A0C-9B6C-3CF7F6EABEC9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{094A32EA-BABC-4A0C-9B6C-3CF7F6EABEC9}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{094A32EA-BABC-4A0C-9B6C-3CF7F6EABEC9}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{094A32EA-BABC-4A0C-9B6C-3CF7F6EABEC9}.Release|Any CPU.Build.0 = Release|Any CPU
+		{6EDCB32A-8420-48FC-99CE-94BEA12D2FD2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{6EDCB32A-8420-48FC-99CE-94BEA12D2FD2}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6EDCB32A-8420-48FC-99CE-94BEA12D2FD2}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{6EDCB32A-8420-48FC-99CE-94BEA12D2FD2}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

examples/virtual-hard-disk/test.vhd

@@ -45,8 +45,7 @@ protected virtual IDictionary<string, string> GetSettings(string key)
             var environmentValue = Environment.GetEnvironmentVariable(key);
             if (string.IsNullOrWhiteSpace(environmentValue))
             {
-                throw new InvalidOperationException($"Unable to create credentials.  " +
-                    "Please set environment ${key}");
+                throw new InvalidOperationException($"Unable to create credentials. Please set environment variable `{key}`");
             }
             IDictionary<string, string> settings = new Dictionary<string, string>();
             foreach (

examples/virtual-hard-disk/test_uploaded_byps.vhd

@@ -33,13 +33,18 @@ public class ExampleScriptRunner
         string _sessionId;
         Random _generator;
         string _resourceGroupName;
+        string _storageAccountName;
         IClientFactory _clientFactory = new ClientFactory();
         TestContext _context;
         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 DefaultStorageAccountType = "Standard_GRS";
 
         public ExampleScriptRunner(string sessionId) : this(new Random(), sessionId)
         {
@@ -96,14 +101,18 @@ public string RunScript(string testName)
                 {
                     Trace.Listeners.Add(listener);
                     _resourceGroupName = CreateRandomName();
+                    _storageAccountName = CreateRandomName() + "sto";
                     if (File.Exists(deploymentTemplatePath))
                     {
                         DeployTemplate(deploymentTemplatePath, _resourceGroupName);
                     }
 
+                    process.EnvironmentVariables[BaseDir] = testDirectory;
                     process.EnvironmentVariables[SessionKey] = _sessionId;
                     process.EnvironmentVariables[ResourceGroupNameKey] = _resourceGroupName;
-                    process.EnvironmentVariables[locationKey] = DefaultLocation;
+                    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/CLUCoreCLR.sln

@@ -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/EnvironmentCredentialsProvider.cs

@@ -31,12 +31,19 @@ public SampleTest(ScenarioTestFixture fixture)
         {
             _collectionState = fixture;
         }
+
         [Fact]
-        public void RunSampleTest()
+        public void ResourceGroupsTest()
         {
             var helper = _collectionState.GetRunner("resource-management");
             helper.RunScript("01-ResourceGroups");
         }
 
+        [Fact]
+        public void VirtualHardDisksTest()
+        {
+            var helper = _collectionState.GetRunner("virtual-hard-disk");
+            helper.RunScript("01-VirtualHardDisks");
+        }
     }
 }

src/CLU/Commands.Common.ScenarioTest/ExampleScriptRunner.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/ProcessHelper.cs

@@ -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/Commands.Common.ScenarioTest/SampleTest.cs

@@ -14,5 +14,8 @@
   <PropertyGroup>
     <SchemaVersion>2.0</SchemaVersion>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
+    <ProduceOutputsOnBuild>True</ProduceOutputsOnBuild>
+  </PropertyGroup>
   <Import Project="$(VSToolsPath)\DNX\Microsoft.DNX.targets" Condition="'$(VSToolsPath)' != ''" />
 </Project>