Skip to content

Commit 707df41

Browse files
BurtBielBurtBiel
committed
Merge pull request #6 from Azure/clu
Clu
2 parents a3b2e12 + 6bb4338 commit 707df41

File tree

641 files changed

+10110
-639
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

641 files changed

+10110
-639
lines changed

‎examples/compute-management/02-VirtualMachineCreation.sh

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@ printf "\n1. Creating a new resource group: %s and location: %s.\n" "$groupName"
66
az resourcemanager group create -n "$groupName" --location "$location"
77

88
printf "\n2. Creating a new storage account '%s' in type '%s'.\n" "$storageAccountName" "$storageAccountType"
9-
az storage account new --resourcegroupname "$groupName" --name "$storageAccountName" --location "$location" --type "$storageAccountType"
9+
az storage account create--resourcegroupname "$groupName" --name "$storageAccountName" --location "$location" --type "$storageAccountType"
1010

1111
printf "\n3. Create virtual network.\n"
12-
result=`az vnet new --resourcegroupname "$groupName" --name test --location "$location" --addressprefix "[\"10.0.0.0/16\"]" --subnet "[{\"Name\":\"test\",\"AddressPrefix\":\"10.0.0.0/24\"}]" --force`
12+
result=`az vnet create--resourcegroupname "$groupName" --name test --location "$location" --addressprefix "[\"10.0.0.0/16\"]" --subnet "[{\"Name\":\"test\",\"AddressPrefix\":\"10.0.0.0/24\"}]" --force`
1313

1414
contextResult=`az context ls`
1515

@@ -19,7 +19,7 @@ subnetId="/subscriptions/$subId/resourceGroups/$groupName/providers/Microsoft.Ne
1919

2020
printf "\n4. Create network interface with:\r\nsubId='%s' \r\n& \r\nsubnetId='$subnetId'.\n" "$subId"
2121
export MSYS_NO_PATHCONV=1
22-
az networkinterface new --name test --resourcegroupname "$groupName" --location "$location" --subnetid "$subnetId"
22+
az networkinterface create--name test --resourcegroupname "$groupName" --location "$location" --subnetid "$subnetId"
2323
export MSYS_NO_PATHCONV=
2424

2525
nicId="/subscriptions/$subId/resourceGroups/$groupName/providers/Microsoft.Network/networkInterfaces/test"
@@ -30,7 +30,7 @@ vmStr="{\"Name\":\"test\",\"HardwareProfile\":{\"VmSize\":\"Standard_A1\"},\"Net
3030

3131
printf "\n5. Create virtual machine with\r\nnicId='%s'\r\nvhdUri='%s'\r\nvmStr='%s'\n" "$nicId" "$vhdUri" "$vmStr"
3232

33-
az vm new --resourcegroupname "$groupName" --location "$location" --vmprofile "$vmStr"
33+
az vm create--resourcegroupname "$groupName" --location "$location" --vmprofile "$vmStr"
3434

3535
printf "\n6. Removing resource group: %s.\n" "$groupName"
3636
az resourcemanager group rm -n "$groupName" -f

‎examples/lib/loginService.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
#!/bin/env/bash
2-
az account add --spn --appid "$spn" --secret "$secret" -t "$tenant" -s "$spnSubscription"
2+
az login --spn --appid "$spn" --secret "$secret" -t "$tenant" -s "$spnSubscription"

‎examples/lib/loginUser.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
#!/bin/env/bash
2-
az account add -u "$azureUser" -p "$password" -s "$userSubscription"
2+
az login -u "$azureUser" -p "$password" -s "$userSubscription"

‎examples/resource-management/02-Resource.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ destinationGroupName=$groupName"Destination"
88

99
printf "\n2. Registering Resource Provider Namespace.\n"
1010
providerNamespace="Providers.Test"
11-
az resourcemanager resource resourcemanager provider register --ProviderNamespace $providerNamespace --Force
11+
az resourcemanager resource provider register --ProviderNamespace $providerNamespace --Force
1212

1313
printf "\n3. Creating a new Resource: %s.\n" "$resourceName"
1414
resourceType="$providerNamespace/statefulResources"
@@ -33,13 +33,13 @@ az resourcemanager resource set --ResourceGroupName $groupName --ResourceName $r
3333

