Bug fix - Monitor group update crash.

movinfinex · Jun 27, 2022 · 11d9933 · 11d9933
1 parent 82e6ad9
commit 11d9933
Show file tree

Hide file tree

Showing 28 changed files with 51 additions and 46 deletions.
diff --git a/README.md b/README.md
@@ -35,7 +35,7 @@ terraform {
     site24x7 = {
       source  = "site24x7/site24x7"
       // Update the latest version from https://registry.terraform.io/providers/site24x7/site24x7/latest 
-      version = "1.0.16"
+      version = "1.0.17"
     }
   }
 }

diff --git a/api/types.go b/api/types.go
@@ -63,7 +63,7 @@ type MonitorGroup struct {
 	Description            string   `json:"description,omitempty"`
 	Monitors               []string `json:"monitors,omitempty"`
 	HealthThresholdCount   int      `json:"health_threshold_count,omitempty"`
-	DependencyResourceID   []string `json:"dependency_resource_ids,omitempty"`
+	DependencyResourceIDs  []string `json:"dependency_resource_ids,omitempty"`
 	SuppressAlert          bool     `json:"suppress_alert"`
 	DependencyResourceType int      `json:"selection_type,omitempty"`
 }

diff --git a/docs/resources/monitor_group.md b/docs/resources/monitor_group.md
@@ -13,6 +13,7 @@ Use this resource to create, update and delete a monitor group in Site24x7.
 ## Example Usage
 
 ```hcl
+
 // Site24x7 Monitor Group API doc - https://www.site24x7.com/help/api/#monitor-groups
 resource "site24x7_monitor_group" "monitor_group_us" {
   // (Required) Display Name for the Monitor Group.
@@ -24,12 +25,13 @@ resource "site24x7_monitor_group" "monitor_group_us" {
   // Number of monitors' health that decide the group status. ‘0’ implies that all the monitors 
   // are considered for determining the group status. Default value is 1
   health_threshold_count = 1
-  // (Optional) List of dependent resource ids.
-  dependency_resource_id = ["100000000005938013"]
+  // (Optional) List of dependent resource IDs. Suppress alert when dependent monitor(s) is down.
+  dependency_resource_ids = ["100000000005938013"]
   // (Optional) Boolean value indicating whether to suppress alert when the dependent monitor is down
   // Setting suppress_alert = true with an empty dependency_resource_id is meaningless.
   suppress_alert = true
 }
+
 ```
 
 ## Attributes Reference
@@ -42,7 +44,7 @@ resource "site24x7_monitor_group" "monitor_group_us" {
 
 ### Optional
 
-* `dependency_resource_id` (List of String) List of dependent resource IDs. Suppress alert when dependent monitor(s) is down.
+* `dependency_resource_ids` (List of String) List of dependent resource IDs. Suppress alert when dependent monitor(s) is down.
 * `health_threshold_count` (Number) Number of monitors' health that decide the group status. ‘0’ implies that all the monitors are considered for determining the group status. Default value is 1.
 * `id` (String) The ID of this resource.
 * `suppress_alert` (Boolean) Boolean value indicating whether to suppress alert when the dependent monitor is down. Setting suppress_alert = true with an empty dependency_resource_id is meaningless.

diff --git a/examples/all_resources_us.tf b/examples/all_resources_us.tf
@@ -6,12 +6,12 @@ terraform {
     site24x7 = {
       source  = "site24x7/site24x7"
       // Update the latest version from https://registry.terraform.io/providers/site24x7/site24x7/latest 
-      version = "1.0.16"
+      version = "1.0.17"
       // Uncomment for local setup
       # source  = "registry.zoho.io/zoho/site24x7"
-      # version = "1.0.16"
+      # version = "1.0.17"
     #   source  = "registry.terraform.io/site24x7/site24x7"
-    #   version = "1.0.16"
+    #   version = "1.0.17"
     }
   }
 }

diff --git a/examples/amazon_monitor_us.tf b/examples/amazon_monitor_us.tf
@@ -6,7 +6,7 @@ terraform {
     site24x7 = {
       source  = "site24x7/site24x7"
       # Update the latest version from https://registry.terraform.io/providers/site24x7/site24x7/latest 
-      version = "1.0.16"
+      version = "1.0.17"
     }
   }
 }

diff --git a/examples/data-sources/monitor_us.tf b/examples/data-sources/monitor_us.tf
@@ -6,7 +6,7 @@ terraform {
     site24x7 = {
       source  = "site24x7/site24x7"
       # Update the latest version from https://registry.terraform.io/providers/site24x7/site24x7/latest 
-      version = "1.0.16"
+      version = "1.0.17"
     }
   }
 }

