From c45e8e5c43ebd8b25f8eb526f1e5d443b06c397c Mon Sep 17 00:00:00 2001 From: zscholl Date: Mon, 16 Nov 2020 14:02:06 -0600 Subject: [PATCH 1/2] failing test --- splunk/resource_splunk_saved_searches_test.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/splunk/resource_splunk_saved_searches_test.go b/splunk/resource_splunk_saved_searches_test.go index 9946f7f1..4f937093 100644 --- a/splunk/resource_splunk_saved_searches_test.go +++ b/splunk/resource_splunk_saved_searches_test.go @@ -105,7 +105,7 @@ resource "splunk_saved_searches" "test" { action_email_max_results = 100 action_email_send_csv = 1 action_email_send_results = false - action_email_subject = "Splunk Alert: $name$" + action_email_subject = "" action_email_to = "splunk@splunk.com" action_email_track_alert = true dispatch_earliest_time = "rt-15m" @@ -219,7 +219,7 @@ func TestAccSplunkSavedSearches(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "action_email_max_results", "100"), resource.TestCheckResourceAttr(resourceName, "action_email_send_csv", "1"), resource.TestCheckResourceAttr(resourceName, "action_email_send_results", "false"), - resource.TestCheckResourceAttr(resourceName, "action_email_subject", "Splunk Alert: $name$"), + resource.TestCheckResourceAttr(resourceName, "action_email_subject", ""), resource.TestCheckResourceAttr(resourceName, "action_email_to", "splunk@splunk.com"), resource.TestCheckResourceAttr(resourceName, "action_email_track_alert", "true"), resource.TestCheckResourceAttr(resourceName, "dispatch_earliest_time", "rt-15m"), From 905cdd003d141a3962ca7922359d36d63797f3a0 Mon Sep 17 00:00:00 2001 From: zscholl Date: Mon, 16 Nov 2020 14:47:24 -0600 Subject: [PATCH 2/2] remove omitempty --- 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 8be10d88..2820e9d2 100644 --- a/client/models/saved_searches.go +++ b/client/models/saved_searches.go @@ -42,7 +42,7 @@ type SavedSearchObject struct { ActionEmailSendCSV int `json:"action.email.sendcsv,string,omitempty" url:"action.email.sendcsv,omitempty"` ActionEmailSendPDF bool `json:"action.email.sendpdf" url:"action.email.sendpdf"` ActionEmailSendResults bool `json:"action.email.sendresults" url:"action.email.sendresults"` - ActionEmailSubject string `json:"action.email.subject,omitempty" url:"action.email.subject,omitempty"` + ActionEmailSubject string `json:"action.email.subject,omitempty" url:"action.email.subject"` ActionEmailTo string `json:"action.email.to,omitempty" url:"action.email.to,omitempty"` ActionEmailTrackAlert bool `json:"action.email.track_alert" url:"action.email.track_alert"` ActionEmailTTL string `json:"action.email.ttl,omitempty" url:"action.email.ttl,omitempty"`