3434
printf "\n7. Move Resource to resource group: %s.\n" "$destinationGroupName"
3535
az resourcemanager group create --name "$destinationGroupName" --location "$location"
36-
resourceId=$(echo $resourceInfo | jq '.Id')
36+
resourceId=$(echo $resourceInfo | jq '.ResourceId')
3737
arrayId="[$resourceId]"
3838
az resourcemanager resource move -g "$destinationGroupName" --ResourceId "$arrayId" -f
3939

4040
printf "\n8. Removing resource: %s.\n" "$resourceName"
4141
foundResource=$(az resourcemanager resource find -n "$resourceName" -t $resourceType)
42-
resourceId=$(echo $foundResource | jq '.Id' --raw-output)
42+
resourceId=$(echo $foundResource | jq '.ResourceId' --raw-output)
4343
echo $resourceId
4444
export MSYS_NO_PATHCONV=1
4545
az resourcemanager resource rm --Id "$resourceId" -f

‎examples/webapp-management/01-AppServicePlan.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ setPlanInfo=`az appservice plan set -n $whpName -g $groupName --tier $newTier --
3333
[ $(echo $setPlanInfo | jq '.sku.tier' --raw-output) == "$newTier" ]
3434
[ $(echo $setPlanInfo | jq '.sku.capacity' --raw-output) -eq $newCapacity ]
3535
[ $(echo $setPlanInfo | jq '.sku.name' --raw-output) == "D1" ]
36-
[ $(echo $setPlanInfo | jq '.["properties.geoRegion"]' --raw-output) == "West US" ]
36+
[ $(echo $setPlanInfo | jq '.["geoRegion"]' --raw-output) == "West US" ]
3737

3838
whpName2=`randomName testplan`
3939
printf "\n4. Creating a new app service plan: %s" "$whpName2"

‎examples/webapp-management/02-WebAppSlot.sh

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ set -e
33
printf "\n=== Managing Web App Slot in Azure ===\n"
44

55
pingwebapp() {
6-
url=`echo "$1" | jq '."properties.hostNames"[0]' --raw-output`
6+
url=`echo "$1" | jq '."HostNames"[0]' --raw-output`
77
curl -I `echo "$url"`
88
}
99

@@ -27,18 +27,18 @@ printf "\n2. Create a new web app %s " "$appName1"
2727
webappInfo1=`az appservice create -g "$groupName" -n "$appName1" -l "$location" --plan "$planName1"`
2828

2929
printf "\nValidating web app name %s " "$appName1"
30-
[ $(echo $webappInfo1 | jq '.name' --raw-output) == "$appName1" ]
30+
[ $(echo $webappInfo1 | jq '.Name' --raw-output) == "$appName1" ]
3131

3232
printf "\n3. Create a web app slot %s " "$slotname1"
3333
slot1=`az appservice slot create -g "$groupName" --plan "$planName1" -n "$appName1" --slot "$slotname1"`
3434
appWithSlotName1="$appName1/$slotname1"
3535

3636
printf "\nValidating web app slot %s " "$slotname1"
37-
[ $(echo $slot1 | jq '.name' --raw-output) == "$appWithSlotName1" ]
37+
[ $(echo $slot1 | jq '.Name' --raw-output) == "$appWithSlotName1" ]
3838

3939
printf "\nValidating web app slot get for %s " "$slotname1"
4040
slot1=`az appservice slot ls -g "$groupName" -n "$appName1" --slot "$slotname1"`
41-
[ $(echo $slot1 | jq '.name' --raw-output) == "$appWithSlotName1" ]
41+
[ $(echo $slot1 | jq '.Name' --raw-output) == "$appWithSlotName1" ]
4242

4343
printf "\nValidating web app slot via pipline obj for %s " "$slotname1"
4444
slot1=`echo "$webappInfo1" | az appservice slot ls --slot "$slotname1"`
@@ -49,22 +49,22 @@ appWithSlotName2="$appName1/$slotname2"
4949

5050
printf "\n5. Get the webapp slots:"
5151
slots=`az appservice slot ls -g "$groupName" -n "$appName1"`
52-
slotN1=`echo $slots | jq '.[0].name'`
53-
slotN2=`echo $slots | jq '.[1].name'`
52+
slotN1=`echo $slots | jq '.[0].Name'`
53+
slotN2=`echo $slots | jq '.[1].Name'`
5454
slotNames=`echo $slotN1 $slotN2`
5555

5656
printf "\nValidating web app slots %s " "$slotname1 and $slotname2"
5757
[[ $slotNames == *"$appWithSlotName1"* ]]
5858
[[ $slotNames == *"$appWithSlotName2"* ]]
5959

6060
printf "\n6. Change web app slot %s service plan" "$slotname2"
61-
servicePlanInfo2=`az app service plan create -n "$planName2" -g "$groupName" -l "$location" --tier "$tier2"`
61+
servicePlanInfo2=`az appservice plan create -n "$planName2" -g "$groupName" -l "$location" --tier "$tier2"`
6262
# slot3=`az appservice slot create -g "$groupName" --plan "$planName3" -n "$appName" --slot "$slotname2"`
6363
slot1=`az appservice slot set -g "$groupName" -n "$appName1" --slot "$slotname1" --plan "$planName2"`
6464

6565
printf "\nValidating web app slots %s " "$slotname1"
66-
[ $(echo $slot1 | jq '.name' --raw-output) == "$appName1/$slotname1" ]
67-
[[ $(echo $slot1 | jq '."properties.serverFarmId"') == *"$planName2"* ]]
66+
[ $(echo $slot1 | jq '.Name' --raw-output) == "$appName1/$slotname1" ]
67+
[[ $(echo $slot1 | jq '."ServerFarmId"') == *"$planName2"* ]]
6868

6969
printf "\n7. Set web app slot %s config properties"
7070
# Unable to test pipline. verity property name and value instead.
@@ -77,11 +77,11 @@ slot1=`az appservice slot set -g "$groupName" --plan "$planName1" -n "$appName1"
7777
printf "\n9. Get web app slot %s publishing profile" "$slotname1"
7878
outputFile1="webappslot-profile-1"
7979
outputFile2="webappslot-profile-2"
80-
az appservice slot profile get -g "$groupName" -n "$appName1" --slot "$slotname1" --outputfile "$outputFile1"
80+
az appservice slot profile ls -g "$groupName" -n "$appName1" --slot "$slotname1" --outputfile "$outputFile1"
8181

