workbench: Fix issue with apply failing with labels was null (#15055)

Author: bcreddy-gcp

mmv1/products/workbench/Instance.yaml

@@ -615,7 +615,6 @@ properties:
     description: |
       Optional. Labels to apply to this instance. These can be later modified
       by the UpdateInstance method.
-    diff_suppress_func: 'WorkbenchInstanceLabelsDiffSuppress'
   - name: 'enableThirdPartyIdentity'
     type: Boolean
     description: |

mmv1/templates/terraform/constants/workbench_instance.go.tmpl

@@ -1,28 +1,3 @@
-var WorkbenchInstanceProvidedLabels = []string{
-	"consumer-project-id",
-	"consumer-project-number",
-	"notebooks-product",
-	"resource-name",
-}
-
-func WorkbenchInstanceLabelsDiffSuppress(k, old, new string, d *schema.ResourceData) bool {
-	// Suppress diffs for the labels
-	for _, label := range WorkbenchInstanceProvidedLabels {
-		if strings.Contains(k, label) && new == "" {
-			return true
-		}
-	}
-
-	// Let diff be determined by labels (above)
-	if strings.Contains(k, "labels.%") {
-		return true
-	}
-
-	// For other keys, don't suppress diff.
-	return false
-}
-
-
 var WorkbenchInstanceSettableUnmodifiableDefaultMetadata = []string{
 	"install-monitoring-agent",
 	"serial-port-logging-enable",

mmv1/third_party/terraform/services/workbench/resource_workbench_instance_test.go

@@ -732,6 +732,9 @@ resource "google_workbench_instance" "instance" {
 }
 
 func TestAccWorkbenchInstance_updatelabels(t *testing.T) {
+	// Skip it in VCR test because of the randomness of uuid in "labels" field
+	// which causes the replaying mode after recording mode failing in VCR test
+	acctest.SkipIfVcr(t)
 	t.Parallel()
 
 	context := map[string]interface{}{
@@ -741,6 +744,9 @@ func TestAccWorkbenchInstance_updatelabels(t *testing.T) {
 	acctest.VcrTest(t, resource.TestCase{
 		PreCheck:                 func() { acctest.AccTestPreCheck(t) },
 		ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t),
+		ExternalProviders: map[string]resource.ExternalProvider{
+			"random": {},
+		},
 		Steps: []resource.TestStep{
 			{
 				Config: testAccWorkbenchInstance_label(context),
@@ -787,11 +793,15 @@ func TestAccWorkbenchInstance_updatelabels(t *testing.T) {
 
 func testAccWorkbenchInstance_label(context map[string]interface{}) string {
 	return acctest.Nprintf(`
+resource "random_uuid" "test" {
+}
+
 resource "google_workbench_instance" "instance" {
   name = "tf-test-workbench-instance%{random_suffix}"
   location = "us-central1-a"
   labels = {
     k = "val"
+	computed_label = "${random_uuid.test.result}"
   }
 }
 `, context)