Skip to content

Commit 94026f6

Browse files
prbansaprbansa
committed
MarketplaceOrdering updated after review comments
1 parent 6cb4d45 commit 94026f6

File tree

14 files changed

+163
-93
lines changed

14 files changed

+163
-93
lines changed

‎src/ResourceManager/MarketplaceOrdering/AzureRM.MarketplaceOrdering.psd1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
# RootModule = ''
1313

1414
# Version number of this module.
15-
ModuleVersion = '1.0.0'
15+
ModuleVersion = '0.1.0'
1616

1717
# Supported PSEditions
1818
# CompatiblePSEditions = @()

‎src/ResourceManager/MarketplaceOrdering/ChangeLog.md

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,6 @@
1818
- Additional information about change #1
1919
-->
2020
## Current Release
21-
22-
## Version 1.0.0
2321
* New Cmdlet Get-AzureRmMarketplaceTerms
2422
- Get the agreement terms of a given publisher id, offer id and plan id.
2523
* New Cmdlet Set-AzureRmMarketplaceTerms

‎src/ResourceManager/MarketplaceOrdering/Commands.MarketplaceOrdering.Test/Properties/AssemblyInfo.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,5 +46,5 @@
4646
// You can specify all the values or you can default the Build and Revision Numbers
4747
// by using the '*' as shown below:
4848
// [assembly: AssemblyVersion("1.0.*")]
49-
[assembly: AssemblyVersion("0.0.1")]
50-
[assembly: AssemblyFileVersion("0.0.1")]
49+
[assembly: AssemblyVersion("0.1.0")]
50+
[assembly: AssemblyFileVersion("0.1.0")]

‎src/ResourceManager/MarketplaceOrdering/Commands.MarketplaceOrdering.Test/ScenarioTests/AgreementsTests.ps1

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ function Test-SetAgreementTermsNotAccepted
4545
Assert-NotNull $agreementTerms.PrivacyPolicyLink
4646
Assert-NotNull $agreementTerms.Signature
4747

48-
$newAgreementTerms = Set-AzureRmMarketplaceTerms -Publisher $PublisherId -Product $ProductId -Name $PlanId -Accepted:$false
48+
$newAgreementTerms = Set-AzureRmMarketplaceTerms -Publisher $PublisherId -Product $ProductId -Name $PlanId -Accepted $false
4949
Assert-NotNull $newAgreementTerms
5050
Assert-NotNull $newAgreementTerms.LicenseTextLink
5151
Assert-NotNull $newAgreementTerms.PrivacyPolicyLink
@@ -69,7 +69,7 @@ function Test-SetAgreementTermsAccepted
6969
Assert-NotNull $agreementTerms.PrivacyPolicyLink
7070
Assert-NotNull $agreementTerms.Signature
7171

72-
$newAgreementTerms = Set-AzureRmMarketplaceTerms -Publisher $PublisherId -Product $ProductId -Name $PlanId -InputObject $agreementTerms -Accepted
72+
$newAgreementTerms = Set-AzureRmMarketplaceTerms -Publisher $PublisherId -Product $ProductId -Name $PlanId -Terms $agreementTerms -Accepted $true
7373
Assert-NotNull $newAgreementTerms
7474
Assert-NotNull $newAgreementTerms.LicenseTextLink
7575
Assert-NotNull $newAgreementTerms.PrivacyPolicyLink
@@ -86,7 +86,7 @@ function Test-SetAgreementTermsAcceptedPipelineGet
8686
$PublisherId = "microsoft-ads"
8787
$ProductId = "windows-data-science-vm"
8888
$PlanId = "windows2016"
89-
$newAgreementTerms = Get-AzureRmMarketplaceTerms -Publisher $PublisherId -Product $ProductId -Name $PlanId|Set-AzureRmMarketplaceTerms -Publisher $PublisherId -Product $ProductId -Name $PlanId -Accepted
89+
$newAgreementTerms = Get-AzureRmMarketplaceTerms -Publisher $PublisherId -Product $ProductId -Name $PlanId|Set-AzureRmMarketplaceTerms -Accepted $true
9090
Assert-NotNull $newAgreementTerms
9191
Assert-NotNull $newAgreementTerms.LicenseTextLink
9292
Assert-NotNull $newAgreementTerms.PrivacyPolicyLink

