managedhsm: refactoring to use hashicorp/go-azure-sdks base layer…

… / API Version `2023-07-01` (#24761) * `managedhsm`: updating to use API Version `2023-07-01` (and `hashicorp/go-azure-sdk`s base layer) * go mod tidy && go mod vendor * linting * go mod vendor --------- Co-authored-by: kt <[email protected]>
hashicorp · Feb 9, 2024 · 63095e6 · 63095e6
1 parent fd95513
commit 63095e6
Show file tree

Hide file tree

Showing 53 changed files with 1,027 additions and 1,197 deletions.
diff --git a/internal/clients/client.go b/internal/clients/client.go
@@ -494,7 +494,9 @@ func (client *Client) Build(ctx context.Context, o *common.ClientOptions) error
 		return fmt.Errorf("building clients for Managed Applications: %+v", err)
 	}
 	client.ManagementGroups = managementgroup.NewClient(o)
-	client.ManagedHSMs = managedhsm.NewClient(o)
+	if client.ManagedHSMs, err = managedhsm.NewClient(o); err != nil {
+		return fmt.Errorf("building clients for ManagedHSM: %+v", err)
+	}
 	if client.Maps, err = maps.NewClient(o); err != nil {
 		return fmt.Errorf("building clients for Maps: %+v", err)
 	}

diff --git a/internal/services/managedhsm/client/client.go b/internal/services/managedhsm/client/client.go
@@ -4,7 +4,9 @@
 package client
 
 import (
-	"github.com/hashicorp/go-azure-sdk/resource-manager/keyvault/2023-02-01/managedhsms"
+	"fmt"
+
+	"github.com/hashicorp/go-azure-sdk/resource-manager/keyvault/2023-07-01/managedhsms"
 	"github.com/hashicorp/terraform-provider-azurerm/internal/common"
 	dataplane "github.com/tombuildsstuff/kermit/sdk/keyvault/7.4/keyvault"
 )
@@ -27,9 +29,12 @@ type Client struct {
 	DataPlaneSecurityDomainsClient *dataplane.HSMSecurityDomainClient
 }
 
