Fixes issue #21347 related to google_chronicle_rule_deployment resource (GoogleCloudPlatform#13130)

Author: ankitgoyal0301

mmv1/products/chronicle/RuleDeployment.yaml

@@ -32,7 +32,9 @@ exclude_delete: true
 autogen_status: UnVsZURlcGxveW1lbnQ=
 
 custom_code:
+  constants: 'templates/terraform/constants/chronicle_rule_deployment.go.tmpl'
   custom_create: 'templates/terraform/custom_create/chronicle_rule_deployment.go.tmpl'
+  pre_update: 'templates/terraform/pre_update/chronicle_rule_deployment.go.tmpl'
 
 examples:
   - name: 'chronicle_ruledeployment_basic'
@@ -45,6 +47,11 @@ examples:
     min_version: 'beta'
     test_env_vars:
       chronicle_id: 'CHRONICLE_ID'
+  - name: 'chronicle_ruledeployment_run_frequency_missing'
+    primary_resource_id: 'example'
+    min_version: 'beta'
+    test_env_vars:
+      chronicle_id: 'CHRONICLE_ID'
 
 parameters:
   - name: location
@@ -101,6 +108,7 @@ properties:
     output: true
   - name: runFrequency
     type: String
+    diff_suppress_func: 'chronicleRuleDeploymentNilRunFrequencyDiffSuppressFunc'
     description: |2-
 
       The run frequency of the rule deployment.

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

@@ -0,0 +1,6 @@
+func chronicleRuleDeploymentNilRunFrequencyDiffSuppressFunc(_, old, new string, _ *schema.ResourceData) bool {
+    if new == "" {
+		return true
+	}
+	return false
+}

mmv1/templates/terraform/custom_create/chronicle_rule_deployment.go.tmpl

@@ -58,7 +58,7 @@ if res != nil {
     enabledValue, enabledExists:= res["enabled"]
     if enabledExists {
         enabled:= flattenChronicleRuleDeploymentEnabled(enabledValue, d, config)
-        if!reflect.DeepEqual(enabledProp, enabled) {
+        if !reflect.DeepEqual(enabledProp, enabled) {
             obj["enabled"] = enabledProp
             updateMask = append(updateMask, "enabled")
         }
@@ -73,7 +73,7 @@ if res != nil {
     alertingValue, alertingExists:= res["alerting"]
     if alertingExists {
         alerting:= flattenChronicleRuleDeploymentAlerting(alertingValue, d, config)
-        if!reflect.DeepEqual(alertingProp, alerting) {
+        if !reflect.DeepEqual(alertingProp, alerting) {
             obj["alerting"] = alertingProp
             updateMask = append(updateMask, "alerting")
         }
@@ -88,7 +88,7 @@ if res != nil {
     archivedValue, archivedExists:= res["archived"]
     if archivedExists {
         archived:= flattenChronicleRuleDeploymentArchived(archivedValue, d, config)
-        if!reflect.DeepEqual(archivedProp, archived) {
+        if !reflect.DeepEqual(archivedProp, archived) {
             obj["archived"] = archivedProp
             updateMask = append(updateMask, "archived")
         }
@@ -103,7 +103,8 @@ if res != nil {
     runFrequencyValue, runFrequencyExists:= res["runFrequency"]
     if runFrequencyExists {
         runFrequency:= flattenChronicleRuleDeploymentRunFrequency(runFrequencyValue, d, config)
-        if!reflect.DeepEqual(runFrequencyProp, runFrequency) {
+        _, ok := d.GetOkExists("run_frequency")
+        if !reflect.DeepEqual(runFrequencyProp, runFrequency) && ok {
             obj["runFrequency"] = runFrequencyProp
             updateMask = append(updateMask, "runFrequency")
         }

mmv1/templates/terraform/examples/chronicle_ruledeployment_run_frequency_missing.tf.tmpl

@@ -0,0 +1,18 @@
+resource "google_chronicle_rule" "my-rule" {
+ provider = "google-beta"
+ location = "us"
+ instance = "{{index $.TestEnvVars "chronicle_id"}}"
+ text = <<-EOT
+             rule test_rule { meta: events:  $userid = $e.principal.user.userid  match: $userid over 10m condition: $e }
+         EOT
+}
+
+resource "google_chronicle_rule_deployment" "{{$.PrimaryResourceId}}" {
+ provider = "google-beta"
+ location = "us"
+ instance = "{{index $.TestEnvVars "chronicle_id"}}"
+ rule = element(split("/", resource.google_chronicle_rule.my-rule.name), length(split("/", resource.google_chronicle_rule.my-rule.name)) - 1)
+ enabled = true
+ alerting = true
+ archived = false
+}

mmv1/templates/terraform/pre_update/chronicle_rule_deployment.go.tmpl

@@ -0,0 +1,20 @@
+// removeRunFrequencyFromUpdateMask removes 'runFrequency' from the updateMask in a URL.
+removeRunFrequencyFromUpdateMask := func(url string) (string) {
+    // Remove "runFrequency" and handle commas.
+    url = strings.ReplaceAll(url, "%2CrunFrequency", "")
+    url = strings.ReplaceAll(url, "runFrequency%2C", "")
+    url = strings.ReplaceAll(url, "runFrequency", "")
+
+    // Remove extra commas.
+    url = strings.ReplaceAll(url, "%2C%2C", "%2C")
+
+    //Remove trailing commas.
+    url = strings.TrimSuffix(url, "%2C")
+
+    return url
+}
+
+// Remove "runFrequency" and handle commas if run_frequency not configured by user
+if _, ok := d.GetOk("run_frequency"); !ok {
+    url = removeRunFrequencyFromUpdateMask(url)
+}