From 910c62a1d1bd9a79b77bb6533c931e8096c031c1 Mon Sep 17 00:00:00 2001 From: SDKAuto Date: Thu, 7 Jan 2021 03:15:26 +0000 Subject: [PATCH] CodeGen from PR 11353 in Azure/azure-rest-api-specs [Hub Generated] Review request for Microsoft.Network to add version stable/2020-11-01 (#11353) * Adds base for updating Microsoft.Network from version stable/2020-04-01 to version 2020-11-01 * Updates readme * Updates API version in new specs and examples * WAF API update 20201101 * Add WAF SKU 20201101 * WAF SKU is optional * WAF SKU description updated * v20201101 WAF API changes * clean up ManagedRuleSet * fix json validation * fix examples --- .../mgmt/2019-04-01/frontdoor/CHANGELOG.md | 10 -- .../mgmt/2019-04-01/frontdoor/endpoints.go | 20 ++- .../mgmt/2019-04-01/frontdoor/frontdoors.go | 50 +++++- .../2019-04-01/frontdoor/frontendendpoints.go | 42 ++++- .../2019-04-01/frontdoor/managedrulesets.go | 2 +- .../mgmt/2019-04-01/frontdoor/models.go | 166 +++--------------- .../mgmt/2019-04-01/frontdoor/policies.go | 48 ++++- 7 files changed, 171 insertions(+), 167 deletions(-) delete mode 100644 services/frontdoor/mgmt/2019-04-01/frontdoor/CHANGELOG.md diff --git a/services/frontdoor/mgmt/2019-04-01/frontdoor/CHANGELOG.md b/services/frontdoor/mgmt/2019-04-01/frontdoor/CHANGELOG.md deleted file mode 100644 index d31cd0b4e339..000000000000 --- a/services/frontdoor/mgmt/2019-04-01/frontdoor/CHANGELOG.md +++ /dev/null @@ -1,10 +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 `NewManagedRuleSetDefinitionListPage` parameter(s) have been changed from `(func(context.Context, ManagedRuleSetDefinitionList) (ManagedRuleSetDefinitionList, error))` to `(ManagedRuleSetDefinitionList, func(context.Context, ManagedRuleSetDefinitionList) (ManagedRuleSetDefinitionList, error))` -- Function `NewWebApplicationFirewallPolicyListPage` parameter(s) have been changed from `(func(context.Context, WebApplicationFirewallPolicyList) (WebApplicationFirewallPolicyList, error))` to `(WebApplicationFirewallPolicyList, func(context.Context, WebApplicationFirewallPolicyList) (WebApplicationFirewallPolicyList, error))` -- Function `NewFrontendEndpointsListResultPage` parameter(s) have been changed from `(func(context.Context, FrontendEndpointsListResult) (FrontendEndpointsListResult, error))` to `(FrontendEndpointsListResult, func(context.Context, FrontendEndpointsListResult) (FrontendEndpointsListResult, error))` -- Function `NewListResultPage` parameter(s) have been changed from `(func(context.Context, ListResult) (ListResult, error))` to `(ListResult, func(context.Context, ListResult) (ListResult, error))` diff --git a/services/frontdoor/mgmt/2019-04-01/frontdoor/endpoints.go b/services/frontdoor/mgmt/2019-04-01/frontdoor/endpoints.go index 9986e2319847..5f9384bc8fa3 100644 --- a/services/frontdoor/mgmt/2019-04-01/frontdoor/endpoints.go +++ b/services/frontdoor/mgmt/2019-04-01/frontdoor/endpoints.go @@ -82,7 +82,7 @@ func (client EndpointsClient) PurgeContent(ctx context.Context, resourceGroupNam result, err = client.PurgeContentSender(req) if err != nil { - err = autorest.NewErrorWithError(err, "frontdoor.EndpointsClient", "PurgeContent", result.Response(), "Failure sending request") + err = autorest.NewErrorWithError(err, "frontdoor.EndpointsClient", "PurgeContent", nil, "Failure sending request") return } @@ -120,7 +120,23 @@ func (client EndpointsClient) PurgeContentSender(req *http.Request) (future Endp 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 EndpointsClient) (ar autorest.Response, err error) { + var done bool + done, err = future.DoneWithContext(context.Background(), client) + if err != nil { + err = autorest.NewErrorWithError(err, "frontdoor.EndpointsPurgeContentFuture", "Result", future.Response(), "Polling failure") + return + } + if !done { + err = azure.NewAsyncOpIncompleteError("frontdoor.EndpointsPurgeContentFuture") + return + } + ar.Response = future.Response() + return + } return } diff --git a/services/frontdoor/mgmt/2019-04-01/frontdoor/frontdoors.go b/services/frontdoor/mgmt/2019-04-01/frontdoor/frontdoors.go index b42f3ff52999..fad94aeb3d42 100644 --- a/services/frontdoor/mgmt/2019-04-01/frontdoor/frontdoors.go +++ b/services/frontdoor/mgmt/2019-04-01/frontdoor/frontdoors.go @@ -78,7 +78,7 @@ func (client FrontDoorsClient) CreateOrUpdate(ctx context.Context, resourceGroup result, err = client.CreateOrUpdateSender(req) if err != nil { - err = autorest.NewErrorWithError(err, "frontdoor.FrontDoorsClient", "CreateOrUpdate", result.Response(), "Failure sending request") + err = autorest.NewErrorWithError(err, "frontdoor.FrontDoorsClient", "CreateOrUpdate", nil, "Failure sending request") return } @@ -116,7 +116,29 @@ func (client FrontDoorsClient) CreateOrUpdateSender(req *http.Request) (future F 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 FrontDoorsClient) (fd FrontDoor, err error) { + var done bool + done, err = future.DoneWithContext(context.Background(), client) + if err != nil { + err = autorest.NewErrorWithError(err, "frontdoor.FrontDoorsCreateOrUpdateFutureType", "Result", future.Response(), "Polling failure") + return + } + if !done { + err = azure.NewAsyncOpIncompleteError("frontdoor.FrontDoorsCreateOrUpdateFutureType") + return + } + sender := autorest.DecorateSender(client, autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) + if fd.Response.Response, err = future.GetResult(sender); err == nil && fd.Response.Response.StatusCode != http.StatusNoContent { + fd, err = client.CreateOrUpdateResponder(fd.Response.Response) + if err != nil { + err = autorest.NewErrorWithError(err, "frontdoor.FrontDoorsCreateOrUpdateFutureType", "Result", fd.Response.Response, "Failure responding to request") + } + } + return + } return } @@ -167,7 +189,7 @@ func (client FrontDoorsClient) Delete(ctx context.Context, resourceGroupName str result, err = client.DeleteSender(req) if err != nil { - err = autorest.NewErrorWithError(err, "frontdoor.FrontDoorsClient", "Delete", result.Response(), "Failure sending request") + err = autorest.NewErrorWithError(err, "frontdoor.FrontDoorsClient", "Delete", nil, "Failure sending request") return } @@ -203,7 +225,23 @@ func (client FrontDoorsClient) DeleteSender(req *http.Request) (future FrontDoor 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 FrontDoorsClient) (ar autorest.Response, err error) { + var done bool + done, err = future.DoneWithContext(context.Background(), client) + if err != nil { + err = autorest.NewErrorWithError(err, "frontdoor.FrontDoorsDeleteFutureType", "Result", future.Response(), "Polling failure") + return + } + if !done { + err = azure.NewAsyncOpIncompleteError("frontdoor.FrontDoorsDeleteFutureType") + return + } + ar.Response = future.Response() + return + } return } @@ -339,6 +377,7 @@ func (client FrontDoorsClient) List(ctx context.Context) (result ListResultPage, } if result.lr.hasNextLink() && result.lr.IsEmpty() { err = result.NextWithContext(ctx) + return } return @@ -398,7 +437,6 @@ func (client FrontDoorsClient) listNextResults(ctx context.Context, lastResults result, err = client.ListResponder(resp) if err != nil { err = autorest.NewErrorWithError(err, "frontdoor.FrontDoorsClient", "listNextResults", resp, "Failure responding to next results request") - return } return } @@ -462,6 +500,7 @@ func (client FrontDoorsClient) ListByResourceGroup(ctx context.Context, resource } if result.lr.hasNextLink() && result.lr.IsEmpty() { err = result.NextWithContext(ctx) + return } return @@ -522,7 +561,6 @@ func (client FrontDoorsClient) listByResourceGroupNextResults(ctx context.Contex result, err = client.ListByResourceGroupResponder(resp) if err != nil { err = autorest.NewErrorWithError(err, "frontdoor.FrontDoorsClient", "listByResourceGroupNextResults", resp, "Failure responding to next results request") - return } return } diff --git a/services/frontdoor/mgmt/2019-04-01/frontdoor/frontendendpoints.go b/services/frontdoor/mgmt/2019-04-01/frontdoor/frontendendpoints.go index 14ba57665486..d5ae5f849148 100644 --- a/services/frontdoor/mgmt/2019-04-01/frontdoor/frontendendpoints.go +++ b/services/frontdoor/mgmt/2019-04-01/frontdoor/frontendendpoints.go @@ -83,7 +83,7 @@ func (client FrontendEndpointsClient) DisableHTTPS(ctx context.Context, resource result, err = client.DisableHTTPSSender(req) if err != nil { - err = autorest.NewErrorWithError(err, "frontdoor.FrontendEndpointsClient", "DisableHTTPS", result.Response(), "Failure sending request") + err = autorest.NewErrorWithError(err, "frontdoor.FrontendEndpointsClient", "DisableHTTPS", nil, "Failure sending request") return } @@ -120,7 +120,23 @@ func (client FrontendEndpointsClient) DisableHTTPSSender(req *http.Request) (fut 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 FrontendEndpointsClient) (ar autorest.Response, err error) { + var done bool + done, err = future.DoneWithContext(context.Background(), client) + if err != nil { + err = autorest.NewErrorWithError(err, "frontdoor.FrontendEndpointsDisableHTTPSFuture", "Result", future.Response(), "Polling failure") + return + } + if !done { + err = azure.NewAsyncOpIncompleteError("frontdoor.FrontendEndpointsDisableHTTPSFuture") + return + } + ar.Response = future.Response() + return + } return } @@ -176,7 +192,7 @@ func (client FrontendEndpointsClient) EnableHTTPS(ctx context.Context, resourceG result, err = client.EnableHTTPSSender(req) if err != nil { - err = autorest.NewErrorWithError(err, "frontdoor.FrontendEndpointsClient", "EnableHTTPS", result.Response(), "Failure sending request") + err = autorest.NewErrorWithError(err, "frontdoor.FrontendEndpointsClient", "EnableHTTPS", nil, "Failure sending request") return } @@ -215,7 +231,23 @@ func (client FrontendEndpointsClient) EnableHTTPSSender(req *http.Request) (futu 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 FrontendEndpointsClient) (ar autorest.Response, err error) { + var done bool + done, err = future.DoneWithContext(context.Background(), client) + if err != nil { + err = autorest.NewErrorWithError(err, "frontdoor.FrontendEndpointsEnableHTTPSFuture", "Result", future.Response(), "Polling failure") + return + } + if !done { + err = azure.NewAsyncOpIncompleteError("frontdoor.FrontendEndpointsEnableHTTPSFuture") + return + } + ar.Response = future.Response() + return + } return } @@ -372,6 +404,7 @@ func (client FrontendEndpointsClient) ListByFrontDoor(ctx context.Context, resou } if result.felr.hasNextLink() && result.felr.IsEmpty() { err = result.NextWithContext(ctx) + return } return @@ -433,7 +466,6 @@ func (client FrontendEndpointsClient) listByFrontDoorNextResults(ctx context.Con result, err = client.ListByFrontDoorResponder(resp) if err != nil { err = autorest.NewErrorWithError(err, "frontdoor.FrontendEndpointsClient", "listByFrontDoorNextResults", resp, "Failure responding to next results request") - return } return } diff --git a/services/frontdoor/mgmt/2019-04-01/frontdoor/managedrulesets.go b/services/frontdoor/mgmt/2019-04-01/frontdoor/managedrulesets.go index ee608aa3dc98..3fa7fd5ed715 100644 --- a/services/frontdoor/mgmt/2019-04-01/frontdoor/managedrulesets.go +++ b/services/frontdoor/mgmt/2019-04-01/frontdoor/managedrulesets.go @@ -74,6 +74,7 @@ func (client ManagedRuleSetsClient) List(ctx context.Context) (result ManagedRul } if result.mrsdl.hasNextLink() && result.mrsdl.IsEmpty() { err = result.NextWithContext(ctx) + return } return @@ -133,7 +134,6 @@ func (client ManagedRuleSetsClient) listNextResults(ctx context.Context, lastRes result, err = client.ListResponder(resp) if err != nil { err = autorest.NewErrorWithError(err, "frontdoor.ManagedRuleSetsClient", "listNextResults", resp, "Failure responding to next results request") - return } return } diff --git a/services/frontdoor/mgmt/2019-04-01/frontdoor/models.go b/services/frontdoor/mgmt/2019-04-01/frontdoor/models.go index c802d59b96a2..d6e05bb4255e 100644 --- a/services/frontdoor/mgmt/2019-04-01/frontdoor/models.go +++ b/services/frontdoor/mgmt/2019-04-01/frontdoor/models.go @@ -328,24 +328,10 @@ type CustomRuleList struct { // EndpointsPurgeContentFuture an abstraction for monitoring and retrieving the results of a long-running // operation. type EndpointsPurgeContentFuture struct { - azure.Future -} - -// Result returns the result of the asynchronous operation. -// If the operation has not completed it will return an error. -func (future *EndpointsPurgeContentFuture) Result(client EndpointsClient) (ar autorest.Response, err error) { - var done bool - done, err = future.DoneWithContext(context.Background(), client) - if err != nil { - err = autorest.NewErrorWithError(err, "frontdoor.EndpointsPurgeContentFuture", "Result", future.Response(), "Polling failure") - return - } - if !done { - err = azure.NewAsyncOpIncompleteError("frontdoor.EndpointsPurgeContentFuture") - return - } - ar.Response = future.Response() - return + azure.FutureAPI + // Result returns the result of the asynchronous operation. + // If the operation has not completed it will return an error. + Result func(EndpointsClient) (autorest.Response, error) } // Error ... @@ -534,53 +520,19 @@ func (fd *FrontDoor) UnmarshalJSON(body []byte) error { // FrontDoorsCreateOrUpdateFutureType an abstraction for monitoring and retrieving the results of a // long-running operation. type FrontDoorsCreateOrUpdateFutureType struct { - azure.Future -} - -// Result returns the result of the asynchronous operation. -// If the operation has not completed it will return an error. -func (future *FrontDoorsCreateOrUpdateFutureType) Result(client FrontDoorsClient) (fd FrontDoor, err error) { - var done bool - done, err = future.DoneWithContext(context.Background(), client) - if err != nil { - err = autorest.NewErrorWithError(err, "frontdoor.FrontDoorsCreateOrUpdateFutureType", "Result", future.Response(), "Polling failure") - return - } - if !done { - err = azure.NewAsyncOpIncompleteError("frontdoor.FrontDoorsCreateOrUpdateFutureType") - return - } - sender := autorest.DecorateSender(client, autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) - if fd.Response.Response, err = future.GetResult(sender); err == nil && fd.Response.Response.StatusCode != http.StatusNoContent { - fd, err = client.CreateOrUpdateResponder(fd.Response.Response) - if err != nil { - err = autorest.NewErrorWithError(err, "frontdoor.FrontDoorsCreateOrUpdateFutureType", "Result", fd.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(FrontDoorsClient) (FrontDoor, error) } // FrontDoorsDeleteFutureType an abstraction for monitoring and retrieving the results of a long-running // operation. type FrontDoorsDeleteFutureType struct { - azure.Future -} - -// Result returns the result of the asynchronous operation. -// If the operation has not completed it will return an error. -func (future *FrontDoorsDeleteFutureType) Result(client FrontDoorsClient) (ar autorest.Response, err error) { - var done bool - done, err = future.DoneWithContext(context.Background(), client) - if err != nil { - err = autorest.NewErrorWithError(err, "frontdoor.FrontDoorsDeleteFutureType", "Result", future.Response(), "Polling failure") - return - } - if !done { - err = azure.NewAsyncOpIncompleteError("frontdoor.FrontDoorsDeleteFutureType") - return - } - ar.Response = future.Response() - return + azure.FutureAPI + // Result returns the result of the asynchronous operation. + // If the operation has not completed it will return an error. + Result func(FrontDoorsClient) (autorest.Response, error) } // FrontendEndpoint a frontend endpoint used for routing. @@ -713,47 +665,19 @@ func (fep FrontendEndpointProperties) MarshalJSON() ([]byte, error) { // FrontendEndpointsDisableHTTPSFuture an abstraction for monitoring and retrieving the results of a // long-running operation. type FrontendEndpointsDisableHTTPSFuture struct { - azure.Future -} - -// Result returns the result of the asynchronous operation. -// If the operation has not completed it will return an error. -func (future *FrontendEndpointsDisableHTTPSFuture) Result(client FrontendEndpointsClient) (ar autorest.Response, err error) { - var done bool - done, err = future.DoneWithContext(context.Background(), client) - if err != nil { - err = autorest.NewErrorWithError(err, "frontdoor.FrontendEndpointsDisableHTTPSFuture", "Result", future.Response(), "Polling failure") - return - } - if !done { - err = azure.NewAsyncOpIncompleteError("frontdoor.FrontendEndpointsDisableHTTPSFuture") - return - } - ar.Response = future.Response() - return + azure.FutureAPI + // Result returns the result of the asynchronous operation. + // If the operation has not completed it will return an error. + Result func(FrontendEndpointsClient) (autorest.Response, error) } // FrontendEndpointsEnableHTTPSFuture an abstraction for monitoring and retrieving the results of a // long-running operation. type FrontendEndpointsEnableHTTPSFuture struct { - azure.Future -} - -// Result returns the result of the asynchronous operation. -// If the operation has not completed it will return an error. -func (future *FrontendEndpointsEnableHTTPSFuture) Result(client FrontendEndpointsClient) (ar autorest.Response, err error) { - var done bool - done, err = future.DoneWithContext(context.Background(), client) - if err != nil { - err = autorest.NewErrorWithError(err, "frontdoor.FrontendEndpointsEnableHTTPSFuture", "Result", future.Response(), "Polling failure") - return - } - if !done { - err = azure.NewAsyncOpIncompleteError("frontdoor.FrontendEndpointsEnableHTTPSFuture") - return - } - ar.Response = future.Response() - return + azure.FutureAPI + // Result returns the result of the asynchronous operation. + // If the operation has not completed it will return an error. + Result func(FrontendEndpointsClient) (autorest.Response, error) } // FrontendEndpointsListResult result of the request to list frontend endpoints. It contains a list of @@ -1725,53 +1649,19 @@ type MatchCondition struct { // PoliciesCreateOrUpdateFuture an abstraction for monitoring and retrieving the results of a long-running // operation. type PoliciesCreateOrUpdateFuture struct { - azure.Future -} - -// Result returns the result of the asynchronous operation. -// If the operation has not completed it will return an error. -func (future *PoliciesCreateOrUpdateFuture) Result(client PoliciesClient) (wafp WebApplicationFirewallPolicy, err error) { - var done bool - done, err = future.DoneWithContext(context.Background(), client) - if err != nil { - err = autorest.NewErrorWithError(err, "frontdoor.PoliciesCreateOrUpdateFuture", "Result", future.Response(), "Polling failure") - return - } - if !done { - err = azure.NewAsyncOpIncompleteError("frontdoor.PoliciesCreateOrUpdateFuture") - return - } - sender := autorest.DecorateSender(client, autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) - if wafp.Response.Response, err = future.GetResult(sender); err == nil && wafp.Response.Response.StatusCode != http.StatusNoContent { - wafp, err = client.CreateOrUpdateResponder(wafp.Response.Response) - if err != nil { - err = autorest.NewErrorWithError(err, "frontdoor.PoliciesCreateOrUpdateFuture", "Result", wafp.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(PoliciesClient) (WebApplicationFirewallPolicy, error) } // PoliciesDeleteFuture an abstraction for monitoring and retrieving the results of a long-running // operation. type PoliciesDeleteFuture struct { - azure.Future -} - -// Result returns the result of the asynchronous operation. -// If the operation has not completed it will return an error. -func (future *PoliciesDeleteFuture) Result(client PoliciesClient) (ar autorest.Response, err error) { - var done bool - done, err = future.DoneWithContext(context.Background(), client) - if err != nil { - err = autorest.NewErrorWithError(err, "frontdoor.PoliciesDeleteFuture", "Result", future.Response(), "Polling failure") - return - } - if !done { - err = azure.NewAsyncOpIncompleteError("frontdoor.PoliciesDeleteFuture") - return - } - ar.Response = future.Response() - return + azure.FutureAPI + // Result returns the result of the asynchronous operation. + // If the operation has not completed it will return an error. + Result func(PoliciesClient) (autorest.Response, error) } // PolicySettings defines top-level WebApplicationFirewallPolicy configuration settings. diff --git a/services/frontdoor/mgmt/2019-04-01/frontdoor/policies.go b/services/frontdoor/mgmt/2019-04-01/frontdoor/policies.go index c96b6215c7fc..8b34edc99b1b 100644 --- a/services/frontdoor/mgmt/2019-04-01/frontdoor/policies.go +++ b/services/frontdoor/mgmt/2019-04-01/frontdoor/policies.go @@ -83,7 +83,7 @@ func (client PoliciesClient) CreateOrUpdate(ctx context.Context, resourceGroupNa result, err = client.CreateOrUpdateSender(req) if err != nil { - err = autorest.NewErrorWithError(err, "frontdoor.PoliciesClient", "CreateOrUpdate", result.Response(), "Failure sending request") + err = autorest.NewErrorWithError(err, "frontdoor.PoliciesClient", "CreateOrUpdate", nil, "Failure sending request") return } @@ -121,7 +121,29 @@ func (client PoliciesClient) CreateOrUpdateSender(req *http.Request) (future Pol 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 PoliciesClient) (wafp WebApplicationFirewallPolicy, err error) { + var done bool + done, err = future.DoneWithContext(context.Background(), client) + if err != nil { + err = autorest.NewErrorWithError(err, "frontdoor.PoliciesCreateOrUpdateFuture", "Result", future.Response(), "Polling failure") + return + } + if !done { + err = azure.NewAsyncOpIncompleteError("frontdoor.PoliciesCreateOrUpdateFuture") + return + } + sender := autorest.DecorateSender(client, autorest.DoRetryForStatusCodes(client.RetryAttempts, client.RetryDuration, autorest.StatusCodesForRetry...)) + if wafp.Response.Response, err = future.GetResult(sender); err == nil && wafp.Response.Response.StatusCode != http.StatusNoContent { + wafp, err = client.CreateOrUpdateResponder(wafp.Response.Response) + if err != nil { + err = autorest.NewErrorWithError(err, "frontdoor.PoliciesCreateOrUpdateFuture", "Result", wafp.Response.Response, "Failure responding to request") + } + } + return + } return } @@ -170,7 +192,7 @@ func (client PoliciesClient) Delete(ctx context.Context, resourceGroupName strin result, err = client.DeleteSender(req) if err != nil { - err = autorest.NewErrorWithError(err, "frontdoor.PoliciesClient", "Delete", result.Response(), "Failure sending request") + err = autorest.NewErrorWithError(err, "frontdoor.PoliciesClient", "Delete", nil, "Failure sending request") return } @@ -206,7 +228,23 @@ func (client PoliciesClient) DeleteSender(req *http.Request) (future PoliciesDel 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 PoliciesClient) (ar autorest.Response, err error) { + var done bool + done, err = future.DoneWithContext(context.Background(), client) + if err != nil { + err = autorest.NewErrorWithError(err, "frontdoor.PoliciesDeleteFuture", "Result", future.Response(), "Polling failure") + return + } + if !done { + err = azure.NewAsyncOpIncompleteError("frontdoor.PoliciesDeleteFuture") + return + } + ar.Response = future.Response() + return + } return } @@ -350,6 +388,7 @@ func (client PoliciesClient) List(ctx context.Context, resourceGroupName string) } if result.wafpl.hasNextLink() && result.wafpl.IsEmpty() { err = result.NextWithContext(ctx) + return } return @@ -410,7 +449,6 @@ func (client PoliciesClient) listNextResults(ctx context.Context, lastResults We result, err = client.ListResponder(resp) if err != nil { err = autorest.NewErrorWithError(err, "frontdoor.PoliciesClient", "listNextResults", resp, "Failure responding to next results request") - return } return }