Skip to content

Commit f0c250f

Browse files
markcowlmarkcowl
authored
Merge pull request Azure#9678 from omprakaashve/master
Added Confirmation Message to Stop-AzDataBoxJob and Remove-AzDataBoxJob
2 parents aeee5fc + 63af80d commit f0c250f

24 files changed

+2044
-1054
lines changed

‎src/DataBox/DataBox.Test/ScenarioTests/DataBoxTests.ps1

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,8 @@ function Test-GetCredentialForNewlyCreatedJob
5555
}
5656
finally
5757
{
58-
Stop-AzDataBoxJob -ResourceGroupName $rgname -Name $dfname -Reason "Random"
59-
Remove-AzDataBoxJob -ResourceGroupName $rgname -Name $dfname
58+
Stop-AzDataBoxJob -ResourceGroupName $rgname -Name $dfname -Reason "Random" -Force
59+
Remove-AzDataBoxJob -ResourceGroupName $rgname -Name $dfname -Force
6060
Remove-AzStorageAccount -ResourceGroupName $rgname -Name $storageaccountname
6161
}
6262
}
@@ -100,8 +100,8 @@ function Test-CreateDataBoxJob
100100
}
101101
finally
102102
{
103-
Stop-AzDataBoxJob -ResourceGroupName $rgname -Name $dfname -Reason "Random"
104-
Remove-AzDataBoxJob -ResourceGroupName $rgname -Name $dfname
103+
Stop-AzDataBoxJob -ResourceGroupName $rgname -Name $dfname -Reason "Random" -Force
104+
Remove-AzDataBoxJob -ResourceGroupName $rgname -Name $dfname -Force
105105
Remove-AzStorageAccount -ResourceGroupName $rgname -Name $storageaccountname
106106
}
107107
}
@@ -132,8 +132,8 @@ function Test-CreateAlreadyExistingDataBoxJob
132132
}
133133
finally
134134
{
135-
Stop-AzDataBoxJob -ResourceGroupName $rgname -Name $dfname -Reason "Random"
136-
Remove-AzDataBoxJob -ResourceGroupName $rgname -Name $dfname
135+
Stop-AzDataBoxJob -ResourceGroupName $rgname -Name $dfname -Reason "Random" -Force
136+
Remove-AzDataBoxJob -ResourceGroupName $rgname -Name $dfname -Force
137137
Remove-AzStorageAccount -ResourceGroupName $rgname -Name $storageaccountname
138138
}
139139
}
@@ -158,17 +158,16 @@ function Test-StopDataBoxJob
158158
try
159159
{
160160
Create-Job $dfname $rgname $storageaccount.Id
161-
Stop-AzDataBoxJob -ResourceGroupName $rgname -Name $dfname -Reason "Random"
161+
Stop-AzDataBoxJob -ResourceGroupName $rgname -Name $dfname -Reason "Random" -Force
162162
$expected = Get-AzDataBoxJob -ResourceGroupName $rgname -Name $dfname
163163

164164
Assert-AreEqual $expected.JobResource.Status "Cancelled"
165165
}
166166
finally
167167
{
168168

169-
Remove-AzDataBoxJob -ResourceGroupName $rgname -Name $dfname
169+
Remove-AzDataBoxJob -ResourceGroupName $rgname -Name $dfname -Force
170170
Remove-AzStorageAccount -ResourceGroupName $rgname -Name $storageaccountname
171-
172171
}
173172
}
174173

@@ -192,8 +191,8 @@ function Test-RemoveDataBoxJob
192191
try
193192
{
194193
Create-Job $dfname $rgname $storageaccount.Id
195-
Stop-AzDataBoxJob -ResourceGroupName $rgname -Name $dfname -Reason "Random"
196-
Remove-AzDataBoxJob -ResourceGroupName $rgname -Name $dfname
194+
Stop-AzDataBoxJob -ResourceGroupName $rgname -Name $dfname -Reason "Random" -Force
195+
Remove-AzDataBoxJob -ResourceGroupName $rgname -Name $dfname -Force
197196

198197
Assert-ThrowsContains { Get-AzDataBoxJob -ResourceGroupName $rgname -Name $dfname } "Could not find"
199198
}