8282
printf "\n10. Get web app slot %s publishing profile via pipline obj" "$slotname1"
8383
# Unable to test pipline. verity property name and value instead.
84-
# echo "$slot1" | az appservice slot profile get --outputfile "$outputFile2"
84+
# echo "$slot1" | az appservice slot profile ls --outputfile "$outputFile2"
8585

8686
printf "\nValidating web app slot profile output file"
8787
[ -s "$outputFile1" ]
@@ -100,72 +100,72 @@ metrics=`az appservice slot metrics ls -g "$groupName" -n "$appName1" --slot "$s
100100

101101
printf "\nValidating web app slot metrics via pipline obj %s " "$slotname1"
102102
# Unable to test pipline. verity property name and value instead.
103-
# echo "$slot1" | az appservice slot metrics get --metrics "$metricsNames" --starttime "$startTime" --endtime "$endTime" --granularity PT1M
103+
# echo "$slot1" | az appservice slot metrics ls --metrics "$metricsNames" --starttime "$startTime" --endtime "$endTime" --granularity PT1M
104104

105105
printf "\n12. Stop web app slot: %s." "$slotname1"
106106
slot1=`echo "$slot1" | az appservice slot stop`
107107
printf "\nValidating web app slot %s stopped " "$slotname1"
108-
[ $(echo $slot1 | jq '."properties.state"' --raw-output) == "Stopped" ]
108+
[ $(echo $slot1 | jq '."State"' --raw-output) == "Stopped" ]
109109

110110
printf "\n13 Stop web app slot: %s." "$slotname1"
111111
slot1=`echo "$slot1" | az appservice slot start`
112112
printf "\nValidating web app slot %s running " "$slotname1"
113-
[ $(echo $slot1 | jq '."properties.state"' --raw-output) == "Running" ]
113+
[ $(echo $slot1 | jq '."State"' --raw-output) == "Running" ]
114114

115115
printf "\n14 Stop web app slot: %s." "$slotname1"
116116
slot1=`echo "$slot1" | az appservice slot stop`
117117
printf "\nValidating web app slot %s stopped " "$slotname1"
118-
[ $(echo $slot1 | jq '."properties.state"' --raw-output) == "Stopped" ]
118+
[ $(echo $slot1 | jq '."State"' --raw-output) == "Stopped" ]
119119

120120
printf "\n15 Stop web app slot: %s." "$slotname1"
121121
slot1=`echo "$slot1" | az appservice slot start`
122122
printf "\nValidating web app slot %s running " "$slotname1"
123-
[ $(echo $slot1 | jq '."properties.state"' --raw-output) == "Running" ]
123+
[ $(echo $slot1 | jq '."State"' --raw-output) == "Running" ]
124124

125125
printf "\n16 Restart web app slot: %s." "$slotname1"
126126
slot1=`az appservice slot restart -g "$groupName" -n "$appName1" --slot "$slotname1"`
127127
printf "\nValidating web app slot %s Running " "$slotname1"
128-
[ $(echo $slot1 | jq '."properties.state"' --raw-output) == "Running" ]
128+
[ $(echo $slot1 | jq '."State"' --raw-output) == "Running" ]
129129

130130
printf "\n17 Restart web app slot: %s with pipline object." "$slotname1"
131131
slot1=`echo "$slot1" | az appservice slot restart`
132132
printf "\nValidating web app slot %s Running " "$slotname1"
133-
[ $(echo $slot1 | jq '."properties.state"' --raw-output) == "Running" ]
133+
[ $(echo $slot1 | jq '."State"' --raw-output) == "Running" ]
134134

135135
# Need to create a 'Premium' plan for clone test
136136
printf "\n18. Create a new web app for clone testing"
137137
location1="eastus"
138138

139-
az app service plan set -n "$planName1" -g "$groupName" --tier "$tier2"
139+
az appservice plan set -n "$planName1" -g "$groupName" --tier "$tier2"
140140
webappInfo2=`az appservice create -g "$groupName" -n "$appName3" -l "$location" --plan "$planName1"`
141141

142142
printf "\n19. Clone web app slot to a slot."
143143
slotClone=`az appservice slot create -g "$groupName" -n "$appName3" --slot "$slotname3" --sourcewebapp "$webappInfo2"`
144144
appWithSlotNameClone="$appName3/$slotname3"
145145

146146
printf "\nValidating cloned web app slot %s " "$slotname3"
147-
[ $(echo $slotClone | jq '.name' --raw-output) == "$appWithSlotNameClone" ]
147+
[ $(echo $slotClone | jq '.Name' --raw-output) == "$appWithSlotNameClone" ]
148148

149149
printf "\nValidating web app slot get for %s " "$slotname3"
150-
slotClone=`az appservice slot get -g "$groupName" -n "$appName3" --slot "$slotname3"`
151-
[ $(echo $slotClone | jq '.name' --raw-output) == "$appWithSlotNameClone" ]
150+
slotClone=`az appservice slot ls -g "$groupName" -n "$appName3" --slot "$slotname3"`
151+
[ $(echo $slotClone | jq '.Name' --raw-output) == "$appWithSlotNameClone" ]
152152

153153
printf "\n20. Create a new web app for clone testing"
154154
slot2=`az appservice slot create -g "$groupName" --plan "$planName1" -n "$appName3" --slot "$slotname3"`
155155

156156
printf "\n21. Create a new web app for clone testing"
157-
servicePlan=`az app service plan create -n "$planName3" -g "$groupName" -l "$location1" --tier "$tier2"`
157+
servicePlan=`az appservice plan create -n "$planName3" -g "$groupName" -l "$location1" --tier "$tier2"`
158158
webappInfo3=`az appservice create -g "$groupName" -n "$appName4" -l "$location1" --plan "$planName3"`
159159
slot3=`az appservice slot create -g "$groupName" --plan "$planName3" -n "$appName4" --slot "$slotname3" --sourcewebapp "$slot2"`
160160

161-
printf "\nValidating web app slot get for %s " "$slotname3"
161+
printf "\nValidating web app slot ls for %s " "$slotname3"
162162
appWithSlotName3="$appName4/$slotname3"
163-
[ $(echo $slot3 | jq '.name' --raw-output) == "$appWithSlotName3" ]
163+
[ $(echo $slot3 | jq '.Name' --raw-output) == "$appWithSlotName3" ]
164164

165165
# Cleanup
166166
printf "\n22. Remove web app slot: %s." "$slotname1"
167167
az appservice slot rm -g "$groupName" -n "$appName1" --slot "$slotname1" --force
168168
az appservice slot rm -g "$groupName" -n "$appName1" --slot "$slotname2" --force
169169

170170
printf "\n23. Remove resource group: %s." "$groupName"
171-
az group rm --name "$groupName" --force
171+
az resourcemanager group rm --name "$groupName" --force

‎examples/webapp-management/03-WebApp.sh

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ result=`az appservice ls -g "$groupName" -n "$appName1"`
2424
printf "\n3: Creating a new webapp: %s under resource group: %s.\n" "$appName2" "$groupName"
2525
actual2=`az appservice create -g "$groupName" -l "$location" -n "$appName2" --plan "$planName1"`
2626
[ $(echo $actual2 | jq '.name' --raw-output) == "$appName2" ]
27-
[ $(echo $actual2 | jq '."properties.serverFarmId"' --raw-output) == $(echo $serverFarm | jq '.id' --raw-output) ]
27+
[ $(echo $actual2 | jq '."serverFarmId"' --raw-output) == $(echo $serverFarm | jq '.id' --raw-output) ]
2828

2929
printf "\n4: Get WebApp by ResourceGroup: %s.\n" "$groupName"
3030
count=`az appservice ls -g "$groupName"`
@@ -55,33 +55,33 @@ serverFarm2=`az appservice plan create -n "$planName2" -g "$groupName" -l "$loca
5555
printf "\n10: Change webapp: %s to new service plan: %s\n" "$appName2" "$planName2"
5656
changePlan=`az appservice set -g "$groupName" -n $appName2 --plan $planName2`
5757
[ $(echo $changePlan | jq '.name' --raw-output) == "$appName2" ]
58-
[ $(echo $changePlan | jq '."properties.serverFarmId"' --raw-output) == $(echo $serverFarm2 | jq '.id' --raw-output) ]
58+
[ $(echo $changePlan | jq '."serverFarmId"' --raw-output) == $(echo $serverFarm2 | jq '.id' --raw-output) ]
5959

