Merge branch 'main' of https://github.com/GoogleCloudPlatform/magic-modules

Author: actions-user

mmv1/products/dialogflowcx/TestCase.yaml

@@ -35,15 +35,13 @@ custom_code:
   pre_read: 'templates/terraform/pre_create/dialogflow_set_location.go.tmpl'
   pre_update: 'templates/terraform/pre_create/dialogflow_set_location.go.tmpl'
   pre_delete: 'templates/terraform/pre_create/dialogflow_set_location.go.tmpl'
+  constants: 'templates/terraform/constants/dialogflowcx_test_case_session_parameters_diff_suppress.go.tmpl'
 exclude_sweeper: true
 examples:
   - name: 'dialogflowcx_test_case_full'
     primary_resource_id: 'basic_test_case'
     vars:
       agent_name: 'dialogflowcx-agent'
-    # Skip in VCR until the test issue is resolved
-    # https://github.com/hashicorp/terraform-provider-google/issues/21532
-    skip_vcr: true
 parameters:
   - name: 'parent'
     type: String
@@ -194,6 +192,7 @@ properties:
               description: |
                 The session parameters available to the bot at this point.
               state_func: 'func(v interface{}) string { s, _ := structure.NormalizeJsonString(v); return s }'
+              diff_suppress_func: 'dialogflowcxTestCaseSessionParametersDiffSuppress'
               custom_flatten: 'templates/terraform/custom_flatten/json_schema.tmpl'
               custom_expand: 'templates/terraform/custom_expand/json_schema.tmpl'
               validation:

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

@@ -0,0 +1,22 @@
+func dialogflowcxTestCaseSessionParametersDiffSuppress(k, old, new string, d *schema.ResourceData) bool {
+	// Treat empty string and empty JSON object as equivalent
+	if (old == "" || old == "{}") && (new == "" || new == "{}") {
+		return true
+	}
+
+	if old == "" || new == "" {
+		return old == new
+	}
+
+	var oldJson, newJson interface{}
+
+	if err := json.Unmarshal([]byte(old), &oldJson); err != nil {
+		return false
+	}
+
+	if err := json.Unmarshal([]byte(new), &newJson); err != nil {
+		return false
+	}
+
+	return reflect.DeepEqual(oldJson, newJson)
+}

mmv1/third_party/terraform/services/dialogflowcx/resource_dialogflow_cx_test_case_test.go

@@ -12,10 +12,6 @@ import (
 func TestAccDialogflowCXTestCase_update(t *testing.T) {
 	t.Parallel()
 
-	// Skip in VCR until the test issue is resolved
-	// https://github.com/hashicorp/terraform-provider-google/issues/25227
-	acctest.SkipIfVcr(t)
-
 	context := map[string]interface{}{
 		"org_id":          envvar.GetTestOrgFromEnv(t),
 		"billing_account": envvar.GetTestBillingAccountFromEnv(t),

…owcx/resource_dialogflow_cx_tool_test.go …resource_dialogflow_cx_tool_test.go.tmplmmv1/third_party/terraform/services/dialogflowcx/resource_dialogflow_cx_tool_test.go renamed to mmv1/third_party/terraform/services/dialogflowcx/resource_dialogflow_cx_tool_test.go.tmpl mmv1/third_party/terraform/services/dialogflowcx/resource_dialogflow_cx_tool_test.go renamed to mmv1/third_party/terraform/services/dialogflowcx/resource_dialogflow_cx_tool_test.go.tmpl

@@ -309,6 +309,7 @@ func testAccDialogflowCXTool_full_bearer_token(context map[string]interface{}) s
 	`, context)
 }
 
+{{ if ne $.TargetVersionName `ga` -}}
 func TestAccDialogflowCXTool_dialogflowcxToolConnectorExample_update(t *testing.T) {
 	t.Parallel()
 
@@ -550,3 +551,4 @@ data "google_project" "test_project" {
 }
 `, context)
 }
+{{- end }}