Merge branch 'clu' of github.com:Azure/azure-powershell into webapp-test

Author: Hao Chen

clu-getstart.md

@@ -63,7 +63,7 @@ To test on osx/linux boxes, do #1, open `<repo-root>\drop\clurun`, copy the flav
 (All of those are subject to change, contact yugangw or adxsdkdev for any questions)
 
 ### Quick introductions on cmdlets
-  *  Run commands using the ‘az’ prefix, cmdlet nouns, and cmdlet verbs, for example, `az environment get` maps to the cmdlet `Get-AzureRmEnvironment`
+  *  Run commands using the ‘az’ prefix, cmdlet nouns, and cmdlet verbs, for example, `az env get` maps to the cmdlet `Get-AzureRmEnvironment`
   *  Cmdlet parameters use the double dash (--) so for example, getting a subscription with a particular name would be: `az subscription get –-SubscriptionName “name of subscription"`
   * To log in, 3 options
     * login interactively using device flow, this is the only option for msa account or any org-id with 2fa enforced, example: `az account add`
@@ -73,14 +73,14 @@ To test on osx/linux boxes, do #1, open `<repo-root>\drop\clurun`, copy the flav
     ```az subscription get --SubscriptionName | az context set```
   * You can capture piped output using redirection to a file - the result will be the json serialization of the output object.
     ```az subscription get > subscriptions.json```
-  * You can use file input tu aparameter using '@' notation:
+  * You can use file input to a parameter using '@' notation:
     ```az command --param1 @file1.json```
     Reads input from file1.json and attempts to deserialize the .net object that is the Parameter type for ```param1```
     ```az command --param1 @@file1.json```
     Does the same thing, but treats the input from ```file1.json``` as if it come from the pipeline, so that multiple objects will result in multiple invocations of ```ProcessRecord()``` for the target cmdlet.
   * There are some known issues with the current approach to sessions, which can cause session variables to not be propagated when running cmdlets in a pipeline, to work around this, set the 'CmdletSessionId' environment variable to a numeric value - all cmdlets running from the shell will use that session id, and sessions will work with pipelining 
 
-    ```set CmdletSessionId=1010 ```
+    ```set AzureProfile=1010 ```
 
 ### Testing Cmdlets
 
@@ -119,7 +119,8 @@ Please set the environment variables for either Username/Password (no 2FA) or Se
 
 - To implement an xunit bash scenario test you must
   - Add a ```[Collection("SampleCollection")]``` attribute to your test class
-  - Add a field to your class of type ```ScenarioTestFixture``` and add a constructor that initializes it
+  - Add a field to your class of type ```ScenarioTestFixture``` and add a constructor that initializes it.
+  
     ```C#
     [Collection("SampleCollection")]
     public class SampleTestClass

examples/webapp-management/01-AppServicePlan.sh

@@ -9,13 +9,13 @@ tier="Standard"
 size="Medium"
 capacity=2
 skuName="S2"
-azure group create --name "$groupName" --location "$location"
+az group create --name "$groupName" --location "$location"
 
 printf "\n1. Create a new app service plan %s " "$whpName"
-azure app service plan create -n "$whpName" -g "$groupName" -l "$location" --tier "$tier" --size "$size" --workers "$capacity"
+az app service plan create -n "$whpName" -g "$groupName" -l "$location" --tier "$tier" --size "$size" --workers "$capacity"
 
 printf "\n2. Get information about the app service plan : %s.\n" "$whpName"
-whpInfo=`azure app service plan get --name $whpName --group $groupName`
+whpInfo=`az app service plan get --name $whpName --group $groupName`
 
 printf "\nValidating app service plan name: %s\n" "$whpName"
 [ $(echo $whpInfo | jq '.name' --raw-output) == "$whpName" ]
@@ -28,7 +28,7 @@ printf "\n3. Set the appservice plan: %s " "$whpName"
 newTier="Shared"
 newCapacity=0
 newSize="Medium"
-setPlanInfo=`azure app service plan set -n $whpName -g $groupName --tier $newTier --workers --workers $newCapacity --size $newSize`
+setPlanInfo=`az app service plan set -n $whpName -g $groupName --tier $newTier --workers --workers $newCapacity --size $newSize`
 [ $(echo $setPlanInfo | jq '.name' --raw-output) == "$whpName" ]
 [ $(echo $setPlanInfo | jq '.sku.tier' --raw-output) == "$newTier" ]
 [ $(echo $setPlanInfo | jq '.sku.capacity' --raw-output) -eq $newCapacity ]
@@ -38,32 +38,32 @@ setPlanInfo=`azure app service plan set -n $whpName -g $groupName --tier $newTie
 whpName2=`randomName testplan`
 printf "\n4. Creating a new app service plan: %s" "$whpName2"
 location2="East US"