diff --git a/examples/data-sources/monitors_us.tf b/examples/data-sources/monitors_us.tf
@@ -6,7 +6,7 @@ terraform {
     site24x7 = {
       source  = "site24x7/site24x7"
       # Update the latest version from https://registry.terraform.io/providers/site24x7/site24x7/latest 
-      version = "1.0.16"
+      version = "1.0.17"
     }
   }
 }

diff --git a/examples/location_profile_us.tf b/examples/location_profile_us.tf
@@ -6,7 +6,7 @@ terraform {
     site24x7 = {
       source  = "site24x7/site24x7"
       # Update the latest version from https://registry.terraform.io/providers/site24x7/site24x7/latest 
-      version = "1.0.16"
+      version = "1.0.17"
     }
   }
 }

diff --git a/examples/monitor_group_us.tf b/examples/monitor_group_us.tf
@@ -6,7 +6,7 @@ terraform {
     site24x7 = {
       source  = "site24x7/site24x7"
       # Update the latest version from https://registry.terraform.io/providers/site24x7/site24x7/latest 
-      version = "1.0.16"
+      version = "1.0.17"
     }
   }
 }
@@ -56,8 +56,8 @@ resource "site24x7_monitor_group" "monitor_group_us" {
   // Number of monitors' health that decide the group status. ‘0’ implies that all the monitors 
   // are considered for determining the group status. Default value is 1
   health_threshold_count = 1
-  // (Optional) List of dependent resource ids.
-  dependency_resource_id = ["100000000005938013"]
+  // (Optional) List of dependent resource IDs. Suppress alert when dependent monitor(s) is down.
+  dependency_resource_ids = ["100000000005938013"]
   // (Optional) Boolean value indicating whether to suppress alert when the dependent monitor is down
   // Setting suppress_alert = true with an empty dependency_resource_id is meaningless.
   suppress_alert = true

diff --git a/examples/notification_profile_us.tf b/examples/notification_profile_us.tf
@@ -6,7 +6,7 @@ terraform {
     site24x7 = {
       source  = "site24x7/site24x7"
       # Update the latest version from https://registry.terraform.io/providers/site24x7/site24x7/latest 
-      version = "1.0.16"
+      version = "1.0.17"
     }
   }
 }

diff --git a/examples/opsgenie_integration_us.tf b/examples/opsgenie_integration_us.tf
@@ -6,7 +6,7 @@ terraform {
     site24x7 = {
       source  = "site24x7/site24x7"
       # Update the latest version from https://registry.terraform.io/providers/site24x7/site24x7/latest
-      version = "1.0.16"
+      version = "1.0.17"
     }
   }
 }

diff --git a/examples/pagerduty_integration_us.tf b/examples/pagerduty_integration_us.tf
@@ -6,7 +6,7 @@ terraform {
     site24x7 = {
       source  = "site24x7/site24x7"
       # Update the latest version from https://registry.terraform.io/providers/site24x7/site24x7/latest 
-      version = "1.0.16"
+      version = "1.0.17"
     }
   }
 }

diff --git a/examples/rest_api_monitor_us.tf b/examples/rest_api_monitor_us.tf
@@ -6,7 +6,7 @@ terraform {
     site24x7 = {
       source  = "site24x7/site24x7"
       # Update the latest version from https://registry.terraform.io/providers/site24x7/site24x7/latest 
-      version = "1.0.16"
+      version = "1.0.17"
     }
   }
 }

diff --git a/examples/schedule_maintenance_us.tf b/examples/schedule_maintenance_us.tf
@@ -6,7 +6,7 @@ terraform {
     site24x7 = {
       source  = "site24x7/site24x7"
       # Update the latest version from https://registry.terraform.io/providers/site24x7/site24x7/latest 
-      version = "1.0.16"
+      version = "1.0.17"
     }
   }
 }

diff --git a/examples/server_monitor_us.tf b/examples/server_monitor_us.tf
@@ -6,7 +6,7 @@ terraform {
     site24x7 = {
       source = "site24x7/site24x7"
       # Update the latest version from https://registry.terraform.io/providers/site24x7/site24x7/latest 
-      version = "1.0.16"
+      version = "1.0.17"
     }
   }
 }

