Skip to content

Commit

Permalink
update go-azure-sdk to v0.20240222.1164640 (hashicorp#25002)
Browse files Browse the repository at this point in the history
  • Loading branch information
catriona-m authored and rizkybiz committed Feb 29, 2024
1 parent fb51524 commit bb0d8bf
Show file tree
Hide file tree
Showing 19 changed files with 656 additions and 691 deletions.
4 changes: 2 additions & 2 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ require (
github.com/google/go-cmp v0.5.9
github.com/google/uuid v1.3.1
github.com/hashicorp/go-azure-helpers v0.66.2
github.com/hashicorp/go-azure-sdk/resource-manager v0.20240221.1170458
github.com/hashicorp/go-azure-sdk/sdk v0.20240221.1170458
github.com/hashicorp/go-azure-sdk/resource-manager v0.20240222.1164640
github.com/hashicorp/go-azure-sdk/sdk v0.20240222.1164640
github.com/hashicorp/go-hclog v1.5.0
github.com/hashicorp/go-multierror v1.1.1
github.com/hashicorp/go-uuid v1.0.3
Expand Down
8 changes: 4 additions & 4 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -115,10 +115,10 @@ github.com/hashicorp/errwrap v1.1.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brv
github.com/hashicorp/go-azure-helpers v0.12.0/go.mod h1:Zc3v4DNeX6PDdy7NljlYpnrdac1++qNW0I4U+ofGwpg=
github.com/hashicorp/go-azure-helpers v0.66.2 h1:+Pzuo7pdKl0hBXXr5ymmhs4Q40tHAo2nAvHq4WgSjx8=
github.com/hashicorp/go-azure-helpers v0.66.2/go.mod h1:kJxXrFtJKJdOEqvad8pllAe7dhP4DbN8J6sqFZe47+4=
github.com/hashicorp/go-azure-sdk/resource-manager v0.20240221.1170458 h1:YwvV8cQEWy50hylW6+q77H/HTjhLo/8wWKJCtHbw3lQ=
github.com/hashicorp/go-azure-sdk/resource-manager v0.20240221.1170458/go.mod h1:rSFUK3WVOne8VyvuIhDDDcwIsQ0eNvYFNS3vmL3UDkU=
github.com/hashicorp/go-azure-sdk/sdk v0.20240221.1170458 h1:QqPOGszB/UFKXi4tz11GK5IhVE4S5EQHi2MFqlmtr/8=
github.com/hashicorp/go-azure-sdk/sdk v0.20240221.1170458/go.mod h1:IKIPyL+hfFWBHABKT0NOWlIEzlusiUBG0SxIfaiv278=
github.com/hashicorp/go-azure-sdk/resource-manager v0.20240222.1164640 h1:SkPXJcSTQ+Y1rONZLu0X9ur7IaMTXMx1E4/mUfN9uQQ=
github.com/hashicorp/go-azure-sdk/resource-manager v0.20240222.1164640/go.mod h1:ZqVMnNEXjBN2y96Ax7QGwczXLaYbU9jRPnr5VW4MERw=
github.com/hashicorp/go-azure-sdk/sdk v0.20240222.1164640 h1:fueP5grEuugdoLX8cSSxSPU5ewskUoHXhpThakZeQfI=
github.com/hashicorp/go-azure-sdk/sdk v0.20240222.1164640/go.mod h1:IKIPyL+hfFWBHABKT0NOWlIEzlusiUBG0SxIfaiv278=
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=
Expand Down
6 changes: 4 additions & 2 deletions internal/clients/client.go
Original file line number Diff line number Diff line change
Expand Up @@ -607,9 +607,11 @@ func (client *Client) Build(ctx context.Context, o *common.ClientOptions) error
if client.ServiceConnector, err = serviceConnector.NewClient(o); err != nil {
return fmt.Errorf("building clients for ServiceConnector: %+v", err)
}
client.ServiceFabric = serviceFabric.NewClient(o)
if client.ServiceFabric, err = serviceFabric.NewClient(o); err != nil {
return fmt.Errorf("building clients for ServiceConnector: %+v", err)
}
if client.ServiceFabricManaged, err = serviceFabricManaged.NewClient(o); err != nil {
return fmt.Errorf("building clients for ServiceFabricManagedCluster: %+v", err)
return fmt.Errorf("building clients for ServiceFabric: %+v", err)
}
if client.ServiceNetworking, err = serviceNetworking.NewClient(o); err != nil {
return fmt.Errorf("building clients for ServiceNetworking: %+v", err)
Expand Down
15 changes: 10 additions & 5 deletions internal/services/servicefabric/client/client.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@
package client

import (
"fmt"

"github.com/hashicorp/go-azure-sdk/resource-manager/servicefabric/2021-06-01/cluster"
"github.com/hashicorp/terraform-provider-azurerm/internal/common"
)
Expand All @@ -12,11 +14,14 @@ type Client struct {
ClustersClient *cluster.ClusterClient
}

func NewClient(o *common.ClientOptions) *Client {
clustersClient := cluster.NewClusterClientWithBaseURI(o.ResourceManagerEndpoint)
o.ConfigureClient(&clustersClient.Client, o.ResourceManagerAuthorizer)
func NewClient(o *common.ClientOptions) (*Client, error) {
clustersClient, err := cluster.NewClusterClientWithBaseURI(o.Environment.ResourceManager)
if err != nil {
return nil, fmt.Errorf("building Clusters Client: %+v", err)
}
o.Configure(clustersClient.Client, o.Authorizers.ResourceManager)

return &Client{
ClustersClient: &clustersClient,
}
ClustersClient: clustersClient,
}, nil
}

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit bb0d8bf

Please sign in to comment.