feat(monitor): support different regions for opsgenie notification channel (#251)

dbonf · web-flow · commit d0527de37b69 · 2023-02-09T08:58:17.000+01:00
diff --git a/sysdig/internal/client/monitor/models.go b/sysdig/internal/client/monitor/models.go
@@ -194,6 +194,7 @@ type NotificationChannelOptions struct {
 	ServiceKey        string                 `json:"serviceKey,omitempty"`        // Type: PagerDuty
 	ServiceName       string                 `json:"serviceName,omitempty"`       // Type: PagerDuty
 	AdditionalHeaders map[string]interface{} `json:"additionalHeaders,omitempty"` // Type: Webhook
+	Region            string                 `json:"region,omitempty"`            // Type: OpsGenie
 
 	NotifyOnOk           bool `json:"notifyOnOk"`
 	NotifyOnResolve      bool `json:"notifyOnResolve"`
diff --git a/sysdig/internal/client/secure/models.go b/sysdig/internal/client/secure/models.go
@@ -77,6 +77,7 @@ type NotificationChannelOptions struct {
 	Account         string   `json:"account,omitempty"`         // Type: PagerDuty
 	ServiceKey      string   `json:"serviceKey,omitempty"`      // Type: PagerDuty
 	ServiceName     string   `json:"serviceName,omitempty"`     // Type: PagerDuty
+	Region          string   `json:"region,omitempty"`          // Type: OpsGenie
 
 	NotifyOnOk           bool `json:"notifyOnOk"`
 	NotifyOnResolve      bool `json:"notifyOnResolve"`
diff --git a/sysdig/resource_sysdig_monitor_notification_channel_opsgenie.go b/sysdig/resource_sysdig_monitor_notification_channel_opsgenie.go
@@ -2,14 +2,13 @@ package sysdig
 
 import (
 	"context"
-	"fmt"
-	"regexp"
 	"strconv"
 	"time"
 
 	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
 
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation"
 
 	"github.com/draios/terraform-provider-sysdig/sysdig/internal/client/monitor"
 )
@@ -38,6 +37,12 @@ func resourceSysdigMonitorNotificationChannelOpsGenie() *schema.Resource {
 				Type:     schema.TypeString,
 				Required: true,
 			},
+			"region": {
+				Type:         schema.TypeString,
+				Optional:     true,
+				Default:      "US",
+				ValidateFunc: validation.StringInSlice([]string{"US", "EU"}, false),
+			},
 		}),
 	}
 }
@@ -134,8 +139,8 @@ func monitorNotificationChannelOpsGenieFromResourceData(d *schema.ResourceData)
 
 	nc.Type = NOTIFICATION_CHANNEL_TYPE_OPSGENIE
 	apiKey := d.Get("api_key").(string)
-	nc.Options.Url = fmt.Sprintf("https://api.opsgenie.com/v1/json/sysdigcloud?apiKey=%s", apiKey)
 	nc.Options.APIKey = apiKey
+	nc.Options.Region = d.Get("region").(string)
 	return
 }
 
@@ -145,13 +150,8 @@ func monitorNotificationChannelOpsGenieToResourceData(nc *monitor.NotificationCh
 		return
 	}
 
-	regex, err := regexp.Compile("apiKey=(.*)?$")
-	if err != nil {
-		return
-	}
-
-	key := regex.FindStringSubmatch(nc.Options.Url)[1]
-	_ = d.Set("api_key", key)
+	_ = d.Set("api_key", nc.Options.APIKey)
+	_ = d.Set("region", nc.Options.Region)
 
 	return
 }
diff --git a/sysdig/resource_sysdig_monitor_notification_channel_opsgenie_test.go b/sysdig/resource_sysdig_monitor_notification_channel_opsgenie_test.go
@@ -38,6 +38,14 @@ func TestAccMonitorNotificationChannelOpsGenie(t *testing.T) {
 				ImportState:       true,
 				ImportStateVerify: true,
 			},
+			{
+				Config: monitorNotificationChannelOpsGenieWithNameAndRegion(rText()),
+			},
+			{
+				ResourceName:      "sysdig_monitor_notification_channel_opsgenie.sample-opsgenie-2",
+				ImportState:       true,
+				ImportStateVerify: true,
+			},
 		},
 	})
 }