6060
printf "\n11: Set config properties 'httpLoggingEnabled' & 'requestTracingEnabled' of the webapp: %s to true.\n" "$appName2"
61-
changePlan=`echo $changePlan | jq '."properties.siteConfig"."properties.httpLoggingEnabled"'=true`
62-
changePlan=`echo $changePlan | jq '."properties.siteConfig"."properties.requestTracingEnabled"'=true`
61+
changePlan=`echo $changePlan | jq '."siteConfig"."httpLoggingEnabled"'=true`
62+
changePlan=`echo $changePlan | jq '."siteConfig"."requestTracingEnabled"'=true`
6363
changePlan=`echo $changePlan | az appservice set`
6464
[ $(echo $changePlan | jq '.name' --raw-output) == "$appName2" ]
65-
[ $(echo $changePlan | jq '."properties.serverFarmId"' --raw-output) == $(echo $serverFarm2 | jq '.id' --raw-output) ]
66-
[ $(echo $changePlan | jq '."properties.siteConfig"."properties.httpLoggingEnabled"' --raw-output) == true ]
67-
[ $(echo $changePlan | jq '."properties.siteConfig"."properties.requestTracingEnabled"' --raw-output) == true ]
65+
[ $(echo $changePlan | jq '."serverFarmId"' --raw-output) == $(echo $serverFarm2 | jq '.id' --raw-output) ]
66+
[ $(echo $changePlan | jq '."siteConfig"."httpLoggingEnabled"' --raw-output) == true ]
67+
[ $(echo $changePlan | jq '."siteConfig"."requestTracingEnabled"' --raw-output) == true ]
6868

