diff --git a/services/preview/iotspaces/mgmt/2017-10-01-preview/iotspaces/CHANGELOG.md b/services/preview/iotspaces/mgmt/2017-10-01-preview/iotspaces/CHANGELOG.md deleted file mode 100644 index 257e39c78ddd..000000000000 --- a/services/preview/iotspaces/mgmt/2017-10-01-preview/iotspaces/CHANGELOG.md +++ /dev/null @@ -1,8 +0,0 @@ -Generated from https://github.com/Azure/azure-rest-api-specs/tree/3c764635e7d442b3e74caf593029fcd440b3ef82 - -Code generator @microsoft.azure/autorest.go@~2.1.161 - -## Breaking Changes - -- Function `NewDescriptionListResultPage` parameter(s) have been changed from `(func(context.Context, DescriptionListResult) (DescriptionListResult, error))` to `(DescriptionListResult, func(context.Context, DescriptionListResult) (DescriptionListResult, error))` -- Function `NewOperationListResultPage` parameter(s) have been changed from `(func(context.Context, OperationListResult) (OperationListResult, error))` to `(OperationListResult, func(context.Context, OperationListResult) (OperationListResult, error))` diff --git a/services/preview/iotspaces/mgmt/2017-10-01-preview/iotspaces/iotspaces.go b/services/preview/iotspaces/mgmt/2017-10-01-preview/iotspaces/iotspaces.go index 9752ff3abeaa..f5626b55040a 100644 --- a/services/preview/iotspaces/mgmt/2017-10-01-preview/iotspaces/iotspaces.go +++ b/services/preview/iotspaces/mgmt/2017-10-01-preview/iotspaces/iotspaces.go @@ -163,7 +163,7 @@ func (client Client) CreateOrUpdate(ctx context.Context, resourceGroupName strin result, err = client.CreateOrUpdateSender(req) if err != nil { - err = autorest.NewErrorWithError(err, "iotspaces.Client", "CreateOrUpdate", result.Response(), "Failure sending request") + err = autorest.NewErrorWithError(err, "iotspaces.Client", "CreateOrUpdate", nil, "Failure sending request") return } @@ -201,7 +201,29 @@ func (client Client) CreateOrUpdateSender(req *http.Request) (future CreateOrUpd if err != nil { return } - future.Future, err = azure.NewFutureFromResponse(resp) + var azf azure.Future + azf, err = azure.NewFutureFromResponse(resp) + future.FutureAPI = &azf + future.Result = func(client Client) (d Description, err error) { + var done bool + done, err = future.DoneWithContext(context.Background(), client) + if err != nil { + err = autorest.NewErrorWithError(err, "iotspaces.CreateOrUpdateFuture", "Result", future.Response(), "Polling failure") + return + } + if !done { + err = azure.NewAsyncOpIncompleteError("iotspaces.CreateOrUpdateFuture") + return + } + sender := autorest.DecorateSender(client, autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) + if d.Response.Response, err = future.GetResult(sender); err == nil && d.Response.Response.StatusCode != http.StatusNoContent { + d, err = client.CreateOrUpdateResponder(d.Response.Response) + if err != nil { + err = autorest.NewErrorWithError(err, "iotspaces.CreateOrUpdateFuture", "Result", d.Response.Response, "Failure responding to request") + } + } + return + } return } @@ -250,7 +272,7 @@ func (client Client) Delete(ctx context.Context, resourceGroupName string, resou result, err = client.DeleteSender(req) if err != nil { - err = autorest.NewErrorWithError(err, "iotspaces.Client", "Delete", result.Response(), "Failure sending request") + err = autorest.NewErrorWithError(err, "iotspaces.Client", "Delete", nil, "Failure sending request") return } @@ -286,7 +308,29 @@ func (client Client) DeleteSender(req *http.Request) (future DeleteFuture, err e if err != nil { return } - future.Future, err = azure.NewFutureFromResponse(resp) + var azf azure.Future + azf, err = azure.NewFutureFromResponse(resp) + future.FutureAPI = &azf + future.Result = func(client Client) (d Description, err error) { + var done bool + done, err = future.DoneWithContext(context.Background(), client) + if err != nil { + err = autorest.NewErrorWithError(err, "iotspaces.DeleteFuture", "Result", future.Response(), "Polling failure") + return + } + if !done { + err = azure.NewAsyncOpIncompleteError("iotspaces.DeleteFuture") + return + } + sender := autorest.DecorateSender(client, autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) + if d.Response.Response, err = future.GetResult(sender); err == nil && d.Response.Response.StatusCode != http.StatusNoContent { + d, err = client.DeleteResponder(d.Response.Response) + if err != nil { + err = autorest.NewErrorWithError(err, "iotspaces.DeleteFuture", "Result", d.Response.Response, "Failure responding to request") + } + } + return + } return } @@ -421,6 +465,7 @@ func (client Client) List(ctx context.Context) (result DescriptionListResultPage } if result.dlr.hasNextLink() && result.dlr.IsEmpty() { err = result.NextWithContext(ctx) + return } return @@ -480,7 +525,6 @@ func (client Client) listNextResults(ctx context.Context, lastResults Descriptio result, err = client.ListResponder(resp) if err != nil { err = autorest.NewErrorWithError(err, "iotspaces.Client", "listNextResults", resp, "Failure responding to next results request") - return } return } @@ -543,6 +587,7 @@ func (client Client) ListByResourceGroup(ctx context.Context, resourceGroupName } if result.dlr.hasNextLink() && result.dlr.IsEmpty() { err = result.NextWithContext(ctx) + return } return @@ -603,7 +648,6 @@ func (client Client) listByResourceGroupNextResults(ctx context.Context, lastRes result, err = client.ListByResourceGroupResponder(resp) if err != nil { err = autorest.NewErrorWithError(err, "iotspaces.Client", "listByResourceGroupNextResults", resp, "Failure responding to next results request") - return } return } @@ -658,7 +702,7 @@ func (client Client) Update(ctx context.Context, resourceGroupName string, resou result, err = client.UpdateSender(req) if err != nil { - err = autorest.NewErrorWithError(err, "iotspaces.Client", "Update", result.Response(), "Failure sending request") + err = autorest.NewErrorWithError(err, "iotspaces.Client", "Update", nil, "Failure sending request") return } @@ -696,7 +740,29 @@ func (client Client) UpdateSender(req *http.Request) (future UpdateFuture, err e if err != nil { return } - future.Future, err = azure.NewFutureFromResponse(resp) + var azf azure.Future + azf, err = azure.NewFutureFromResponse(resp) + future.FutureAPI = &azf + future.Result = func(client Client) (d Description, err error) { + var done bool + done, err = future.DoneWithContext(context.Background(), client) + if err != nil { + err = autorest.NewErrorWithError(err, "iotspaces.UpdateFuture", "Result", future.Response(), "Polling failure") + return + } + if !done { + err = azure.NewAsyncOpIncompleteError("iotspaces.UpdateFuture") + return + } + sender := autorest.DecorateSender(client, autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) + if d.Response.Response, err = future.GetResult(sender); err == nil && d.Response.Response.StatusCode != http.StatusNoContent { + d, err = client.UpdateResponder(d.Response.Response) + if err != nil { + err = autorest.NewErrorWithError(err, "iotspaces.UpdateFuture", "Result", d.Response.Response, "Failure responding to request") + } + } + return + } return } diff --git a/services/preview/iotspaces/mgmt/2017-10-01-preview/iotspaces/models.go b/services/preview/iotspaces/mgmt/2017-10-01-preview/iotspaces/models.go index ab89c2107760..108bf1e24b7a 100644 --- a/services/preview/iotspaces/mgmt/2017-10-01-preview/iotspaces/models.go +++ b/services/preview/iotspaces/mgmt/2017-10-01-preview/iotspaces/models.go @@ -33,58 +33,18 @@ const fqdn = "github.com/Azure/azure-sdk-for-go/services/preview/iotspaces/mgmt/ // CreateOrUpdateFuture an abstraction for monitoring and retrieving the results of a long-running // operation. type CreateOrUpdateFuture struct { - azure.Future -} - -// Result returns the result of the asynchronous operation. -// If the operation has not completed it will return an error. -func (future *CreateOrUpdateFuture) Result(client Client) (d Description, err error) { - var done bool - done, err = future.DoneWithContext(context.Background(), client) - if err != nil { - err = autorest.NewErrorWithError(err, "iotspaces.CreateOrUpdateFuture", "Result", future.Response(), "Polling failure") - return - } - if !done { - err = azure.NewAsyncOpIncompleteError("iotspaces.CreateOrUpdateFuture") - return - } - sender := autorest.DecorateSender(client, autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) - if d.Response.Response, err = future.GetResult(sender); err == nil && d.Response.Response.StatusCode != http.StatusNoContent { - d, err = client.CreateOrUpdateResponder(d.Response.Response) - if err != nil { - err = autorest.NewErrorWithError(err, "iotspaces.CreateOrUpdateFuture", "Result", d.Response.Response, "Failure responding to request") - } - } - return + azure.FutureAPI + // Result returns the result of the asynchronous operation. + // If the operation has not completed it will return an error. + Result func(Client) (Description, error) } // DeleteFuture an abstraction for monitoring and retrieving the results of a long-running operation. type DeleteFuture struct { - azure.Future -} - -// Result returns the result of the asynchronous operation. -// If the operation has not completed it will return an error. -func (future *DeleteFuture) Result(client Client) (d Description, err error) { - var done bool - done, err = future.DoneWithContext(context.Background(), client) - if err != nil { - err = autorest.NewErrorWithError(err, "iotspaces.DeleteFuture", "Result", future.Response(), "Polling failure") - return - } - if !done { - err = azure.NewAsyncOpIncompleteError("iotspaces.DeleteFuture") - return - } - sender := autorest.DecorateSender(client, autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) - if d.Response.Response, err = future.GetResult(sender); err == nil && d.Response.Response.StatusCode != http.StatusNoContent { - d, err = client.DeleteResponder(d.Response.Response) - if err != nil { - err = autorest.NewErrorWithError(err, "iotspaces.DeleteFuture", "Result", d.Response.Response, "Failure responding to request") - } - } - return + azure.FutureAPI + // Result returns the result of the asynchronous operation. + // If the operation has not completed it will return an error. + Result func(Client) (Description, error) } // Description the description of the IoTSpaces service. @@ -603,28 +563,8 @@ type StorageContainerProperties struct { // UpdateFuture an abstraction for monitoring and retrieving the results of a long-running operation. type UpdateFuture struct { - azure.Future -} - -// Result returns the result of the asynchronous operation. -// If the operation has not completed it will return an error. -func (future *UpdateFuture) Result(client Client) (d Description, err error) { - var done bool - done, err = future.DoneWithContext(context.Background(), client) - if err != nil { - err = autorest.NewErrorWithError(err, "iotspaces.UpdateFuture", "Result", future.Response(), "Polling failure") - return - } - if !done { - err = azure.NewAsyncOpIncompleteError("iotspaces.UpdateFuture") - return - } - sender := autorest.DecorateSender(client, autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) - if d.Response.Response, err = future.GetResult(sender); err == nil && d.Response.Response.StatusCode != http.StatusNoContent { - d, err = client.UpdateResponder(d.Response.Response) - if err != nil { - err = autorest.NewErrorWithError(err, "iotspaces.UpdateFuture", "Result", d.Response.Response, "Failure responding to request") - } - } - return + azure.FutureAPI + // Result returns the result of the asynchronous operation. + // If the operation has not completed it will return an error. + Result func(Client) (Description, error) } diff --git a/services/preview/iotspaces/mgmt/2017-10-01-preview/iotspaces/operations.go b/services/preview/iotspaces/mgmt/2017-10-01-preview/iotspaces/operations.go index d3572d0b74d8..2b189559039b 100644 --- a/services/preview/iotspaces/mgmt/2017-10-01-preview/iotspaces/operations.go +++ b/services/preview/iotspaces/mgmt/2017-10-01-preview/iotspaces/operations.go @@ -75,6 +75,7 @@ func (client OperationsClient) List(ctx context.Context) (result OperationListRe } if result.olr.hasNextLink() && result.olr.IsEmpty() { err = result.NextWithContext(ctx) + return } return @@ -130,7 +131,6 @@ func (client OperationsClient) listNextResults(ctx context.Context, lastResults result, err = client.ListResponder(resp) if err != nil { err = autorest.NewErrorWithError(err, "iotspaces.OperationsClient", "listNextResults", resp, "Failure responding to next results request") - return } return }