Merge pull request #336 from SumoLogic/vishal-fix-topology-label

Author: sumovishal

CHANGELOG.md

@@ -1,14 +1,15 @@
 ## 2.12.0 (Unreleased)
 
-BUG FIXES:
-
-* sumologic_cse_log_mapping split_index as int (GH-333)
-* Gcp Metrics Source (GH-329, 332)
+FEATURES:
+* **New Resource:** Gcp Metrics Source `sumologic_gcp_metrics_source` (GH-329, 332)
 
 ENHANCEMENTS:
-
 * Add backoff on http 429s (GH-338)
 
+BUG FIXES:
+* Fix to allow more than one topology_label for Dashboard resource (GH-336)
+* sumologic_cse_log_mapping split_index as int (GH-333)
+
 ## 2.11.5 (December 14, 2021)
 
 BUG FIXES:

sumologic/resource_sumologic_dashboard.go

@@ -69,7 +69,7 @@ func resourceSumologicDashboard() *schema.Resource {
 				Elem: &schema.Resource{
 					Schema: map[string]*schema.Schema{
 						"data": {
-							Type:     schema.TypeList,
+							Type:     schema.TypeSet,
 							Required: true,
 							Elem: &schema.Resource{
 								Schema: map[string]*schema.Schema{
@@ -132,7 +132,7 @@ func resourceSumologicDashboard() *schema.Resource {
 				ValidateFunc: validation.StringInSlice([]string{"Light", "Dark"}, true),
 				Default:      "Light",
 			},
-			// TODO Do we need this field in terraform?
+			// TODO: This field is NOT supported. Remove it.
 			"coloring_rule": {
 				Type:     schema.TypeList,
 				Optional: true,
@@ -948,9 +948,9 @@ func getTimeRangeBoundary(tfRangeBoundary map[string]interface{}) interface{} {
 }
 
 func getTopologyLabel(tfTopologyLabel map[string]interface{}) *TopologyLabel {
-	if items := tfTopologyLabel["data"].([]interface{}); len(items) == 1 {
+	if items := tfTopologyLabel["data"].(*schema.Set); items.Len() >= 1 {
 		labelMap := make(map[string][]string)
-		for _, item := range items {
+		for _, item := range items.List() {
 			dataItem := item.(map[string]interface{})
 			key := dataItem["label"].(string)
 			itemValues := dataItem["values"].([]interface{})
@@ -960,6 +960,7 @@ func getTopologyLabel(tfTopologyLabel map[string]interface{}) *TopologyLabel {
 			}
 			labelMap[key] = values
 		}
+
 		return &TopologyLabel{
 			Data: labelMap,
 		}

sumologic/resource_sumologic_dashboard_test.go

@@ -11,6 +11,15 @@ import (
 	"github.com/hashicorp/terraform-plugin-sdk/terraform"
 )
 
+var firstLabelKey = "service"
+var secondLabelKey = "env"
+var topologyLabel = TopologyLabel{
+	Data: map[string][]string{
+		firstLabelKey:  {"collection-proxy"},
+		secondLabelKey: {"dev", "prod"},
+	},
+}
+
 func TestAccSumologicDashboard_basic(t *testing.T) {
 	testNameSuffix := acctest.RandString(16)
 	title := "terraform_test_dashboard_" + testNameSuffix
@@ -41,8 +50,7 @@ func TestAccSumologicDashboard_create(t *testing.T) {
 	description := "Test dashboard description"
 	theme := "Dark"
 	refreshInterval := 120
-	topologyLabel := "service"
-	topologyLabelValue := "collection-proxy"
+
 	literalRangeName := "today"
 	textPanel := TextPanel{
 		Key:   "text-panel-001",
@@ -77,7 +85,7 @@ func TestAccSumologicDashboard_create(t *testing.T) {
 		Steps: []resource.TestStep{
 			{
 				Config: dashboardCreateConfig(title, description, theme, refreshInterval,
-					topologyLabel, topologyLabelValue, literalRangeName, textPanel, layout, variable),
+					topologyLabel, literalRangeName, textPanel, layout, variable),
 				Check: resource.ComposeTestCheckFunc(
 					testAccCheckDashboardExists("sumologic_dashboard.tf_crud_test", &dashboard, t),
 					resource.TestCheckResourceAttr("sumologic_dashboard.tf_crud_test",
@@ -89,9 +97,7 @@ func TestAccSumologicDashboard_create(t *testing.T) {
 					resource.TestCheckResourceAttr("sumologic_dashboard.tf_crud_test",
 						"theme", theme),
 					resource.TestCheckResourceAttr("sumologic_dashboard.tf_crud_test",
-						"topology_label_map.0.data.0.label", topologyLabel),
-					resource.TestCheckResourceAttr("sumologic_dashboard.tf_crud_test",
-						"topology_label_map.0.data.0.values.0", topologyLabelValue),
+						"topology_label_map.0.data.#", "2"),
 					resource.TestCheckResourceAttr("sumologic_dashboard.tf_crud_test",
 						"time_range.#", "1"),
 					resource.TestCheckResourceAttr("sumologic_dashboard.tf_crud_test",
@@ -124,8 +130,6 @@ func TestAccSumologicDashboard_update(t *testing.T) {
 	description := "Test dashboard description"
 	theme := "Dark"
 	refreshInterval := 120
-	topologyLabel := "service"
-	topologyLabelValue := "collection-proxy"
 	literalRangeName := "today"
 	textPanel := TextPanel{
 		Key:   "text-panel-001",
@@ -155,7 +159,7 @@ func TestAccSumologicDashboard_update(t *testing.T) {
 	// updated config
 	newTheme := "Light"
 	newRefreshInterval := 300
-	newTopologyLabelValue := "collection-cluster"
+	newFirstLabelValue := "collection-cluster"
 	newLiteralRangeName := "week"
 	searchPanel := SumoSearchPanel{
 		Key:   "search-panel-001",
@@ -207,7 +211,7 @@ func TestAccSumologicDashboard_update(t *testing.T) {
 		Steps: []resource.TestStep{
 			{
 				Config: dashboardCreateConfig(title, description, theme, refreshInterval,
-					topologyLabel, topologyLabelValue, literalRangeName, textPanel, layout, csvVariable),
+					topologyLabel, literalRangeName, textPanel, layout, csvVariable),
 				Check: resource.ComposeTestCheckFunc(
 					testAccCheckDashboardExists("sumologic_dashboard.tf_crud_test", &dashboard, t),
 					resource.TestCheckResourceAttr("sumologic_dashboard.tf_crud_test",
@@ -217,7 +221,7 @@ func TestAccSumologicDashboard_update(t *testing.T) {
 					resource.TestCheckResourceAttr("sumologic_dashboard.tf_crud_test",
 						"theme", theme),
 					resource.TestCheckResourceAttr("sumologic_dashboard.tf_crud_test",
-						"topology_label_map.0.data.0.values.0", topologyLabelValue),
+						"topology_label_map.0.data.#", "2"),
 					resource.TestCheckResourceAttr("sumologic_dashboard.tf_crud_test",
 						"time_range.0.begin_bounded_time_range.0.from.0.literal_time_range.0.range_name",
 						literalRangeName),
@@ -237,7 +241,7 @@ func TestAccSumologicDashboard_update(t *testing.T) {
 			},
 			{
 				Config: dashboardUpdateConfig(title, description, newTheme, newRefreshInterval,
-					topologyLabel, newTopologyLabelValue, newLiteralRangeName, textPanel, searchPanel,
+					firstLabelKey, newFirstLabelValue, newLiteralRangeName, textPanel, searchPanel,
 					newLayout, newVariables),
 				Check: resource.ComposeTestCheckFunc(
 					testAccCheckDashboardExists("sumologic_dashboard.tf_crud_test", &dashboard, t),
@@ -248,7 +252,7 @@ func TestAccSumologicDashboard_update(t *testing.T) {
 					resource.TestCheckResourceAttr("sumologic_dashboard.tf_crud_test",
 						"theme", newTheme),
 					resource.TestCheckResourceAttr("sumologic_dashboard.tf_crud_test",
-						"topology_label_map.0.data.0.values.0", newTopologyLabelValue),
+						"topology_label_map.0.data.#", "1"),
 					resource.TestCheckResourceAttr("sumologic_dashboard.tf_crud_test",
 						"time_range.0.begin_bounded_time_range.0.from.0.literal_time_range.0.range_name",
 						newLiteralRangeName),
@@ -391,8 +395,8 @@ func dashboardImportConfig(title string) string {
 }
 
 func dashboardCreateConfig(title string, description string, theme string, refreshInterval int,
-	topologyLabel string, topologyLabelValue string, rangeName string, textPanel TextPanel,
-	layout GridLayout, variable Variable) string {
+	topologyLabel TopologyLabel, rangeName string, textPanel TextPanel, layout GridLayout,
+	variable Variable) string {
 
 	return fmt.Sprintf(`
 		data "sumologic_personal_folder" "personalFolder" {}
@@ -407,6 +411,10 @@ func dashboardCreateConfig(title string, description string, theme string, refre
 					label = "%s"
 					values = ["%s"]
 				}
+				data {
+					label = "%s"
+					values = ["%s", "%s"]
+				}
 			}
 			time_range {
 				begin_bounded_time_range {
@@ -448,8 +456,9 @@ func dashboardCreateConfig(title string, description string, theme string, refre
 				hide_from_ui = false
 			}
 		}`,
-		title, description, refreshInterval, theme, topologyLabel, topologyLabelValue, rangeName,
-		textPanel.Key, textPanel.Title, textPanel.Text,
+		title, description, refreshInterval, theme, firstLabelKey, topologyLabel.Data[firstLabelKey][0],
+		secondLabelKey, topologyLabel.Data[secondLabelKey][0], topologyLabel.Data[secondLabelKey][1],
+		rangeName, textPanel.Key, textPanel.Title, textPanel.Text,
 		layout.LayoutStructures[0].Key, variable.Name, variable.DisplayName, variable.DefaultValue,
 		variable.SourceDefinition.(CsvVariableSourceDefinition).Values,
 	)