bit of spin on acceptance tests remediation

Author: galapas1

internal/providersdkv2/data_source_packer_bucket_names_test.go

@@ -34,7 +34,10 @@ func TestAcc_Packer_dataSourcePackerBucketNames(t *testing.T) {
 				},
 				Config: config,
 				Check: resource.ComposeTestCheckFunc(
-					testAccCheckPackerBucketNamesCountCapture(dataAddr, &baselineCount),
+					func(*terraform.State) error {
+						baselineCount = testAccPackerListBucketCount(t)
+						return nil
+					},
 				),
 			},
 			{
@@ -75,17 +78,6 @@ func TestAcc_Packer_dataSourcePackerBucketNames(t *testing.T) {
 	})
 }
 
-func testAccCheckPackerBucketNamesCountCapture(addr string, dest *int) resource.TestCheckFunc {
-	return func(s *terraform.State) error {
-		n, err := testAccPackerBucketNamesCount(s, addr)
-		if err != nil {
-			return err
-		}
-		*dest = n
-		return nil
-	}
-}
-
 func testAccCheckPackerBucketNamesCountEquals(addr string, want int) resource.TestCheckFunc {
 	return func(s *terraform.State) error {
 		got, err := testAccPackerBucketNamesCount(s, addr)

internal/providersdkv2/test_helpers_for_packer_test.go

@@ -4,6 +4,7 @@
 package providersdkv2
 
 import (
+	"context"
 	"errors"
 	"fmt"
 	"net/http"
@@ -22,6 +23,25 @@ import (
 	"google.golang.org/grpc/codes"
 )
 
+// testAccPackerListBucketCount returns the number of Packer buckets in the test project via the
+// same ListBuckets API the data source uses. Prefer this over reading names.# from Terraform
+// state for baselines: the first data source read can briefly disagree with the API after
+// registry upsert.
+func testAccPackerListBucketCount(t *testing.T) int {
+	t.Helper()
+
+	client := testAccProvider.Meta().(*clients.Client)
+	loc := &sharedmodels.HashicorpCloudLocationLocation{
+		OrganizationID: client.Config.OrganizationID,
+		ProjectID:      client.Config.ProjectID,
+	}
+	buckets, err := packerv2.ListBuckets(context.Background(), client, loc)
+	if err != nil {
+		t.Fatalf("ListBuckets: %v", err)
+	}
+	return len(buckets)
+}
+
 func upsertRegistry(t *testing.T) {
 	t.Helper()