diff --git a/examples/servicenow_integration_us.tf b/examples/servicenow_integration_us.tf
@@ -6,7 +6,7 @@ terraform {
     site24x7 = {
       source  = "site24x7/site24x7"
       # Update the latest version from https://registry.terraform.io/providers/site24x7/site24x7/latest 
-      version = "1.0.16"
+      version = "1.0.17"
     }
   }
 }

diff --git a/examples/slack_integration_us.tf b/examples/slack_integration_us.tf
@@ -6,7 +6,7 @@ terraform {
     site24x7 = {
       source  = "site24x7/site24x7"
       # Update the latest version from https://registry.terraform.io/providers/site24x7/site24x7/latest
-      version = "1.0.16"
+      version = "1.0.17"
     }
   }
 }

diff --git a/examples/ssl_monitor_us.tf b/examples/ssl_monitor_us.tf
@@ -6,7 +6,7 @@ terraform {
     site24x7 = {
       source  = "site24x7/site24x7"
       # Update the latest version from https://registry.terraform.io/providers/site24x7/site24x7/latest 
-      version = "1.0.16"
+      version = "1.0.17"
     }
   }
 }

diff --git a/examples/tag_us.tf b/examples/tag_us.tf
@@ -6,7 +6,7 @@ terraform {
     site24x7 = {
       source  = "site24x7/site24x7"
       # Update the latest version from https://registry.terraform.io/providers/site24x7/site24x7/latest 
-      version = "1.0.16"
+      version = "1.0.17"
     }
   }
 }

diff --git a/examples/threshold_profile_us.tf b/examples/threshold_profile_us.tf
@@ -6,7 +6,7 @@ terraform {
     site24x7 = {
       source  = "site24x7/site24x7"
       # Update the latest version from https://registry.terraform.io/providers/site24x7/site24x7/latest 
-      version = "1.0.16"
+      version = "1.0.17"
     }
   }
 }

diff --git a/examples/url_it_automation_action_us.tf b/examples/url_it_automation_action_us.tf
@@ -6,7 +6,7 @@ terraform {
     site24x7 = {
       source  = "site24x7/site24x7"
       # Update the latest version from https://registry.terraform.io/providers/site24x7/site24x7/latest 
-      version = "1.0.16"
+      version = "1.0.17"
     }
   }
 }

diff --git a/examples/user_group_us.tf b/examples/user_group_us.tf
@@ -6,7 +6,7 @@ terraform {
     site24x7 = {
       source  = "site24x7/site24x7"
       # Update the latest version from https://registry.terraform.io/providers/site24x7/site24x7/latest 
-      version = "1.0.16"
+      version = "1.0.17"
     }
   }
 }

diff --git a/examples/web_page_speed_monitor_us.tf b/examples/web_page_speed_monitor_us.tf
@@ -6,7 +6,7 @@ terraform {
     site24x7 = {
       source  = "site24x7/site24x7"
       # Update the latest version from https://registry.terraform.io/providers/site24x7/site24x7/latest 
-      version = "1.0.16"
+      version = "1.0.17"
     }
   }
 }

diff --git a/examples/webhook_integration_us.tf b/examples/webhook_integration_us.tf
@@ -6,7 +6,7 @@ terraform {
     site24x7 = {
       source  = "site24x7/site24x7"
       # Update the latest version from https://registry.terraform.io/providers/site24x7/site24x7/latest 
-      version = "1.0.16"
+      version = "1.0.17"
     }
   }
 }

diff --git a/examples/website_monitor_us.tf b/examples/website_monitor_us.tf
@@ -6,7 +6,7 @@ terraform {
     site24x7 = {
       source  = "site24x7/site24x7"
       # Update the latest version from https://registry.terraform.io/providers/site24x7/site24x7/latest 
-      version = "1.0.16"
+      version = "1.0.17"
     }
   }
 }

