Skip to content

Commit b254403

Browse files
OchirkhuyagOchi
Ochirkhuyag
and
Ochi
authored
SubscriptionRP: Updated Microsoft.Azure.Management.Subscription .net SDK version to 2.0.0 (#16969)
* Updated .net SDK version to 2.0.0 * Updated changelog * solved compilation error * tests are fixed * Session records are updated * Cancel Subscription test case scenario is added Co-authored-by: Ochi <[email protected]>
1 parent bca8db5 commit b254403

File tree

12 files changed

+104
-85
lines changed

12 files changed

+104
-85
lines changed

‎src/Subscription/Subscription.Test/ScenarioTests/SubscriptionTests.ps1

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -18,37 +18,36 @@ Create subscription
1818
#>
1919
function Test-UpdateRenameSubscription
2020
{
21-
$subId = "bc085fce-1a23-4734-b588-7c36b622317e"
21+
$subscriptionId = "d17ad3ae-320e-42ff-b5a1-705389c6063a"
2222

23-
$updateSub = Update-AzSubscription -SubscriptionId $subId -Action "Rename" -Name "RenameFromPowershell"
23+
$updateSub = Update-AzSubscription -SubscriptionId $subscriptionId -Action "Rename" -Name "RenameFromPowershell"
2424

2525
Assert-NotNull updateSub.SubscriptionId
2626
}
2727

2828
function Test-UpdateCancelSubscription
2929
{
30-
$subId = "bc085fce-1a23-4734-b588-7c36b622317e"
30+
$subscriptionId = "687a7385-011e-4538-8d8d-ab484f19ba00"
3131

32-
$updateSub = Update-AzSubscription -SubscriptionId $subId -Action "Cancel"
32+
$updateSub = Update-AzSubscription -SubscriptionId $subscriptionId -Action "Cancel"
3333

3434
Assert-NotNull updateSub.SubscriptionId
3535
}
3636

3737
function Test-NewSubscriptionAlias
3838
{
39-
$aliasName = "navyprod1"
40-
$displayName = "testSub1"
41-
$billingScope ="billingScope"
39+
$aliasName = "test-alias"
4240
$workload = "Production"
41+
$subscriptionId = "d17ad3ae-320e-42ff-b5a1-705389c6063a"
4342

44-
$newsub = New-AzSubscriptionAlias -AliasName $aliasName -SubscriptionName $displayName -BillingScope $billingScope -Workload $workload
43+
$newsub = New-AzSubscriptionAlias -AliasName $aliasName -Workload $workload -SubscriptionId $subscriptionId
4544

4645
Assert-NotNull newsub
4746
}
4847

4948
function Test-GetSubscriptionAlias
5049
{
51-
$aliasName = "navyprod1"
50+
$aliasName = "test-alias"
5251

5352
$newsub = Get-AzSubscriptionAlias -AliasName $aliasName
5453

@@ -57,7 +56,7 @@ function Test-GetSubscriptionAlias
5756

5857
function Test-RemoveSubscriptionAlias
5958
{
60-
$aliasName = "navyprod1"
59+
$aliasName = "test-alias"
6160

6261
$newsub = Remove-AzSubscriptionAlias -AliasName $aliasName
6362

‎src/Subscription/Subscription.Test/SessionRecords/Subscription.Test.ScenarioTests.SubscriptionTests/TestGetSubscriptionAlias.json

Lines changed: 17 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,22 @@
11
{
22
"Entries": [
33
{
4-
"RequestUri": "/providers/Microsoft.Subscription/aliases/navyprod1?api-version=2020-09-01",
5-
"EncodedRequestUri": "L3Byb3ZpZGVycy9NaWNyb3NvZnQuU3Vic2NyaXB0aW9uL2FsaWFzZXMvbmF2eXByb2QxP2FwaS12ZXJzaW9uPTIwMjAtMDktMDE=",
4+
"RequestUri": "/providers/Microsoft.Subscription/aliases/test-alias?api-version=2021-10-01",
5+
"EncodedRequestUri": "L3Byb3ZpZGVycy9NaWNyb3NvZnQuU3Vic2NyaXB0aW9uL2FsaWFzZXMvdGVzdC1hbGlhcz9hcGktdmVyc2lvbj0yMDIxLTEwLTAx",
66
"RequestMethod": "GET",
77
"RequestBody": "",
88
"RequestHeaders": {
99
"x-ms-client-request-id": [
10-
"39c471c0-9fd7-434d-8947-38ed4d2be60f"
10+
"5ee407b7-67ba-42f8-a3d0-fefe39ec2ed4"
1111
],
1212
"Accept-Language": [
1313
"en-US"
1414
],
1515
"User-Agent": [
16-
"FxVersion/4.6.29130.01",
16+
"FxVersion/4.6.30411.01",
1717
"OSName/Windows",
18-
"OSVersion/Microsoft.Windows.10.0.19041.",
19-
"Microsoft.Azure.Management.Subscription.SubscriptionClient/1.1.5.0"
18+
"OSVersion/Microsoft.Windows.10.0.22000.",
19+
"Microsoft.Azure.Management.Subscription.SubscriptionClient/2.0.0.0"
2020
]
2121
},
2222
"ResponseHeaders": {
@@ -32,11 +32,14 @@
3232
"x-ms-ratelimit-remaining-tenant-reads": [
3333
"11999"
3434
],
35+
"MS-CV": [
36+
"r5h1/XAVhkOlk90uyr4GLg.0"
37+
],
3538
"x-ms-correlation-request-id": [
36-
"68f53ee5-2184-430d-90ff-f0afcf2d9b69"
39+
"e180e822-d382-41a4-aea1-be73cf507e7a"
3740
],
3841
"request-id": [
39-
"68f53ee5-2184-430d-90ff-f0afcf2d9b69"
42+
"e180e822-d382-41a4-aea1-be73cf507e7a"
4043
],
4144
"x-gsm": [
4245
"1.0.0.0"
@@ -54,19 +57,19 @@
5457
"ASP.NET"
5558
],
5659
"x-ms-request-id": [
57-
"68f53ee5-2184-430d-90ff-f0afcf2d9b69"
60+
"e180e822-d382-41a4-aea1-be73cf507e7a"
5861
],
5962
"x-ms-routing-request-id": [
60-
"WESTUS:20200901T220819Z:68f53ee5-2184-430d-90ff-f0afcf2d9b69"
63+
"WESTUS:20220203T065754Z:e180e822-d382-41a4-aea1-be73cf507e7a"
6164
],
6265
"Strict-Transport-Security": [
6366
"max-age=31536000; includeSubDomains"
6467
],
6568
"Date": [
66-
"Tue, 01 Sep 2020 22:08:18 GMT"
69+
"Thu, 03 Feb 2022 06:57:53 GMT"
6770
],
6871
"Content-Length": [
69-
"222"
72+
"224"
7073
],
7174
"Content-Type": [
7275
"application/json; charset=utf-8"
@@ -75,12 +78,12 @@
7578
"-1"
7679
]
7780
},
78-
"ResponseBody": "{\r\n \"id\": \"/providers/Microsoft.Subscription/aliases/navyprod1\",\r\n \"name\": \"navyprod1\",\r\n \"type\": \"Microsoft.Subscription/aliases\",\r\n \"properties\": {\r\n \"subscriptionId\": \"cef41c82-c4f0-48ae-a336-2ec44ec4375a\",\r\n \"provisioningState\": \"Succeeded\"\r\n }\r\n}",
81+
"ResponseBody": "{\r\n \"id\": \"/providers/Microsoft.Subscription/aliases/test-alias\",\r\n \"name\": \"test-alias\",\r\n \"type\": \"Microsoft.Subscription/aliases\",\r\n \"properties\": {\r\n \"subscriptionId\": \"d17ad3ae-320e-42ff-b5a1-705389c6063a\",\r\n \"provisioningState\": \"Succeeded\"\r\n }\r\n}",
7982
"StatusCode": 200
8083
}
8184
],
8285
"Names": {},
8386
"Variables": {
84-
"SubscriptionId": "5b47c35e-863f-4c66-ba9f-52b9d0ced037"
87+
"SubscriptionId": "d17ad3ae-320e-42ff-b5a1-705389c6063a"
8588
}
8689
}

‎src/Subscription/Subscription.Test/SessionRecords/Subscription.Test.ScenarioTests.SubscriptionTests/TestNewSubscriptionAlias.json

Lines changed: 19 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,28 @@
11
{
22
"Entries": [
33
{
4-
"RequestUri": "/providers/Microsoft.Subscription/aliases/navyprod1?api-version=2020-09-01",
5-
"EncodedRequestUri": "L3Byb3ZpZGVycy9NaWNyb3NvZnQuU3Vic2NyaXB0aW9uL2FsaWFzZXMvbmF2eXByb2QxP2FwaS12ZXJzaW9uPTIwMjAtMDktMDE=",
4+
"RequestUri": "/providers/Microsoft.Subscription/aliases/test-alias?api-version=2021-10-01",
5+
"EncodedRequestUri": "L3Byb3ZpZGVycy9NaWNyb3NvZnQuU3Vic2NyaXB0aW9uL2FsaWFzZXMvdGVzdC1hbGlhcz9hcGktdmVyc2lvbj0yMDIxLTEwLTAx",
66
"RequestMethod": "PUT",
7-
"RequestBody": "{\r\n \"properties\": {\r\n \"displayName\": \"testSub1\",\r\n \"workload\": \"Production\",\r\n \"billingScope\": \"billingScope\"\r\n }\r\n}",
7+
"RequestBody": "{\r\n \"properties\": {\r\n \"workload\": \"Production\",\r\n \"subscriptionId\": \"d17ad3ae-320e-42ff-b5a1-705389c6063a\"\r\n }\r\n}",
88
"RequestHeaders": {
99
"x-ms-client-request-id": [
10-
"754fdc06-4e5e-4331-bfb1-8a699ac22fe0"
10+
"4f634d8b-de86-43e9-a6d0-a1969e5a19c3"
1111
],
1212
"Accept-Language": [
1313
"en-US"
1414
],
1515
"User-Agent": [
16-
"FxVersion/4.6.29130.01",
16+
"FxVersion/4.6.30411.01",
1717
"OSName/Windows",
18-
"OSVersion/Microsoft.Windows.10.0.19041.",
19-
"Microsoft.Azure.Management.Subscription.SubscriptionClient/1.1.5.0"
18+
"OSVersion/Microsoft.Windows.10.0.22000.",
19+
"Microsoft.Azure.Management.Subscription.SubscriptionClient/2.0.0.0"
2020
],
2121
"Content-Type": [
2222
"application/json; charset=utf-8"
2323
],
2424
"Content-Length": [
25-
"127"
25+
"121"
2626
]
2727
},
2828
"ResponseHeaders": {
@@ -38,11 +38,14 @@
3838
"x-ms-ratelimit-remaining-tenant-writes": [
3939
"1199"
4040
],
41+
"MS-CV": [
42+
"6w8rF/fecU+4LkdC/lFigg.0"
43+
],
4144
"x-ms-correlation-request-id": [
42-
"ad1c5637-1edc-4f54-80af-b26289a4502a"
45+
"d15b29f4-9be7-41e1-880a-dd96de8ede1c"
4346
],
4447
"request-id": [
45-
"ad1c5637-1edc-4f54-80af-b26289a4502a"
48+
"d15b29f4-9be7-41e1-880a-dd96de8ede1c"
4649
],
4750
"x-gsm": [
4851
"1.0.0.0"
@@ -60,19 +63,19 @@
6063
"ASP.NET"
6164
],
6265
"x-ms-request-id": [
63-
"ad1c5637-1edc-4f54-80af-b26289a4502a"
66+
"d15b29f4-9be7-41e1-880a-dd96de8ede1c"
6467
],
6568
"x-ms-routing-request-id": [
66-
"WESTUS:20200901T212110Z:ad1c5637-1edc-4f54-80af-b26289a4502a"
69+
"WESTUS:20220203T070234Z:d15b29f4-9be7-41e1-880a-dd96de8ede1c"
6770
],
6871
"Strict-Transport-Security": [
6972
"max-age=31536000; includeSubDomains"
7073
],
7174
"Date": [
72-
"Tue, 01 Sep 2020 21:21:10 GMT"
75+
"Thu, 03 Feb 2022 07:02:34 GMT"
7376
],
7477
"Content-Length": [
75-
"222"
78+
"224"
7679
],
7780
"Content-Type": [
7881
"application/json; charset=utf-8"
@@ -81,12 +84,12 @@
8184
"-1"
8285
]
8386
},
84-
"ResponseBody": "{\r\n \"id\": \"/providers/Microsoft.Subscription/aliases/navyprod1\",\r\n \"name\": \"navyprod1\",\r\n \"type\": \"Microsoft.Subscription/aliases\",\r\n \"properties\": {\r\n \"subscriptionId\": \"cef41c82-c4f0-48ae-a336-2ec44ec4375a\",\r\n \"provisioningState\": \"Succeeded\"\r\n }\r\n}",
87+
"ResponseBody": "{\r\n \"id\": \"/providers/Microsoft.Subscription/aliases/test-alias\",\r\n \"name\": \"test-alias\",\r\n \"type\": \"Microsoft.Subscription/aliases\",\r\n \"properties\": {\r\n \"subscriptionId\": \"d17ad3ae-320e-42ff-b5a1-705389c6063a\",\r\n \"provisioningState\": \"Succeeded\"\r\n }\r\n}",
8588
"StatusCode": 200
8689
}
8790
],
8891
"Names": {},
8992
"Variables": {
90-
"SubscriptionId": "5b47c35e-863f-4c66-ba9f-52b9d0ced037"
93+
"SubscriptionId": "d17ad3ae-320e-42ff-b5a1-705389c6063a"
9194
}
9295
}

‎src/Subscription/Subscription.Test/SessionRecords/Subscription.Test.ScenarioTests.SubscriptionTests/TestRemoveSubscriptionAlias.json

Lines changed: 15 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,22 @@
11
{
22
"Entries": [
33
{
4-
"RequestUri": "/providers/Microsoft.Subscription/aliases/navyprod1?api-version=2020-09-01",
5-
"EncodedRequestUri": "L3Byb3ZpZGVycy9NaWNyb3NvZnQuU3Vic2NyaXB0aW9uL2FsaWFzZXMvbmF2eXByb2QxP2FwaS12ZXJzaW9uPTIwMjAtMDktMDE=",
4+
"RequestUri": "/providers/Microsoft.Subscription/aliases/test-alias?api-version=2021-10-01",
5+
"EncodedRequestUri": "L3Byb3ZpZGVycy9NaWNyb3NvZnQuU3Vic2NyaXB0aW9uL2FsaWFzZXMvdGVzdC1hbGlhcz9hcGktdmVyc2lvbj0yMDIxLTEwLTAx",
66
"RequestMethod": "DELETE",
77
"RequestBody": "",
88
"RequestHeaders": {
99
"x-ms-client-request-id": [
10-
"7877be7d-8890-43d9-9828-8ffb4f941e76"
10+
"6ea6709a-3941-4fe6-8948-11d22f9d1a5e"
1111
],
1212
"Accept-Language": [
1313
"en-US"
1414
],
1515
"User-Agent": [
16-
"FxVersion/4.6.29130.01",
16+
"FxVersion/4.6.30411.01",
1717
"OSName/Windows",
18-
"OSVersion/Microsoft.Windows.10.0.19041.",
19-
"Microsoft.Azure.Management.Subscription.SubscriptionClient/1.1.5.0"
18+
"OSVersion/Microsoft.Windows.10.0.22000.",
19+
"Microsoft.Azure.Management.Subscription.SubscriptionClient/2.0.0.0"
2020
]
2121
},
2222
"ResponseHeaders": {
@@ -26,11 +26,14 @@
2626
"Pragma": [
2727
"no-cache"
2828
],
29+
"MS-CV": [
30+
"T02vUQuh8EGy5cd8yyCVIg.0"
31+
],
2932
"x-ms-correlation-request-id": [
30-
"eb016bf5-6e93-468d-9408-a05245da5f3f"
33+
"bfed3713-c665-44e4-a6a9-75806c7b8de6"
3134
],
3235
"request-id": [
33-
"eb016bf5-6e93-468d-9408-a05245da5f3f"
36+
"bfed3713-c665-44e4-a6a9-75806c7b8de6"
3437
],
3538
"x-gsm": [
3639
"1.0.0.0"
@@ -51,16 +54,16 @@
5154
"14999"
5255
],
5356
"x-ms-request-id": [
54-
"eb016bf5-6e93-468d-9408-a05245da5f3f"
57+
"bfed3713-c665-44e4-a6a9-75806c7b8de6"
5558
],
5659
"x-ms-routing-request-id": [
57-
"WESTUS:20200901T220831Z:eb016bf5-6e93-468d-9408-a05245da5f3f"
60+
"WESTUS:20220203T070216Z:bfed3713-c665-44e4-a6a9-75806c7b8de6"
5861
],
5962
"Strict-Transport-Security": [
6063
"max-age=31536000; includeSubDomains"
6164
],
6265
"Date": [
63-
"Tue, 01 Sep 2020 22:08:31 GMT"
66+
"Thu, 03 Feb 2022 07:02:16 GMT"
6467
],
6568
"Expires": [
6669
"-1"
@@ -75,6 +78,6 @@
7578
],
7679
"Names": {},
7780
"Variables": {
78-
"SubscriptionId": "5b47c35e-863f-4c66-ba9f-52b9d0ced037"
81+
"SubscriptionId": "d17ad3ae-320e-42ff-b5a1-705389c6063a"
7982
}
8083
}

‎src/Subscription/Subscription.Test/SessionRecords/Subscription.Test.ScenarioTests.SubscriptionTests/TestUpdateCancelSubscription.json

Lines changed: 16 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,22 @@
11
{
22
"Entries": [
33
{
4-
"RequestUri": "/subscriptions/bc085fce-1a23-4734-b588-7c36b622317e/providers/Microsoft.Subscription/cancel?api-version=2020-09-01",
5-
"EncodedRequestUri": "L3N1YnNjcmlwdGlvbnMvYmMwODVmY2UtMWEyMy00NzM0LWI1ODgtN2MzNmI2MjIzMTdlL3Byb3ZpZGVycy9NaWNyb3NvZnQuU3Vic2NyaXB0aW9uL2NhbmNlbD9hcGktdmVyc2lvbj0yMDIwLTA5LTAx",
4+
"RequestUri": "/subscriptions/687a7385-011e-4538-8d8d-ab484f19ba00/providers/Microsoft.Subscription/cancel?api-version=2021-10-01",
5+
"EncodedRequestUri": "L3N1YnNjcmlwdGlvbnMvNjg3YTczODUtMDExZS00NTM4LThkOGQtYWI0ODRmMTliYTAwL3Byb3ZpZGVycy9NaWNyb3NvZnQuU3Vic2NyaXB0aW9uL2NhbmNlbD9hcGktdmVyc2lvbj0yMDIxLTEwLTAx",
66
"RequestMethod": "POST",
77
"RequestBody": "",
88
"RequestHeaders": {
99
"x-ms-client-request-id": [
10-
"2fb37549-1be1-434a-9594-552fc7be902f"
10+
"be8ef279-fbe1-400c-b57b-ce2522add6fa"
1111
],
1212
"Accept-Language": [
1313
"en-US"
1414
],
1515
"User-Agent": [
16-
"FxVersion/4.6.29220.03",
16+
"FxVersion/4.6.30411.01",
1717
"OSName/Windows",
18-
"OSVersion/Microsoft.Windows.10.0.19042.",
19-
"Microsoft.Azure.Management.Subscription.SubscriptionClient/1.1.5.0"
18+
"OSVersion/Microsoft.Windows.10.0.22000.",
19+
"Microsoft.Azure.Management.Subscription.SubscriptionClient/2.0.0.0"
2020
]
2121
},
2222
"ResponseHeaders": {
@@ -32,11 +32,14 @@
3232
"x-ms-ratelimit-remaining-subscription-writes": [
3333
"1199"
3434
],
35+
"MS-CV": [
36+
"j6xT9Mp320+ijJHnXt3U0g.0"
37+
],
3538
"x-ms-correlation-request-id": [
36-
"e83a70af-9a8d-4dce-9d99-8d85594e2d00"
39+
"db2c53ab-664e-4033-820a-a159a00aecf7"
3740
],
3841
"request-id": [
39-
"e83a70af-9a8d-4dce-9d99-8d85594e2d00"
42+
"db2c53ab-664e-4033-820a-a159a00aecf7"
4043
],
4144
"x-gsm": [
4245
"1.0.0.0"
@@ -54,16 +57,16 @@
5457
"ASP.NET"
5558
],
5659
"x-ms-request-id": [
57-
"e83a70af-9a8d-4dce-9d99-8d85594e2d00"
60+
"db2c53ab-664e-4033-820a-a159a00aecf7"
5861
],
5962
"x-ms-routing-request-id": [
60-
"WESTUS:20201009T184351Z:e83a70af-9a8d-4dce-9d99-8d85594e2d00"
63+
"WESTUS:20220208T075518Z:db2c53ab-664e-4033-820a-a159a00aecf7"
6164
],
6265
"Strict-Transport-Security": [
6366
"max-age=31536000; includeSubDomains"
6467
],
6568
"Date": [
66-
"Fri, 09 Oct 2020 18:43:50 GMT"
69+
"Tue, 08 Feb 2022 07:55:18 GMT"
6770
],
6871
"Content-Length": [
6972
"57"
@@ -75,12 +78,12 @@
7578
"-1"
7679
]
7780
},
78-
"ResponseBody": "{\r\n \"subscriptionId\": \"bc085fce-1a23-4734-b588-7c36b622317e\"\r\n}",
81+
"ResponseBody": "{\r\n \"subscriptionId\": \"687a7385-011e-4538-8d8d-ab484f19ba00\"\r\n}",
7982
"StatusCode": 200
8083
}
8184
],
8285
"Names": {},
8386
"Variables": {
84-
"SubscriptionId": "5b47c35e-863f-4c66-ba9f-52b9d0ced037"
87+
"SubscriptionId": "d17ad3ae-320e-42ff-b5a1-705389c6063a"
8588
}
8689
}

0 commit comments

Comments
 (0)