From ef6a13a4321defe829ca8d93bf586fd87a0ab7a5 Mon Sep 17 00:00:00 2001 From: Matt Hagenbuch Date: Wed, 17 Jan 2024 10:16:39 -0500 Subject: [PATCH] Revert "fix hidden_queries plan bug (#201)" (#204) This reverts commit 8a92fc0765dadf84e95ca651e5f227dcb14eae53. --- .go-version | 2 +- lightstep/resource_alert.go | 14 ++++---------- lightstep/resource_alert_test.go | 5 ----- 3 files changed, 5 insertions(+), 16 deletions(-) diff --git a/.go-version b/.go-version index e52a44e4..2568a548 100644 --- a/.go-version +++ b/.go-version @@ -1 +1 @@ -1.86.1 +1.86.2 diff --git a/lightstep/resource_alert.go b/lightstep/resource_alert.go index 29d92448..b94e9dcf 100644 --- a/lightstep/resource_alert.go +++ b/lightstep/resource_alert.go @@ -34,17 +34,11 @@ func getQueriesFromUnifiedConditionResourceData( ) } - hq := make(map[string]string, len(q.HiddenQueries)) - for k, v := range q.HiddenQueries { - hq[k] = fmt.Sprintf("%t", v) - } - qs := map[string]interface{}{ - "hidden": q.Hidden, - "display": q.Display, - "query_name": q.Name, - "query_string": q.TQLQuery, - "hidden_queries": hq, + "hidden": q.Hidden, + "display": q.Display, + "query_name": q.Name, + "query_string": q.TQLQuery, } queries = append(queries, qs) } diff --git a/lightstep/resource_alert_test.go b/lightstep/resource_alert_test.go index fd4b09c0..52121791 100644 --- a/lightstep/resource_alert_test.go +++ b/lightstep/resource_alert_test.go @@ -57,9 +57,6 @@ resource "lightstep_alert" "test" { query_name = "a" hidden = false query_string = "metric requests | rate 1h, 30s | filter \"project_name\" == \"catlab\" && \"service\" != \"android\" | group_by[\"method\"], mean | reduce 30s, min" - hidden_queries = { - "a" = false - } } alerting_rule { @@ -124,7 +121,6 @@ resource "lightstep_alert" "test" { resource.TestCheckResourceAttr(resourceName, "description", "A link to a playbook"), resource.TestCheckResourceAttr(resourceName, "query.0.query_string", "metric requests | rate 1h, 30s | filter \"project_name\" == \"catlab\" && \"service\" != \"android\" | group_by[\"method\"], mean | reduce 30s, min"), resource.TestCheckResourceAttr(resourceName, "expression.0.is_no_data", "true"), - resource.TestCheckResourceAttr(resourceName, "query.0.hidden_queries.a", "false"), ), }, { @@ -135,7 +131,6 @@ resource "lightstep_alert" "test" { resource.TestCheckResourceAttr(resourceName, "description", "A link to a fresh playbook"), resource.TestCheckResourceAttr(resourceName, "query.0.query_string", "metric requests | rate 1h, 30s | filter \"project_name\" == \"catlab\" && \"service\" != \"iOS\" | group_by[\"method\"], mean | reduce 30s, min"), resource.TestCheckResourceAttr(resourceName, "expression.0.is_no_data", "false"), - resource.TestCheckNoResourceAttr(resourceName, "query.0.hidden_queries.a"), ), }, },