test cleanup

dominic-retli-hashi · dominic-retli-hashi · commit 66f2a61fce87 · 2025-09-18T11:15:31.000-04:00
diff --git a/internal/provider/data_source_hyok_customer_key_version_test.go b/internal/provider/data_source_hyok_customer_key_version_test.go
@@ -4,8 +4,6 @@ import (
 	"os"
 	"testing"
 
-	"github.com/hashicorp/terraform-plugin-go/tfprotov6"
-	"github.com/hashicorp/terraform-plugin-testing/echoprovider"
 	"github.com/hashicorp/terraform-plugin-testing/helper/resource"
 )
 
@@ -16,10 +14,8 @@ func TestAccTFEHYOKCustomerKeyVersionDataSource_basic(t *testing.T) {
 	}
 
 	resource.Test(t, resource.TestCase{
-		PreCheck: func() { testAccPreCheck(t) },
-		ProtoV6ProviderFactories: map[string]func() (tfprotov6.ProviderServer, error){
-			"echo": echoprovider.NewProviderServer(),
-		},
+		PreCheck:                 func() { testAccPreCheck(t) },
+		ProtoV6ProviderFactories: testAccMuxedProviders,
 		Steps: []resource.TestStep{
 			{
 				Config: testAccTFEHYOKCustomerKeyVersionDataSourceConfig(hyokCustomerKeyVersionId),
diff --git a/internal/provider/data_source_hyok_encrypted_data_key_test.go b/internal/provider/data_source_hyok_encrypted_data_key_test.go
@@ -4,8 +4,6 @@ import (
 	"os"
 	"testing"
 
-	"github.com/hashicorp/terraform-plugin-go/tfprotov6"
-	"github.com/hashicorp/terraform-plugin-testing/echoprovider"
 	"github.com/hashicorp/terraform-plugin-testing/helper/resource"
 )
 
@@ -16,10 +14,8 @@ func TestAccTFEHYOKEncryptedDataKeyDataSource_basic(t *testing.T) {
 	}
 
 	resource.Test(t, resource.TestCase{
-		PreCheck: func() { testAccPreCheck(t) },
-		ProtoV6ProviderFactories: map[string]func() (tfprotov6.ProviderServer, error){
-			"echo": echoprovider.NewProviderServer(),
-		},
+		PreCheck:                 func() { testAccPreCheck(t) },
+		ProtoV6ProviderFactories: testAccMuxedProviders,
 		Steps: []resource.TestStep{
 			{
 				Config: testAccTFEHYOKEncryptedDataKeyDataSourceConfig(hyokEncryptedDataKeyID),

Original file line number	Diff line number	Diff line change
`@@ -4,8 +4,6 @@ import (`
`4`	`4`	`"os"`
`5`	`5`	`"testing"`
`6`	`6`
`7`		`- "github.com/hashicorp/terraform-plugin-go/tfprotov6"`
`8`		`- "github.com/hashicorp/terraform-plugin-testing/echoprovider"`
`9`	`7`	`"github.com/hashicorp/terraform-plugin-testing/helper/resource"`
`10`	`8`	`)`
`11`	`9`
`@@ -16,10 +14,8 @@ func TestAccTFEHYOKCustomerKeyVersionDataSource_basic(t *testing.T) {`
`16`	`14`	`}`
`17`	`15`
`18`	`16`	`resource.Test(t, resource.TestCase{`
`19`		`- PreCheck: func() { testAccPreCheck(t) },`
`20`		`- ProtoV6ProviderFactories: map[string]func() (tfprotov6.ProviderServer, error){`
`21`		`- "echo": echoprovider.NewProviderServer(),`
`22`		`- },`
	`17`	`+ PreCheck: func() { testAccPreCheck(t) },`
	`18`	`+ ProtoV6ProviderFactories: testAccMuxedProviders,`
`23`	`19`	`Steps: []resource.TestStep{`
`24`	`20`	`{`
`25`	`21`	`Config: testAccTFEHYOKCustomerKeyVersionDataSourceConfig(hyokCustomerKeyVersionId),`