From 852af7bbbf973cbc3993d4b909d2825786f621c4 Mon Sep 17 00:00:00 2001 From: jackofallops Date: Thu, 25 Apr 2024 10:58:22 +0200 Subject: [PATCH] bump to v0.20240424.1114424 of go-azure-sdk to fix LRO polling for streamanalytics clusters --- go.mod | 4 ++-- go.sum | 8 ++++---- .../go-azure-sdk/sdk/client/resourcemanager/poller.go | 3 --- .../go-azure-sdk/sdk/client/resourcemanager/poller_lro.go | 5 +++++ vendor/modules.txt | 4 ++-- 5 files changed, 13 insertions(+), 11 deletions(-) diff --git a/go.mod b/go.mod index b45053a9f696..cb31b0c03560 100644 --- a/go.mod +++ b/go.mod @@ -17,8 +17,8 @@ require ( github.com/google/go-cmp v0.5.9 github.com/google/uuid v1.4.0 github.com/hashicorp/go-azure-helpers v0.67.0 - github.com/hashicorp/go-azure-sdk/resource-manager v0.20240422.1195251 - github.com/hashicorp/go-azure-sdk/sdk v0.20240422.1195251 + github.com/hashicorp/go-azure-sdk/resource-manager v0.20240424.1114424 + github.com/hashicorp/go-azure-sdk/sdk v0.20240424.1114424 github.com/hashicorp/go-hclog v1.5.0 github.com/hashicorp/go-multierror v1.1.1 github.com/hashicorp/go-uuid v1.0.3 diff --git a/go.sum b/go.sum index 9d7587848ee2..a1ce6e5ff77e 100644 --- a/go.sum +++ b/go.sum @@ -95,10 +95,10 @@ github.com/hashicorp/errwrap v1.1.0 h1:OxrOeh75EUXMY8TBjag2fzXGZ40LB6IKw45YeGUDY github.com/hashicorp/errwrap v1.1.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4= github.com/hashicorp/go-azure-helpers v0.67.0 h1:0RY6mY3W3Ym2I+jExLtyLx96fh6p5n9vidqisAKGUSE= github.com/hashicorp/go-azure-helpers v0.67.0/go.mod h1:S4Bu66vyJvHA0trqHQB0YVGsISuF7HMH9tyEsMVlx8A= -github.com/hashicorp/go-azure-sdk/resource-manager v0.20240422.1195251 h1:0z+DGiKhyGeACbevyYlbNmJvFKEyZ9HYctRLDu/EvAo= -github.com/hashicorp/go-azure-sdk/resource-manager v0.20240422.1195251/go.mod h1:jP9GFFQadeHtK/cuNT/pxojd5pYA2ROTI2vF5lViFQA= -github.com/hashicorp/go-azure-sdk/sdk v0.20240422.1195251 h1:yGdvRwt7VAz+4fISSoa+xd37Up4PtTknMeq58XGrIsU= -github.com/hashicorp/go-azure-sdk/sdk v0.20240422.1195251/go.mod h1:Ts5vRL3KPw8iLit+4WSi1hOWlRCx++wJrCkMGj69xBY= +github.com/hashicorp/go-azure-sdk/resource-manager v0.20240424.1114424 h1:yf756pBFA1+44If2SCt0oiE1MRkDX5FEq/u5DpVrvqw= +github.com/hashicorp/go-azure-sdk/resource-manager v0.20240424.1114424/go.mod h1:cJ5/5JQAZM8Z8qanBc2YgKtedFtpLKA1BoJUUt48EHM= +github.com/hashicorp/go-azure-sdk/sdk v0.20240424.1114424 h1:wd0Co6WE3ERj8TU5jN7HKDOqKIlK4Dcgh685JM3VffY= +github.com/hashicorp/go-azure-sdk/sdk v0.20240424.1114424/go.mod h1:Ts5vRL3KPw8iLit+4WSi1hOWlRCx++wJrCkMGj69xBY= github.com/hashicorp/go-checkpoint v0.5.0 h1:MFYpPZCnQqQTE18jFwSII6eUQrD/oxMFp3mlgcqk5mU= github.com/hashicorp/go-checkpoint v0.5.0/go.mod h1:7nfLNL10NsxqO4iWuW6tWW0HjZuDrwkBuEQsVcpCOgg= github.com/hashicorp/go-cleanhttp v0.5.0/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtngrth3wmdIIUrZ80= diff --git a/vendor/github.com/hashicorp/go-azure-sdk/sdk/client/resourcemanager/poller.go b/vendor/github.com/hashicorp/go-azure-sdk/sdk/client/resourcemanager/poller.go index 98f80a9ece29..a28ead880b09 100644 --- a/vendor/github.com/hashicorp/go-azure-sdk/sdk/client/resourcemanager/poller.go +++ b/vendor/github.com/hashicorp/go-azure-sdk/sdk/client/resourcemanager/poller.go @@ -28,7 +28,6 @@ func PollerFromResponse(response *client.Response, client *Client) (poller polle if isLroStatus && lroPollingUri != "" && !methodIsDelete && !lroIsSelfReference { lro, lroErr := longRunningOperationPollerFromResponse(response, client.Client) if lroErr != nil { - err = lroErr return pollers.Poller{}, fmt.Errorf("building long-running-operation poller: %+v", lroErr) } return pollers.NewPoller(lro, lro.initialRetryDuration, pollers.DefaultNumberOfDroppedConnectionsToAllow), nil @@ -48,7 +47,6 @@ func PollerFromResponse(response *client.Response, client *Client) (poller polle if statusCodesToCheckProvisioningState && contentTypeMatchesForProvisioningStateCheck && methodIsApplicable { provisioningState, provisioningStateErr := provisioningStatePollerFromResponse(response, lroIsSelfReference, client, DefaultPollingInterval) if provisioningStateErr != nil { - err = provisioningStateErr return pollers.Poller{}, fmt.Errorf("building provisioningState poller: %+v", provisioningStateErr) } return pollers.NewPoller(provisioningState, provisioningState.initialRetryDuration, pollers.DefaultNumberOfDroppedConnectionsToAllow), nil @@ -59,7 +57,6 @@ func PollerFromResponse(response *client.Response, client *Client) (poller polle if methodIsDelete && statusCodesToCheckDelete { deletePoller, deletePollerErr := deletePollerFromResponse(response, client, DefaultPollingInterval) if deletePollerErr != nil { - err = deletePollerErr return pollers.Poller{}, fmt.Errorf("building delete poller: %+v", deletePollerErr) } return pollers.NewPoller(deletePoller, deletePoller.initialRetryDuration, pollers.DefaultNumberOfDroppedConnectionsToAllow), nil diff --git a/vendor/github.com/hashicorp/go-azure-sdk/sdk/client/resourcemanager/poller_lro.go b/vendor/github.com/hashicorp/go-azure-sdk/sdk/client/resourcemanager/poller_lro.go index c8c40cfbaf18..4ada36bc4882 100644 --- a/vendor/github.com/hashicorp/go-azure-sdk/sdk/client/resourcemanager/poller_lro.go +++ b/vendor/github.com/hashicorp/go-azure-sdk/sdk/client/resourcemanager/poller_lro.go @@ -244,6 +244,11 @@ func (p *longRunningOperationPoller) Poll(ctx context.Context) (result *pollers. // StorageSync@2020-03-01 returns `validateInput` rather than `InProgress` during creation/update (https://github.com/hashicorp/go-azure-sdk/issues/565) "validateInput": pollers.PollingStatusInProgress, + + // StreamAnalytics@2020-03-01 introduced "CreatingVirtualMachines", "ConfiguringNetworking", and "SettingUpStreamingRuntime" as undocumented granular statuses on 2024-04-09 + "CreatingVirtualMachines": pollers.PollingStatusInProgress, + "ConfiguringNetworking": pollers.PollingStatusInProgress, + "SettingUpStreamingRuntime": pollers.PollingStatusInProgress, } for k, v := range statuses { if strings.EqualFold(string(op.Properties.ProvisioningState), string(k)) { diff --git a/vendor/modules.txt b/vendor/modules.txt index 041e0b78f0bf..de222f60def0 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -151,7 +151,7 @@ github.com/hashicorp/go-azure-helpers/resourcemanager/tags github.com/hashicorp/go-azure-helpers/resourcemanager/zones github.com/hashicorp/go-azure-helpers/sender github.com/hashicorp/go-azure-helpers/storage -# github.com/hashicorp/go-azure-sdk/resource-manager v0.20240422.1195251 +# github.com/hashicorp/go-azure-sdk/resource-manager v0.20240424.1114424 ## explicit; go 1.21 github.com/hashicorp/go-azure-sdk/resource-manager/aad/2021-05-01/domainservices github.com/hashicorp/go-azure-sdk/resource-manager/aadb2c/2021-04-01-preview @@ -1084,7 +1084,7 @@ github.com/hashicorp/go-azure-sdk/resource-manager/workloads/2023-04-01/saplands github.com/hashicorp/go-azure-sdk/resource-manager/workloads/2023-04-01/saprecommendations github.com/hashicorp/go-azure-sdk/resource-manager/workloads/2023-04-01/sapsupportedsku github.com/hashicorp/go-azure-sdk/resource-manager/workloads/2023-04-01/sapvirtualinstances -# github.com/hashicorp/go-azure-sdk/sdk v0.20240422.1195251 +# github.com/hashicorp/go-azure-sdk/sdk v0.20240424.1114424 ## explicit; go 1.21 github.com/hashicorp/go-azure-sdk/sdk/auth github.com/hashicorp/go-azure-sdk/sdk/auth/autorest