From 82439403cc30c07862bbac7862b6755dba14a964 Mon Sep 17 00:00:00 2001 From: Jake Choi Date: Tue, 4 Mar 2025 16:18:44 -0700 Subject: [PATCH 1/3] Added Jira dedup behavior --- client/models/saved_searches.go | 1 + docs/resources/saved_searches.md | 1 + splunk/resource_splunk_configs_conf_test.go | 1 - splunk/resource_splunk_saved_searches.go | 21 ++++++++++++------- splunk/resource_splunk_saved_searches_test.go | 2 ++ 5 files changed, 17 insertions(+), 9 deletions(-) diff --git a/client/models/saved_searches.go b/client/models/saved_searches.go index ab32c661..cc744d90 100644 --- a/client/models/saved_searches.go +++ b/client/models/saved_searches.go @@ -117,6 +117,7 @@ type SavedSearchObject struct { ActionJiraServiceDeskParamJiraSummary string `json:"action.jira_service_desk.param.jira_summary,omitempty" url:"action.jira_service_desk.param.jira_summary"` ActionJiraServiceDeskParamJiraPriority string `json:"action.jira_service_desk.param.jira_priority,omitempty" url:"action.jira_service_desk.param.jira_priority"` ActionJiraServiceDeskParamJiraDescription string `json:"action.jira_service_desk.param.jira_description,omitempty" url:"action.jira_service_desk.param.jira_description"` + ActionJiraServiceDeskParamJiraDedup string `json:"action.jira_service_desk.param.jira_dedup,omitempty" url:"action.jira_service_desk.param.jira_description"` ActionJiraServiceDeskParamJiraCustomfields string `json:"action.jira_service_desk.param.jira_customfields,omitempty" url:"action.jira_service_desk.param.jira_customfields"` ActionWebhookParamUrl string `json:"action.webhook.param.url,omitempty" url:"action.webhook.param.url"` AlertDigestMode bool `json:"alert.digest_mode" url:"alert.digest_mode"` diff --git a/docs/resources/saved_searches.md b/docs/resources/saved_searches.md index 99e64726..5caa0d43 100644 --- a/docs/resources/saved_searches.md +++ b/docs/resources/saved_searches.md @@ -126,6 +126,7 @@ This resource block supports the following arguments: * `action_jira_service_desk_param_jira_summary` - (Optional) Jira issue title/summary * `action_jira_service_desk_param_jira_priority` - (Optional) Jira priority of issue * `action_jira_service_desk_param_jira_description` - (Optional) Jira issue description +* `action_jira_service_desk_param_jira_dedup` - (Optional) Allows enabling of Jira Ticket dedup behavior * `action_jira_service_desk_param_jira_customfields` - (Optional) Jira custom fields data (see https://ta-jira-service-desk-simple-addon.readthedocs.io/en/latest/userguide.html) * `action_webhook_param_url` - (Optional) URL to send the HTTP POST request to. Must be accessible from the Splunk server * `actions` - (Optional) A comma-separated list of actions to enable. For example: rss,email diff --git a/splunk/resource_splunk_configs_conf_test.go b/splunk/resource_splunk_configs_conf_test.go index 50dff922..abfe504f 100644 --- a/splunk/resource_splunk_configs_conf_test.go +++ b/splunk/resource_splunk_configs_conf_test.go @@ -112,7 +112,6 @@ func TestAccCreateSplunkConfigsConfSpecialChars(t *testing.T) { }) } - func testAccSplunkConfigsConfDestroyResources(s *terraform.State) error { client, err := newTestClient() if err != nil { diff --git a/splunk/resource_splunk_saved_searches.go b/splunk/resource_splunk_saved_searches.go index 7b7141bb..3f321d4a 100644 --- a/splunk/resource_splunk_saved_searches.go +++ b/splunk/resource_splunk_saved_searches.go @@ -14,9 +14,9 @@ import ( ) func suppressDefault(defaultValue string) schema.SchemaDiffSuppressFunc { - return func(k, old, new string, d *schema.ResourceData) bool { - return old == defaultValue && new == "" - } + return func(k, old, new string, d *schema.ResourceData) bool { + return old == defaultValue && new == "" + } } func savedSearches() *schema.Resource { @@ -676,9 +676,9 @@ func savedSearches() *schema.Resource { Description: "Jira Issue Type you would like to create", }, "action_jira_service_desk_param_jira_summary": { - Type: schema.TypeString, - Optional: true, - Description: "Jira Issue Summary or title", + Type: schema.TypeString, + Optional: true, + Description: "Jira Issue Summary or title", DiffSuppressFunc: suppressDefault("Splunk Alert: $name$"), }, "action_jira_service_desk_param_jira_priority": { @@ -687,10 +687,15 @@ func savedSearches() *schema.Resource { Description: "Priority of issue created", }, "action_jira_service_desk_param_jira_description": { + Type: schema.TypeString, + Optional: true, + Description: "Enter the description of issue created", + DiffSuppressFunc: suppressDefault("The alert condition for '$name$' was triggered."), + }, + "action_jira_service_desk_param_jira_dedup": { Type: schema.TypeString, Optional: true, - Description: "Enter the description of issue created", - DiffSuppressFunc: suppressDefault("The alert condition for '$name$' was triggered."), + Description: "Enables Jira ticket deduplication", }, "action_jira_service_desk_param_jira_customfields": { Type: schema.TypeString, diff --git a/splunk/resource_splunk_saved_searches_test.go b/splunk/resource_splunk_saved_searches_test.go index 18f104ca..d42fdff5 100644 --- a/splunk/resource_splunk_saved_searches_test.go +++ b/splunk/resource_splunk_saved_searches_test.go @@ -207,6 +207,7 @@ resource "splunk_saved_searches" "test" { action_jira_service_desk_param_jira_summary = "error message" action_jira_service_desk_param_jira_priority = "Normal" action_jira_service_desk_param_jira_description = "test ticket creation" + action_jira_service_desk_param_jira_dedup = "enabled" action_jira_service_desk_param_jira_customfields = "\"customfield_10058\":{\"value\":\"custom_field_value_1\"},\"customfield_10046\":{\"value\":\"custom_field_value_2\"}" alert_comparator = "greater than" alert_digest_mode = true @@ -467,6 +468,7 @@ func TestAccSplunkSavedSearches(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "action_jira_service_desk_param_jira_summary", "error message"), resource.TestCheckResourceAttr(resourceName, "action_jira_service_desk_param_jira_priority", "Normal"), resource.TestCheckResourceAttr(resourceName, "action_jira_service_desk_param_jira_description", "test ticket creation"), + resource.TestCheckResourceAttr(resourceName, "action_jira_service_desk_param_jira_dedup", "enabled"), resource.TestCheckResourceAttr(resourceName, "action_jira_service_desk_param_jira_customfields", "\"customfield_10058\":{\"value\":\"custom_field_value_1\"},\"customfield_10046\":{\"value\":\"custom_field_value_2\"}"), resource.TestCheckResourceAttr(resourceName, "alert_comparator", "greater than"), resource.TestCheckResourceAttr(resourceName, "alert_digest_mode", "true"), From 0d2961a0b73da837e3292deb5f65275567d2421f Mon Sep 17 00:00:00 2001 From: Jake Choi Date: Tue, 4 Mar 2025 16:22:50 -0700 Subject: [PATCH 2/3] Updated formatting --- client/models/saved_searches.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/models/saved_searches.go b/client/models/saved_searches.go index cc744d90..2ac16fd7 100644 --- a/client/models/saved_searches.go +++ b/client/models/saved_searches.go @@ -117,7 +117,7 @@ type SavedSearchObject struct { ActionJiraServiceDeskParamJiraSummary string `json:"action.jira_service_desk.param.jira_summary,omitempty" url:"action.jira_service_desk.param.jira_summary"` ActionJiraServiceDeskParamJiraPriority string `json:"action.jira_service_desk.param.jira_priority,omitempty" url:"action.jira_service_desk.param.jira_priority"` ActionJiraServiceDeskParamJiraDescription string `json:"action.jira_service_desk.param.jira_description,omitempty" url:"action.jira_service_desk.param.jira_description"` - ActionJiraServiceDeskParamJiraDedup string `json:"action.jira_service_desk.param.jira_dedup,omitempty" url:"action.jira_service_desk.param.jira_description"` + ActionJiraServiceDeskParamJiraDedup string `json:"action.jira_service_desk.param.jira_dedup,omitempty" url:"action.jira_service_desk.param.jira_description"` ActionJiraServiceDeskParamJiraCustomfields string `json:"action.jira_service_desk.param.jira_customfields,omitempty" url:"action.jira_service_desk.param.jira_customfields"` ActionWebhookParamUrl string `json:"action.webhook.param.url,omitempty" url:"action.webhook.param.url"` AlertDigestMode bool `json:"alert.digest_mode" url:"alert.digest_mode"` From 7653b6d0999c16f6cd1c6ecf5384d0e6a159c809 Mon Sep 17 00:00:00 2001 From: Jake Choi <23219623+jake-choi-cf@users.noreply.github.com> Date: Wed, 5 Mar 2025 11:45:31 -0700 Subject: [PATCH 3/3] Update saved_searches.go Fixed the URL string for Jira dedup action to point correctly to action.jira_service_desk.param.jira_dedup --- client/models/saved_searches.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/models/saved_searches.go b/client/models/saved_searches.go index 2ac16fd7..e9f8f7a3 100644 --- a/client/models/saved_searches.go +++ b/client/models/saved_searches.go @@ -117,7 +117,7 @@ type SavedSearchObject struct { ActionJiraServiceDeskParamJiraSummary string `json:"action.jira_service_desk.param.jira_summary,omitempty" url:"action.jira_service_desk.param.jira_summary"` ActionJiraServiceDeskParamJiraPriority string `json:"action.jira_service_desk.param.jira_priority,omitempty" url:"action.jira_service_desk.param.jira_priority"` ActionJiraServiceDeskParamJiraDescription string `json:"action.jira_service_desk.param.jira_description,omitempty" url:"action.jira_service_desk.param.jira_description"` - ActionJiraServiceDeskParamJiraDedup string `json:"action.jira_service_desk.param.jira_dedup,omitempty" url:"action.jira_service_desk.param.jira_description"` + ActionJiraServiceDeskParamJiraDedup string `json:"action.jira_service_desk.param.jira_dedup,omitempty" url:"action.jira_service_desk.param.jira_dedup"` ActionJiraServiceDeskParamJiraCustomfields string `json:"action.jira_service_desk.param.jira_customfields,omitempty" url:"action.jira_service_desk.param.jira_customfields"` ActionWebhookParamUrl string `json:"action.webhook.param.url,omitempty" url:"action.webhook.param.url"` AlertDigestMode bool `json:"alert.digest_mode" url:"alert.digest_mode"`