Merge pull request #286 from SumoLogic/mfiglus-fix-hierarchy-filter

Fix hierarchy without a filter not being accepted

Author: mfiglus-sumo

CHANGELOG.md

@@ -9,6 +9,9 @@ FEATURES:
 * **New Resource:** sumologic_cse_insights_status (GH-274)
 * **New Resource:** sumologic_cse_insights_configuration (GH-274)
 
+BUG FIXES:
+
+* Fix hierarchy without a filter not being accepted
 
 ## 2.10.0 (September 22, 2021)
 

sumologic/resource_sumologic_hierarchy.go

@@ -239,12 +239,15 @@ func resourceToHierarchy(d *schema.ResourceData) Hierarchy {
 	rawLevel := d.Get("level").([]interface{})[0]
 	level := getLevel(rawLevel.(map[string]interface{}))
 
-	return Hierarchy{
-		Name:   d.Get("name").(string),
-		ID:     d.Id(),
-		Filter: &filter,
-		Level:  level,
+	hierarchy := Hierarchy{}
+	hierarchy.Name = d.Get("name").(string)
+	hierarchy.ID = d.Id()
+	hierarchy.Level = level
+	if len(filter.Key) > 0 {
+		hierarchy.Filter = &filter
 	}
+
+	return hierarchy
 }
 
 func getFilter(rawFilter map[string]interface{}) HierarchyFilteringClause {

sumologic/resource_sumologic_hierarchy_test.go

@@ -78,6 +78,8 @@ func TestAccSumologicHierarchy_create(t *testing.T) {
 					resource.TestCheckResourceAttr("sumologic_hierarchy.test", "name", testName),
 					resource.TestCheckResourceAttr("sumologic_hierarchy.test", "filter.0.key", testFilter.Key),
 					resource.TestCheckResourceAttr("sumologic_hierarchy.test", "filter.0.value", testFilter.Value),
+					resource.TestCheckResourceAttr("sumologic_hierarchy.test", "level.0.entity_type",
+						testLevel.EntityType),
 					resource.TestCheckResourceAttr("sumologic_hierarchy.test",
 						"level.0.next_levels_with_conditions.0.condition",
 						testLevel.NextLevelsWithConditions[0].Condition),
@@ -93,45 +95,27 @@ func TestAccSumologicHierarchy_create(t *testing.T) {
 	})
 }
 
-func testAccCheckHierarchyDestroy(hierarchy Hierarchy) resource.TestCheckFunc {
-	return func(s *terraform.State) error {
-		client := testAccProvider.Meta().(*Client)
-		for _, r := range s.RootModule().Resources {
-			id := r.Primary.ID
-			u, err := client.GetHierarchy(id)
-			if err != nil {
-				return fmt.Errorf("Encountered an error: " + err.Error())
-			}
-			if u != nil {
-				return fmt.Errorf("Hierarchy %s still exists", id)
-			}
-		}
-		return nil
-	}
-}
-
-func testAccCheckHierarchyExists(name string, hierarchy *Hierarchy, t *testing.T) resource.TestCheckFunc {
-	return func(s *terraform.State) error {
-		rs, ok := s.RootModule().Resources[name]
-		if !ok {
-			//need this so that we don't get an unused import error for strconv in some cases
-			return fmt.Errorf("Error = %s. Hierarchy not found: %s", strconv.FormatBool(ok), name)
-		}
-
-		//need this so that we don't get an unused import error for strings in some cases
-		if strings.EqualFold(rs.Primary.ID, "") {
-			return fmt.Errorf("Hierarchy ID is not set")
-		}
+func TestAccSumologicHierarchy_createAlmostEmpty(t *testing.T) {
+	var hierarchy Hierarchy
+	testName, _, testLevel := getRandomizedParamsForHierarchy()
 
-		id := rs.Primary.ID
-		c := testAccProvider.Meta().(*Client)
-		newHierarchy, err := c.GetHierarchy(id)
-		if err != nil {
-			return fmt.Errorf("Hierarchy %s not found", id)
-		}
-		hierarchy = newHierarchy
-		return nil
-	}
+	resource.Test(t, resource.TestCase{
+		PreCheck:     func() { testAccPreCheck(t) },
+		Providers:    testAccProviders,
+		CheckDestroy: testAccCheckHierarchyDestroy(hierarchy),
+		Steps: []resource.TestStep{
+			{
+				Config: testAccSumologicHierarchyAlmostEmpty(testName, testLevel),
+				Check: resource.ComposeTestCheckFunc(
+					testAccCheckHierarchyExists("sumologic_hierarchy.test", &hierarchy, t),
+					resource.TestCheckResourceAttrSet("sumologic_hierarchy.test", "id"),
+					resource.TestCheckResourceAttr("sumologic_hierarchy.test", "name", testName),
+					resource.TestCheckResourceAttr("sumologic_hierarchy.test", "level.0.entity_type",
+						testLevel.EntityType),
+				),
+			},
+		},
+	})
 }
 
 func TestAccSumologicHierarchy_update(t *testing.T) {
@@ -153,6 +137,8 @@ func TestAccSumologicHierarchy_update(t *testing.T) {
 					resource.TestCheckResourceAttr("sumologic_hierarchy.test", "name", testName),
 					resource.TestCheckResourceAttr("sumologic_hierarchy.test", "filter.0.key", testFilter.Key),
 					resource.TestCheckResourceAttr("sumologic_hierarchy.test", "filter.0.value", testFilter.Value),
+					resource.TestCheckResourceAttr("sumologic_hierarchy.test", "level.0.entity_type",
+						testLevel.EntityType),
 					resource.TestCheckResourceAttr("sumologic_hierarchy.test",
 						"level.0.next_levels_with_conditions.0.condition",
 						testLevel.NextLevelsWithConditions[0].Condition),
@@ -172,6 +158,8 @@ func TestAccSumologicHierarchy_update(t *testing.T) {
 					resource.TestCheckResourceAttr("sumologic_hierarchy.test", "name", testUpdatedName),
 					resource.TestCheckResourceAttr("sumologic_hierarchy.test", "filter.0.key", testUpdatedFilter.Key),
 					resource.TestCheckResourceAttr("sumologic_hierarchy.test", "filter.0.value", testUpdatedFilter.Value),
+					resource.TestCheckResourceAttr("sumologic_hierarchy.test", "level.0.entity_type",
+						testUpdatedLevel.EntityType),
 					resource.TestCheckResourceAttr("sumologic_hierarchy.test",
 						"level.0.next_levels_with_conditions.0.condition",
 						testUpdatedLevel.NextLevelsWithConditions[0].Condition),
@@ -187,6 +175,47 @@ func TestAccSumologicHierarchy_update(t *testing.T) {
 	})
 }
 
+func testAccCheckHierarchyDestroy(hierarchy Hierarchy) resource.TestCheckFunc {
+	return func(s *terraform.State) error {
+		client := testAccProvider.Meta().(*Client)
+		for _, r := range s.RootModule().Resources {
+			id := r.Primary.ID
+			u, err := client.GetHierarchy(id)
+			if err != nil {
+				return fmt.Errorf("Encountered an error: " + err.Error())
+			}
+			if u != nil {
+				return fmt.Errorf("Hierarchy %s still exists", id)
+			}
+		}
+		return nil
+	}
+}
+
+func testAccCheckHierarchyExists(name string, hierarchy *Hierarchy, t *testing.T) resource.TestCheckFunc {
+	return func(s *terraform.State) error {
+		rs, ok := s.RootModule().Resources[name]
+		if !ok {
+			//need this so that we don't get an unused import error for strconv in some cases
+			return fmt.Errorf("Error = %s. Hierarchy not found: %s", strconv.FormatBool(ok), name)
+		}
+
+		//need this so that we don't get an unused import error for strings in some cases
+		if strings.EqualFold(rs.Primary.ID, "") {
+			return fmt.Errorf("Hierarchy ID is not set")
+		}
+
+		id := rs.Primary.ID
+		c := testAccProvider.Meta().(*Client)
+		newHierarchy, err := c.GetHierarchy(id)
+		if err != nil {
+			return fmt.Errorf("Hierarchy %s not found", id)
+		}
+		hierarchy = newHierarchy
+		return nil
+	}
+}
+
 func testAccCheckSumologicHierarchyConfigImported(name string, filter HierarchyFilteringClause, level Level) string {
 	return fmt.Sprintf(`
         resource "sumologic_hierarchy" "test" {
@@ -235,6 +264,17 @@ func testAccSumologicHierarchy(name string, filter HierarchyFilteringClause, lev
 		level.NextLevelsWithConditions[0].Level.EntityType, level.NextLevel.EntityType)
 }
 
+func testAccSumologicHierarchyAlmostEmpty(name string, level Level) string {
+	return fmt.Sprintf(`
+        resource "sumologic_hierarchy" "test" {
+            name = "%s"
+            level {
+                entity_type = "%s"
+            }
+        }`,
+		name, level.EntityType)
+}
+
 func testAccSumologicHierarchyUpdate(name string, filter HierarchyFilteringClause, level Level) string {
 	return fmt.Sprintf(`
         resource "sumologic_hierarchy" "test" {