ref: rename test package to provider_test

jianyuan · jianyuan · commit 97bbc52dae55 · 2025-02-26T23:50:49.000Z
diff --git a/internal/acctest/acctest.go b/internal/acctest/acctest.go
@@ -6,8 +6,11 @@ import (
 	"os"
 	"testing"
 
+	"github.com/hashicorp/terraform-plugin-framework/providerserver"
+	"github.com/hashicorp/terraform-plugin-go/tfprotov6"
 	"github.com/jianyuan/go-utils/must"
 	"github.com/jianyuan/terraform-provider-openai/internal/apiclient"
+	"github.com/jianyuan/terraform-provider-openai/internal/provider"
 )
 
 var (
@@ -36,3 +39,11 @@ func PreCheck(t *testing.T) {
 		t.Fatal("OPENAI_TEST_USER_ID must be set for acceptance tests")
 	}
 }
+
+// testAccProtoV6ProviderFactories are used to instantiate a provider during
+// acceptance testing. The factory function will be invoked for every Terraform
+// CLI command executed to create a provider server to which the CLI can
+// reattach.
+var TestAccProtoV6ProviderFactories = map[string]func() (tfprotov6.ProviderServer, error){
+	"openai": providerserver.NewProtocol6WithError(provider.New("test")()),
+}
diff --git a/internal/provider/data_source_invite_test.go b/internal/provider/data_source_invite_test.go
@@ -1,4 +1,4 @@
-package provider
+package provider_test
 
 import (
 	"fmt"
@@ -18,7 +18,7 @@ func TestAccInviteDataSource(t *testing.T) {
 
 	resource.Test(t, resource.TestCase{
 		PreCheck:                 func() { acctest.PreCheck(t) },
-		ProtoV6ProviderFactories: testAccProtoV6ProviderFactories,
+		ProtoV6ProviderFactories: acctest.TestAccProtoV6ProviderFactories,
 		Steps: []resource.TestStep{
 			{
 				Config: testAccInviteDataSourceConfig(email),
diff --git a/internal/provider/data_source_invites_test.go b/internal/provider/data_source_invites_test.go
@@ -1,4 +1,4 @@
-package provider
+package provider_test
 
 import (
 	"testing"
@@ -15,7 +15,7 @@ func TestAccInvitesDataSource(t *testing.T) {
 
 	resource.Test(t, resource.TestCase{
 		PreCheck:                 func() { acctest.PreCheck(t) },
-		ProtoV6ProviderFactories: testAccProtoV6ProviderFactories,
+		ProtoV6ProviderFactories: acctest.TestAccProtoV6ProviderFactories,
 		Steps: []resource.TestStep{
 			{
 				Config: testAccInvitesDataSourceConfig,
diff --git a/internal/provider/data_source_project_rate_limits_test.go b/internal/provider/data_source_project_rate_limits_test.go
@@ -1,4 +1,4 @@
-package provider
+package provider_test
 
 import (
 	"testing"
@@ -15,7 +15,7 @@ func TestAccProjectRateLimitsDataSource(t *testing.T) {
 
 	resource.Test(t, resource.TestCase{
 		PreCheck:                 func() { acctest.PreCheck(t) },
-		ProtoV6ProviderFactories: testAccProtoV6ProviderFactories,
+		ProtoV6ProviderFactories: acctest.TestAccProtoV6ProviderFactories,
 		Steps: []resource.TestStep{
 			{
 				Config: testAccProjectRateLimitsDataSourceConfig,
diff --git a/internal/provider/data_source_project_test.go b/internal/provider/data_source_project_test.go
@@ -1,4 +1,4 @@
-package provider
+package provider_test
 
 import (
 	"fmt"
@@ -17,7 +17,7 @@ func TestAccProjectDataSource(t *testing.T) {
 
 	resource.Test(t, resource.TestCase{
 		PreCheck:                 func() { acctest.PreCheck(t) },
-		ProtoV6ProviderFactories: testAccProtoV6ProviderFactories,
+		ProtoV6ProviderFactories: acctest.TestAccProtoV6ProviderFactories,
 		Steps: []resource.TestStep{
 			{
 				Config: testAccProjectDataSourceConfig(projectName),
diff --git a/internal/provider/data_source_projects_test.go b/internal/provider/data_source_projects_test.go
@@ -1,4 +1,4 @@
-package provider
+package provider_test
 
 import (
 	"testing"
@@ -15,7 +15,7 @@ func TestAccProjectsDataSource(t *testing.T) {
 
 	resource.Test(t, resource.TestCase{
 		PreCheck:                 func() { acctest.PreCheck(t) },
-		ProtoV6ProviderFactories: testAccProtoV6ProviderFactories,
+		ProtoV6ProviderFactories: acctest.TestAccProtoV6ProviderFactories,
 		Steps: []resource.TestStep{
 			{
 				Config: testAccProjectsDataSourceConfig,
@@ -40,7 +40,7 @@ func TestAccProjectsDataSource_includeArchived(t *testing.T) {
 
 	resource.Test(t, resource.TestCase{
 		PreCheck:                 func() { acctest.PreCheck(t) },
-		ProtoV6ProviderFactories: testAccProtoV6ProviderFactories,
+		ProtoV6ProviderFactories: acctest.TestAccProtoV6ProviderFactories,
 		Steps: []resource.TestStep{
 			{
 				Config: testAccProjectsDataSourceConfig_includeArchived,
diff --git a/internal/provider/data_source_user_test.go b/internal/provider/data_source_user_test.go
@@ -1,4 +1,4 @@
-package provider
+package provider_test
 
 import (
 	"fmt"
@@ -16,7 +16,7 @@ func TestAccUserDataSource(t *testing.T) {
 
 	resource.Test(t, resource.TestCase{
 		PreCheck:                 func() { acctest.PreCheck(t) },
-		ProtoV6ProviderFactories: testAccProtoV6ProviderFactories,
+		ProtoV6ProviderFactories: acctest.TestAccProtoV6ProviderFactories,
 		Steps: []resource.TestStep{
 			{
 				Config: testAccUserDataSourceConfig,
diff --git a/internal/provider/data_source_users_test.go b/internal/provider/data_source_users_test.go
@@ -1,4 +1,4 @@
-package provider
+package provider_test
 
 import (
 	"testing"
@@ -15,7 +15,7 @@ func TestAccUsersDataSource(t *testing.T) {
 
 	resource.Test(t, resource.TestCase{
 		PreCheck:                 func() { acctest.PreCheck(t) },
-		ProtoV6ProviderFactories: testAccProtoV6ProviderFactories,
+		ProtoV6ProviderFactories: acctest.TestAccProtoV6ProviderFactories,
 		Steps: []resource.TestStep{
 			{
 				Config: testAccUsersDataSourceConfig,
diff --git a/internal/provider/provider_test.go b/internal/provider/provider_test.go
diff --git a/internal/provider/resource_admin_api_key_test.go b/internal/provider/resource_admin_api_key_test.go
@@ -1,4 +1,4 @@
-package provider
+package provider_test
 
 import (
 	"context"
@@ -71,7 +71,7 @@ func TestAccAdminApiKeyResource(t *testing.T) {
 
 	resource.Test(t, resource.TestCase{
 		PreCheck:                 func() { acctest.PreCheck(t) },
-		ProtoV6ProviderFactories: testAccProtoV6ProviderFactories,
+		ProtoV6ProviderFactories: acctest.TestAccProtoV6ProviderFactories,
 		Steps: []resource.TestStep{
 			{
 				Config: testAccAdminApiKeyResourceConfig(name),
diff --git a/internal/provider/resource_invite_test.go b/internal/provider/resource_invite_test.go
@@ -1,4 +1,4 @@
-package provider
+package provider_test
 
 import (
 	"fmt"
@@ -17,7 +17,7 @@ func TestAccInviteResource(t *testing.T) {
 
 	resource.Test(t, resource.TestCase{
 		PreCheck:                 func() { acctest.PreCheck(t) },
-		ProtoV6ProviderFactories: testAccProtoV6ProviderFactories,
+		ProtoV6ProviderFactories: acctest.TestAccProtoV6ProviderFactories,
 		Steps: []resource.TestStep{
 			{
 				Config: testAccInviteResourceConfig(email, "reader"),
diff --git a/internal/provider/resource_project_rate_limit_test.go b/internal/provider/resource_project_rate_limit_test.go
@@ -1,4 +1,4 @@
-package provider
+package provider_test
 
 import (
 	"fmt"
@@ -18,7 +18,7 @@ func TestAccProjectRateLimitResource(t *testing.T) {
 
 	resource.Test(t, resource.TestCase{
 		PreCheck:                 func() { acctest.PreCheck(t) },
-		ProtoV6ProviderFactories: testAccProtoV6ProviderFactories,
+		ProtoV6ProviderFactories: acctest.TestAccProtoV6ProviderFactories,
 		Steps: []resource.TestStep{
 			{
 				Config: testAccProjectRateLimitResourceConfig(projectName, "text-embedding-3-small", 3, 3),
diff --git a/internal/provider/resource_project_service_account_test.go b/internal/provider/resource_project_service_account_test.go
@@ -1,4 +1,4 @@
-package provider
+package provider_test
 
 import (
 	"context"
@@ -123,7 +123,7 @@ func TestAccProjectServiceAccountResource(t *testing.T) {
 
 	resource.Test(t, resource.TestCase{
 		PreCheck:                 func() { acctest.PreCheck(t) },
-		ProtoV6ProviderFactories: testAccProtoV6ProviderFactories,
+		ProtoV6ProviderFactories: acctest.TestAccProtoV6ProviderFactories,
 		Steps: []resource.TestStep{
 			{
 				Config: testAccProjectServiceAccountResourceConfig(projectName, projectServiceAccountName),
diff --git a/internal/provider/resource_project_test.go b/internal/provider/resource_project_test.go
@@ -1,4 +1,4 @@
-package provider
+package provider_test
 
 import (
 	"context"
@@ -78,7 +78,7 @@ func TestAccProjectResource(t *testing.T) {
 
 	resource.Test(t, resource.TestCase{
 		PreCheck:                 func() { acctest.PreCheck(t) },
-		ProtoV6ProviderFactories: testAccProtoV6ProviderFactories,
+		ProtoV6ProviderFactories: acctest.TestAccProtoV6ProviderFactories,
 		Steps: []resource.TestStep{
 			{
 				Config: testAccProjectResourceConfig(projectName),
diff --git a/internal/provider/resource_project_user.go b/internal/provider/resource_project_user.go
@@ -15,6 +15,7 @@ import (
 	"github.com/hashicorp/terraform-plugin-framework/schema/validator"
 	"github.com/hashicorp/terraform-plugin-framework/types"
 	"github.com/jianyuan/terraform-provider-openai/internal/apiclient"
+	"github.com/jianyuan/terraform-provider-openai/internal/tfutils"
 )
 
 type ProjectUserResourceModel struct {
@@ -191,7 +192,7 @@ func (r *ProjectUserResource) Delete(ctx context.Context, req resource.DeleteReq
 }
 
 func (r *ProjectUserResource) ImportState(ctx context.Context, req resource.ImportStateRequest, resp *resource.ImportStateResponse) {
-	projectId, userId, err := SplitTwoPartId(req.ID, "project-id", "user-id")
+	projectId, userId, err := tfutils.SplitTwoPartId(req.ID, "project-id", "user-id")
 	if err != nil {
 		resp.Diagnostics.AddError("Invalid ID", fmt.Sprintf("Error parsing ID: %s", err.Error()))
 		return
diff --git a/internal/provider/resource_project_user_test.go b/internal/provider/resource_project_user_test.go
@@ -1,4 +1,4 @@
-package provider
+package provider_test
 
 import (
 	"fmt"
@@ -11,6 +11,7 @@ import (
 	"github.com/hashicorp/terraform-plugin-testing/terraform"
 	"github.com/hashicorp/terraform-plugin-testing/tfjsonpath"
 	"github.com/jianyuan/terraform-provider-openai/internal/acctest"
+	"github.com/jianyuan/terraform-provider-openai/internal/tfutils"
 )
 
 func TestAccProjectUserResource(t *testing.T) {
@@ -19,7 +20,7 @@ func TestAccProjectUserResource(t *testing.T) {
 
 	resource.Test(t, resource.TestCase{
 		PreCheck:                 func() { acctest.PreCheck(t) },
-		ProtoV6ProviderFactories: testAccProtoV6ProviderFactories,
+		ProtoV6ProviderFactories: acctest.TestAccProtoV6ProviderFactories,
 		Steps: []resource.TestStep{
 			{
 				Config: testAccProjectUserResourceConfig(projectName, acctest.TestUserId, "owner"),
@@ -39,7 +40,7 @@ func TestAccProjectUserResource(t *testing.T) {
 					}
 					projectId := rs.Primary.Attributes["project_id"]
 					userId := rs.Primary.Attributes["user_id"]
-					return BuildTwoPartId(projectId, userId), nil
+					return tfutils.BuildTwoPartId(projectId, userId), nil
 				},
 			},
 			{
@@ -60,7 +61,7 @@ func TestAccProjectUserResource(t *testing.T) {
 					}
 					projectId := rs.Primary.Attributes["project_id"]
 					userId := rs.Primary.Attributes["user_id"]
-					return BuildTwoPartId(projectId, userId), nil
+					return tfutils.BuildTwoPartId(projectId, userId), nil
 				},
 			},
 		},
diff --git a/internal/provider/resource_user_role_test.go b/internal/provider/resource_user_role_test.go
@@ -1,4 +1,4 @@
-package provider
+package provider_test
 
 import (
 	"fmt"
@@ -16,7 +16,7 @@ func TestAccUserRoleResource(t *testing.T) {
 
 	resource.Test(t, resource.TestCase{
 		PreCheck:                 func() { acctest.PreCheck(t) },
-		ProtoV6ProviderFactories: testAccProtoV6ProviderFactories,
+		ProtoV6ProviderFactories: acctest.TestAccProtoV6ProviderFactories,
 		Steps: []resource.TestStep{
 			{
 				Config: testAccUserRoleResourceConfig(acctest.TestUserId, "owner"),
diff --git a/internal/tfutils/id_builder.go b/internal/tfutils/id_builder.go
@@ -1,4 +1,4 @@
-package provider
+package tfutils
 
 import (
 	"fmt"
