Fixed PR based on comments

Author: NA2047

mmv1/third_party/terraform/provider/provider_mmv1_resources.go.tmpl

@@ -22,9 +22,9 @@ var handwrittenDatasources = map[string]*schema.Resource{
 	"google_access_approval_project_service_account":   accessapproval.DataSourceAccessApprovalProjectServiceAccount(),
 	"google_access_context_manager_access_policy":   accesscontextmanager.DataSourceAccessContextManagerAccessPolicy(),
 	"google_active_folder":                             resourcemanager.DataSourceGoogleActiveFolder(),
-	"google_alloydb_cluster":                           alloydb.DataSourceAlloydbDatabaseCluster(),
 	"google_alloydb_locations":                         alloydb.DataSourceAlloydbLocations(),
 	"google_alloydb_supported_database_flags":          alloydb.DataSourceAlloydbSupportedDatabaseFlags(),
+	"google_alloydb_cluster":                           alloydb.DataSourceAlloydbDatabaseCluster(),
 	"google_artifact_registry_docker_image":            artifactregistry.DataSourceArtifactRegistryDockerImage(),
         "google_artifact_registry_locations":               artifactregistry.DataSourceGoogleArtifactRegistryLocations(),
 	"google_artifact_registry_repository":              artifactregistry.DataSourceArtifactRegistryRepository(),
@@ -134,12 +134,12 @@ var handwrittenDatasources = map[string]*schema.Resource{
 	"google_gke_hub_feature":                           gkehub2.DataSourceGoogleGkeHubFeature(),
 	"google_filestore_instance":                        filestore.DataSourceGoogleFilestoreInstance(),
 	"google_iam_policy":                                resourcemanager.DataSourceGoogleIamPolicy(),
+		{{- if ne $.TargetVersionName "ga" }}
 	"google_iam_role":                                  resourcemanager.DataSourceGoogleIamRole(),
 	"google_iam_testable_permissions":                  resourcemanager.DataSourceGoogleIamTestablePermissions(),
-	{{- if ne $.TargetVersionName "ga" }}
 	"google_iam_workload_identity_pool":                iambeta.DataSourceIAMBetaWorkloadIdentityPool(),
-	"google_iam_workload_identity_pool_provider":       iambeta.DataSourceIAMBetaWorkloadIdentityPoolProvider(),
 	{{- end }}
+	"google_iam_workload_identity_pool_provider":       iambeta.DataSourceIAMBetaWorkloadIdentityPoolProvider(),
 	"google_iap_client":                                iap.DataSourceGoogleIapClient(),
 	"google_kms_crypto_key":                            kms.DataSourceGoogleKmsCryptoKey(),
 	"google_kms_crypto_keys":                           kms.DataSourceGoogleKmsCryptoKeys(),
@@ -191,9 +191,11 @@ var handwrittenDatasources = map[string]*schema.Resource{
 	"google_parameter_manager_parameter":               parametermanager.DataSourceParameterManagerParameter(),
 	"google_parameter_manager_parameters":              parametermanager.DataSourceParameterManagerParameters(),
 	"google_parameter_manager_parameter_version":       parametermanager.DataSourceParameterManagerParameterVersion(),
+	"google_parameter_manager_parameter_version_render":parametermanager.DataSourceParameterManagerParameterVersionRender(),
 	"google_parameter_manager_regional_parameter":      parametermanagerregional.DataSourceParameterManagerRegionalRegionalParameter(),
 	"google_parameter_manager_regional_parameters":     parametermanagerregional.DataSourceParameterManagerRegionalRegionalParameters(),
 	"google_parameter_manager_regional_parameter_version": parametermanagerregional.DataSourceParameterManagerRegionalRegionalParameterVersion(),
+	"google_parameter_manager_regional_parameter_version_render":parametermanagerregional.DataSourceParameterManagerRegionalRegionalParameterVersionRender(),
 	{{- end }}
 	"google_privateca_certificate_authority":           privateca.DataSourcePrivatecaCertificateAuthority(),
 	"google_privileged_access_manager_entitlement":     privilegedaccessmanager.DataSourceGooglePrivilegedAccessManagerEntitlement(),

mmv1/third_party/terraform/services/alloydb/data_soruce_alloydb_cluster.go renamed to mmv1/third_party/terraform/services/alloydb/data_source_alloydb_cluster.go

@@ -12,7 +12,7 @@ func TestAccAlloydbDatabaseClusterDatasourceConfig(t *testing.T) {
 
 	context := map[string]interface{}{
 		"random_suffix": acctest.RandString(t, 10),
-		"network_name":  acctest.BootstrapSharedServiceNetworkingConnection(t, "alloydb-instance-mandatory-1"),
+		"network_name":  acctest.BootstrapSharedServiceNetworkingConnection(t, "alloydb-cluster-ds"),
 	}
 
 	acctest.VcrTest(t, resource.TestCase{
@@ -29,16 +29,6 @@ func TestAccAlloydbDatabaseClusterDatasourceConfig(t *testing.T) {
 
 func testAccAlloydbDatabaseClusterDatasourceConfig(context map[string]interface{}) string {
 	return acctest.Nprintf(`
-resource "google_alloydb_instance" "default" {
-  cluster       = google_alloydb_cluster.default.name
-  instance_id   = "tf-test-alloydb-instance%{random_suffix}"
-  instance_type = "PRIMARY"
-
-  machine_config {
-    cpu_count = 2
-  }
-}
-
 resource "google_alloydb_cluster" "default" {
   cluster_id = "tf-test-alloydb-cluster%{random_suffix}"
   location   = "us-central1"