Skip to content

Commit

Permalink
Merge pull request #17469 from hashicorp/f/azurestackhci-to-go-azure-sdk
Browse files Browse the repository at this point in the history
azurestackhci: refactoring to use `hashicorp/go-azure-sdk`
  • Loading branch information
tombuildsstuff authored Jul 3, 2022
2 parents 917a4c5 + 97e68ea commit cc6ffb6
Show file tree
Hide file tree
Showing 169 changed files with 1,817 additions and 2,384 deletions.
4 changes: 2 additions & 2 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ require (
github.com/gofrs/uuid v4.0.0+incompatible
github.com/google/go-cmp v0.5.8
github.com/google/uuid v1.1.2
github.com/hashicorp/go-azure-helpers v0.34.0
github.com/hashicorp/go-azure-sdk v0.20220628.1190740
github.com/hashicorp/go-azure-helpers v0.35.0
github.com/hashicorp/go-azure-sdk v0.20220701.1073833
github.com/hashicorp/go-multierror v1.1.1
github.com/hashicorp/go-uuid v1.0.2
github.com/hashicorp/go-version v1.4.0
Expand Down
8 changes: 4 additions & 4 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -257,10 +257,10 @@ github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brv
github.com/hashicorp/errwrap v1.1.0 h1:OxrOeh75EUXMY8TBjag2fzXGZ40LB6IKw45YeGUDY2I=
github.com/hashicorp/errwrap v1.1.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=
github.com/hashicorp/go-azure-helpers v0.12.0/go.mod h1:Zc3v4DNeX6PDdy7NljlYpnrdac1++qNW0I4U+ofGwpg=
github.com/hashicorp/go-azure-helpers v0.34.0 h1:Lvk3IgwFT51WVu1IK5rpUMd+rKnRylg9vMTt6Qx6xn4=
github.com/hashicorp/go-azure-helpers v0.34.0/go.mod h1:gcutZ/Hf/O7YN9M3UIvyZ9l0Rxv7Yrc9x5sSfM9cuSw=
github.com/hashicorp/go-azure-sdk v0.20220628.1190740 h1:jI/MGHxnXhx8hFyI+gIHIvmDntQxVphjHMynZP7GTJ8=
github.com/hashicorp/go-azure-sdk v0.20220628.1190740/go.mod h1:jPd83zRme0J5C+rUQaU6bzrWg/AS5WN1TiilFzRoKU0=
github.com/hashicorp/go-azure-helpers v0.35.0 h1:/Jpm37dzTmSHobt9SuC8bK6/jSoWw5FdxB9WIqQFXbI=
github.com/hashicorp/go-azure-helpers v0.35.0/go.mod h1:gcutZ/Hf/O7YN9M3UIvyZ9l0Rxv7Yrc9x5sSfM9cuSw=
github.com/hashicorp/go-azure-sdk v0.20220701.1073833 h1:cwutAQhHojIpJR0a7gyf4884A4KX3Un1lj9SUZDRdxE=
github.com/hashicorp/go-azure-sdk v0.20220701.1073833/go.mod h1:yjQPw8DCOtQR8E8+FNaTxF6yz+tyQGkDNiVAGCNoLOo=
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: 3 additions & 3 deletions internal/services/azurestackhci/client/client.go
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
package client

import (
"github.com/Azure/azure-sdk-for-go/services/azurestackhci/mgmt/2020-10-01/azurestackhci"
"github.com/hashicorp/go-azure-sdk/resource-manager/azurestackhci/2020-10-01/clusters"
"github.com/hashicorp/terraform-provider-azurerm/internal/common"
)

type Client struct {
ClusterClient *azurestackhci.ClustersClient
ClusterClient *clusters.ClustersClient
}

func NewClient(o *common.ClientOptions) *Client {
clusterClient := azurestackhci.NewClustersClientWithBaseURI(o.ResourceManagerEndpoint, o.SubscriptionId)
clusterClient := clusters.NewClustersClientWithBaseURI(o.ResourceManagerEndpoint)
o.ConfigureClient(&clusterClient.Client, o.ResourceManagerAuthorizer)

return &Client{
Expand Down
69 changes: 0 additions & 69 deletions internal/services/azurestackhci/parse/cluster.go

This file was deleted.

112 changes: 0 additions & 112 deletions internal/services/azurestackhci/parse/cluster_test.go

This file was deleted.

3 changes: 0 additions & 3 deletions internal/services/azurestackhci/resourceids.go

This file was deleted.

Loading

0 comments on commit cc6ffb6

Please sign in to comment.