Fix dataproc tests to use sweepable names (GoogleCloudPlatform#9469)

davcen · Nov 17, 2023 · eae2206 · eae2206
1 parent 7ade9bb
commit eae2206
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 19 deletions.
diff --git a/mmv1/products/metastore/Service.yaml b/mmv1/products/metastore/Service.yaml
@@ -114,23 +114,23 @@ examples:
     skip_docs: true
     primary_resource_id: 'telemetry'
     vars:
-      metastore_service_name: 'telemetry'
+      metastore_service_name: 'ms-telemetry'
   - !ruby/object:Provider::Terraform::Examples
     name: 'dataproc_metastore_service_dpms2'
     primary_resource_id: 'dpms2'
     vars:
-      metastore_service_name: 'dpms2'
+      metastore_service_name: 'ms-dpms2'
   - !ruby/object:Provider::Terraform::Examples
     name: 'dataproc_metastore_service_dpms2_scaling_factor'
     primary_resource_id: 'dpms2_scaling_factor'
     vars:
-      metastore_service_name: 'dpms2sf'
+      metastore_service_name: 'ms-dpms2sf'
   - !ruby/object:Provider::Terraform::Examples
     name: 'dataproc_metastore_service_dpms2_scaling_factor_lt1'
     skip_docs: true
     primary_resource_id: 'dpms2_scaling_factor_lt1'
     vars:
-      metastore_service_name: 'dpms2sflt1'
+      metastore_service_name: 'ms-dpms2sflt1'
 parameters:
   - !ruby/object:Api::Type::String
     name: 'serviceId'

diff --git a/mmv1/third_party/terraform/services/dataproc/iam_dataproc_cluster_test.go b/mmv1/third_party/terraform/services/dataproc/iam_dataproc_cluster_test.go
@@ -12,8 +12,8 @@ import (
 func TestAccDataprocClusterIamBinding(t *testing.T) {
 	t.Parallel()
 
-	cluster := "tf-dataproc-iam-" + acctest.RandString(t, 10)
-	account := "tf-dataproc-iam-" + acctest.RandString(t, 10)
+	cluster := "tf-test-iam-" + acctest.RandString(t, 10)
+	account := "tf-test-dpiam-" + acctest.RandString(t, 10)
 	role := "roles/editor"
 
 	networkName := acctest.BootstrapSharedTestNetwork(t, "dataproc-cluster")
@@ -58,8 +58,8 @@ func TestAccDataprocClusterIamBinding(t *testing.T) {
 func TestAccDataprocClusterIamMember(t *testing.T) {
 	t.Parallel()
 
-	cluster := "tf-dataproc-iam-" + acctest.RandString(t, 10)
-	account := "tf-dataproc-iam-" + acctest.RandString(t, 10)
+	cluster := "tf-test-iam-" + acctest.RandString(t, 10)
+	account := "tf-test-dpiam-" + acctest.RandString(t, 10)
 	role := "roles/editor"
 
 	networkName := acctest.BootstrapSharedTestNetwork(t, "dataproc-cluster")
@@ -100,8 +100,8 @@ func TestAccDataprocClusterIamMember(t *testing.T) {
 func TestAccDataprocClusterIamPolicy(t *testing.T) {
 	t.Parallel()
 
-	cluster := "tf-dataproc-iam-" + acctest.RandString(t, 10)
-	account := "tf-dataproc-iam-" + acctest.RandString(t, 10)
+	cluster := "tf-test-iam-" + acctest.RandString(t, 10)
+	account := "tf-test-dpiam-" + acctest.RandString(t, 10)
 	role := "roles/editor"
 
 	networkName := acctest.BootstrapSharedTestNetwork(t, "dataproc-cluster")

diff --git a/mmv1/third_party/terraform/services/dataproc/iam_dataproc_job_test.go b/mmv1/third_party/terraform/services/dataproc/iam_dataproc_job_test.go
@@ -12,9 +12,9 @@ import (
 func TestAccDataprocJobIamBinding(t *testing.T) {
 	t.Parallel()
 
-	cluster := "tf-dataproc-iam-cluster" + acctest.RandString(t, 10)
-	job := "tf-dataproc-iam-job-" + acctest.RandString(t, 10)
-	account := "tf-dataproc-iam-" + acctest.RandString(t, 10)
+	cluster := "tf-test-iam-" + acctest.RandString(t, 10)
+	job := "tf-test-iam-" + acctest.RandString(t, 10)
+	account := "tf-test-dpiam-" + acctest.RandString(t, 10)
 	role := "roles/editor"
 
 	networkName := acctest.BootstrapSharedTestNetwork(t, "dataproc-cluster")
@@ -55,9 +55,9 @@ func TestAccDataprocJobIamBinding(t *testing.T) {
 func TestAccDataprocJobIamMember(t *testing.T) {
 	t.Parallel()
 
-	cluster := "tf-dataproc-iam-cluster" + acctest.RandString(t, 10)
-	job := "tf-dataproc-iam-jobid-" + acctest.RandString(t, 10)
-	account := "tf-dataproc-iam-" + acctest.RandString(t, 10)
+	cluster := "tf-test-iam-" + acctest.RandString(t, 10)
+	job := "tf-test-iam-" + acctest.RandString(t, 10)
+	account := "tf-test-dpiam-" + acctest.RandString(t, 10)
 	role := "roles/editor"
 
 	networkName := acctest.BootstrapSharedTestNetwork(t, "dataproc-cluster")
@@ -92,9 +92,9 @@ func TestAccDataprocJobIamMember(t *testing.T) {
 func TestAccDataprocJobIamPolicy(t *testing.T) {
 	t.Parallel()
 
-	cluster := "tf-dataproc-iam-cluster" + acctest.RandString(t, 10)
-	job := "tf-dataproc-iam-jobid-" + acctest.RandString(t, 10)
-	account := "tf-dataproc-iam-" + acctest.RandString(t, 10)
+	cluster := "tf-test-iam-" + acctest.RandString(t, 10)
+	job := "tf-test-iam-" + acctest.RandString(t, 10)
+	account := "tf-test-dpiam-" + acctest.RandString(t, 10)
 	role := "roles/editor"
 
 	networkName := acctest.BootstrapSharedTestNetwork(t, "dataproc-cluster")