diff --git a/main.tf b/main.tf
@@ -6,7 +6,7 @@ terraform {
     site24x7 = {
       # source  = "site24x7/site24x7"
       # // Update the latest version from https://registry.terraform.io/providers/site24x7/site24x7/latest 
-      # version = "1.0.16"
+      # version = "1.0.17"
       source  = "registry.terraform.io/site24x7/site24x7"
       version = "1.0.0"
     }
@@ -66,5 +66,4 @@ resource "site24x7_website_monitor" "website_monitor_example" {
   // (https://www.site24x7.com/help/api/#list-of-all-location-profiles) will be
   // used.
   location_profile_name = "North America"
-
 }
diff --git a/site24x7/monitor_group.go b/site24x7/monitor_group.go
@@ -31,7 +31,7 @@ var MonitorGroupSchema = map[string]*schema.Schema{
 		Default:     1,
 		Description: "Number of monitors' health that decide the group status. ‘0’ implies that all the monitors are considered for determining the group status. Default value is 1.",
 	},
-	"dependency_resource_id": {
+	"dependency_resource_ids": {
 		Type: schema.TypeSet,
 		Elem: &schema.Schema{
 			Type: schema.TypeString,
@@ -153,12 +153,10 @@ func resourceDataToMonitorGroupCreate(d *schema.ResourceData) *api.MonitorGroup
 		}
 	}
 
-	var dependencyIDs []string
-	// If dependency_resource_id's are set in the configuration file iterate them and append to dependencyIDs
-	if _, monitorsExistsInConf := d.GetOk("dependency_resource_id"); monitorsExistsInConf {
-		for _, id := range d.Get("dependency_resource_id").([]interface{}) {
-			dependencyIDs = append(dependencyIDs, id.(string))
-		}
+	dependencyIDs := d.Get("dependency_resource_ids").(*schema.Set).List()
+	dependencyResourceIDs := make([]string, 0, len(dependencyIDs))
+	for _, dependencyResourceID := range dependencyIDs {
+		dependencyResourceIDs = append(dependencyResourceIDs, dependencyResourceID.(string))
 	}
 
 	return &api.MonitorGroup{
@@ -167,7 +165,7 @@ func resourceDataToMonitorGroupCreate(d *schema.ResourceData) *api.MonitorGroup
 		Description:            d.Get("description").(string),
 		Monitors:               monitorIDs,
 		HealthThresholdCount:   healthThresholdCount,
-		DependencyResourceID:   dependencyIDs,
+		DependencyResourceIDs:  dependencyResourceIDs,
 		SuppressAlert:          d.Get("suppress_alert").(bool),
 		DependencyResourceType: 2,
 	}
@@ -204,9 +202,10 @@ func resourceDataToMonitorGroupUpdate(d *schema.ResourceData, monitorGroup *api.
 		}
 	}
 
-	var dependencyResourceIDs []string
-	for _, dependencyID := range d.Get("dependency_resource_id").([]interface{}) {
-		dependencyResourceIDs = append(dependencyResourceIDs, dependencyID.(string))
+	dependencyIDs := d.Get("dependency_resource_ids").(*schema.Set).List()
+	dependencyResourceIDs := make([]string, 0, len(dependencyIDs))
+	for _, dependencyResourceID := range dependencyIDs {
+		dependencyResourceIDs = append(dependencyResourceIDs, dependencyResourceID.(string))
 	}
 
 	var suppressAlert bool
@@ -226,7 +225,7 @@ func resourceDataToMonitorGroupUpdate(d *schema.ResourceData, monitorGroup *api.
 		// Setting monitors from GET response. Empty "monitors" in PUT request dissociates all monitors from the monitor group.
 		Monitors:               monitorGroup.Monitors,
 		HealthThresholdCount:   healthThresholdCount,
-		DependencyResourceID:   dependencyResourceIDs,
+		DependencyResourceIDs:  dependencyResourceIDs,
 		SuppressAlert:          suppressAlert,
 		DependencyResourceType: 2,
 	}
@@ -237,6 +236,6 @@ func updateMonitorGroupResourceData(d *schema.ResourceData, monitorGroup *api.Mo
 	d.Set("description", monitorGroup.Description)
 	// d.Set("monitors", monitorGroup.Monitors)
 	d.Set("health_threshold_count", monitorGroup.HealthThresholdCount)
-	d.Set("dependency_resource_id", monitorGroup.DependencyResourceID)
+	d.Set("dependency_resource_ids", monitorGroup.DependencyResourceIDs)
 	d.Set("suppress_alert", monitorGroup.SuppressAlert)
 }
diff --git a/site24x7/monitor_group_test.go b/site24x7/monitor_group_test.go
@@ -19,6 +19,7 @@ func TestMonitorGroupCreate(t *testing.T) {
 	a := &api.MonitorGroup{
 		DisplayName:            "foobar",
 		Description:            "baz",
+		DependencyResourceIDs:  []string{"234", "567"},
 		DependencyResourceType: 2,
 	}
 
@@ -121,5 +122,9 @@ func monitorGroupTestResourceData(t *testing.T) *schema.ResourceData {
 		"display_name":   "foobar",
 		"description":    "baz",
 		"selection_type": 2,
+		"dependency_resource_ids": []interface{}{
+			"234",
+			"567",
+		},
 	})
 }