-func NewClient(o *common.ClientOptions) *Client {
-	managedHsmClient := managedhsms.NewManagedHsmsClientWithBaseURI(o.ResourceManagerEndpoint)
-	o.ConfigureClient(&managedHsmClient.Client, o.ResourceManagerAuthorizer)
+func NewClient(o *common.ClientOptions) (*Client, error) {
+	managedHsmClient, err := managedhsms.NewManagedHsmsClientWithBaseURI(o.Environment.ResourceManager)
+	if err != nil {
+		return nil, fmt.Errorf("building ManagedHsms client: %+v", err)
+	}
+	o.Configure(managedHsmClient.Client, o.Authorizers.ResourceManager)
 
 	managementClient := dataplane.New()
 	o.ConfigureClient(&managementClient.Client, o.KeyVaultAuthorizer)
@@ -45,12 +50,12 @@ func NewClient(o *common.ClientOptions) *Client {
 
 	return &Client{
 		// Resource Manger
-		ManagedHsmClient: &managedHsmClient,
+		ManagedHsmClient: managedHsmClient,
 
 		// Data Plane
 		DataPlaneClient:                &managementClient,
 		DataPlaneSecurityDomainsClient: &securityDomainClient,
 		DataPlaneRoleDefinitionsClient: &roleDefinitionsClient,
 		DataPlaneRoleAssignmentsClient: &roleAssignmentsClient,
-	}
+	}, nil
 }
diff --git a/internal/services/managedhsm/custompollers/hsm_purge_poller.go b/internal/services/managedhsm/custompollers/hsm_purge_poller.go
@@ -9,7 +9,7 @@ import (
 	"time"
 
 	"github.com/hashicorp/go-azure-helpers/lang/response"
-	"github.com/hashicorp/go-azure-sdk/resource-manager/keyvault/2023-02-01/managedhsms"
+	"github.com/hashicorp/go-azure-sdk/resource-manager/keyvault/2023-07-01/managedhsms"
 	"github.com/hashicorp/go-azure-sdk/sdk/client/pollers"
 )
 

diff --git a/internal/services/managedhsm/key_vault_managed_hardware_security_module_data_source.go b/internal/services/managedhsm/key_vault_managed_hardware_security_module_data_source.go
@@ -11,7 +11,7 @@ import (
 	"github.com/hashicorp/go-azure-helpers/resourcemanager/commonschema"
 	"github.com/hashicorp/go-azure-helpers/resourcemanager/location"
 	"github.com/hashicorp/go-azure-helpers/resourcemanager/tags"
-	"github.com/hashicorp/go-azure-sdk/resource-manager/keyvault/2023-02-01/managedhsms"
+	"github.com/hashicorp/go-azure-sdk/resource-manager/keyvault/2023-07-01/managedhsms"
 	"github.com/hashicorp/terraform-provider-azurerm/internal/clients"
 	"github.com/hashicorp/terraform-provider-azurerm/internal/services/managedhsm/validate"
 	"github.com/hashicorp/terraform-provider-azurerm/internal/tf/pluginsdk"

diff --git a/internal/services/managedhsm/key_vault_managed_hardware_security_module_resource.go b/internal/services/managedhsm/key_vault_managed_hardware_security_module_resource.go
@@ -18,7 +18,7 @@ import (
 	"github.com/hashicorp/go-azure-helpers/resourcemanager/commonschema"
 	"github.com/hashicorp/go-azure-helpers/resourcemanager/location"
 	"github.com/hashicorp/go-azure-helpers/resourcemanager/tags"
-	"github.com/hashicorp/go-azure-sdk/resource-manager/keyvault/2023-02-01/managedhsms"
+	"github.com/hashicorp/go-azure-sdk/resource-manager/keyvault/2023-07-01/managedhsms"
 	"github.com/hashicorp/go-azure-sdk/sdk/client/pollers"
 	"github.com/hashicorp/terraform-provider-azurerm/helpers/azure"
 	"github.com/hashicorp/terraform-provider-azurerm/helpers/tf"

diff --git a/internal/services/managedhsm/key_vault_managed_hardware_security_module_resource_test.go b/internal/services/managedhsm/key_vault_managed_hardware_security_module_resource_test.go
@@ -8,7 +8,7 @@ import (
 	"fmt"
 	"testing"
 
-	"github.com/hashicorp/go-azure-sdk/resource-manager/keyvault/2023-02-01/managedhsms"
+	"github.com/hashicorp/go-azure-sdk/resource-manager/keyvault/2023-07-01/managedhsms"
 	"github.com/hashicorp/terraform-provider-azurerm/internal/acceptance"
 	"github.com/hashicorp/terraform-provider-azurerm/internal/acceptance/check"
 	"github.com/hashicorp/terraform-provider-azurerm/internal/clients"

diff --git a/internal/services/storage/storage_account_customer_managed_key_resource.go b/internal/services/storage/storage_account_customer_managed_key_resource.go
@@ -11,7 +11,7 @@ import (
 	"github.com/Azure/azure-sdk-for-go/services/storage/mgmt/2021-09-01/storage" // nolint: staticcheck
 	"github.com/hashicorp/go-azure-helpers/lang/pointer"
 	"github.com/hashicorp/go-azure-helpers/resourcemanager/commonids"
-	"github.com/hashicorp/go-azure-sdk/resource-manager/keyvault/2023-02-01/managedhsms"
+	"github.com/hashicorp/go-azure-sdk/resource-manager/keyvault/2023-07-01/managedhsms"
 	"github.com/hashicorp/terraform-provider-azurerm/helpers/tf"
 	"github.com/hashicorp/terraform-provider-azurerm/internal/clients"
 	"github.com/hashicorp/terraform-provider-azurerm/internal/locks"

diff --git a/...hub.com/hashicorp/go-azure-sdk/resource-manager/keyvault/2023-02-01/managedhsms/client.go b/...hub.com/hashicorp/go-azure-sdk/resource-manager/keyvault/2023-02-01/managedhsms/client.go
diff --git a/...urce-manager/keyvault/2023-02-01/managedhsms/method_checkmhsmnameavailability_autorest.go b/...urce-manager/keyvault/2023-02-01/managedhsms/method_checkmhsmnameavailability_autorest.go
diff --git a/...re-sdk/resource-manager/keyvault/2023-02-01/managedhsms/method_createorupdate_autorest.go b/...re-sdk/resource-manager/keyvault/2023-02-01/managedhsms/method_createorupdate_autorest.go
diff --git a/...p/go-azure-sdk/resource-manager/keyvault/2023-02-01/managedhsms/method_delete_autorest.go b/...p/go-azure-sdk/resource-manager/keyvault/2023-02-01/managedhsms/method_delete_autorest.go