diff --git a/go.mod b/go.mod index bcaf2c387c7e..5e52d5de13fa 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.70.1 - github.com/hashicorp/go-azure-sdk/resource-manager v0.20240731.1212841 - github.com/hashicorp/go-azure-sdk/sdk v0.20240731.1212841 + github.com/hashicorp/go-azure-sdk/resource-manager v0.20240819.1075239 + github.com/hashicorp/go-azure-sdk/sdk v0.20240819.1075239 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 7dc7466ae565..ddd34f8579a1 100644 --- a/go.sum +++ b/go.sum @@ -93,10 +93,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.70.1 h1:7hlnRrZobMZxpOzdlNEsayzAayj/KRG4wpDS1jgo4GM= github.com/hashicorp/go-azure-helpers v0.70.1/go.mod h1:BmbF4JDYXK5sEmFeU5hcn8Br21uElcqLfdQxjatwQKw= -github.com/hashicorp/go-azure-sdk/resource-manager v0.20240731.1212841 h1:H7BkxZl0qitdWq7sEGzNqkn5/11YTamwq2XTI8/7Jq0= -github.com/hashicorp/go-azure-sdk/resource-manager v0.20240731.1212841/go.mod h1:/4Ly9Gppp/Nu9AaWDfod6atYQ4n2OqN0ERpE2xZQz8A= -github.com/hashicorp/go-azure-sdk/sdk v0.20240731.1212841 h1:RzWuy96j/7q3Vi2aZoiIrokm8yotUNX1UGD3pbWi5Ck= -github.com/hashicorp/go-azure-sdk/sdk v0.20240731.1212841/go.mod h1:dMKF6bXrgGmy1d3pLzkmBpG2JIHgSAV2/OMSCEgyMwE= +github.com/hashicorp/go-azure-sdk/resource-manager v0.20240819.1075239 h1:Vs3yqWI0DEy0AswanjEB+Vj7486rc1O6QCPv8uX2qgg= +github.com/hashicorp/go-azure-sdk/resource-manager v0.20240819.1075239/go.mod h1:lDFtVt7Q/VcFqyu/SlE9IhtroHlsAurHpw0YMhsa5Oc= +github.com/hashicorp/go-azure-sdk/sdk v0.20240819.1075239 h1:SUrK9B4A04gmCfdPzj4ZisIyOI10RYwurUyBU0dfkm8= +github.com/hashicorp/go-azure-sdk/sdk v0.20240819.1075239/go.mod h1:dMKF6bXrgGmy1d3pLzkmBpG2JIHgSAV2/OMSCEgyMwE= 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/internal/clients/graph/client.go b/internal/clients/graph/client.go index 63131098ca5a..d70ee4597a66 100644 --- a/internal/clients/graph/client.go +++ b/internal/clients/graph/client.go @@ -41,7 +41,7 @@ type directoryObjectModel struct { } func graphClient(authorizer auth.Authorizer, environment environments.Environment) (*msgraph.Client, error) { - client, err := msgraph.NewMsGraphClient(environment.MicrosoftGraph, "Graph", msgraph.VersionOnePointZero) + client, err := msgraph.NewClient(environment.MicrosoftGraph, "Graph", msgraph.VersionOnePointZero) if err != nil { return nil, fmt.Errorf("building client: %+v", err) } diff --git a/vendor/github.com/hashicorp/go-azure-sdk/sdk/client/msgraph/client.go b/vendor/github.com/hashicorp/go-azure-sdk/sdk/client/msgraph/client.go index 3cf67d08f25d..0a74b22cad1c 100644 --- a/vendor/github.com/hashicorp/go-azure-sdk/sdk/client/msgraph/client.go +++ b/vendor/github.com/hashicorp/go-azure-sdk/sdk/client/msgraph/client.go @@ -35,7 +35,7 @@ type Client struct { tenantId string } -func NewMsGraphClient(api environments.Api, serviceName string, apiVersion ApiVersion) (*Client, error) { +func NewClient(api environments.Api, serviceName string, apiVersion ApiVersion) (*Client, error) { endpoint, ok := api.Endpoint() if !ok { return nil, fmt.Errorf("no `endpoint` was returned for this environment") @@ -49,6 +49,11 @@ func NewMsGraphClient(api environments.Api, serviceName string, apiVersion ApiVe }, nil } +// Deprecated: use NewClient instead +func NewMsGraphClient(api environments.Api, serviceName string, apiVersion ApiVersion) (*Client, error) { + return NewClient(api, serviceName, apiVersion) +} + func (c *Client) NewRequest(ctx context.Context, input client.RequestOptions) (*client.Request, error) { // TODO move these validations to base client method if _, ok := ctx.Deadline(); !ok { diff --git a/vendor/github.com/hashicorp/go-azure-sdk/sdk/client/resourcemanager/client.go b/vendor/github.com/hashicorp/go-azure-sdk/sdk/client/resourcemanager/client.go index 8c9b67a9c4fe..9cd3335f1ba8 100644 --- a/vendor/github.com/hashicorp/go-azure-sdk/sdk/client/resourcemanager/client.go +++ b/vendor/github.com/hashicorp/go-azure-sdk/sdk/client/resourcemanager/client.go @@ -23,7 +23,7 @@ type Client struct { apiVersion string } -func NewResourceManagerClient(api environments.Api, serviceName, apiVersion string) (*Client, error) { +func NewClient(api environments.Api, serviceName, apiVersion string) (*Client, error) { endpoint, ok := api.Endpoint() if !ok { return nil, fmt.Errorf("no `endpoint` was returned for this environment") @@ -38,6 +38,11 @@ func NewResourceManagerClient(api environments.Api, serviceName, apiVersion stri }, nil } +// Deprecated: use NewClient instead +func NewResourceManagerClient(api environments.Api, serviceName, apiVersion string) (*Client, error) { + return NewClient(api, serviceName, apiVersion) +} + func (c *Client) NewRequest(ctx context.Context, input client.RequestOptions) (*client.Request, error) { // TODO move these validations to base client method if _, ok := ctx.Deadline(); !ok { diff --git a/vendor/modules.txt b/vendor/modules.txt index 7a0ef073ee53..b2adb7eb0d28 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.20240731.1212841 +# github.com/hashicorp/go-azure-sdk/resource-manager v0.20240819.1075239 ## 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 @@ -1125,7 +1125,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.20240731.1212841 +# github.com/hashicorp/go-azure-sdk/sdk v0.20240819.1075239 ## explicit; go 1.21 github.com/hashicorp/go-azure-sdk/sdk/auth github.com/hashicorp/go-azure-sdk/sdk/auth/autorest