Skip to content

Commit

Permalink
Merge pull request #21004 from hashicorp/f/dependencies-go-azure-sdk
Browse files Browse the repository at this point in the history
dependencies: updating to `v0.20230317.1100159` of `github.com/hashicorp/go-azure-sdk`
  • Loading branch information
tombuildsstuff authored Mar 17, 2023
2 parents 9896408 + 2f8a2b4 commit 0054e7b
Show file tree
Hide file tree
Showing 44 changed files with 1,419 additions and 2,068 deletions.
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ require (
github.com/google/go-cmp v0.5.9
github.com/google/uuid v1.1.2
github.com/hashicorp/go-azure-helpers v0.55.0
github.com/hashicorp/go-azure-sdk v0.20230316.1132628
github.com/hashicorp/go-azure-sdk v0.20230317.1100159
github.com/hashicorp/go-multierror v1.1.1
github.com/hashicorp/go-uuid v1.0.3
github.com/hashicorp/go-version v1.6.0
Expand Down
4 changes: 2 additions & 2 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -136,8 +136,8 @@ 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.55.0 h1:2A2KWPiaDC5kQWr6tYHTD/P1k9bO0HvflEb/Nc1yLeU=
github.com/hashicorp/go-azure-helpers v0.55.0/go.mod h1:RQugkG8wEcNIjYmcBLHpuEI/u2mTJwO4r37rR/OKRpo=
github.com/hashicorp/go-azure-sdk v0.20230316.1132628 h1:fuoXvk4cgaQMBcr6X62j9YqenGpwIjX+ikFRNkgb3G8=
github.com/hashicorp/go-azure-sdk v0.20230316.1132628/go.mod h1:L9JXVUcnL0GjMizCnngYUlMp1lLhDBNgSTvn6Of/5O4=
github.com/hashicorp/go-azure-sdk v0.20230317.1100159 h1:Nup/Opy0OB1j2Km/kd/yxWkcxs5zQ4psb1W4qd8AtPE=
github.com/hashicorp/go-azure-sdk v0.20230317.1100159/go.mod h1:L9JXVUcnL0GjMizCnngYUlMp1lLhDBNgSTvn6Of/5O4=
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
4 changes: 3 additions & 1 deletion internal/clients/client.go
Original file line number Diff line number Diff line change
Expand Up @@ -299,7 +299,9 @@ func (client *Client) Build(ctx context.Context, o *common.ClientOptions) error
return fmt.Errorf("building clients for Dashboard: %+v", err)
}
client.DatabaseMigration = datamigration.NewClient(o)
client.DataBricks = databricks.NewClient(o)
if client.DataBricks, err = databricks.NewClient(o); err != nil {
return fmt.Errorf("building clients for DataBricks: %+v", err)
}
client.DataboxEdge = databoxedge.NewClient(o)
client.Datadog = datadog.NewClient(o)
client.DataFactory = datafactory.NewClient(o)
Expand Down
25 changes: 17 additions & 8 deletions internal/services/databricks/client/client.go
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
package client

import (
"fmt"

"github.com/hashicorp/go-azure-sdk/resource-manager/databricks/2022-04-01-preview/accessconnector"
"github.com/hashicorp/go-azure-sdk/resource-manager/databricks/2023-02-01/workspaces"
"github.com/hashicorp/terraform-provider-azurerm/internal/common"
Expand All @@ -11,14 +13,21 @@ type Client struct {
WorkspacesClient *workspaces.WorkspacesClient
}

func NewClient(o *common.ClientOptions) *Client {
AccessConnectorClient := accessconnector.NewAccessConnectorClientWithBaseURI(o.ResourceManagerEndpoint)
o.ConfigureClient(&AccessConnectorClient.Client, o.ResourceManagerAuthorizer)
WorkspacesClient := workspaces.NewWorkspacesClientWithBaseURI(o.ResourceManagerEndpoint)
o.ConfigureClient(&WorkspacesClient.Client, o.ResourceManagerAuthorizer)
func NewClient(o *common.ClientOptions) (*Client, error) {
accessConnectorClient, err := accessconnector.NewAccessConnectorClientWithBaseURI(o.Environment.ResourceManager)
if err != nil {
return nil, fmt.Errorf("building AccessConnector client: %+v", err)
}
o.Configure(accessConnectorClient.Client, o.Authorizers.ResourceManager)

return &Client{
AccessConnectorClient: &AccessConnectorClient,
WorkspacesClient: &WorkspacesClient,
workspacesClient, err := workspaces.NewWorkspacesClientWithBaseURI(o.Environment.ResourceManager)
if err != nil {
return nil, fmt.Errorf("building Workspaces client: %+v", err)
}
o.Configure(workspacesClient.Client, o.Authorizers.ResourceManager)

return &Client{
AccessConnectorClient: accessConnectorClient,
WorkspacesClient: workspacesClient,
}, 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.

This file was deleted.

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

Loading

0 comments on commit 0054e7b

Please sign in to comment.