-azure app service plan create -n "$whpName2" -g "$groupName" -l "$location2" --tier "$tier" --size "$size" --workers "$capacity"
+az app service plan create -n "$whpName2" -g "$groupName" -l "$location2" --tier "$tier" --size "$size" --workers "$capacity"
 
 printf "\n5. Get All app service plans by name: %s" "$whpName2"
-whpInfo2=`azure app service plan get --name $whpName2`
+whpInfo2=`az app service plan get --name $whpName2`
 [ $(echo $whpInfo | jq '.name' --raw-output) == "$whpName2" ]
 [ $(echo $whpInfo | jq '.location' --raw-output) == "$location2" ]
 [ $(echo $whpInfo | jq '.sku.tier' --raw-output) == "$tier" ]
 [ $(echo $whpInfo | jq '.sku.name' --raw-output) == "$skuName" ]
 [ $(echo $whpInfo | jq '.sku.capacity' --raw-output) -eq $capacity ]
 
 printf "\n6. Get All app service plans by resource group: %s" "$groupName"
-plansByGroup=`azure app service plan get --group $groupName`
+plansByGroup=`az app service plan get --group $groupName`
 [  $plansByGroup == *"$whpName"* ]
 [  $plansByGroup == *"$whpName2"* ]
 
 printf "\n7. Get All app service plans by location: %s" "$location2"
-plansByLocation=`azure app service plan get -l $location2`
+plansByLocation=`az app service plan get -l $location2`
 [  $plansByLocation == *"$whpName2"* ]
 
 printf "\n8. Get All app service plans in a subscription."
-plansInSubscription=`azure app service plan get`
+plansInSubscription=`az app service plan get`
 [  $plansInSubscription == *"$whpName"* ]
 [  $plansInSubscription == *"$whpName2"* ]
 
 printf "\n9. Remove app service plan: %s." "$whpName"
-azure app service plan remove -n $whpName -g $groupName
+az app service plan remove -n $whpName -g $groupName
 
 printf "\n10. Remove app service plan: %s." "$whpName2"
-azure app service plan remove -n $whpName2 -g $groupName
+az app service plan remove -n $whpName2 -g $groupName

examples/webapp-management/03-WebApp.sh

@@ -2,7 +2,7 @@
 printf "\n=== Managing Web Apps in Azure ===\n"
 
 printf "\nSetup: Creating a new resource group: %s at location: %s.\n" "$groupName" "$location"
-azure group create --name "$groupName" --location "$location"
+az group create --name "$groupName" --location "$location"
 
 appName1=`randomName testweb`
 appName2=`randomName testweb`
@@ -19,56 +19,56 @@ tier2="Standard"
 tier3="Premium"
 
 printf "\nSetup: Creating a new app service plan: %s under resource group: %s.\n" "$planName1" "$groupName"
-serverFarm=`azure app service plan create -n "$planName1" -g "$groupName" -l "$location" --tier "$tier1"`
+serverFarm=`az app service plan create -n "$planName1" -g "$groupName" -l "$location" --tier "$tier1"`
 
 printf "\n1: Creating a new webapp: %s under resource group: %s.\n" "$appName1" "$groupName"
-actual1=`azure webapp create -g "$groupName" -l "$location" -n "$appName1" --plan "$planName1"`
+actual1=`az webapp create -g "$groupName" -l "$location" -n "$appName1" --plan "$planName1"`
 
 printf "\n2: Getting info about webapp: %s.\n" "$appName1"
-result=`azure webapp get -g "$groupName" -n "$appName1"`
+result=`az webapp get -g "$groupName" -n "$appName1"`
 [ $(echo $result | jq '.Name' --raw-output) == "$appName1" ]
 [ $(echo $result | jq '.serverFarmId' --raw-output) == $(echo $serverFarm | jq '.id' --raw-output) ]
 
 printf "\n3: Creating a new webapp: %s under resource group: %s.\n" "$appName2" "$groupName"
