Replace the usage of Nprinf (#8231) (#5833)

Signed-off-by: Modular Magician <[email protected]>

Author: modular-magician

.changelog/8231.txt

@@ -0,0 +1,3 @@
+```release-note:none
+
+```

google-beta/acctest/test_utils.go

@@ -5,6 +5,7 @@ package acctest
 import (
 	"errors"
 	"fmt"
+	"strings"
 
 	"github.com/hashicorp/terraform-plugin-sdk/v2/terraform"
 )
@@ -56,3 +57,14 @@ func CheckDataSourceStateMatchesResourceStateWithIgnores(dataSourceName, resourc
 		return nil
 	}
 }
+
+// This is a Printf sibling (Nprintf; Named Printf), which handles strings like
+// Nprintf("Hello %{target}!", map[string]interface{}{"target":"world"}) == "Hello world!".
+// This is particularly useful for generated tests, where we don't want to use Printf,
+// since that would require us to generate a very particular ordering of arguments.
+func Nprintf(format string, params map[string]interface{}) string {
+	for key, val := range params {
+		format = strings.Replace(format, "%{"+key+"}", fmt.Sprintf("%v", val), -1)
+	}
+	return format
+}

google-beta/data_source_access_approval_folder_service_account_test.go

@@ -38,7 +38,7 @@ func TestAccDataSourceAccessApprovalFolderServiceAccount_basic(t *testing.T) {
 }
 
 func testAccDataSourceAccessApprovalFolderServiceAccount_basic(context map[string]interface{}) string {
-	return Nprintf(`
+	return acctest.Nprintf(`
 resource "google_folder" "my_folder" {
   display_name = "tf-test-my-folder%{random_suffix}"
   parent       = "organizations/%{org_id}"

google-beta/data_source_access_approval_organization_service_account_test.go

@@ -34,7 +34,7 @@ func TestAccDataSourceAccessApprovalOrganizationServiceAccount_basic(t *testing.
 }
 
 func testAccDataSourceAccessApprovalOrganizationServiceAccount_basic(context map[string]interface{}) string {
-	return Nprintf(`
+	return acctest.Nprintf(`
 data "google_access_approval_organization_service_account" "aa_account" {
   organization_id = "%{org_id}"
 }

google-beta/data_source_access_approval_project_service_account_test.go

@@ -34,7 +34,7 @@ func TestAccDataSourceAccessApprovalProjectServiceAccount_basic(t *testing.T) {
 }
 
 func testAccDataSourceAccessApprovalProjectServiceAccount_basic(context map[string]interface{}) string {
-	return Nprintf(`
+	return acctest.Nprintf(`
 data "google_access_approval_project_service_account" "aa_account" {
   project_id = "%{project_id}"
 }

google-beta/data_source_alloydb_locations_test.go

@@ -38,7 +38,7 @@ func TestAccDataSourceAlloydbLocations_basic(t *testing.T) {
 }
 
 func testAccDataSourceAlloydbLocations_basic(context map[string]interface{}) string {
-	return Nprintf(`
+	return acctest.Nprintf(`
 data "google_alloydb_locations" "qa" {
 }
 `, context)

google-beta/data_source_alloydb_supported_database_flags_test.go

@@ -37,7 +37,7 @@ func TestAccDataSourceAlloydbSupportedDatabaseFlags_basic(t *testing.T) {
 }
 
 func testAccDataSourceAlloydbSupportedDatabaseFlags_basic(context map[string]interface{}) string {
-	return Nprintf(`
+	return acctest.Nprintf(`
 data "google_alloydb_supported_database_flags" "qa" {
 	location = "us-central1"
 }

google-beta/data_source_artifact_registry_repository_test.go

@@ -34,7 +34,7 @@ func TestAccDataSourceGoogleArtifactRegistryRepositoryConfig(t *testing.T) {
 }
 
 func testAccDataSourceGoogleArtifactRegistryRepositoryConfig(context map[string]interface{}) string {
-	return Nprintf(`
+	return acctest.Nprintf(`
 resource "google_artifact_registry_repository" "my-repo" {
   location      = "us-central1"
   repository_id = "tf-test-my-repository%{random_suffix}"

google-beta/data_source_certificate_authority_test.go

@@ -34,7 +34,7 @@ func TestAccDataSourcePrivatecaCertificateAuthority_privatecaCertificateAuthorit
 }
 
 func testAccDataSourcePrivatecaCertificateAuthority_privatecaCertificateAuthorityBasicExample(context map[string]interface{}) string {
-	return Nprintf(`
+	return acctest.Nprintf(`
 resource "google_privateca_certificate_authority" "default" {
   // This example assumes this pool already exists.
   // Pools cannot be deleted in normal test circumstances, so we depend on static pools

google-beta/data_source_cloud_identity_group_memberships_test.go

@@ -19,7 +19,7 @@ func testAccDataSourceCloudIdentityGroupMemberships_basicTest(t *testing.T) {
 		"random_suffix": RandString(t, 10),
 	}
 
-	memberId := Nprintf("%{identity_user}@%{org_domain}", context)
+	memberId := acctest.Nprintf("%{identity_user}@%{org_domain}", context)
 
 	VcrTest(t, resource.TestCase{
 		PreCheck:                 func() { acctest.AccTestPreCheck(t) },
@@ -41,7 +41,7 @@ func testAccDataSourceCloudIdentityGroupMemberships_basicTest(t *testing.T) {
 }
 
 func testAccCloudIdentityGroupMembershipConfig(context map[string]interface{}) string {
-	return testAccCloudIdentityGroupMembership_cloudIdentityGroupMembershipUserExample(context) + Nprintf(`
+	return testAccCloudIdentityGroupMembership_cloudIdentityGroupMembershipUserExample(context) + acctest.Nprintf(`
 
 data "google_cloud_identity_group_memberships" "members" {
   group = google_cloud_identity_group_membership.cloud_identity_group_membership_basic.group