‎src/ResourceManager/MarketplaceOrdering/Commands.MarketplaceOrdering.Test/SessionRecords/Microsoft.Azure.Commands.MarketplaceOrdering.Test.ScenarioTests.AgreementsTests/TestGetAgreement.json

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
"RequestBody": "",
88
"RequestHeaders": {
99
"x-ms-client-request-id": [
10-
"5d460f83-78e4-46b7-a315-1f014b55d53f"
10+
"7bbc24c5-cc79-4721-a912-d955a92c7a09"
1111
],
1212
"accept-language": [
1313
"en-US"
@@ -19,7 +19,7 @@
1919
"Microsoft.Azure.Management.MarketplaceOrdering.MarketplaceOrderingAgreementsClient/1.0.0"
2020
]
2121
},
22-
"ResponseBody": "{\r\n \"id\": \"/subscriptions/2ad668e2-04e4-4a99-8292-4df4f74362ae/providers/Microsoft.MarketplaceOrdering/offertypes/microsoft-ads/offers/windows-data-science-vm/plans/windows2016\",\r\n \"name\": \"windows2016\",\r\n \"type\": \"Microsoft.MarketplaceOrdering/offertypes\",\r\n \"properties\": {\r\n \"publisher\": \"microsoft-ads\",\r\n \"product\": \"windows-data-science-vm\",\r\n \"plan\": \"windows2016\",\r\n \"licenseTextLink\": \"https://106c4.wpc.azureedge.net/80106C4/Gallery-Prod/cdn/2015-02-24/prod20161101-microsoft-windowsazure-gallery/microsoft-ads.windows-data-science-vmwindows2016.1.0.3/Content/LegalTerms0.DEFAULT.txt\",\r\n \"privacyPolicyLink\": \"https://www.microsoft.com/EN-US/privacystatement/OnlineServices/Default.aspx\",\r\n \"retrieveDatetime\": \"2017-10-01T02:13:35.7166118Z\",\r\n \"signature\": \"O2TMAH23UCFWLNLKZ3VBACFDYGS5TRFULL4KWVS6J2OKCBNGPECL45HJLNVGQZOT462DPJ7CE4BUHZLUZTVV5KCAQVYCT7M6NOXUTOY\",\r\n \"accepted\": true\r\n }\r\n}",
22+
"ResponseBody": "{\r\n \"id\": \"/subscriptions/2ad668e2-04e4-4a99-8292-4df4f74362ae/providers/Microsoft.MarketplaceOrdering/offertypes/microsoft-ads/offers/windows-data-science-vm/plans/windows2016\",\r\n \"name\": \"windows2016\",\r\n \"type\": \"Microsoft.MarketplaceOrdering/offertypes\",\r\n \"properties\": {\r\n \"publisher\": \"microsoft-ads\",\r\n \"product\": \"windows-data-science-vm\",\r\n \"plan\": \"windows2016\",\r\n \"licenseTextLink\": \"https://106c4.wpc.azureedge.net/80106C4/Gallery-Prod/cdn/2015-02-24/prod20161101-microsoft-windowsazure-gallery/microsoft-ads.windows-data-science-vmwindows2016.1.0.3/Content/LegalTerms0.DEFAULT.txt\",\r\n \"privacyPolicyLink\": \"https://www.microsoft.com/EN-US/privacystatement/OnlineServices/Default.aspx\",\r\n \"retrieveDatetime\": \"2017-10-04T04:13:57.2894451Z\",\r\n \"signature\": \"J2EMGMJKVJWNLRDHDZLXIQ3Y5FAQ6PW7N7M4MI5QJVBH5BCWPSZCMD3A3TW6CSEQAAUNRJB5QR7DYP6ER5S57WGPXTQVOBMZFQ2RCJA\",\r\n \"accepted\": true\r\n }\r\n}",
2323
"ResponseHeaders": {
2424
"Content-Length": [
2525
"847"
@@ -40,10 +40,10 @@
4040
"14999"
4141
],
4242
"x-ms-client-request-id": [
43-
"5d460f83-78e4-46b7-a315-1f014b55d53f"
43+
"7bbc24c5-cc79-4721-a912-d955a92c7a09"
4444
],
4545
"x-ms-request-id": [
46-
"fa9384cd-0c68-4981-871c-d137abe643d1"
46+
"7dbc39f3-e914-4153-8ddb-1353981482f7"
4747
],
4848
"DataServiceVersion": [
4949
"5.2.1.309 (AzureUX-Store:master.9dbea9b4.170911-1246)"
@@ -52,16 +52,16 @@
5252
"max-age=31536000; includeSubDomains"
5353
],
5454
"x-ms-correlation-request-id": [
55-
"3bd77d61-9e8d-4672-87b7-7b5dce133a3c"
55+
"44904573-d45e-4dda-9410-a4441930a0de"
5656
],
5757
"x-ms-routing-request-id": [
58-
"WESTUS:20171001T021335Z:3bd77d61-9e8d-4672-87b7-7b5dce133a3c"
58+
"WESTUS:20171004T041357Z:44904573-d45e-4dda-9410-a4441930a0de"
5959
],
6060
"Cache-Control": [
6161
"no-cache"
6262
],
6363
"Date": [
64-
"Sun, 01 Oct 2017 02:13:35 GMT"
64+
"Wed, 04 Oct 2017 04:13:57 GMT"
6565
],
6666
"Server": [
6767
"Microsoft-IIS/8.5"

‎src/ResourceManager/MarketplaceOrdering/Commands.MarketplaceOrdering.Test/SessionRecords/Microsoft.Azure.Commands.MarketplaceOrdering.Test.ScenarioTests.AgreementsTests/TestSetAgreementAccepted.json

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
"RequestBody": "",
88
"RequestHeaders": {
99
"x-ms-client-request-id": [
10-
"4327fd29-04c5-4ef4-bf21-9e0c437e0499"
10+
"bb7e3d46-2201-4e75-837f-b4a017e37e67"
1111
],
1212
"accept-language": [
1313
"en-US"
@@ -19,10 +19,10 @@
1919
"Microsoft.Azure.Management.MarketplaceOrdering.MarketplaceOrderingAgreementsClient/1.0.0"
2020
]
2121
},
22-
"ResponseBody": "{\r\n \"id\": \"/subscriptions/2ad668e2-04e4-4a99-8292-4df4f74362ae/providers/Microsoft.MarketplaceOrdering/offertypes/microsoft-ads/offers/windows-data-science-vm/plans/windows2016\",\r\n \"name\": \"windows2016\",\r\n \"type\": \"Microsoft.MarketplaceOrdering/offertypes\",\r\n \"properties\": {\r\n \"publisher\": \"microsoft-ads\",\r\n \"product\": \"windows-data-science-vm\",\r\n \"plan\": \"windows2016\",\r\n \"licenseTextLink\": \"https://106c4.wpc.azureedge.net/80106C4/Gallery-Prod/cdn/2015-02-24/prod20161101-microsoft-windowsazure-gallery/microsoft-ads.windows-data-science-vmwindows2016.1.0.3/Content/LegalTerms0.DEFAULT.txt\",\r\n \"privacyPolicyLink\": \"https://www.microsoft.com/EN-US/privacystatement/OnlineServices/Default.aspx\",\r\n \"retrieveDatetime\": \"2017-10-01T02:14:25.8118692Z\",\r\n \"signature\": \"VKK2CKOXMBFVW6S4T6NUXPUUIXOQK4OZBC65SEELD4YSXWHHKC5EVFENE5V2AKIZK6M7Q2EKMR2B5FCR4ISEA6CXGJTF6OOTGSLB2HQ\",\r\n \"accepted\": false\r\n }\r\n}",
22+
"ResponseBody": "{\r\n \"id\": \"/subscriptions/2ad668e2-04e4-4a99-8292-4df4f74362ae/providers/Microsoft.MarketplaceOrdering/offertypes/microsoft-ads/offers/windows-data-science-vm/plans/windows2016\",\r\n \"name\": \"windows2016\",\r\n \"type\": \"Microsoft.MarketplaceOrdering/offertypes\",\r\n \"properties\": {\r\n \"publisher\": \"microsoft-ads\",\r\n \"product\": \"windows-data-science-vm\",\r\n \"plan\": \"windows2016\",\r\n \"licenseTextLink\": \"https://106c4.wpc.azureedge.net/80106C4/Gallery-Prod/cdn/2015-02-24/prod20161101-microsoft-windowsazure-gallery/microsoft-ads.windows-data-science-vmwindows2016.1.0.3/Content/LegalTerms0.DEFAULT.txt\",\r\n \"privacyPolicyLink\": \"https://www.microsoft.com/EN-US/privacystatement/OnlineServices/Default.aspx\",\r\n \"retrieveDatetime\": \"2017-10-04T04:13:41.06291Z\",\r\n \"signature\": \"U5LMK3XRHJZLQYCZM4HEPILPIZG636D57236EGDHWHZT5NGSCFESWKKFEQFMJLYPVJAG6FT5TS2VGGZG7AN474V5G4RYLWNQA5QE3WY\",\r\n \"accepted\": false\r\n }\r\n}",
2323
"ResponseHeaders": {
2424
"Content-Length": [
25-
"848"
25+
"846"
2626
],
2727
"Content-Type": [
2828
"application/json; charset=utf-8"
@@ -40,10 +40,10 @@
4040
"14999"
4141
],
4242
"x-ms-client-request-id": [
43-
"4327fd29-04c5-4ef4-bf21-9e0c437e0499"
43+
"bb7e3d46-2201-4e75-837f-b4a017e37e67"
4444
],
4545
"x-ms-request-id": [
46-
"af2748a4-634b-43d1-ae2a-8e8d406c171e"
46+
"df3304c6-1dbd-4fb1-8446-f6336ef1a586"
4747
],
4848
"DataServiceVersion": [
4949
"5.2.1.309 (AzureUX-Store:master.9dbea9b4.170911-1246)"
@@ -52,16 +52,16 @@
5252
"max-age=31536000; includeSubDomains"
5353
],
5454
"x-ms-correlation-request-id": [
55-
"6b33fd68-c30e-42ee-82ca-f0a12302c37f"
55+
"0d4b5968-6a1c-4ae4-909d-80775af97171"
5656
],
5757
"x-ms-routing-request-id": [
58-
"WESTUS:20171001T021425Z:6b33fd68-c30e-42ee-82ca-f0a12302c37f"
58+
"WESTUS:20171004T041341Z:0d4b5968-6a1c-4ae4-909d-80775af97171"
5959
],
6060
"Cache-Control": [
6161
"no-cache"
6262
],
6363
"Date": [
64-
"Sun, 01 Oct 2017 02:14:25 GMT"
64+
"Wed, 04 Oct 2017 04:13:40 GMT"
6565
],
6666
"Server": [
6767
"Microsoft-IIS/8.5"
@@ -73,16 +73,16 @@
7373
"RequestUri": "/subscriptions/2ad668e2-04e4-4a99-8292-4df4f74362ae/providers/Microsoft.MarketplaceOrdering/offerTypes/virtualmachine/publishers/microsoft-ads/offers/windows-data-science-vm/plans/windows2016/agreements/current?api-version=2015-06-01",
7474
"EncodedRequestUri": "L3N1YnNjcmlwdGlvbnMvMmFkNjY4ZTItMDRlNC00YTk5LTgyOTItNGRmNGY3NDM2MmFlL3Byb3ZpZGVycy9NaWNyb3NvZnQuTWFya2V0cGxhY2VPcmRlcmluZy9vZmZlclR5cGVzL3ZpcnR1YWxtYWNoaW5lL3B1Ymxpc2hlcnMvbWljcm9zb2Z0LWFkcy9vZmZlcnMvd2luZG93cy1kYXRhLXNjaWVuY2Utdm0vcGxhbnMvd2luZG93czIwMTYvYWdyZWVtZW50cy9jdXJyZW50P2FwaS12ZXJzaW9uPTIwMTUtMDYtMDE=",
7575
"RequestMethod": "PUT",
76-
"RequestBody": "{\r\n \"properties\": {\r\n \"publisher\": \"microsoft-ads\",\r\n \"product\": \"windows-data-science-vm\",\r\n \"plan\": \"windows2016\",\r\n \"licenseTextLink\": \"https://106c4.wpc.azureedge.net/80106C4/Gallery-Prod/cdn/2015-02-24/prod20161101-microsoft-windowsazure-gallery/microsoft-ads.windows-data-science-vmwindows2016.1.0.3/Content/LegalTerms0.DEFAULT.txt\",\r\n \"privacyPolicyLink\": \"https://www.microsoft.com/EN-US/privacystatement/OnlineServices/Default.aspx\",\r\n \"retrieveDatetime\": \"2017-10-01T02:14:25.8118692Z\",\r\n \"signature\": \"VKK2CKOXMBFVW6S4T6NUXPUUIXOQK4OZBC65SEELD4YSXWHHKC5EVFENE5V2AKIZK6M7Q2EKMR2B5FCR4ISEA6CXGJTF6OOTGSLB2HQ\",\r\n \"accepted\": true\r\n }\r\n}",
76+
"RequestBody": "{\r\n \"properties\": {\r\n \"publisher\": \"microsoft-ads\",\r\n \"product\": \"windows-data-science-vm\",\r\n \"plan\": \"windows2016\",\r\n \"licenseTextLink\": \"https://106c4.wpc.azureedge.net/80106C4/Gallery-Prod/cdn/2015-02-24/prod20161101-microsoft-windowsazure-gallery/microsoft-ads.windows-data-science-vmwindows2016.1.0.3/Content/LegalTerms0.DEFAULT.txt\",\r\n \"privacyPolicyLink\": \"https://www.microsoft.com/EN-US/privacystatement/OnlineServices/Default.aspx\",\r\n \"retrieveDatetime\": \"2017-10-04T04:13:41.06291Z\",\r\n \"signature\": \"U5LMK3XRHJZLQYCZM4HEPILPIZG636D57236EGDHWHZT5NGSCFESWKKFEQFMJLYPVJAG6FT5TS2VGGZG7AN474V5G4RYLWNQA5QE3WY\",\r\n \"accepted\": true\r\n }\r\n}",
7777
"RequestHeaders": {
7878
"Content-Type": [
7979
"application/json; charset=utf-8"
8080
],
8181
"Content-Length": [
82-
"670"
82+
"668"
8383
],
8484
"x-ms-client-request-id": [
85-
"2b3f2730-caa3-443f-a268-3dec452bca2c"
85+
"12a392e5-e9c6-472a-a83c-2a2a08519dec"
8686
],
8787
"accept-language": [
8888
"en-US"
@@ -94,10 +94,10 @@
9494
"Microsoft.Azure.Management.MarketplaceOrdering.MarketplaceOrderingAgreementsClient/1.0.0"
9595
]
9696
},
97-
"ResponseBody": "{\r\n \"id\": \"/subscriptions/2ad668e2-04e4-4a99-8292-4df4f74362ae/providers/Microsoft.MarketplaceOrdering/offertypes/microsoft-ads/offers/windows-data-science-vm/plans/windows2016\",\r\n \"name\": \"windows2016\",\r\n \"type\": \"Microsoft.MarketplaceOrdering/offertypes\",\r\n \"properties\": {\r\n \"publisher\": \"microsoft-ads\",\r\n \"product\": \"windows-data-science-vm\",\r\n \"plan\": \"windows2016\",\r\n \"licenseTextLink\": \"https://106c4.wpc.azureedge.net/80106C4/Gallery-Prod/cdn/2015-02-24/prod20161101-microsoft-windowsazure-gallery/microsoft-ads.windows-data-science-vmwindows2016.1.0.3/Content/LegalTerms0.DEFAULT.txt\",\r\n \"privacyPolicyLink\": \"https://www.microsoft.com/EN-US/privacystatement/OnlineServices/Default.aspx\",\r\n \"retrieveDatetime\": \"2017-10-01T02:14:25.8118692Z\",\r\n \"signature\": \"VKK2CKOXMBFVW6S4T6NUXPUUIXOQK4OZBC65SEELD4YSXWHHKC5EVFENE5V2AKIZK6M7Q2EKMR2B5FCR4ISEA6CXGJTF6OOTGSLB2HQ\",\r\n \"accepted\": true\r\n }\r\n}",
97+
"ResponseBody": "{\r\n \"id\": \"/subscriptions/2ad668e2-04e4-4a99-8292-4df4f74362ae/providers/Microsoft.MarketplaceOrdering/offertypes/microsoft-ads/offers/windows-data-science-vm/plans/windows2016\",\r\n \"name\": \"windows2016\",\r\n \"type\": \"Microsoft.MarketplaceOrdering/offertypes\",\r\n \"properties\": {\r\n \"publisher\": \"microsoft-ads\",\r\n \"product\": \"windows-data-science-vm\",\r\n \"plan\": \"windows2016\",\r\n \"licenseTextLink\": \"https://106c4.wpc.azureedge.net/80106C4/Gallery-Prod/cdn/2015-02-24/prod20161101-microsoft-windowsazure-gallery/microsoft-ads.windows-data-science-vmwindows2016.1.0.3/Content/LegalTerms0.DEFAULT.txt\",\r\n \"privacyPolicyLink\": \"https://www.microsoft.com/EN-US/privacystatement/OnlineServices/Default.aspx\",\r\n \"retrieveDatetime\": \"2017-10-04T04:13:41.06291Z\",\r\n \"signature\": \"U5LMK3XRHJZLQYCZM4HEPILPIZG636D57236EGDHWHZT5NGSCFESWKKFEQFMJLYPVJAG6FT5TS2VGGZG7AN474V5G4RYLWNQA5QE3WY\",\r\n \"accepted\": true\r\n }\r\n}",
9898
"ResponseHeaders": {
9999
"Content-Length": [
100-
"847"
100+
"845"
101101
],
102102
"Content-Type": [
103103
"application/json; charset=utf-8"
@@ -115,10 +115,10 @@
115115
"1199"
116116
],
117117
"x-ms-client-request-id": [
118-
"2b3f2730-caa3-443f-a268-3dec452bca2c"
118+
"12a392e5-e9c6-472a-a83c-2a2a08519dec"
119119
],
120120
"x-ms-request-id": [
121-
"9ceb71e7-4260-40d7-99f4-cb3814370acd"
121+
"10ab7125-53c9-4232-9f36-1027cdad1744"
122122
],
123123
"DataServiceVersion": [
124124
"5.2.1.309 (AzureUX-Store:master.9dbea9b4.170911-1246)"
@@ -127,16 +127,16 @@
127127
"max-age=31536000; includeSubDomains"
128128
],
129129
"x-ms-correlation-request-id": [
130-
"174d4baa-d96a-4071-bf9d-7ee7b785857f"
130+
"f2b8aaf1-02db-47f3-9a95-cb70af15d98b"
131131
],
132132
"x-ms-routing-request-id": [
133-
"WESTUS:20171001T021426Z:174d4baa-d96a-4071-bf9d-7ee7b785857f"
133+
"WESTUS:20171004T041341Z:f2b8aaf1-02db-47f3-9a95-cb70af15d98b"
134134
],
135135
"Cache-Control": [
136136
"no-cache"
137137
],
138138
"Date": [
139-
"Sun, 01 Oct 2017 02:14:26 GMT"
139+
"Wed, 04 Oct 2017 04:13:41 GMT"
140140
],
141141
"Server": [
142142
"Microsoft-IIS/8.5"

0 commit comments

Comments
 (0)