-actual2=`azure webapp create -g "$groupName" -l "$location" -n "$appName2" --plan "$planName1"`
+actual2=`az webapp create -g "$groupName" -l "$location" -n "$appName2" --plan "$planName1"`
 [ $(echo $actual2 | jq '.name' --raw-output) == "$appName2" ]
 [ $(echo $actual2 | jq '."properties.serverFarmId"' --raw-output) == $(echo $serverFarm | jq '.id' --raw-output) ]
 
 printf "\n4: Get WebApp by ResourceGroup: %s.\n" "$groupName"
-count=`azure webapp get -g "$groupName"`
+count=`az webapp get -g "$groupName"`
 [ $(echo $count | jq -s '. | length') -eq 2 ]
 
 printf "\n5: Get WebApp by App Plan :%s.\n" "$planName1"
-count=`azure webapp get --plan "$serverFarm"`
+count=`az webapp get --plan "$serverFarm"`
 [ $(echo $count | jq -s '. | length') -eq 2 ]
 
 printf "\n6: Get WebApp by location :%s.\n" "$location"
-count=`azure webapp get -l "$location"`
+count=`az webapp get -l "$location"`
 [ $(echo $count | jq -s '. | length') -ge 2 ]
 
 printf "\n7: Get WebApp under the current subscription.\n"
-count=`azure webapp get`
+count=`az webapp get`
 [ $(echo $count | jq -s '. | length') -ge 2 ]
 
 printf "\n8: Get WebApp metrics ['CPU', 'Requests'] for webapp: %s" "$appName1"
 start=`date +"%Y-%m-%dT%H:%M:%SZ"`
-metricsInfo=`azure webapp metrics get -g "$groupName" -n "$appName1" --starttime "$start" --granularity PT1M --metrics "[\"CPU\", \"Requests\"]"`
+metricsInfo=`az webapp metrics get -g "$groupName" -n "$appName1" --starttime "$start" --granularity PT1M --metrics "[\"CPU\", \"Requests\"]"`
 [ $(echo $metricsInfo | jq -s '. | length') -eq 2 ]
 [ $(echo $metricsInfo | jq -sr '. [0].name.value') == "Requests" ] || [ $(echo $metricsInfo | jq -sr '. [0].name.value') == "CPU" ]
 [ $(echo $metricsInfo | jq -sr '. [1].name.value') == "CPU" ] || [ $(echo $metricsInfo | jq -sr '. [1].name.value') == "Requests" ]
 
 printf "\n9: Creating a new app service plan: %s under resource group: %s.\n" "$planName2" "$groupName"
-serverFarm2=`azure app service plan create -n "$planName2" -g "$groupName" -l "$location" --tier "$tier2"`
+serverFarm2=`az app service plan create -n "$planName2" -g "$groupName" -l "$location" --tier "$tier2"`
 
 printf "\n10: Change webapp: %s to new service plan: %s\n" "$appName2" "$planName2"
-changePlan=`azure webapp set -g "$groupName" -n $appName2 --plan $planName2`
+changePlan=`az webapp set -g "$groupName" -n $appName2 --plan $planName2`
 [ $(echo $changePlan | jq '.name' --raw-output) == "$appName2" ]
 [ $(echo $changePlan | jq '."properties.serverFarmId"' --raw-output) == $(echo $serverFarm2 | jq '.id' --raw-output) ]
 
 printf "\n11: Set config properties 'httpLoggingEnabled' & 'requestTracingEnabled' of the webapp: %s to true.\n" "$appName2"
 changePlan=`echo $changePlan | jq '."properties.siteConfig"."properties.httpLoggingEnabled"'=true`
 changePlan=`echo $changePlan | jq '."properties.siteConfig"."properties.requestTracingEnabled"'=true`
-changePlan=`echo $changePlan | azure webapp set`
+changePlan=`echo $changePlan | az webapp set`
 [ $(echo $changePlan | jq '.name' --raw-output) == "$appName2" ]
 [ $(echo $changePlan | jq '."properties.serverFarmId"' --raw-output) == $(echo $serverFarm2 | jq '.id' --raw-output) ]
 [ $(echo $changePlan | jq '."properties.siteConfig"."properties.httpLoggingEnabled"' --raw-output) == true ]