@@ -52,3 +60,15 @@ resource "sysdig_monitor_notification_channel_opsgenie" "sample-opsgenie" {
 	notify_when_resolved = false
 }`, name)
 }
+
+func monitorNotificationChannelOpsGenieWithNameAndRegion(name string) string {
+	return fmt.Sprintf(`
+resource "sysdig_monitor_notification_channel_opsgenie" "sample-opsgenie-2" {
+	name = "Example Channel %s - OpsGenie - 2"
+	enabled = true
+	api_key = "2349324-342354353-5324-23"
+	notify_when_ok = false
+	notify_when_resolved = false
+	region = "EU"
+}`, name)
+}
diff --git a/sysdig/resource_sysdig_secure_notification_channel_opsgenie.go b/sysdig/resource_sysdig_secure_notification_channel_opsgenie.go
@@ -2,14 +2,13 @@ package sysdig
 
 import (
 	"context"
-	"fmt"
-	"regexp"
 	"strconv"
 	"time"
 
 	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
 
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation"
 
 	"github.com/draios/terraform-provider-sysdig/sysdig/internal/client/secure"
 )
@@ -38,6 +37,12 @@ func resourceSysdigSecureNotificationChannelOpsGenie() *schema.Resource {
 				Type:     schema.TypeString,
 				Required: true,
 			},
+			"region": {
+				Type:         schema.TypeString,
+				Optional:     true,
+				Default:      "US",
+				ValidateFunc: validation.StringInSlice([]string{"US", "EU"}, false),
+			},
 		}),
 	}
 }
@@ -133,8 +138,8 @@ func secureNotificationChannelOpsGenieFromResourceData(d *schema.ResourceData) (
 
 	nc.Type = NOTIFICATION_CHANNEL_TYPE_OPSGENIE
 	apiKey := d.Get("api_key").(string)
-	nc.Options.Url = fmt.Sprintf("https://api.opsgenie.com/v1/json/sysdigcloud?apiKey=%s", apiKey)
 	nc.Options.APIKey = apiKey
+	nc.Options.Region = d.Get("region").(string)
 	return
 }
 
@@ -144,12 +149,8 @@ func secureNotificationChannelOpsGenieToResourceData(nc *secure.NotificationChan
 		return
 	}
 
-	regex, err := regexp.Compile("apiKey=(.*)?$")
-	if err != nil {
-		return
-	}
-	key := regex.FindStringSubmatch(nc.Options.Url)[1]
-	_ = d.Set("api_key", key)
+	_ = d.Set("api_key", nc.Options.APIKey)
+	_ = d.Set("region", nc.Options.Region)
 
 	return
 }
diff --git a/sysdig/resource_sysdig_secure_notification_channel_opsgenie_test.go b/sysdig/resource_sysdig_secure_notification_channel_opsgenie_test.go
@@ -38,6 +38,14 @@ func TestAccSecureNotificationChannelOpsGenie(t *testing.T) {
 				ImportState:       true,
 				ImportStateVerify: true,
 			},
+			{
+				Config: secureNotificationChannelOpsGenieWithNameAndRegion(rText()),
+			},
+			{
+				ResourceName:      "sysdig_secure_notification_channel_opsgenie.sample-opsgenie-2",
+				ImportState:       true,
+				ImportStateVerify: true,
+			},
 		},
 	})
 }
@@ -52,3 +60,15 @@ resource "sysdig_secure_notification_channel_opsgenie" "sample-opsgenie" {
 	notify_when_resolved = false
 }`, name)
 }
+
+func secureNotificationChannelOpsGenieWithNameAndRegion(name string) string {
+	return fmt.Sprintf(`
+resource "sysdig_secure_notification_channel_opsgenie" "sample-opsgenie-2" {
+	name = "Example Channel %s - OpsGenie - 2"
+	enabled = true
+	api_key = "2349324-342354353-5324-23"
+	notify_when_ok = false
+	notify_when_resolved = false
+	region = "EU"
+}`, name)
+}
diff --git a/website/docs/r/monitor_notification_channel_opsgenie.md b/website/docs/r/monitor_notification_channel_opsgenie.md
@@ -30,12 +30,14 @@ resource "sysdig_monitor_notification_channel_opsgenie" "sample-opsgenie" {
 
 * `api_key` - (Required) Key for the API.
 
+* `region` - (Optional) Opsgenie Region. Can be `US` or `EU`. Default is `US`.
+
 * `enabled` - (Optional) If false, the channel will not emit notifications. Default is true.
 
-* `notify_when_ok` - (Optional) Send a new notification when the alert condition is 
+* `notify_when_ok` - (Optional) Send a new notification when the alert condition is
     no longer triggered. Default is false.
 
-* `notify_when_resolved` - (Optional) Send a new notification when the alert is manually 
+* `notify_when_resolved` - (Optional) Send a new notification when the alert is manually
     acknowledged by a user. Default is false.
 
 * `send_test_notification` - (Optional) Send an initial test notification to check
@@ -55,4 +57,4 @@ Opsgenie notification channels for Monitor can be imported using the ID, e.g.
 
 ```
 $ terraform import sysdig_monitor_notification_channel_opsgenie.example 12345
-```
+```
diff --git a/website/docs/r/secure_notification_channel_opsgenie.md b/website/docs/r/secure_notification_channel_opsgenie.md
@@ -30,12 +30,14 @@ resource "sysdig_secure_notification_channel_opsgenie" "sample-opsgenie" {
 
 * `api_key` - (Required) Key for the API.
 
+* `region` - (Optional) Opsgenie Region. Can be `US` or `EU`. Default is `US`.
+
 * `enabled` - (Optional) If false, the channel will not emit notifications. Default is true.
 
-* `notify_when_ok` - (Optional) Send a new notification when the alert condition is 
+* `notify_when_ok` - (Optional) Send a new notification when the alert condition is
     no longer triggered. Default is false.
 
-* `notify_when_resolved` - (Optional) Send a new notification when the alert is manually 
+* `notify_when_resolved` - (Optional) Send a new notification when the alert is manually
     acknowledged by a user. Default is false.
 
 * `send_test_notification` - (Optional) Send an initial test notification to check
@@ -55,4 +57,4 @@ Opsgenie notification channels for Secure can be imported using the ID, e.g.
 
 ```
 $ terraform import sysdig_secure_notification_channel_opsgenie.example 12345
-```
+```