‎src/DataBox/DataBox.Test/SessionRecords/Microsoft.Azure.Commands.DataBox.Test.DataBoxTests/TestAmbiguousAddress.json

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
"RequestBody": "{\r\n \"shippingAddress\": {\r\n \"streetAddress1\": \"16 TOWNSEND ST11\",\r\n \"city\": \"San Francisco\",\r\n \"stateOrProvince\": \"CA\",\r\n \"country\": \"US\",\r\n \"postalCode\": \"94107\",\r\n \"addressType\": \"None\"\r\n },\r\n \"deviceType\": \"DataBox\"\r\n}",
88
"RequestHeaders": {
99
"x-ms-client-request-id": [
10-
"6473a8ce-bb39-45c2-9d7c-1698fd03a774"
10+
"184cccc7-87b9-43de-9ac3-decba8e6a2ad"
1111
],
1212
"Accept-Language": [
1313
"en-US"
@@ -36,28 +36,28 @@
3636
"nosniff"
3737
],
3838
"x-ms-request-id": [
39-
"bc530d7c-d18f-4789-94cb-ee268047b28f"
39+
"c3263b8b-b6d5-4f67-9455-44f266a152ef"
4040
],
4141
"x-ms-client-request-id": [
42-
"6473a8ce-bb39-45c2-9d7c-1698fd03a774"
42+
"184cccc7-87b9-43de-9ac3-decba8e6a2ad"
4343
],
4444
"X-Powered-By": [
4545
"ASP.NET"
4646
],
4747
"x-ms-ratelimit-remaining-subscription-writes": [
48-
"1199"
48+
"1198"
4949
],
5050
"x-ms-correlation-request-id": [
51-
"4ed646bb-58b7-4313-a48f-26394923941c"
51+
"82219eec-1b7f-4fbb-987b-45e47f8ac82d"
5252
],
5353
"x-ms-routing-request-id": [
54-
"SOUTHINDIA:20190716T113504Z:4ed646bb-58b7-4313-a48f-26394923941c"
54+
"SOUTHINDIA:20190718T070248Z:82219eec-1b7f-4fbb-987b-45e47f8ac82d"
5555
],
5656
"Strict-Transport-Security": [
5757
"max-age=31536000; includeSubDomains"
5858
],
5959
"Date": [
60-
"Tue, 16 Jul 2019 11:35:03 GMT"
60+
"Thu, 18 Jul 2019 07:02:48 GMT"
6161
],
6262
"Content-Length": [
6363
"426"

‎src/DataBox/DataBox.Test/SessionRecords/Microsoft.Azure.Commands.DataBox.Test.DataBoxTests/TestCreateAlreadyExistingDataBoxJob.json

Lines changed: 228 additions & 165 deletions
Large diffs are not rendered by default.

‎src/DataBox/DataBox.Test/SessionRecords/Microsoft.Azure.Commands.DataBox.Test.DataBoxTests/TestCreateDataBoxJob.json

Lines changed: 549 additions & 171 deletions
Large diffs are not rendered by default.

‎src/DataBox/DataBox.Test/SessionRecords/Microsoft.Azure.Commands.DataBox.Test.DataBoxTests/TestGetCredentialForNewlyCreatedJob.json

Lines changed: 563 additions & 122 deletions
Large diffs are not rendered by default.

‎src/DataBox/DataBox.Test/SessionRecords/Microsoft.Azure.Commands.DataBox.Test.DataBoxTests/TestGetNonExistingDataBoxJob.json

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
{
22
"Entries": [
33
{
4-
"RequestUri": "/subscriptions/05b5dd1c-793d-41de-be9f-6f9ed142f695/resourcegroups/ps261?api-version=2016-09-01",
5-
"EncodedRequestUri": "L3N1YnNjcmlwdGlvbnMvMDViNWRkMWMtNzkzZC00MWRlLWJlOWYtNmY5ZWQxNDJmNjk1L3Jlc291cmNlZ3JvdXBzL3BzMjYxP2FwaS12ZXJzaW9uPTIwMTYtMDktMDE=",
4+
"RequestUri": "/subscriptions/05b5dd1c-793d-41de-be9f-6f9ed142f695/resourcegroups/ps1312?api-version=2016-09-01",
5+
"EncodedRequestUri": "L3N1YnNjcmlwdGlvbnMvMDViNWRkMWMtNzkzZC00MWRlLWJlOWYtNmY5ZWQxNDJmNjk1L3Jlc291cmNlZ3JvdXBzL3BzMTMxMj9hcGktdmVyc2lvbj0yMDE2LTA5LTAx",
66
"RequestMethod": "PUT",
77
"RequestBody": "{\r\n \"location\": \"West US\"\r\n}",
88
"RequestHeaders": {
99
"x-ms-client-request-id": [
10-
"d03cd39a-96a9-4537-9a61-0af235240599"
10+
"87c1180d-3b8a-4c3c-be8f-650bb2409e96"
1111
],
1212
"Accept-Language": [
1313
"en-US"
@@ -16,7 +16,7 @@
1616
"FxVersion/4.6.27617.04",
1717
"OSName/Windows",
1818
"OSVersion/Microsoft.Windows.10.0.18362.",
19-
"Microsoft.Azure.Management.Internal.Resources.ResourceManagementClient/1.2.1"
19+
"Microsoft.Azure.Management.Internal.Resources.ResourceManagementClient/1.3.1"
2020
],
2121
"Content-Type": [
2222
"application/json; charset=utf-8"
@@ -33,16 +33,16 @@
3333
"no-cache"
3434
],
3535
"x-ms-ratelimit-remaining-subscription-writes": [
36-
"1199"
36+
"1197"
3737
],
3838
"x-ms-request-id": [
39-
"4f5f27d3-0472-4368-a261-9784617fb927"
39+
"7f2b5b02-9823-410e-964a-a86810db882b"
4040
],
4141
"x-ms-correlation-request-id": [
42-
"4f5f27d3-0472-4368-a261-9784617fb927"
42+
"7f2b5b02-9823-410e-964a-a86810db882b"
4343
],
4444
"x-ms-routing-request-id": [
45-
"SOUTHINDIA:20190716T113452Z:4f5f27d3-0472-4368-a261-9784617fb927"
45+
"SOUTHINDIA:20190718T070236Z:7f2b5b02-9823-410e-964a-a86810db882b"
4646
],
4747
"Strict-Transport-Security": [
4848
"max-age=31536000; includeSubDomains"
@@ -51,10 +51,10 @@
5151
"nosniff"
5252
],
5353
"Date": [
54-
"Tue, 16 Jul 2019 11:34:51 GMT"
54+
"Thu, 18 Jul 2019 07:02:35 GMT"
5555
],
5656
"Content-Length": [
57-
"163"
57+
"165"
5858
],
5959
"Content-Type": [
6060
"application/json; charset=utf-8"
@@ -63,17 +63,17 @@
6363
"-1"
6464
]
6565
},
66-
"ResponseBody": "{\r\n \"id\": \"/subscriptions/05b5dd1c-793d-41de-be9f-6f9ed142f695/resourceGroups/ps261\",\r\n \"name\": \"ps261\",\r\n \"location\": \"westus\",\r\n \"properties\": {\r\n \"provisioningState\": \"Succeeded\"\r\n }\r\n}",
66+
"ResponseBody": "{\r\n \"id\": \"/subscriptions/05b5dd1c-793d-41de-be9f-6f9ed142f695/resourceGroups/ps1312\",\r\n \"name\": \"ps1312\",\r\n \"location\": \"westus\",\r\n \"properties\": {\r\n \"provisioningState\": \"Succeeded\"\r\n }\r\n}",
6767
"StatusCode": 201
6868
},
6969
{
70-
"RequestUri": "/subscriptions/05b5dd1c-793d-41de-be9f-6f9ed142f695/resourceGroups/ps261/providers/Microsoft.DataBox/jobs/ps8310?api-version=2018-01-01&$expand=details",
71-
"EncodedRequestUri": "L3N1YnNjcmlwdGlvbnMvMDViNWRkMWMtNzkzZC00MWRlLWJlOWYtNmY5ZWQxNDJmNjk1L3Jlc291cmNlR3JvdXBzL3BzMjYxL3Byb3ZpZGVycy9NaWNyb3NvZnQuRGF0YUJveC9qb2JzL3BzODMxMD9hcGktdmVyc2lvbj0yMDE4LTAxLTAxJiRleHBhbmQ9ZGV0YWlscw==",
70+
"RequestUri": "/subscriptions/05b5dd1c-793d-41de-be9f-6f9ed142f695/resourceGroups/ps1312/providers/Microsoft.DataBox/jobs/ps452?api-version=2018-01-01&$expand=details",
71+
"EncodedRequestUri": "L3N1YnNjcmlwdGlvbnMvMDViNWRkMWMtNzkzZC00MWRlLWJlOWYtNmY5ZWQxNDJmNjk1L3Jlc291cmNlR3JvdXBzL3BzMTMxMi9wcm92aWRlcnMvTWljcm9zb2Z0LkRhdGFCb3gvam9icy9wczQ1Mj9hcGktdmVyc2lvbj0yMDE4LTAxLTAxJiRleHBhbmQ9ZGV0YWlscw==",
7272
"RequestMethod": "GET",
7373
"RequestBody": "",
7474
"RequestHeaders": {
7575
"x-ms-client-request-id": [
76-
"958a8f19-e254-4c09-b6c0-a80925324d3a"
76+
"6f6d0b88-db1b-4f13-bb10-957a3e0cc32a"
7777
],
7878
"Accept-Language": [
7979
"en-US"
@@ -96,13 +96,13 @@
9696
"gateway"
9797
],
9898
"x-ms-request-id": [
99-
"88dc39bb-01b4-4617-b79b-70394f63979e"
99+
"4cf701a8-ce5e-474a-9b29-9e513fb84b4e"
100100
],
101101
"x-ms-correlation-request-id": [
102-
"88dc39bb-01b4-4617-b79b-70394f63979e"
102+
"4cf701a8-ce5e-474a-9b29-9e513fb84b4e"
103103
],
104104
"x-ms-routing-request-id": [
105-
"SOUTHINDIA:20190716T113453Z:88dc39bb-01b4-4617-b79b-70394f63979e"
105+
"SOUTHINDIA:20190718T070237Z:4cf701a8-ce5e-474a-9b29-9e513fb84b4e"
106106
],
107107
"Strict-Transport-Security": [
108108
"max-age=31536000; includeSubDomains"
@@ -111,7 +111,7 @@
111111
"nosniff"
112112
],
113113
"Date": [
114-
"Tue, 16 Jul 2019 11:34:53 GMT"
114+
"Thu, 18 Jul 2019 07:02:36 GMT"
115115
],
116116
"Content-Type": [
117117
"application/json; charset=utf-8"
@@ -123,14 +123,14 @@
123123
"138"
124124
]
125125
},
126-
"ResponseBody": "{\r\n \"error\": {\r\n \"code\": \"ResourceNotFound\",\r\n \"message\": \"The Resource 'Microsoft.DataBox/jobs/ps8310' under resource group 'ps261' was not found.\"\r\n }\r\n}",
126+
"ResponseBody": "{\r\n \"error\": {\r\n \"code\": \"ResourceNotFound\",\r\n \"message\": \"The Resource 'Microsoft.DataBox/jobs/ps452' under resource group 'ps1312' was not found.\"\r\n }\r\n}",
127127
"StatusCode": 404
128128
}
129129
],
130130
"Names": {
131131
"Test-GetNonExistingDataBoxJob": [
132-
"ps8310",
133-
"ps261"
132+
"ps452",
133+
"ps1312"
134134
]
135135
},
136136
"Variables": {

‎src/DataBox/DataBox.Test/SessionRecords/Microsoft.Azure.Commands.DataBox.Test.DataBoxTests/TestInvalidAddress.json

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
"RequestBody": "{\r\n \"shippingAddress\": {\r\n \"streetAddress1\": \"blah blah\",\r\n \"city\": \"San Francisco\",\r\n \"stateOrProvince\": \"CA\",\r\n \"country\": \"US\",\r\n \"postalCode\": \"94107\",\r\n \"addressType\": \"None\"\r\n },\r\n \"deviceType\": \"DataBox\"\r\n}",
88
"RequestHeaders": {
99
"x-ms-client-request-id": [
10-
"096b2d6f-a646-4815-8889-0c5681d2b4ad"
10+
"e47ef85d-9447-4f16-9b87-51c3508e887d"
1111
],
1212
"Accept-Language": [
1313
"en-US"
@@ -36,28 +36,28 @@
3636
"nosniff"
3737
],
3838
"x-ms-request-id": [
39-
"00921acb-5868-46e7-98ce-ce1a7a8ccc70"
39+
"b3360aa8-a3c2-4cfe-bfdf-3b829d6b9f9b"
4040
],
4141
"x-ms-client-request-id": [
42-
"096b2d6f-a646-4815-8889-0c5681d2b4ad"
42+
"e47ef85d-9447-4f16-9b87-51c3508e887d"
4343
],
4444
"X-Powered-By": [
4545
"ASP.NET"
4646
],
4747
"x-ms-ratelimit-remaining-subscription-writes": [
48-
"1199"
48+
"1194"
4949
],
5050
"x-ms-correlation-request-id": [
51-
"0df37c26-6316-46cf-9429-0a6fedfee1cf"
51+
"dbf4f3af-644c-432d-840f-33c2dec3b78d"
5252
],
5353
"x-ms-routing-request-id": [
54-
"SOUTHINDIA:20190716T113511Z:0df37c26-6316-46cf-9429-0a6fedfee1cf"
54+
"SOUTHINDIA:20190718T070253Z:dbf4f3af-644c-432d-840f-33c2dec3b78d"
5555
],
5656
"Strict-Transport-Security": [
5757
"max-age=31536000; includeSubDomains"
5858
],
5959
"Date": [
60-
"Tue, 16 Jul 2019 11:35:10 GMT"
60+
"Thu, 18 Jul 2019 07:02:53 GMT"
6161
],
6262
"Content-Length": [
6363
"105"

0 commit comments

Comments
 (0)