6969
printf "\n12: Set appsettings and connectionstrings of the webapp: %s.\n" "$appName2"
7070
appsettings="{\"setting1\":\"valueA\",\"setting2\":\"valueB\"}"
7171
constr="{ \"connstring1\": { \"Type\": \"MySql\", \"Value\": \"string value 1\" }, \"connstring2\": { \"Type\": \"SqlAzure\", \"Value\": \"string value 2\" } }"
7272

7373
setconn=`az appservice set -g "$groupName" -n "$appName2" --appsettings "$appsettings" --connectionstrings "$constr"`
7474
[ $(echo $setconn | jq '.name' --raw-output) == "$appName2" ]
75-
[ $(echo $setconn | jq '."properties.siteConfig"."properties.appSettings" | length') -eq 2 ]
76-
[ $(echo $setconn | jq '."properties.siteConfig"."properties.connectionStrings" | length') -eq 2 ]
75+
[ $(echo $setconn | jq '."siteConfig"."appSettings" | length') -eq 2 ]
76+
[ $(echo $setconn | jq '."siteConfig"."connectionStrings" | length') -eq 2 ]
7777

78-
app=`echo $setconn | jq -r '."properties.siteConfig"."properties.appSettings"'`
78+
app=`echo $setconn | jq -r '."siteConfig"."appSettings"'`
7979
[ $(echo $app | jq -r '.[0].name') == "setting2" ]
8080
[ $(echo $app | jq -r '.[0].value') == "valueB" ]
8181
[ $(echo $app | jq -r '.[0].name') == "setting1" ]
8282
[ $(echo $app | jq -r '.[0].value') == "valueA" ]
8383

