diff --git a/go.mod b/go.mod index 399e182ed257..f25a1069d6ee 100644 --- a/go.mod +++ b/go.mod @@ -17,8 +17,8 @@ require ( github.com/google/go-cmp v0.6.0 github.com/google/uuid v1.6.0 github.com/hashicorp/go-azure-helpers v0.71.0 - github.com/hashicorp/go-azure-sdk/resource-manager v0.20241212.1154051 - github.com/hashicorp/go-azure-sdk/sdk v0.20241212.1154051 + github.com/hashicorp/go-azure-sdk/resource-manager v0.20250115.1141151 + github.com/hashicorp/go-azure-sdk/sdk v0.20250115.1141151 github.com/hashicorp/go-hclog v1.6.3 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 0903929d8112..17bcbc242ee9 100644 --- a/go.sum +++ b/go.sum @@ -94,10 +94,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.71.0 h1:ra3aIRzg01g6MLKQ+yABcb6WJtrqRUDDgyuPLmyZ9lY= github.com/hashicorp/go-azure-helpers v0.71.0/go.mod h1:BmbF4JDYXK5sEmFeU5hcn8Br21uElcqLfdQxjatwQKw= -github.com/hashicorp/go-azure-sdk/resource-manager v0.20241212.1154051 h1:jFgd3bzeRViGTzicIn9gDw2O/Gk6WjVJCTTefPNOGPY= -github.com/hashicorp/go-azure-sdk/resource-manager v0.20241212.1154051/go.mod h1:XapOZ9HiCtXz3qb5yNFiCuWbOBj2I3WU1K2jwqgK2zA= -github.com/hashicorp/go-azure-sdk/sdk v0.20241212.1154051 h1:4fCKJPSeLVvwl7ZCqU7MOUKyx/M7kl/J6wlw2O3xn40= -github.com/hashicorp/go-azure-sdk/sdk v0.20241212.1154051/go.mod h1:oI5R0fTbBx3K/sJBK5R/OlEy8ozdQjvctxVU9v3EDkc= +github.com/hashicorp/go-azure-sdk/resource-manager v0.20250115.1141151 h1:bPvF5BpQiyd6lAcS+YEcYZOPPsszEV2ElwtrlxjF6aM= +github.com/hashicorp/go-azure-sdk/resource-manager v0.20250115.1141151/go.mod h1:h5yWlutmMw0h3tvfQ8hFoI37CT51ybYfqDfIFFiI1tg= +github.com/hashicorp/go-azure-sdk/sdk v0.20250115.1141151 h1:1Z1Y7QIHf1J9rzJTrRtgOhQYldhF1bOqny4uYn8aj/A= +github.com/hashicorp/go-azure-sdk/sdk v0.20250115.1141151/go.mod h1:oI5R0fTbBx3K/sJBK5R/OlEy8ozdQjvctxVU9v3EDkc= 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/resource-manager/containerregistry/2023-07-01/credentialsets/model_credentialset.go b/vendor/github.com/hashicorp/go-azure-sdk/resource-manager/containerregistry/2023-07-01/credentialsets/model_credentialset.go index 26779ccad5c0..9258c25f35fc 100644 --- a/vendor/github.com/hashicorp/go-azure-sdk/resource-manager/containerregistry/2023-07-01/credentialsets/model_credentialset.go +++ b/vendor/github.com/hashicorp/go-azure-sdk/resource-manager/containerregistry/2023-07-01/credentialsets/model_credentialset.go @@ -9,10 +9,10 @@ import ( // Licensed under the MIT License. See NOTICE.txt in the project root for license information. type CredentialSet struct { - Id *string `json:"id,omitempty"` - Identity *identity.SystemAndUserAssignedMap `json:"identity,omitempty"` - Name *string `json:"name,omitempty"` - Properties *CredentialSetProperties `json:"properties,omitempty"` - SystemData *systemdata.SystemData `json:"systemData,omitempty"` - Type *string `json:"type,omitempty"` + Id *string `json:"id,omitempty"` + Identity *identity.SystemAssigned `json:"identity,omitempty"` + Name *string `json:"name,omitempty"` + Properties *CredentialSetProperties `json:"properties,omitempty"` + SystemData *systemdata.SystemData `json:"systemData,omitempty"` + Type *string `json:"type,omitempty"` } diff --git a/vendor/github.com/hashicorp/go-azure-sdk/resource-manager/containerregistry/2023-07-01/credentialsets/model_credentialsetupdateparameters.go b/vendor/github.com/hashicorp/go-azure-sdk/resource-manager/containerregistry/2023-07-01/credentialsets/model_credentialsetupdateparameters.go index b43c63ad176e..14588433426b 100644 --- a/vendor/github.com/hashicorp/go-azure-sdk/resource-manager/containerregistry/2023-07-01/credentialsets/model_credentialsetupdateparameters.go +++ b/vendor/github.com/hashicorp/go-azure-sdk/resource-manager/containerregistry/2023-07-01/credentialsets/model_credentialsetupdateparameters.go @@ -8,6 +8,6 @@ import ( // Licensed under the MIT License. See NOTICE.txt in the project root for license information. type CredentialSetUpdateParameters struct { - Identity *identity.SystemAndUserAssignedMap `json:"identity,omitempty"` - Properties *CredentialSetUpdateProperties `json:"properties,omitempty"` + Identity *identity.SystemAssigned `json:"identity,omitempty"` + Properties *CredentialSetUpdateProperties `json:"properties,omitempty"` } diff --git a/vendor/github.com/hashicorp/go-azure-sdk/resource-manager/redisenterprise/2024-06-01-preview/databases/model_forcelinkparameters.go b/vendor/github.com/hashicorp/go-azure-sdk/resource-manager/redisenterprise/2024-06-01-preview/databases/model_forcelinkparameters.go index 7c8c1ecd0124..8d9d8518ad16 100644 --- a/vendor/github.com/hashicorp/go-azure-sdk/resource-manager/redisenterprise/2024-06-01-preview/databases/model_forcelinkparameters.go +++ b/vendor/github.com/hashicorp/go-azure-sdk/resource-manager/redisenterprise/2024-06-01-preview/databases/model_forcelinkparameters.go @@ -4,6 +4,5 @@ package databases // Licensed under the MIT License. See NOTICE.txt in the project root for license information. type ForceLinkParameters struct { - GroupNickname string `json:"groupNickname"` - LinkedDatabases []LinkedDatabase `json:"linkedDatabases"` + GeoReplication ForceLinkParametersGeoReplication `json:"geoReplication"` } diff --git a/vendor/github.com/hashicorp/go-azure-sdk/resource-manager/redisenterprise/2024-06-01-preview/databases/model_forcelinkparametersgeoreplication.go b/vendor/github.com/hashicorp/go-azure-sdk/resource-manager/redisenterprise/2024-06-01-preview/databases/model_forcelinkparametersgeoreplication.go new file mode 100644 index 000000000000..89772649f897 --- /dev/null +++ b/vendor/github.com/hashicorp/go-azure-sdk/resource-manager/redisenterprise/2024-06-01-preview/databases/model_forcelinkparametersgeoreplication.go @@ -0,0 +1,9 @@ +package databases + +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. See NOTICE.txt in the project root for license information. + +type ForceLinkParametersGeoReplication struct { + GroupNickname *string `json:"groupNickname,omitempty"` + LinkedDatabases *[]LinkedDatabase `json:"linkedDatabases,omitempty"` +} diff --git a/vendor/github.com/hashicorp/go-azure-sdk/resource-manager/redisenterprise/2024-06-01-preview/redisenterprise/model_forcelinkparameters.go b/vendor/github.com/hashicorp/go-azure-sdk/resource-manager/redisenterprise/2024-06-01-preview/redisenterprise/model_forcelinkparameters.go index 32ca00618d37..b80b6aaf76b7 100644 --- a/vendor/github.com/hashicorp/go-azure-sdk/resource-manager/redisenterprise/2024-06-01-preview/redisenterprise/model_forcelinkparameters.go +++ b/vendor/github.com/hashicorp/go-azure-sdk/resource-manager/redisenterprise/2024-06-01-preview/redisenterprise/model_forcelinkparameters.go @@ -4,6 +4,5 @@ package redisenterprise // Licensed under the MIT License. See NOTICE.txt in the project root for license information. type ForceLinkParameters struct { - GroupNickname string `json:"groupNickname"` - LinkedDatabases []LinkedDatabase `json:"linkedDatabases"` + GeoReplication ForceLinkParametersGeoReplication `json:"geoReplication"` } diff --git a/vendor/github.com/hashicorp/go-azure-sdk/resource-manager/redisenterprise/2024-06-01-preview/redisenterprise/model_forcelinkparametersgeoreplication.go b/vendor/github.com/hashicorp/go-azure-sdk/resource-manager/redisenterprise/2024-06-01-preview/redisenterprise/model_forcelinkparametersgeoreplication.go new file mode 100644 index 000000000000..53242cf971bb --- /dev/null +++ b/vendor/github.com/hashicorp/go-azure-sdk/resource-manager/redisenterprise/2024-06-01-preview/redisenterprise/model_forcelinkparametersgeoreplication.go @@ -0,0 +1,9 @@ +package redisenterprise + +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. See NOTICE.txt in the project root for license information. + +type ForceLinkParametersGeoReplication struct { + GroupNickname *string `json:"groupNickname,omitempty"` + LinkedDatabases *[]LinkedDatabase `json:"linkedDatabases,omitempty"` +} diff --git a/vendor/github.com/hashicorp/go-azure-sdk/sdk/client/client.go b/vendor/github.com/hashicorp/go-azure-sdk/sdk/client/client.go index d77e8afaf4d9..a52e5dad6640 100644 --- a/vendor/github.com/hashicorp/go-azure-sdk/sdk/client/client.go +++ b/vendor/github.com/hashicorp/go-azure-sdk/sdk/client/client.go @@ -622,7 +622,7 @@ func (c *Client) ExecutePaged(ctx context.Context, req *Request) (*Response, err return resp, err } } - if nextLink == nil { + if nextLink == nil || string(*nextLink) == "" { // This is the last page return resp, nil } diff --git a/vendor/modules.txt b/vendor/modules.txt index 5bd66be5931b..3f04b5497440 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -148,7 +148,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.20241212.1154051 +# github.com/hashicorp/go-azure-sdk/resource-manager v0.20250115.1141151 ## explicit; go 1.22 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 @@ -1165,7 +1165,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.20241212.1154051 +# github.com/hashicorp/go-azure-sdk/sdk v0.20250115.1141151 ## explicit; go 1.22 github.com/hashicorp/go-azure-sdk/sdk/auth github.com/hashicorp/go-azure-sdk/sdk/auth/autorest