From e4e0780232fcf604f7670f4f2c356e856811ddb3 Mon Sep 17 00:00:00 2001 From: alkigel <77278418+alkigel@users.noreply.github.com> Date: Thu, 25 Feb 2021 16:21:14 +0200 Subject: [PATCH 1/7] Updating MarketplaceOrdering SDK with new swagger version --- .../IMarketplaceAgreementsOperations.cs | 6 ++-- .../MarketplaceAgreementsOperations.cs | 33 +++++-------------- .../MarketplaceOrderingAgreementsClient.cs | 2 +- .../SdkInfo_MarketplaceOrderingAgreements.cs | 4 +-- 4 files changed, 15 insertions(+), 30 deletions(-) diff --git a/sdk/marketplaceordering/Microsoft.Azure.Management.MarketplaceOrdering/src/Generated/IMarketplaceAgreementsOperations.cs b/sdk/marketplaceordering/Microsoft.Azure.Management.MarketplaceOrdering/src/Generated/IMarketplaceAgreementsOperations.cs index 1213141eebe4..e82673b05fa4 100644 --- a/sdk/marketplaceordering/Microsoft.Azure.Management.MarketplaceOrdering/src/Generated/IMarketplaceAgreementsOperations.cs +++ b/sdk/marketplaceordering/Microsoft.Azure.Management.MarketplaceOrdering/src/Generated/IMarketplaceAgreementsOperations.cs @@ -41,7 +41,7 @@ public partial interface IMarketplaceAgreementsOperations /// /// The cancellation token. /// - /// + /// /// Thrown when the operation returned an invalid status code /// /// @@ -156,7 +156,7 @@ public partial interface IMarketplaceAgreementsOperations /// /// The cancellation token. /// - /// + /// /// Thrown when the operation returned an invalid status code /// /// @@ -175,7 +175,7 @@ public partial interface IMarketplaceAgreementsOperations /// /// The cancellation token. /// - /// + /// /// Thrown when the operation returned an invalid status code /// /// diff --git a/sdk/marketplaceordering/Microsoft.Azure.Management.MarketplaceOrdering/src/Generated/MarketplaceAgreementsOperations.cs b/sdk/marketplaceordering/Microsoft.Azure.Management.MarketplaceOrdering/src/Generated/MarketplaceAgreementsOperations.cs index f8a57a7da1c2..4e364e851476 100644 --- a/sdk/marketplaceordering/Microsoft.Azure.Management.MarketplaceOrdering/src/Generated/MarketplaceAgreementsOperations.cs +++ b/sdk/marketplaceordering/Microsoft.Azure.Management.MarketplaceOrdering/src/Generated/MarketplaceAgreementsOperations.cs @@ -68,7 +68,7 @@ internal MarketplaceAgreementsOperations(MarketplaceOrderingAgreementsClient cli /// /// The cancellation token. /// - /// + /// /// Thrown when the operation returned an invalid status code /// /// @@ -193,14 +193,13 @@ internal MarketplaceAgreementsOperations(MarketplaceOrderingAgreementsClient cli string _responseContent = null; if ((int)_statusCode != 200) { - var ex = new CloudException(string.Format("Operation returned an invalid status code '{0}'", _statusCode)); + var ex = new ErrorResponseException(string.Format("Operation returned an invalid status code '{0}'", _statusCode)); try { _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false); - CloudError _errorBody = Rest.Serialization.SafeJsonConvert.DeserializeObject(_responseContent, Client.DeserializationSettings); + ErrorResponse _errorBody = Rest.Serialization.SafeJsonConvert.DeserializeObject(_responseContent, Client.DeserializationSettings); if (_errorBody != null) { - ex = new CloudException(_errorBody.Message); ex.Body = _errorBody; } } @@ -210,10 +209,6 @@ internal MarketplaceAgreementsOperations(MarketplaceOrderingAgreementsClient cli } ex.Request = new HttpRequestMessageWrapper(_httpRequest, _requestContent); ex.Response = new HttpResponseMessageWrapper(_httpResponse, _responseContent); - if (_httpResponse.Headers.Contains("x-ms-request-id")) - { - ex.RequestId = _httpResponse.Headers.GetValues("x-ms-request-id").FirstOrDefault(); - } if (_shouldTrace) { ServiceClientTracing.Error(_invocationId, ex); @@ -893,7 +888,7 @@ internal MarketplaceAgreementsOperations(MarketplaceOrderingAgreementsClient cli /// /// The cancellation token. /// - /// + /// /// Thrown when the operation returned an invalid status code /// /// @@ -1015,14 +1010,13 @@ internal MarketplaceAgreementsOperations(MarketplaceOrderingAgreementsClient cli string _responseContent = null; if ((int)_statusCode != 200) { - var ex = new CloudException(string.Format("Operation returned an invalid status code '{0}'", _statusCode)); + var ex = new ErrorResponseException(string.Format("Operation returned an invalid status code '{0}'", _statusCode)); try { _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false); - CloudError _errorBody = Rest.Serialization.SafeJsonConvert.DeserializeObject(_responseContent, Client.DeserializationSettings); + ErrorResponse _errorBody = Rest.Serialization.SafeJsonConvert.DeserializeObject(_responseContent, Client.DeserializationSettings); if (_errorBody != null) { - ex = new CloudException(_errorBody.Message); ex.Body = _errorBody; } } @@ -1032,10 +1026,6 @@ internal MarketplaceAgreementsOperations(MarketplaceOrderingAgreementsClient cli } ex.Request = new HttpRequestMessageWrapper(_httpRequest, _requestContent); ex.Response = new HttpResponseMessageWrapper(_httpResponse, _responseContent); - if (_httpResponse.Headers.Contains("x-ms-request-id")) - { - ex.RequestId = _httpResponse.Headers.GetValues("x-ms-request-id").FirstOrDefault(); - } if (_shouldTrace) { ServiceClientTracing.Error(_invocationId, ex); @@ -1089,7 +1079,7 @@ internal MarketplaceAgreementsOperations(MarketplaceOrderingAgreementsClient cli /// /// The cancellation token. /// - /// + /// /// Thrown when the operation returned an invalid status code /// /// @@ -1193,14 +1183,13 @@ internal MarketplaceAgreementsOperations(MarketplaceOrderingAgreementsClient cli string _responseContent = null; if ((int)_statusCode != 200) { - var ex = new CloudException(string.Format("Operation returned an invalid status code '{0}'", _statusCode)); + var ex = new ErrorResponseException(string.Format("Operation returned an invalid status code '{0}'", _statusCode)); try { _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false); - CloudError _errorBody = Rest.Serialization.SafeJsonConvert.DeserializeObject(_responseContent, Client.DeserializationSettings); + ErrorResponse _errorBody = Rest.Serialization.SafeJsonConvert.DeserializeObject(_responseContent, Client.DeserializationSettings); if (_errorBody != null) { - ex = new CloudException(_errorBody.Message); ex.Body = _errorBody; } } @@ -1210,10 +1199,6 @@ internal MarketplaceAgreementsOperations(MarketplaceOrderingAgreementsClient cli } ex.Request = new HttpRequestMessageWrapper(_httpRequest, _requestContent); ex.Response = new HttpResponseMessageWrapper(_httpResponse, _responseContent); - if (_httpResponse.Headers.Contains("x-ms-request-id")) - { - ex.RequestId = _httpResponse.Headers.GetValues("x-ms-request-id").FirstOrDefault(); - } if (_shouldTrace) { ServiceClientTracing.Error(_invocationId, ex); diff --git a/sdk/marketplaceordering/Microsoft.Azure.Management.MarketplaceOrdering/src/Generated/MarketplaceOrderingAgreementsClient.cs b/sdk/marketplaceordering/Microsoft.Azure.Management.MarketplaceOrdering/src/Generated/MarketplaceOrderingAgreementsClient.cs index bd6c29cb5c91..298ec6f1dabb 100644 --- a/sdk/marketplaceordering/Microsoft.Azure.Management.MarketplaceOrdering/src/Generated/MarketplaceOrderingAgreementsClient.cs +++ b/sdk/marketplaceordering/Microsoft.Azure.Management.MarketplaceOrdering/src/Generated/MarketplaceOrderingAgreementsClient.cs @@ -328,7 +328,7 @@ private void Initialize() MarketplaceAgreements = new MarketplaceAgreementsOperations(this); Operations = new Operations(this); BaseUri = new System.Uri("https://management.azure.com"); - ApiVersion = "2015-06-01"; + ApiVersion = "2021-01-01"; AcceptLanguage = "en-US"; LongRunningOperationRetryTimeout = 30; GenerateClientRequestId = true; diff --git a/sdk/marketplaceordering/Microsoft.Azure.Management.MarketplaceOrdering/src/Generated/SdkInfo_MarketplaceOrderingAgreements.cs b/sdk/marketplaceordering/Microsoft.Azure.Management.MarketplaceOrdering/src/Generated/SdkInfo_MarketplaceOrderingAgreements.cs index db1ddbeb6680..134243e7d5ea 100644 --- a/sdk/marketplaceordering/Microsoft.Azure.Management.MarketplaceOrdering/src/Generated/SdkInfo_MarketplaceOrderingAgreements.cs +++ b/sdk/marketplaceordering/Microsoft.Azure.Management.MarketplaceOrdering/src/Generated/SdkInfo_MarketplaceOrderingAgreements.cs @@ -19,8 +19,8 @@ public static IEnumerable> ApiInfo_MarketplaceOrde { return new Tuple[] { - new Tuple("MarketplaceOrdering", "MarketplaceAgreements", "2015-06-01"), - new Tuple("MarketplaceOrdering", "Operations", "2015-06-01"), + new Tuple("MarketplaceOrdering", "MarketplaceAgreements", "2021-01-01"), + new Tuple("MarketplaceOrdering", "Operations", "2021-01-01"), }.AsEnumerable(); } } From 97583e74b2dfbd0020d668e61500868b0780b9c7 Mon Sep 17 00:00:00 2001 From: alkigel <77278418+alkigel@users.noreply.github.com> Date: Thu, 25 Feb 2021 16:23:48 +0200 Subject: [PATCH 2/7] Updating MarketplaceOrdering SDK with new swagger version --- .../src/Generated/Models/AgreementTerms.cs | 20 +++- .../src/Generated/Models/CreatedByType.cs | 24 ++++ .../src/Generated/Models/SystemData.cs | 103 ++++++++++++++++++ 3 files changed, 146 insertions(+), 1 deletion(-) create mode 100644 sdk/marketplaceordering/Microsoft.Azure.Management.MarketplaceOrdering/src/Generated/Models/CreatedByType.cs create mode 100644 sdk/marketplaceordering/Microsoft.Azure.Management.MarketplaceOrdering/src/Generated/Models/SystemData.cs diff --git a/sdk/marketplaceordering/Microsoft.Azure.Management.MarketplaceOrdering/src/Generated/Models/AgreementTerms.cs b/sdk/marketplaceordering/Microsoft.Azure.Management.MarketplaceOrdering/src/Generated/Models/AgreementTerms.cs index 69d1a178063a..6b027da166ed 100644 --- a/sdk/marketplaceordering/Microsoft.Azure.Management.MarketplaceOrdering/src/Generated/Models/AgreementTerms.cs +++ b/sdk/marketplaceordering/Microsoft.Azure.Management.MarketplaceOrdering/src/Generated/Models/AgreementTerms.cs @@ -45,12 +45,16 @@ public AgreementTerms() /// Publisher terms. /// Link to the privacy policy of the /// publisher. + /// Link to HTML with Azure + /// Marketplace terms. /// Date and time in UTC of when the /// terms were accepted. This is empty if Accepted is false. /// Terms signature. /// If any version of the terms have been /// accepted, otherwise false. - public AgreementTerms(string id = default(string), string name = default(string), string type = default(string), string publisher = default(string), string product = default(string), string plan = default(string), string licenseTextLink = default(string), string privacyPolicyLink = default(string), System.DateTime? retrieveDatetime = default(System.DateTime?), string signature = default(string), bool? accepted = default(bool?)) + /// The system meta data relating to this + /// resource. + public AgreementTerms(string id = default(string), string name = default(string), string type = default(string), string publisher = default(string), string product = default(string), string plan = default(string), string licenseTextLink = default(string), string privacyPolicyLink = default(string), string marketplaceTermsLink = default(string), System.DateTime? retrieveDatetime = default(System.DateTime?), string signature = default(string), bool? accepted = default(bool?), SystemData systemData = default(SystemData)) : base(id, name, type) { Publisher = publisher; @@ -58,9 +62,11 @@ public AgreementTerms() Plan = plan; LicenseTextLink = licenseTextLink; PrivacyPolicyLink = privacyPolicyLink; + MarketplaceTermsLink = marketplaceTermsLink; RetrieveDatetime = retrieveDatetime; Signature = signature; Accepted = accepted; + SystemData = systemData; CustomInit(); } @@ -99,6 +105,12 @@ public AgreementTerms() [JsonProperty(PropertyName = "properties.privacyPolicyLink")] public string PrivacyPolicyLink { get; set; } + /// + /// Gets or sets link to HTML with Azure Marketplace terms. + /// + [JsonProperty(PropertyName = "properties.marketplaceTermsLink")] + public string MarketplaceTermsLink { get; set; } + /// /// Gets or sets date and time in UTC of when the terms were accepted. /// This is empty if Accepted is false. @@ -119,5 +131,11 @@ public AgreementTerms() [JsonProperty(PropertyName = "properties.accepted")] public bool? Accepted { get; set; } + /// + /// Gets the system meta data relating to this resource. + /// + [JsonProperty(PropertyName = "systemData")] + public SystemData SystemData { get; private set; } + } } diff --git a/sdk/marketplaceordering/Microsoft.Azure.Management.MarketplaceOrdering/src/Generated/Models/CreatedByType.cs b/sdk/marketplaceordering/Microsoft.Azure.Management.MarketplaceOrdering/src/Generated/Models/CreatedByType.cs new file mode 100644 index 000000000000..b0428522f9a0 --- /dev/null +++ b/sdk/marketplaceordering/Microsoft.Azure.Management.MarketplaceOrdering/src/Generated/Models/CreatedByType.cs @@ -0,0 +1,24 @@ +// +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. See License.txt in the project root for +// license information. +// +// Code generated by Microsoft (R) AutoRest Code Generator. +// Changes may cause incorrect behavior and will be lost if the code is +// regenerated. +// + +namespace Microsoft.Azure.Management.MarketplaceOrdering.Models +{ + + /// + /// Defines values for CreatedByType. + /// + public static class CreatedByType + { + public const string User = "User"; + public const string Application = "Application"; + public const string ManagedIdentity = "ManagedIdentity"; + public const string Key = "Key"; + } +} diff --git a/sdk/marketplaceordering/Microsoft.Azure.Management.MarketplaceOrdering/src/Generated/Models/SystemData.cs b/sdk/marketplaceordering/Microsoft.Azure.Management.MarketplaceOrdering/src/Generated/Models/SystemData.cs new file mode 100644 index 000000000000..1cfe516bfc4f --- /dev/null +++ b/sdk/marketplaceordering/Microsoft.Azure.Management.MarketplaceOrdering/src/Generated/Models/SystemData.cs @@ -0,0 +1,103 @@ +// +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. See License.txt in the project root for +// license information. +// +// Code generated by Microsoft (R) AutoRest Code Generator. +// Changes may cause incorrect behavior and will be lost if the code is +// regenerated. +// + +namespace Microsoft.Azure.Management.MarketplaceOrdering.Models +{ + using Newtonsoft.Json; + using System.Linq; + + /// + /// Metadata pertaining to creation and last modification of the resource. + /// + public partial class SystemData + { + /// + /// Initializes a new instance of the SystemData class. + /// + public SystemData() + { + CustomInit(); + } + + /// + /// Initializes a new instance of the SystemData class. + /// + /// The identity that created the + /// resource. + /// The type of identity that created the + /// resource. Possible values include: 'User', 'Application', + /// 'ManagedIdentity', 'Key' + /// The timestamp of resource creation + /// (UTC). + /// The identity that last modified the + /// resource. + /// The type of identity that last + /// modified the resource. Possible values include: 'User', + /// 'Application', 'ManagedIdentity', 'Key' + /// The timestamp of resource last + /// modification (UTC) + public SystemData(string createdBy = default(string), string createdByType = default(string), System.DateTime? createdAt = default(System.DateTime?), string lastModifiedBy = default(string), string lastModifiedByType = default(string), System.DateTime? lastModifiedAt = default(System.DateTime?)) + { + CreatedBy = createdBy; + CreatedByType = createdByType; + CreatedAt = createdAt; + LastModifiedBy = lastModifiedBy; + LastModifiedByType = lastModifiedByType; + LastModifiedAt = lastModifiedAt; + CustomInit(); + } + + /// + /// An initialization method that performs custom operations like setting defaults + /// + partial void CustomInit(); + + /// + /// Gets or sets the identity that created the resource. + /// + [JsonProperty(PropertyName = "createdBy")] + public string CreatedBy { get; set; } + + /// + /// Gets or sets the type of identity that created the resource. + /// Possible values include: 'User', 'Application', 'ManagedIdentity', + /// 'Key' + /// + [JsonProperty(PropertyName = "createdByType")] + public string CreatedByType { get; set; } + + /// + /// Gets or sets the timestamp of resource creation (UTC). + /// + [JsonProperty(PropertyName = "createdAt")] + public System.DateTime? CreatedAt { get; set; } + + /// + /// Gets or sets the identity that last modified the resource. + /// + [JsonProperty(PropertyName = "lastModifiedBy")] + public string LastModifiedBy { get; set; } + + /// + /// Gets or sets the type of identity that last modified the resource. + /// Possible values include: 'User', 'Application', 'ManagedIdentity', + /// 'Key' + /// + [JsonProperty(PropertyName = "lastModifiedByType")] + public string LastModifiedByType { get; set; } + + /// + /// Gets or sets the timestamp of resource last modification (UTC) + /// + [JsonProperty(PropertyName = "lastModifiedAt")] + public System.DateTime? LastModifiedAt { get; set; } + + } +} From 9b3b96d45c6df6581af2f641494a36e986656974 Mon Sep 17 00:00:00 2001 From: alkigel <77278418+alkigel@users.noreply.github.com> Date: Thu, 11 Mar 2021 18:42:57 +0200 Subject: [PATCH 3/7] Update AzSdk.RP.props --- .../AzSdk.RP.props | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sdk/marketplaceordering/Microsoft.Azure.Management.MarketplaceOrdering/AzSdk.RP.props b/sdk/marketplaceordering/Microsoft.Azure.Management.MarketplaceOrdering/AzSdk.RP.props index 76bd1d8c8b9c..c8939adb393a 100644 --- a/sdk/marketplaceordering/Microsoft.Azure.Management.MarketplaceOrdering/AzSdk.RP.props +++ b/sdk/marketplaceordering/Microsoft.Azure.Management.MarketplaceOrdering/AzSdk.RP.props @@ -1,7 +1,7 @@ - MarketplaceOrdering_2015-06-01; + MarketplaceOrdering_2021-01-01; $(PackageTags);$(CommonTags);$(AzureApiTag); - \ No newline at end of file + From 7dafde210fdb76fd93d18d3108f9cf4122e0d97a Mon Sep 17 00:00:00 2001 From: alkigel <77278418+alkigel@users.noreply.github.com> Date: Thu, 11 Mar 2021 18:43:43 +0200 Subject: [PATCH 4/7] update MarketplaceOrdering tests --- .../tests/ScenarioTests/AgreementsTests.cs | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sdk/marketplaceordering/Microsoft.Azure.Management.MarketplaceOrdering/tests/ScenarioTests/AgreementsTests.cs b/sdk/marketplaceordering/Microsoft.Azure.Management.MarketplaceOrdering/tests/ScenarioTests/AgreementsTests.cs index bc49f97640ae..ca2f7730d8ed 100644 --- a/sdk/marketplaceordering/Microsoft.Azure.Management.MarketplaceOrdering/tests/ScenarioTests/AgreementsTests.cs +++ b/sdk/marketplaceordering/Microsoft.Azure.Management.MarketplaceOrdering/tests/ScenarioTests/AgreementsTests.cs @@ -28,6 +28,7 @@ public void GetMarketplaceOrderingTerms() Assert.NotNull(marketplaceOrderingTerms); Assert.NotNull(marketplaceOrderingTerms.LicenseTextLink); Assert.NotNull(marketplaceOrderingTerms.PrivacyPolicyLink); + Assert.NotNull(marketplaceOrderingTerms.MarketplaceTermsLink); Assert.NotNull(marketplaceOrderingTerms.Signature); } } @@ -44,6 +45,7 @@ public void SetMarketplaceOrderingTerms() Assert.NotNull(marketplaceOrderingTerms); Assert.NotNull(marketplaceOrderingTerms.LicenseTextLink); Assert.NotNull(marketplaceOrderingTerms.PrivacyPolicyLink); + Assert.NotNull(marketplaceOrderingTerms.MarketplaceTermsLink); Assert.NotNull(marketplaceOrderingTerms.Signature); //accept legal terms @@ -54,6 +56,7 @@ public void SetMarketplaceOrderingTerms() Assert.NotNull(newMarketplaceOrderingTerms); Assert.NotNull(newMarketplaceOrderingTerms.LicenseTextLink); Assert.NotNull(newMarketplaceOrderingTerms.PrivacyPolicyLink); + Assert.NotNull(marketplaceOrderingTerms.MarketplaceTermsLink); Assert.NotNull(newMarketplaceOrderingTerms.Signature); //check that new legal terms are accepted From 6124a2eece274b22f9f4a14ee49e4cdcbb63c519 Mon Sep 17 00:00:00 2001 From: alkigel <77278418+alkigel@users.noreply.github.com> Date: Thu, 11 Mar 2021 18:44:39 +0200 Subject: [PATCH 5/7] update mock APIs for MarketplaceOrdering tests --- .../AgreementsTests/GetMarketplaceOrderingTerms.json | 6 +++--- .../AgreementsTests/SetMarketplaceOrderingTerms.json | 12 ++++++------ 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/sdk/marketplaceordering/Microsoft.Azure.Management.MarketplaceOrdering/tests/SessionRecords/AgreementsTests/GetMarketplaceOrderingTerms.json b/sdk/marketplaceordering/Microsoft.Azure.Management.MarketplaceOrdering/tests/SessionRecords/AgreementsTests/GetMarketplaceOrderingTerms.json index 1ee97c59ce4d..a05468c1328b 100644 --- a/sdk/marketplaceordering/Microsoft.Azure.Management.MarketplaceOrdering/tests/SessionRecords/AgreementsTests/GetMarketplaceOrderingTerms.json +++ b/sdk/marketplaceordering/Microsoft.Azure.Management.MarketplaceOrdering/tests/SessionRecords/AgreementsTests/GetMarketplaceOrderingTerms.json @@ -1,8 +1,8 @@ { "Entries": [ { - "RequestUri": "/subscriptions/2367173c-a5bd-4005-be8e-c882f160dcc4/providers/Microsoft.MarketplaceOrdering/offerTypes/virtualmachine/publishers/microsoft-ads/offers/windows-data-science-vm/plans/windows2016/agreements/current?api-version=2015-06-01", - "EncodedRequestUri": "L3N1YnNjcmlwdGlvbnMvMjM2NzE3M2MtYTViZC00MDA1LWJlOGUtYzg4MmYxNjBkY2M0L3Byb3ZpZGVycy9NaWNyb3NvZnQuTWFya2V0cGxhY2VPcmRlcmluZy9vZmZlclR5cGVzL3ZpcnR1YWxtYWNoaW5lL3B1Ymxpc2hlcnMvbWljcm9zb2Z0LWFkcy9vZmZlcnMvd2luZG93cy1kYXRhLXNjaWVuY2Utdm0vcGxhbnMvd2luZG93czIwMTYvYWdyZWVtZW50cy9jdXJyZW50P2FwaS12ZXJzaW9uPTIwMTUtMDYtMDE=", + "RequestUri": "/subscriptions/2367173c-a5bd-4005-be8e-c882f160dcc4/providers/Microsoft.MarketplaceOrdering/offerTypes/virtualmachine/publishers/microsoft-ads/offers/windows-data-science-vm/plans/windows2016/agreements/current?api-version=2021-01-01", + "EncodedRequestUri": "L3N1YnNjcmlwdGlvbnMvMjM2NzE3M2MtYTViZC00MDA1LWJlOGUtYzg4MmYxNjBkY2M0L3Byb3ZpZGVycy9NaWNyb3NvZnQuTWFya2V0cGxhY2VPcmRlcmluZy9vZmZlclR5cGVzL3ZpcnR1YWxtYWNoaW5lL3B1Ymxpc2hlcnMvbWljcm9zb2Z0LWFkcy9vZmZlcnMvd2luZG93cy1kYXRhLXNjaWVuY2Utdm0vcGxhbnMvd2luZG93czIwMTYvYWdyZWVtZW50cy9jdXJyZW50P2FwaS12ZXJzaW9uPTIwMjEtMDEtMDE=", "RequestMethod": "GET", "RequestBody": "", "RequestHeaders": { @@ -17,7 +17,7 @@ "Microsoft.Azure.Management.MarketplaceOrdering.MarketplaceOrderingAgreementsClient/1.0.0.0" ] }, - "ResponseBody": "{\r\n \"id\": \"/subscriptions/2367173c-a5bd-4005-be8e-c882f160dcc4/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.2/Content/LegalTerms0.DEFAULT.txt\",\r\n \"privacyPolicyLink\": \"https://www.microsoft.com/EN-US/privacystatement/OnlineServices/Default.aspx\",\r\n \"retrieveDatetime\": \"2017-09-22T00:35:57.590745Z\",\r\n \"signature\": \"A6LJEMVGX63BP5EIU3DEU4HTKO7CS4RWBV4LKUTA7SJ3H7GZPV75WUVWTOP3YQTBZXVVWCA2GLNQ7UCER7FLIOCNKHKYX24NXSYTARQ\",\r\n \"accepted\": true\r\n }\r\n}", + "ResponseBody": "{\r\n \"id\": \"/subscriptions/2367173c-a5bd-4005-be8e-c882f160dcc4/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.2/Content/LegalTerms0.DEFAULT.txt\",\r\n \"privacyPolicyLink\": \"https://www.microsoft.com/EN-US/privacystatement/OnlineServices/Default.aspx\",\r\n \"marketplaceTermsLink\": \"https://www.microsoft.com/EN-US/privacystatement/OnlineServices/Default.aspx\",\r\n \"retrieveDatetime\": \"2017-09-22T00:35:57.590745Z\",\r\n \"signature\": \"A6LJEMVGX63BP5EIU3DEU4HTKO7CS4RWBV4LKUTA7SJ3H7GZPV75WUVWTOP3YQTBZXVVWCA2GLNQ7UCER7FLIOCNKHKYX24NXSYTARQ\",\r\n \"accepted\": true\r\n }\r\n}", "ResponseHeaders": { "Content-Type": [ "application/json; charset=utf-8" diff --git a/sdk/marketplaceordering/Microsoft.Azure.Management.MarketplaceOrdering/tests/SessionRecords/AgreementsTests/SetMarketplaceOrderingTerms.json b/sdk/marketplaceordering/Microsoft.Azure.Management.MarketplaceOrdering/tests/SessionRecords/AgreementsTests/SetMarketplaceOrderingTerms.json index 0de6dceb6760..b3732b3e03b8 100644 --- a/sdk/marketplaceordering/Microsoft.Azure.Management.MarketplaceOrdering/tests/SessionRecords/AgreementsTests/SetMarketplaceOrderingTerms.json +++ b/sdk/marketplaceordering/Microsoft.Azure.Management.MarketplaceOrdering/tests/SessionRecords/AgreementsTests/SetMarketplaceOrderingTerms.json @@ -1,8 +1,8 @@ { "Entries": [ { - "RequestUri": "/subscriptions/2367173c-a5bd-4005-be8e-c882f160dcc4/providers/Microsoft.MarketplaceOrdering/offerTypes/virtualmachine/publishers/microsoft-ads/offers/windows-data-science-vm/plans/windows2016/agreements/current?api-version=2015-06-01", - "EncodedRequestUri": "L3N1YnNjcmlwdGlvbnMvMjM2NzE3M2MtYTViZC00MDA1LWJlOGUtYzg4MmYxNjBkY2M0L3Byb3ZpZGVycy9NaWNyb3NvZnQuTWFya2V0cGxhY2VPcmRlcmluZy9vZmZlclR5cGVzL3ZpcnR1YWxtYWNoaW5lL3B1Ymxpc2hlcnMvbWljcm9zb2Z0LWFkcy9vZmZlcnMvd2luZG93cy1kYXRhLXNjaWVuY2Utdm0vcGxhbnMvd2luZG93czIwMTYvYWdyZWVtZW50cy9jdXJyZW50P2FwaS12ZXJzaW9uPTIwMTUtMDYtMDE=", + "RequestUri": "/subscriptions/2367173c-a5bd-4005-be8e-c882f160dcc4/providers/Microsoft.MarketplaceOrdering/offerTypes/virtualmachine/publishers/microsoft-ads/offers/windows-data-science-vm/plans/windows2016/agreements/current?api-version=2021-01-01", + "EncodedRequestUri": "L3N1YnNjcmlwdGlvbnMvMjM2NzE3M2MtYTViZC00MDA1LWJlOGUtYzg4MmYxNjBkY2M0L3Byb3ZpZGVycy9NaWNyb3NvZnQuTWFya2V0cGxhY2VPcmRlcmluZy9vZmZlclR5cGVzL3ZpcnR1YWxtYWNoaW5lL3B1Ymxpc2hlcnMvbWljcm9zb2Z0LWFkcy9vZmZlcnMvd2luZG93cy1kYXRhLXNjaWVuY2Utdm0vcGxhbnMvd2luZG93czIwMTYvYWdyZWVtZW50cy9jdXJyZW50P2FwaS12ZXJzaW9uPTIwMjEtMDEtMDE=", "RequestMethod": "GET", "RequestBody": "", "RequestHeaders": { @@ -17,7 +17,7 @@ "Microsoft.Azure.Management.MarketplaceOrdering.MarketplaceOrderingAgreementsClient/1.0.0.0" ] }, - "ResponseBody": "{\r\n \"id\": \"/subscriptions/2367173c-a5bd-4005-be8e-c882f160dcc4/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.2/Content/LegalTerms0.DEFAULT.txt\",\r\n \"privacyPolicyLink\": \"https://www.microsoft.com/EN-US/privacystatement/OnlineServices/Default.aspx\",\r\n \"retrieveDatetime\": \"2017-09-22T00:35:58.3133579Z\",\r\n \"signature\": \"XOANNQQPPIZMQLGAKK5YBOHNZYBBE3QX6HXVTNFVEFE77ANGWONNAHGEDBM7ZCGLJYKBCRQEHQC2EY5VWRVPPYCYPVF7BE77PXO3AFI\",\r\n \"accepted\": true\r\n }\r\n}", + "ResponseBody": "{\r\n \"id\": \"/subscriptions/2367173c-a5bd-4005-be8e-c882f160dcc4/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.2/Content/LegalTerms0.DEFAULT.txt\",\r\n \"privacyPolicyLink\": \"https://www.microsoft.com/EN-US/privacystatement/OnlineServices/Default.aspx\",\r\n \"marketplaceTermsLink\": \"https://www.microsoft.com/EN-US/privacystatement/OnlineServices/Default.aspx\",\r\n \"retrieveDatetime\": \"2017-09-22T00:35:58.3133579Z\",\r\n \"signature\": \"XOANNQQPPIZMQLGAKK5YBOHNZYBBE3QX6HXVTNFVEFE77ANGWONNAHGEDBM7ZCGLJYKBCRQEHQC2EY5VWRVPPYCYPVF7BE77PXO3AFI\",\r\n \"accepted\": true\r\n }\r\n}", "ResponseHeaders": { "Content-Type": [ "application/json; charset=utf-8" @@ -69,8 +69,8 @@ "StatusCode": 200 }, { - "RequestUri": "/subscriptions/2367173c-a5bd-4005-be8e-c882f160dcc4/providers/Microsoft.MarketplaceOrdering/offerTypes/virtualmachine/publishers/microsoft-ads/offers/windows-data-science-vm/plans/windows2016/agreements/current?api-version=2015-06-01", - "EncodedRequestUri": "L3N1YnNjcmlwdGlvbnMvMjM2NzE3M2MtYTViZC00MDA1LWJlOGUtYzg4MmYxNjBkY2M0L3Byb3ZpZGVycy9NaWNyb3NvZnQuTWFya2V0cGxhY2VPcmRlcmluZy9vZmZlclR5cGVzL3ZpcnR1YWxtYWNoaW5lL3B1Ymxpc2hlcnMvbWljcm9zb2Z0LWFkcy9vZmZlcnMvd2luZG93cy1kYXRhLXNjaWVuY2Utdm0vcGxhbnMvd2luZG93czIwMTYvYWdyZWVtZW50cy9jdXJyZW50P2FwaS12ZXJzaW9uPTIwMTUtMDYtMDE=", + "RequestUri": "/subscriptions/2367173c-a5bd-4005-be8e-c882f160dcc4/providers/Microsoft.MarketplaceOrdering/offerTypes/virtualmachine/publishers/microsoft-ads/offers/windows-data-science-vm/plans/windows2016/agreements/current?api-version=2021-01-01", + "EncodedRequestUri": "L3N1YnNjcmlwdGlvbnMvMjM2NzE3M2MtYTViZC00MDA1LWJlOGUtYzg4MmYxNjBkY2M0L3Byb3ZpZGVycy9NaWNyb3NvZnQuTWFya2V0cGxhY2VPcmRlcmluZy9vZmZlclR5cGVzL3ZpcnR1YWxtYWNoaW5lL3B1Ymxpc2hlcnMvbWljcm9zb2Z0LWFkcy9vZmZlcnMvd2luZG93cy1kYXRhLXNjaWVuY2Utdm0vcGxhbnMvd2luZG93czIwMTYvYWdyZWVtZW50cy9jdXJyZW50P2FwaS12ZXJzaW9uPTIwMjEtMDEtMDE=", "RequestMethod": "PUT", "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.2/Content/LegalTerms0.DEFAULT.txt\",\r\n \"privacyPolicyLink\": \"https://www.microsoft.com/EN-US/privacystatement/OnlineServices/Default.aspx\",\r\n \"retrieveDatetime\": \"2017-09-22T00:35:58.3133579Z\",\r\n \"signature\": \"XOANNQQPPIZMQLGAKK5YBOHNZYBBE3QX6HXVTNFVEFE77ANGWONNAHGEDBM7ZCGLJYKBCRQEHQC2EY5VWRVPPYCYPVF7BE77PXO3AFI\",\r\n \"accepted\": true\r\n }\r\n}", "RequestHeaders": { @@ -91,7 +91,7 @@ "Microsoft.Azure.Management.MarketplaceOrdering.MarketplaceOrderingAgreementsClient/1.0.0.0" ] }, - "ResponseBody": "{\r\n \"id\": \"/subscriptions/2367173c-a5bd-4005-be8e-c882f160dcc4/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.2/Content/LegalTerms0.DEFAULT.txt\",\r\n \"privacyPolicyLink\": \"https://www.microsoft.com/EN-US/privacystatement/OnlineServices/Default.aspx\",\r\n \"retrieveDatetime\": \"2017-09-22T00:35:58.3133579Z\",\r\n \"signature\": \"XOANNQQPPIZMQLGAKK5YBOHNZYBBE3QX6HXVTNFVEFE77ANGWONNAHGEDBM7ZCGLJYKBCRQEHQC2EY5VWRVPPYCYPVF7BE77PXO3AFI\",\r\n \"accepted\": true\r\n }\r\n}", + "ResponseBody": "{\r\n \"id\": \"/subscriptions/2367173c-a5bd-4005-be8e-c882f160dcc4/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.2/Content/LegalTerms0.DEFAULT.txt\",\r\n \"privacyPolicyLink\": \"https://www.microsoft.com/EN-US/privacystatement/OnlineServices/Default.aspx\",\r\n \"marketplaceTermsLink\": \"https://www.microsoft.com/EN-US/privacystatement/OnlineServices/Default.aspx\",\r\n \"retrieveDatetime\": \"2017-09-22T00:35:58.3133579Z\",\r\n \"signature\": \"XOANNQQPPIZMQLGAKK5YBOHNZYBBE3QX6HXVTNFVEFE77ANGWONNAHGEDBM7ZCGLJYKBCRQEHQC2EY5VWRVPPYCYPVF7BE77PXO3AFI\",\r\n \"accepted\": true\r\n }\r\n}", "ResponseHeaders": { "Content-Type": [ "application/json; charset=utf-8" From ca3684fdb46fdc83fe0a0a1dd74c3ce32ec59978 Mon Sep 17 00:00:00 2001 From: alkigel <77278418+alkigel@users.noreply.github.com> Date: Wed, 17 Mar 2021 17:37:28 +0200 Subject: [PATCH 6/7] addded marketplaceordering metadata --- .../marketplaceordering_resource-manager.txt | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 eng/mgmt/mgmtmetadata/marketplaceordering_resource-manager.txt diff --git a/eng/mgmt/mgmtmetadata/marketplaceordering_resource-manager.txt b/eng/mgmt/mgmtmetadata/marketplaceordering_resource-manager.txt new file mode 100644 index 000000000000..5f1992c1cf64 --- /dev/null +++ b/eng/mgmt/mgmtmetadata/marketplaceordering_resource-manager.txt @@ -0,0 +1,14 @@ +Installing AutoRest version: v2 +AutoRest installed successfully. +Commencing code generation +Generating CSharp code +Executing AutoRest command +cmd.exe /c autorest.cmd https://github.com/Azure/azure-rest-api-specs/blob/master/specification/marketplaceordering/resource-manager/readme.md --csharp --version=v2 --reflect-api-versions --csharp-sdks-folder=C:\repo\azure-sdk-for-net\sdk +2021-03-11 14:17:43 UTC +Azure-rest-api-specs repository information +GitHub fork: Azure +Branch: master +Commit: 3e5a34c68002ad6816596b537f92a8afa3be413e +AutoRest information +Requested version: v2 +Bootstrapper version: autorest@2.0.4413 From 7ee1675484a65716247da549a7f36dae1dc2476f Mon Sep 17 00:00:00 2001 From: alkigel <77278418+alkigel@users.noreply.github.com> Date: Thu, 18 Mar 2021 12:07:01 +0200 Subject: [PATCH 7/7] Re-generating systemData --- .../src/Generated/Models/SystemData.cs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sdk/marketplaceordering/Microsoft.Azure.Management.MarketplaceOrdering/src/Generated/Models/SystemData.cs b/sdk/marketplaceordering/Microsoft.Azure.Management.MarketplaceOrdering/src/Generated/Models/SystemData.cs index 1cfe516bfc4f..695eda50afa1 100644 --- a/sdk/marketplaceordering/Microsoft.Azure.Management.MarketplaceOrdering/src/Generated/Models/SystemData.cs +++ b/sdk/marketplaceordering/Microsoft.Azure.Management.MarketplaceOrdering/src/Generated/Models/SystemData.cs @@ -41,8 +41,8 @@ public SystemData() /// The type of identity that last /// modified the resource. Possible values include: 'User', /// 'Application', 'ManagedIdentity', 'Key' - /// The timestamp of resource last - /// modification (UTC) + /// The type of identity that last + /// modified the resource. public SystemData(string createdBy = default(string), string createdByType = default(string), System.DateTime? createdAt = default(System.DateTime?), string lastModifiedBy = default(string), string lastModifiedByType = default(string), System.DateTime? lastModifiedAt = default(System.DateTime?)) { CreatedBy = createdBy; @@ -94,7 +94,7 @@ public SystemData() public string LastModifiedByType { get; set; } /// - /// Gets or sets the timestamp of resource last modification (UTC) + /// Gets or sets the type of identity that last modified the resource. /// [JsonProperty(PropertyName = "lastModifiedAt")] public System.DateTime? LastModifiedAt { get; set; }