84-
conexn=`echo $setconn | jq -r '."properties.siteConfig"."properties.connectionStrings"'`
84+
conexn=`echo $setconn | jq -r '."siteConfig"."connectionStrings"'`
8585
[ $(echo $conexn | jq -r '.[0].name') == "connstring1" ]
8686
[[ $(echo $conexn | jq -r '.[0].connectionString') == "string value 1" ]]
8787
[ $(echo $conexn | jq -r '.[0].type') == "MySql" ]
@@ -92,27 +92,27 @@ conexn=`echo $setconn | jq -r '."properties.siteConfig"."properties.connectionSt
9292
printf "\n13: Stop the webapp: %s.\n" "$appName2"
9393
stop=`az appservice stop -g "$groupName" -n "$appName2"`
9494
[ $(echo $stop | jq '.name' --raw-output) == "$appName2" ]
95-
[ $(echo $stop | jq '."properties.state"' --raw-output) == "Stopped" ]
95+
[ $(echo $stop | jq '."state"' --raw-output) == "Stopped" ]
9696

9797
printf "\n14: Start the webapp: %s.\n" "$appName2"
9898
start=`az appservice start -g "$groupName" -n "$appName2"`
9999
[ $(echo $start | jq '.name' --raw-output) == "$appName2" ]
100-
[ $(echo $start | jq '."properties.state"' --raw-output) == "Running" ]
100+
[ $(echo $start | jq '."state"' --raw-output) == "Running" ]
101101

102102
printf "\n15: Stop the webapp: %s again.\n" "$appName2"
103103
stop=`az appservice stop -g "$groupName" -n "$appName2"`
104104
[ $(echo $stop | jq '.name' --raw-output) == "$appName2" ]
105-
[ $(echo $stop | jq '."properties.state"' --raw-output) == "Stopped" ]
105+
[ $(echo $stop | jq '."state"' --raw-output) == "Stopped" ]
106106

107107
printf "\n16: Start the webapp: %s again.\n" "$appName2"
108108
start=`az appservice start -g "$groupName" -n "$appName2"`
109109
[ $(echo $start | jq '.name' --raw-output) == "$appName2" ]
110-
[ $(echo $start | jq '."properties.state"' --raw-output) == "Running" ]
110+
[ $(echo $start | jq '."state"' --raw-output) == "Running" ]
111111

112112
printf "\n17: Restart the webapp: %s.\n" "$appName2"
113113
start=`az appservice restart -g "$groupName" -n "$appName2"`
114114
[ $(echo $start | jq '.name' --raw-output) == "$appName2" ]
115-
[ $(echo $start | jq '."properties.state"' --raw-output) == "Running" ]
115+
[ $(echo $start | jq '."state"' --raw-output) == "Running" ]
116116

117117
printf "\n18: Creating a new app service plan: %s under resource group: %s with Premium tier.\n" "$planName3" "$groupName"
118118
serverFarm3=`az appservice plan create -n "$planName3" -g "$groupName" -l "$location" --tier "$tier3"`

‎src/CLU/Commands.Common.ScenarioTest/ExamplesTests/ResourceManagementTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ public void DeploymentsTest()
5555
public void RoleAssignmentsTest()
5656
{
5757
var helper = _collectionState
58-
.LoginAsUser()
58+
.LoginAsService()
5959
.GetRunner("resource-management")
6060
.RunScript("04-RoleAssignments");
6161
}

‎src/CLU/Commands.Common/AzurePSCmdlet.cs

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -224,14 +224,14 @@ public static bool IsDataCollectionAllowed()
224224
//TODO: CLU - remove before final release
225225
return true;
226226

227-
if (_dataCollectionProfile != null &&
228-
_dataCollectionProfile.EnableAzureDataCollection.HasValue &&
229-
_dataCollectionProfile.EnableAzureDataCollection.Value)
230-
{
231-
return true;
232-
}
227+
//if (_dataCollectionProfile != null &&
228+
// _dataCollectionProfile.EnableAzureDataCollection.HasValue &&
229+
// _dataCollectionProfile.EnableAzureDataCollection.Value)
230+
//{
231+
// return true;
232+
//}
233233

234-
return false;
234+
//return false;
235235
}
236236

237237
/// <summary>

0 commit comments

Comments
 (0)