dataproc use v1 only (#7002) (#13311)

modular-magician · web-flow · commit 6bb9939aa048 · 2022-12-21T09:03:42.000-08:00
* move dataproc to v1

* use dataproc v1 in util/config

* remove remainning v1beta2 API

* fix

* fix2

* clean up all version gaurd

* fix test

* rerun

* rerun

* rerun tests

Signed-off-by: Modular Magician &lt;magic-modules@google.com&gt;

Signed-off-by: Modular Magician &lt;magic-modules@google.com&gt;
diff --git a/.changelog/7002.txt b/.changelog/7002.txt
@@ -0,0 +1,3 @@
+```release-note:enhancement
+dataproc: deprecate the v1beta2 API.
+```
diff --git a/google/resource_dataproc_cluster_test.go b/google/resource_dataproc_cluster_test.go
@@ -707,8 +707,8 @@ func TestAccDataprocCluster_withLabels(t *testing.T) {
 				Check: resource.ComposeTestCheckFunc(
 					testAccCheckDataprocClusterExists(t, "google_dataproc_cluster.with_labels", &cluster),
 
-					// We only provide one, but GCP adds three, so expect 4.
-					resource.TestCheckResourceAttr("google_dataproc_cluster.with_labels", "labels.%", "4"),
+					// We only provide one, but GCP adds three and we added goog-dataproc-autozone internally, so expect 5.
+					resource.TestCheckResourceAttr("google_dataproc_cluster.with_labels", "labels.%", "5"),
 					resource.TestCheckResourceAttr("google_dataproc_cluster.with_labels", "labels.key1", "value1"),
 				),
 			},

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	+```release-note:enhancement
	`2`	`+dataproc: deprecate the v1beta2 API.`
	`3`	+```