diff --git a/services/marketplaceordering/mgmt/2015-06-01/marketplaceordering/CHANGELOG.md b/services/marketplaceordering/mgmt/2015-06-01/marketplaceordering/CHANGELOG.md index 0a062048f9ac..4e9aa8b84975 100644 --- a/services/marketplaceordering/mgmt/2015-06-01/marketplaceordering/CHANGELOG.md +++ b/services/marketplaceordering/mgmt/2015-06-01/marketplaceordering/CHANGELOG.md @@ -1,8 +1,72 @@ -# Change History +# Unreleased + +## Breaking Changes + +### Struct Changes + +#### Removed Structs + +1. ListAgreementTerms + +### Signature Changes + +#### Funcs + +1. MarketplaceAgreementsClient.Cancel + - Returns + - From: AgreementTerms, error + - To: OldAgreementTerms, error +1. MarketplaceAgreementsClient.CancelResponder + - Returns + - From: AgreementTerms, error + - To: OldAgreementTerms, error +1. MarketplaceAgreementsClient.GetAgreement + - Returns + - From: AgreementTerms, error + - To: OldAgreementTerms, error +1. MarketplaceAgreementsClient.GetAgreementResponder + - Returns + - From: AgreementTerms, error + - To: OldAgreementTerms, error +1. MarketplaceAgreementsClient.List + - Returns + - From: ListAgreementTerms, error + - To: AgreementTermsList, error +1. MarketplaceAgreementsClient.ListResponder + - Returns + - From: ListAgreementTerms, error + - To: AgreementTermsList, error +1. MarketplaceAgreementsClient.Sign + - Returns + - From: AgreementTerms, error + - To: OldAgreementTerms, error +1. MarketplaceAgreementsClient.SignResponder + - Returns + - From: AgreementTerms, error + - To: OldAgreementTerms, error ## Additive Changes +### New Constants + +1. State.Active +1. State.Canceled + ### New Funcs -1. ErrorResponseError.MarshalJSON() ([]byte, error) -1. Resource.MarshalJSON() ([]byte, error) +1. *OldAgreementTerms.UnmarshalJSON([]byte) error +1. OldAgreementTerms.MarshalJSON() ([]byte, error) +1. PossibleStateValues() []State + +### Struct Changes + +#### New Structs + +1. AgreementTermsList +1. OldAgreementProperties +1. OldAgreementTerms +1. UnsupportedMediaTypeErrorResponse + +#### New Struct Fields + +1. OperationDisplay.Description diff --git a/services/marketplaceordering/mgmt/2015-06-01/marketplaceordering/_meta.json b/services/marketplaceordering/mgmt/2015-06-01/marketplaceordering/_meta.json index 4352951e5d46..251a14ff4153 100644 --- a/services/marketplaceordering/mgmt/2015-06-01/marketplaceordering/_meta.json +++ b/services/marketplaceordering/mgmt/2015-06-01/marketplaceordering/_meta.json @@ -1,5 +1,5 @@ { - "commit": "3c764635e7d442b3e74caf593029fcd440b3ef82", + "commit": "db37dbb98e65cafab6397ff3a33e5df3599bfbfe", "readme": "/_/azure-rest-api-specs/specification/marketplaceordering/resource-manager/readme.md", "tag": "package-2015-06-01", "use": "@microsoft.azure/autorest.go@2.1.183", diff --git a/services/marketplaceordering/mgmt/2015-06-01/marketplaceordering/enums.go b/services/marketplaceordering/mgmt/2015-06-01/marketplaceordering/enums.go new file mode 100644 index 000000000000..1d5992242f81 --- /dev/null +++ b/services/marketplaceordering/mgmt/2015-06-01/marketplaceordering/enums.go @@ -0,0 +1,22 @@ +package marketplaceordering + +// 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. + +// State enumerates the values for state. +type State string + +const ( + // Active ... + Active State = "Active" + // Canceled ... + Canceled State = "Canceled" +) + +// PossibleStateValues returns an array of possible values for the State const type. +func PossibleStateValues() []State { + return []State{Active, Canceled} +} diff --git a/services/marketplaceordering/mgmt/2015-06-01/marketplaceordering/marketplaceagreements.go b/services/marketplaceordering/mgmt/2015-06-01/marketplaceordering/marketplaceagreements.go index fea3d1f35a42..96f67039150b 100644 --- a/services/marketplaceordering/mgmt/2015-06-01/marketplaceordering/marketplaceagreements.go +++ b/services/marketplaceordering/mgmt/2015-06-01/marketplaceordering/marketplaceagreements.go @@ -36,7 +36,7 @@ func NewMarketplaceAgreementsClientWithBaseURI(baseURI string, subscriptionID st // publisherID - publisher identifier string of image being deployed. // offerID - offer identifier string of image being deployed. // planID - plan identifier string of image being deployed. -func (client MarketplaceAgreementsClient) Cancel(ctx context.Context, publisherID string, offerID string, planID string) (result AgreementTerms, err error) { +func (client MarketplaceAgreementsClient) Cancel(ctx context.Context, publisherID string, offerID string, planID string) (result OldAgreementTerms, err error) { if tracing.IsEnabled() { ctx = tracing.StartSpan(ctx, fqdn+"/MarketplaceAgreementsClient.Cancel") defer func() { @@ -99,7 +99,7 @@ func (client MarketplaceAgreementsClient) CancelSender(req *http.Request) (*http // CancelResponder handles the response to the Cancel request. The method always // closes the http.Response Body. -func (client MarketplaceAgreementsClient) CancelResponder(resp *http.Response) (result AgreementTerms, err error) { +func (client MarketplaceAgreementsClient) CancelResponder(resp *http.Response) (result OldAgreementTerms, err error) { err = autorest.Respond( resp, azure.WithErrorUnlessStatusCode(http.StatusOK), @@ -275,7 +275,7 @@ func (client MarketplaceAgreementsClient) GetResponder(resp *http.Response) (res // publisherID - publisher identifier string of image being deployed. // offerID - offer identifier string of image being deployed. // planID - plan identifier string of image being deployed. -func (client MarketplaceAgreementsClient) GetAgreement(ctx context.Context, publisherID string, offerID string, planID string) (result AgreementTerms, err error) { +func (client MarketplaceAgreementsClient) GetAgreement(ctx context.Context, publisherID string, offerID string, planID string) (result OldAgreementTerms, err error) { if tracing.IsEnabled() { ctx = tracing.StartSpan(ctx, fqdn+"/MarketplaceAgreementsClient.GetAgreement") defer func() { @@ -338,7 +338,7 @@ func (client MarketplaceAgreementsClient) GetAgreementSender(req *http.Request) // GetAgreementResponder handles the response to the GetAgreement request. The method always // closes the http.Response Body. -func (client MarketplaceAgreementsClient) GetAgreementResponder(resp *http.Response) (result AgreementTerms, err error) { +func (client MarketplaceAgreementsClient) GetAgreementResponder(resp *http.Response) (result OldAgreementTerms, err error) { err = autorest.Respond( resp, azure.WithErrorUnlessStatusCode(http.StatusOK), @@ -349,7 +349,7 @@ func (client MarketplaceAgreementsClient) GetAgreementResponder(resp *http.Respo } // List list marketplace agreements in the subscription. -func (client MarketplaceAgreementsClient) List(ctx context.Context) (result ListAgreementTerms, err error) { +func (client MarketplaceAgreementsClient) List(ctx context.Context) (result AgreementTermsList, err error) { if tracing.IsEnabled() { ctx = tracing.StartSpan(ctx, fqdn+"/MarketplaceAgreementsClient.List") defer func() { @@ -409,11 +409,11 @@ func (client MarketplaceAgreementsClient) ListSender(req *http.Request) (*http.R // ListResponder handles the response to the List request. The method always // closes the http.Response Body. -func (client MarketplaceAgreementsClient) ListResponder(resp *http.Response) (result ListAgreementTerms, err error) { +func (client MarketplaceAgreementsClient) ListResponder(resp *http.Response) (result AgreementTermsList, err error) { err = autorest.Respond( resp, azure.WithErrorUnlessStatusCode(http.StatusOK), - autorest.ByUnmarshallingJSON(&result.Value), + autorest.ByUnmarshallingJSON(&result), autorest.ByClosing()) result.Response = autorest.Response{Response: resp} return @@ -424,7 +424,7 @@ func (client MarketplaceAgreementsClient) ListResponder(resp *http.Response) (re // publisherID - publisher identifier string of image being deployed. // offerID - offer identifier string of image being deployed. // planID - plan identifier string of image being deployed. -func (client MarketplaceAgreementsClient) Sign(ctx context.Context, publisherID string, offerID string, planID string) (result AgreementTerms, err error) { +func (client MarketplaceAgreementsClient) Sign(ctx context.Context, publisherID string, offerID string, planID string) (result OldAgreementTerms, err error) { if tracing.IsEnabled() { ctx = tracing.StartSpan(ctx, fqdn+"/MarketplaceAgreementsClient.Sign") defer func() { @@ -487,7 +487,7 @@ func (client MarketplaceAgreementsClient) SignSender(req *http.Request) (*http.R // SignResponder handles the response to the Sign request. The method always // closes the http.Response Body. -func (client MarketplaceAgreementsClient) SignResponder(resp *http.Response) (result AgreementTerms, err error) { +func (client MarketplaceAgreementsClient) SignResponder(resp *http.Response) (result OldAgreementTerms, err error) { err = autorest.Respond( resp, azure.WithErrorUnlessStatusCode(http.StatusOK), diff --git a/services/marketplaceordering/mgmt/2015-06-01/marketplaceordering/marketplaceorderingapi/interfaces.go b/services/marketplaceordering/mgmt/2015-06-01/marketplaceordering/marketplaceorderingapi/interfaces.go index 228f669b3875..6507c01b7aa1 100644 --- a/services/marketplaceordering/mgmt/2015-06-01/marketplaceordering/marketplaceorderingapi/interfaces.go +++ b/services/marketplaceordering/mgmt/2015-06-01/marketplaceordering/marketplaceorderingapi/interfaces.go @@ -13,12 +13,12 @@ import ( // MarketplaceAgreementsClientAPI contains the set of methods on the MarketplaceAgreementsClient type. type MarketplaceAgreementsClientAPI interface { - Cancel(ctx context.Context, publisherID string, offerID string, planID string) (result marketplaceordering.AgreementTerms, err error) + Cancel(ctx context.Context, publisherID string, offerID string, planID string) (result marketplaceordering.OldAgreementTerms, err error) Create(ctx context.Context, publisherID string, offerID string, planID string, parameters marketplaceordering.AgreementTerms) (result marketplaceordering.AgreementTerms, err error) Get(ctx context.Context, publisherID string, offerID string, planID string) (result marketplaceordering.AgreementTerms, err error) - GetAgreement(ctx context.Context, publisherID string, offerID string, planID string) (result marketplaceordering.AgreementTerms, err error) - List(ctx context.Context) (result marketplaceordering.ListAgreementTerms, err error) - Sign(ctx context.Context, publisherID string, offerID string, planID string) (result marketplaceordering.AgreementTerms, err error) + GetAgreement(ctx context.Context, publisherID string, offerID string, planID string) (result marketplaceordering.OldAgreementTerms, err error) + List(ctx context.Context) (result marketplaceordering.AgreementTermsList, err error) + Sign(ctx context.Context, publisherID string, offerID string, planID string) (result marketplaceordering.OldAgreementTerms, err error) } var _ MarketplaceAgreementsClientAPI = (*marketplaceordering.MarketplaceAgreementsClient)(nil) diff --git a/services/marketplaceordering/mgmt/2015-06-01/marketplaceordering/models.go b/services/marketplaceordering/mgmt/2015-06-01/marketplaceordering/models.go index e3ed58828c12..f9cb14151ef0 100644 --- a/services/marketplaceordering/mgmt/2015-06-01/marketplaceordering/models.go +++ b/services/marketplaceordering/mgmt/2015-06-01/marketplaceordering/models.go @@ -112,6 +112,13 @@ func (at *AgreementTerms) UnmarshalJSON(body []byte) error { return nil } +// AgreementTermsList represents the list of AgreementTerms objects +type AgreementTermsList struct { + autorest.Response `json:"-"` + // Value - The value of the array. + Value *[]OldAgreementTerms `json:"value,omitempty"` +} + // ErrorResponse error response indicates Microsoft.MarketplaceOrdering service is not able to process the // incoming request. The reason is provided in the error message. type ErrorResponse struct { @@ -133,10 +140,93 @@ func (er ErrorResponseError) MarshalJSON() ([]byte, error) { return json.Marshal(objectMap) } -// ListAgreementTerms ... -type ListAgreementTerms struct { +// OldAgreementProperties old Agreement Terms definition +type OldAgreementProperties struct { + // ID - A unique identifier of the agreement. + ID *string `json:"id,omitempty"` + // Publisher - Publisher identifier string of image being deployed. + Publisher *string `json:"publisher,omitempty"` + // Offer - Offer identifier string of image being deployed. + Offer *string `json:"offer,omitempty"` + // SignDate - Date and time in UTC of when the terms were accepted. This is empty if state is cancelled. + SignDate *date.Time `json:"signDate,omitempty"` + // CancelDate - Date and time in UTC of when the terms were cancelled. This is empty if state is active. + CancelDate *date.Time `json:"cancelDate,omitempty"` + // State - Whether the agreement is active or cancelled. Possible values include: 'Active', 'Canceled' + State State `json:"state,omitempty"` +} + +// OldAgreementTerms terms properties for provided Publisher/Offer/Plan tuple +type OldAgreementTerms struct { autorest.Response `json:"-"` - Value *[]AgreementTerms `json:"value,omitempty"` + // OldAgreementProperties - Represents the properties of the resource. + *OldAgreementProperties `json:"properties,omitempty"` + // ID - READ-ONLY; Resource ID. + ID *string `json:"id,omitempty"` + // Name - READ-ONLY; Resource name. + Name *string `json:"name,omitempty"` + // Type - READ-ONLY; Resource type. + Type *string `json:"type,omitempty"` +} + +// MarshalJSON is the custom marshaler for OldAgreementTerms. +func (oat OldAgreementTerms) MarshalJSON() ([]byte, error) { + objectMap := make(map[string]interface{}) + if oat.OldAgreementProperties != nil { + objectMap["properties"] = oat.OldAgreementProperties + } + return json.Marshal(objectMap) +} + +// UnmarshalJSON is the custom unmarshaler for OldAgreementTerms struct. +func (oat *OldAgreementTerms) UnmarshalJSON(body []byte) error { + var m map[string]*json.RawMessage + err := json.Unmarshal(body, &m) + if err != nil { + return err + } + for k, v := range m { + switch k { + case "properties": + if v != nil { + var oldAgreementProperties OldAgreementProperties + err = json.Unmarshal(*v, &oldAgreementProperties) + if err != nil { + return err + } + oat.OldAgreementProperties = &oldAgreementProperties + } + case "id": + if v != nil { + var ID string + err = json.Unmarshal(*v, &ID) + if err != nil { + return err + } + oat.ID = &ID + } + case "name": + if v != nil { + var name string + err = json.Unmarshal(*v, &name) + if err != nil { + return err + } + oat.Name = &name + } + case "type": + if v != nil { + var typeVar string + err = json.Unmarshal(*v, &typeVar) + if err != nil { + return err + } + oat.Type = &typeVar + } + } + } + + return nil } // Operation microsoft.MarketplaceOrdering REST API operation @@ -155,6 +245,8 @@ type OperationDisplay struct { Resource *string `json:"resource,omitempty"` // Operation - Operation type: Get Agreement, Sign Agreement, Cancel Agreement etc. Operation *string `json:"operation,omitempty"` + // Description - The description of the operation + Description *string `json:"description,omitempty"` } // OperationListResult result of the request to list MarketplaceOrdering operations. It contains a list of @@ -341,3 +433,10 @@ func (r Resource) MarshalJSON() ([]byte, error) { objectMap := make(map[string]interface{}) return json.Marshal(objectMap) } + +// UnsupportedMediaTypeErrorResponse error response that indicates the media type in the request is +// unsupported. +type UnsupportedMediaTypeErrorResponse struct { + // Message - The details of the error. + Message *string `json:"Message,omitempty"` +}