@@ -78,7 +78,7 @@ printf "\n12: Set appsettings and connectionstrings of the webapp: %s.\n" "$appN
 appsettings="{\"setting1\":\"valueA\",\"setting2\":\"valueB\"}"
 constr="{ \"connstring1\": { \"Type\": \"MySql\", \"Value\": \"string value 1\" }, \"connstring2\": { \"Type\": \"SqlAzure\", \"Value\": \"string value 2\" } }"
 
-setconn=`azure webapp set -g "$groupName" -n "$appName2" --appsettings "$appsettings" --connectionstrings "$constr"`
+setconn=`az webapp set -g "$groupName" -n "$appName2" --appsettings "$appsettings" --connectionstrings "$constr"`
 [ $(echo $setconn | jq '.name' --raw-output) == "$appName2" ]
 [ $(echo $setconn | jq '."properties.siteConfig"."properties.appSettings" | length') -eq 2 ]
 [ $(echo $setconn | jq '."properties.siteConfig"."properties.connectionStrings" | length') -eq 2 ]
@@ -98,89 +98,89 @@ conexn=`echo $setconn | jq -r '."properties.siteConfig"."properties.connectionSt
 [ $(echo $conexn | jq -r '.[1].type') == "SQLAzure" ]
 
 printf "\n13: Stop the webapp: %s.\n" "$appName2"
-stop=`azure webapp stop -g "$groupName" -n "$appName2"`
+stop=`az webapp stop -g "$groupName" -n "$appName2"`
 [ $(echo $stop | jq '.name' --raw-output) == "$appName2" ]
 [ $(echo $stop | jq '."properties.state"' --raw-output) == "Stopped" ]
 
 printf "\n14: Start the webapp: %s.\n" "$appName2"
-start=`azure webapp start -g "$groupName" -n "$appName2"`
+start=`az webapp start -g "$groupName" -n "$appName2"`
 [ $(echo $start | jq '.name' --raw-output) == "$appName2" ]
 [ $(echo $start | jq '."properties.state"' --raw-output) == "Running" ]
 
 printf "\n15: Stop the webapp: %s again.\n" "$appName2"
-stop=`azure webapp stop -g "$groupName" -n "$appName2"`
+stop=`az webapp stop -g "$groupName" -n "$appName2"`
 [ $(echo $stop | jq '.name' --raw-output) == "$appName2" ]
 [ $(echo $stop | jq '."properties.state"' --raw-output) == "Stopped" ]
 
 printf "\n16: Start the webapp: %s again.\n" "$appName2"
-start=`azure webapp start -g "$groupName" -n "$appName2"`
+start=`az webapp start -g "$groupName" -n "$appName2"`
 [ $(echo $start | jq '.name' --raw-output) == "$appName2" ]
 [ $(echo $start | jq '."properties.state"' --raw-output) == "Running" ]
 
 printf "\n17: Restart the webapp: %s.\n" "$appName2"
-start=`azure webapp restart -g "$groupName" -n "$appName2"`
+start=`az webapp restart -g "$groupName" -n "$appName2"`
 [ $(echo $start | jq '.name' --raw-output) == "$appName2" ]
 [ $(echo $start | jq '."properties.state"' --raw-output) == "Running" ]
 
 printf "\n18: Creating a new app service plan: %s under resource group: %s with Premium tier.\n" "$planName3" "$groupName"
-serverFarm3=`azure app service plan create -n "$planName3" -g "$groupName" -l "$location" --tier "$tier3"`
+serverFarm3=`az app service plan create -n "$planName3" -g "$groupName" -l "$location" --tier "$tier3"`
 [ $(echo $serverFarm3 | jq '.name' --raw-output) == "$planName3" ]
 
 printf "\n19: Changing plan: %s to Premium tier.\n" "$planName1"
-plan1set=`azure app service plan set -n "$planName1" -g "$groupName" --tier "$tier3"`
+plan1set=`az app service plan set -n "$planName1" -g "$groupName" --tier "$tier3"`
 [ $(echo $plan1set | jq '.sku.tier' --raw-output) == "$tier3" ]
 
 printf "\n20: Cloning a new webapp: %s from an existing webapp: %s.\n" "$appName3" "$appName1"
-clone=`azure webapp create -g "$groupName" -l "$location" -n "$appName3" --plan "$planName3" --sourcewebapp "$actual1"`
+clone=`az webapp create -g "$groupName" -l "$location" -n "$appName3" --plan "$planName3" --sourcewebapp "$actual1"`
 [ $(echo $clone | jq '.name' --raw-output) == "$appName3" ]
 
 printf "\n21: Get the newly created webapp: %s.\n" "$appName3"
-result3=`azure webapp get -g "$groupName" -n "$appName3"`
+result3=`az webapp get -g "$groupName" -n "$appName3"`
 [ $(echo $result3 | jq '.name' --raw-output) == "$appName3" ]
 
 #Need to ask the webapp team about the creation of traffic manager profile
 #printf "\n22: Creating a new app service plan: %s under resource group: %s with Premium tier.\n" "$planName4" "$groupName"
-#serverFarm4=`azure app service plan create -n "$planName4" -g "$groupName" -l "$location" --tier "$tier3"`
+#serverFarm4=`az app service plan create -n "$planName4" -g "$groupName" -l "$location" --tier "$tier3"`
 #[ $(echo $serverFarm4 | jq '.name' --raw-output) == "$planName4" ]
 
 #profileName=`randomName profile`
 #printf "\n23: Cloning a new webapp: %s from an existing webapp: %s with traffic manager profile: %s.\n" "$appName4" "$appName3" "$profileName"
-#cloneTraffic=`azure webapp create -g "$groupName" -l "$location" -n "$appName4" --plan "$planName4" --sourcewebapp "$clone" --trafficmanagerprofilename "$profileName"`
+#cloneTraffic=`az webapp create -g "$groupName" -l "$location" -n "$appName4" --plan "$planName4" --sourcewebapp "$clone" --trafficmanagerprofilename "$profileName"`
 #[ $(echo $cloneTraffic | jq '.name' --raw-output) == "$appName4" ]
 
 #printf "\n24: Get the newly created webapp: %s.\n" "$appName4"
-#result4=`azure webapp get -g "$groupName" -n "$appName4"`
+#result4=`az webapp get -g "$groupName" -n "$appName4"`
 #[ $(echo $result4 | jq '.name' --raw-output) == "$appName4" ]
 
 filename=`randomName pf`
 filename+=".xml"
 printf "\n25: Get the publish profile for webapp: %s and save it to %s file\n." "$appName3" "$filename"
-pubprof=`azure webapp profile get -g "$groupName" -n "$appName3" --outputfile "$filename"`
+pubprof=`az webapp profile get -g "$groupName" -n "$appName3" --outputfile "$filename"`
 [ -e "$filename" ]
 [ -s "$filename" ]
 
 printf "\n26: Reset the publish profile for webapp: %s.\n" "$appName3"
-azure webapp profile reset -g "$groupName" -n "$appName3"
+az webapp profile reset -g "$groupName" -n "$appName3"
 
 filename2=`randomName pf`
 filename2+=".xml"
 printf "\n27: Get the publish profile for webapp: %s after resetting and save it to %s file\n." "$appName3" "$filename2"
-pubprof2=`azure webapp profile get -g "$groupName" -n "$appName3" --outputfile "$filename2"`
+pubprof2=`az webapp profile get -g "$groupName" -n "$appName3" --outputfile "$filename2"`
 [ -e "$filename2" ]
 [ -s "$filename2" ]
 
 filename3=`randomName pf`
 filename3+=".xml"
 printf "\n28: Get the publish profile for webapp: %s in format FileZilla3 and save it to %s file\n." "$appName3" "$filename3"
-azure webapp profile get -g "$groupName" -n "$appName3" --outputfile "$filename3" --format "FileZilla3"
+az webapp profile get -g "$groupName" -n "$appName3" --outputfile "$filename3" --format "FileZilla3"
 [ -e "$filename3" ]
 [ -s "$filename3" ]
 
 printf "\n29:Remove created webapps: %s, %s, %s, %s.\n" "$appName1" "$appName2" "$appName3" "$appName4"
-azure webapp remove -g "$groupName" -n "$appName1" -f
-azure webapp remove -g "$groupName" -n "$appName2" -f
-azure webapp remove -g "$groupName" -n "$appName3" -f
-#azure webapp remove -g "$groupName" -n "$appName4" -f
+az webapp remove -g "$groupName" -n "$appName1" -f
+az webapp remove -g "$groupName" -n "$appName2" -f
+az webapp remove -g "$groupName" -n "$appName3" -f
+#az webapp remove -g "$groupName" -n "$appName4" -f
 
 printf "\n30:Remove the resource group: %s.\n" "$groupName"
-deleterg=`azure group remove -n "$groupName" --force`
+deleterg=`az group remove -n "$groupName" --force`