Added copy of azure bash script to win output and added example of assert to 01-ResourceGroups.sh

Author: stankovski

clu-getstart.md

@@ -81,11 +81,11 @@ To test on osx/linux boxes, do #1, open `<repo-root>\drop\clurun`, you should se
 ### Testing Cmdlets
 
 #### Environment setup (Windows)
-- Install [git bash for windows](https://git-scm.com/download/win) if you dont have git installed on your system.
-- Install jq using chocolatey `choco install jq`. You can install chocolatey from [here](https://chocolatey.org/).
+- Install latest version of [Git for Windows](https://git-scm.com/download/win) that has `bash 4.x` available.
+- Install `jq` using chocolatey `choco install jq` (chocolatey can be installed from [here](https://chocolatey.org/)).
 
 #### Test Infrastructure
-Testing will consist of scenario tests and unit tests. We want scenario tests to be used as examples and be available in `.ps1` and `.sh` formats.
+Testing will consist of scenario tests and unit tests. Scenario tests should be written in a form of an example and be available in `.ps1` and `.sh` formats.
 
 #### Scenario Tests
 - Scenario tests should be saved under `./examples` directory and grouped by the package or service area. Each scenario tests should consist of both `.ps1` and `.sh` files and should cover "P0" scenarios.
@@ -96,16 +96,18 @@ Testing will consist of scenario tests and unit tests. We want scenario tests to
    ```bash
    export azureuser=<[email protected]>
    export azurepassword=<your_password>
+   export PATH=$PATH:/<path-to-drop>/clurun/win7-x64/
    . /examples/lib/testrunner.sh
    ```
 - All the parameters to the cmdlets should be passed in as envt. variables
-- The test runners are guaranted to provide a unique resource group name via `$groupName` and reomve it at the end of the test execution.
+- The current test runners will provide a unique resource group name via `$groupName` but may not remove it at the end if the test fails.
 - The location for ARM will be provided via variable `$location`.
-- "jq" package and `./examples/lib/assert.sh` should be used to validate the responses.
-
+- "jq" package and BASH assert (e.g. `[ "foo" == "bar" ]`) should be used to validate the responses.
 
+##### PowerShell Tests
+TODO: Add section on PowerShell testing
 
 #### Unit Tests
-TODO: Add details on unit testing
+TODO: Add section on unit testing
 
 

examples/lib/setup.sh

@@ -1,10 +1,17 @@
 #!/bin/bash
 # Login
 login() {
-	echo "Executing Login..."
+    echo "Executing Login..."
     export CmdletSessionId=1010
     azure account add --username $azureuser --password $azurepassword
+}
 
+cleanup() {
+    set +e
+    printf "\nCleanup: removing resource group: %s\n" $groupName
+    azure group remove --name "$groupName" --force
+    set -e
 }
 
-export -f login 
+export -f login 
+export -f cleanup 

examples/lib/testrunner.sh

@@ -6,11 +6,13 @@ export BASEDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 export groupName=`randomName testrg`
 export location="westus"
 
+login
 
 for d in $( ls $BASEDIR/.. --ignore=lib ); do
     for f in $( ls $BASEDIR/../$d/*.sh ); do
         echo "running: $f"
         . $f
-        assert_end examples
+        cleanup
+        echo "success: $f"
     done
 done

examples/resource-management/01-ResourceGroups.sh

@@ -3,17 +3,19 @@ set -e
 printf "\n=== Managing Resource Groups in Azure ===\n"
 
 printf "\n1. Creating a new resource group: %s and location: %s.\n" "$groupName" "$location"
-azure resource group new --name "$groupName" --location "$location"
+azure group create --name "$groupName" --location "$location"
 
 printf "\n2. Updating the group %s with tags.\n" "$groupName"
-azure resource group set --name "$groupName" --tags "[{\"Value\":\"testval\",\"Name\":\"testtag\"}]"
+azure group set --name "$groupName" --tags "[{\"Value\":\"testval\",\"Name\":\"testtag\"}]"
 
 printf "\n3. Get information about resource group : %s.\n" "$groupName"
-resourceGroupInfo=`azure resource group get --name $groupName`
-printf "\nThe resource group info is: \n %s\n" "$resourceGroupInfo"
+resourceGroupInfo=`azure group get --name $groupName`
+
+printf "\nValidating resource group name is: %s\n" "$groupName"
+[ $(echo $resourceGroupInfo | jq '.ResourceGroupName' --raw-output) == "$groupName" ]
 
 printf "\n4. Listing all resource groups in the subscription.\n"
-azure resource group get
+azure group get
 
 printf "\n5. Removing resource group: %s.\n" "$groupName"
-azure resource group remove --name "$groupName" --force
+azure group remove --name "$groupName" --force

tools/CLU/BuildAndInstallClu.bat

@@ -33,4 +33,6 @@ copy /Y %~dp0\azure.sh %root%\drop\clurun\osx.10.10-x64
 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 %~dp0\azure.sh %root%\drop\clurun\ubuntu.14.04-x64
+copy /Y %~dp0\azure.sh %root%\drop\clurun\ubuntu.14.04-x64
+
+copy /Y %~dp0\azure %root%\drop\clurun\win7-x64