avoid removing defaults for notify_when_ok and notify_when_resolved

Author: dbonf

sysdig/internal/client/v2/model.go

@@ -138,9 +138,9 @@ type NotificationChannelOptions struct {
 	CustomData               map[string]any                             `json:"customData,omitempty"`               // Type: ibm function, Webhook
 	TemplateConfiguration    []NotificationChannelTemplateConfiguration `json:"templateConfiguration,omitempty"`    // Type: slack, ms teams
 
-	NotifyOnOk           *bool `json:"notifyOnOk,omitempty"`
-	NotifyOnResolve      *bool `json:"notifyOnResolve,omitempty"`
-	SendTestNotification bool  `json:"sendTestNotification"`
+	NotifyOnOk           bool `json:"notifyOnOk"`
+	NotifyOnResolve      bool `json:"notifyOnResolve"`
+	SendTestNotification bool `json:"sendTestNotification"`
 }
 
 type NotificationChannel struct {

sysdig/resource_sysdig_monitor_notification_channel_common.go

@@ -3,7 +3,6 @@ package sysdig
 import (
 	v2 "github.com/draios/terraform-provider-sysdig/sysdig/internal/client/v2"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
-	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation"
 )
 
 func createMonitorNotificationChannelSchema(original map[string]*schema.Schema) map[string]*schema.Schema {
@@ -23,16 +22,16 @@ func createMonitorNotificationChannelSchema(original map[string]*schema.Schema)
 			Default:  false,
 		},
 		"notify_when_ok": {
-			Type:         schema.TypeString,
-			Optional:     true,
-			ValidateFunc: validation.StringInSlice([]string{"true", "false"}, false),
-			Deprecated:   "The notify_when_ok field is deprecated and will be removed in a future version. This flag has been replaced by the `notify_on_resolve` field inside `notification_channels` when defining an alert resource.",
+			Type:       schema.TypeBool,
+			Optional:   true,
+			Default:    false,
+			Deprecated: "The notify_when_ok field is deprecated and will be removed in a future version. This flag has been replaced by the `notify_on_resolve` field inside `notification_channels` when defining an alert resource.",
 		},
 		"notify_when_resolved": {
-			Type:         schema.TypeString,
-			Optional:     true,
-			ValidateFunc: validation.StringInSlice([]string{"true", "false"}, false),
-			Deprecated:   "The notify_when_resolved field is deprecated and will be removed in a future version. This flag has been replaced by the `notify_on_acknowledge` field inside `notification_channels` when defining an alert resource.",
+			Type:       schema.TypeBool,
+			Optional:   true,
+			Default:    false,
+			Deprecated: "The notify_when_resolved field is deprecated and will be removed in a future version. This flag has been replaced by the `notify_on_acknowledge` field inside `notification_channels` when defining an alert resource.",
 		},
 		"version": {
 			Type:     schema.TypeInt,
@@ -59,35 +58,13 @@ func monitorNotificationChannelFromResourceData(d *schema.ResourceData, teamID i
 		tID = &teamID
 	}
 
-	var notifyOnOk *bool = nil
-	if onOk, ok := d.GetOk("notify_when_ok"); ok && onOk.(string) != "" {
-		if onOk.(string) == "true" {
-			trueValue := true
-			notifyOnOk = &trueValue
-		} else {
-			falseValue := false
-			notifyOnOk = &falseValue
-		}
-	}
-
-	var notifyOnResolve *bool = nil
-	if onResolve, ok := d.GetOk("notify_when_resolved"); ok && onResolve.(string) != "" {
-		if onResolve.(string) == "true" {
-			trueValue := true
-			notifyOnResolve = &trueValue
-		} else {
-			falseValue := false
-			notifyOnResolve = &falseValue
-		}
-	}
-
 	nc = v2.NotificationChannel{
 		Name:    d.Get("name").(string),
 		Enabled: d.Get("enabled").(bool),
 		TeamID:  tID,
 		Options: v2.NotificationChannelOptions{
-			NotifyOnOk:           notifyOnOk,
-			NotifyOnResolve:      notifyOnResolve,
+			NotifyOnOk:           d.Get("notify_when_ok").(bool),
+			NotifyOnResolve:      d.Get("notify_when_resolved").(bool),
 			SendTestNotification: d.Get("send_test_notification").(bool),
 		},
 	}
@@ -107,23 +84,8 @@ func monitorNotificationChannelToResourceData(nc *v2.NotificationChannel, data *
 	if err != nil {
 		return err
 	}
-
-	if nc.Options.NotifyOnOk != nil {
-		if *nc.Options.NotifyOnOk {
-			_ = data.Set("notify_when_ok", "true")
-		} else {
-			_ = data.Set("notify_when_ok", "false")
-		}
-	}
-
-	if nc.Options.NotifyOnResolve != nil {
-		if *nc.Options.NotifyOnResolve {
-			_ = data.Set("notify_when_resolved", "true")
-		} else {
-			_ = data.Set("notify_when_resolved", "false")
-		}
-	}
-
+	_ = data.Set("notify_when_ok", nc.Options.NotifyOnOk)
+	_ = data.Set("notify_when_resolved", nc.Options.NotifyOnResolve)
 	// do not update "send_test_notification" from the api response as it will always be "false" on subsequent reads because the fields is not persisted
 
 	return err

sysdig/resource_sysdig_monitor_notification_channel_custom_webhook_test.go

@@ -69,15 +69,6 @@ func TestAccMonitorNotificationChannelCustomWebhook(t *testing.T) {
 				ImportStateVerify:       true,
 				ImportStateVerifyIgnore: []string{"send_test_notification"},
 			},
-			{
-				Config: monitorNotificationChannelCustomWebhookWithoutNotifyFields(rText()),
-			},
-			{
-				ResourceName:            "sysdig_monitor_notification_channel_custom_webhook.sample-custom-webhook6",
-				ImportState:             true,
-				ImportStateVerify:       true,
-				ImportStateVerifyIgnore: []string{"send_test_notification"},
-			},
 		},
 	})
 }
@@ -159,15 +150,3 @@ func monitorNotificationChannelCustomWebhookSharedWithAdditionalHeaders(name str
 		send_test_notification = false
 	}`, name)
 }
-
-func monitorNotificationChannelCustomWebhookWithoutNotifyFields(name string) string {
-	return fmt.Sprintf(`
-resource "sysdig_monitor_notification_channel_custom_webhook" "sample-custom-webhook6" {
-	name = "Example Channel %s - Custom Webhook"
-	enabled = true
-	url = "https://example.com/"
-	http_method = "POST"
-	template = "{\n  \"code\": \"incident\",\n  \"alert\": \"{{@alert_name}}\"\n}"
-	send_test_notification = false
-}`, name)
-}

sysdig/resource_sysdig_secure_notification_channel_common.go

@@ -3,7 +3,6 @@ package sysdig
 import (
 	v2 "github.com/draios/terraform-provider-sysdig/sysdig/internal/client/v2"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
-	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation"
 )
 
 func createSecureNotificationChannelSchema(original map[string]*schema.Schema) map[string]*schema.Schema {
@@ -23,16 +22,16 @@ func createSecureNotificationChannelSchema(original map[string]*schema.Schema) m
 			Default:  false,
 		},
 		"notify_when_ok": {
-			Type:         schema.TypeString,
-			Optional:     true,
-			ValidateFunc: validation.StringInSlice([]string{"true", "false"}, false),
-			Deprecated:   "The notify_when_ok field is deprecated and will be removed in a future version. This flag has been replaced by the `notify_on_resolve` field inside `notification_channels` when defining an alert resource.",
+			Type:       schema.TypeBool,
+			Optional:   true,
+			Default:    false,
+			Deprecated: "The notify_when_ok field is deprecated and will be removed in a future version. This flag has been replaced by the `notify_on_resolve` field inside `notification_channels` when defining an alert resource.",
 		},
 		"notify_when_resolved": {
-			Type:         schema.TypeString,
-			Optional:     true,
-			ValidateFunc: validation.StringInSlice([]string{"true", "false"}, false),
-			Deprecated:   "The notify_when_resolved field is deprecated and will be removed in a future version. This flag has been replaced by the `notify_on_acknowledge` field inside `notification_channels` when defining an alert resource.",
+			Type:       schema.TypeBool,
+			Optional:   true,
+			Default:    false,
+			Deprecated: "The notify_when_resolved field is deprecated and will be removed in a future version. This flag has been replaced by the `notify_on_acknowledge` field inside `notification_channels` when defining an alert resource.",
 		},
 		"version": {
 			Type:     schema.TypeInt,
@@ -59,35 +58,13 @@ func secureNotificationChannelFromResourceData(d *schema.ResourceData, teamID in
 		tID = &teamID
 	}
 
-	var notifyOnOk *bool = nil
-	if onOk, ok := d.GetOk("notify_when_ok"); ok && onOk.(string) != "" {
-		if onOk.(string) == "true" {
-			trueValue := true
-			notifyOnOk = &trueValue
-		} else {
-			falseValue := false
-			notifyOnOk = &falseValue
-		}
-	}
-
-	var notifyOnResolve *bool = nil
-	if onResolve, ok := d.GetOk("notify_when_resolved"); ok && onResolve.(string) != "" {
-		if onResolve.(string) == "true" {
-			trueValue := true
-			notifyOnResolve = &trueValue
-		} else {
-			falseValue := false
-			notifyOnResolve = &falseValue
-		}
-	}
-
 	nc = v2.NotificationChannel{
 		Name:    d.Get("name").(string),
 		Enabled: d.Get("enabled").(bool),
 		TeamID:  tID,
 		Options: v2.NotificationChannelOptions{
-			NotifyOnOk:           notifyOnOk,
-			NotifyOnResolve:      notifyOnResolve,
+			NotifyOnOk:           d.Get("notify_when_ok").(bool),
+			NotifyOnResolve:      d.Get("notify_when_resolved").(bool),
 			SendTestNotification: d.Get("send_test_notification").(bool),
 		},
 	}
@@ -107,23 +84,8 @@ func secureNotificationChannelToResourceData(nc *v2.NotificationChannel, data *s
 	if err != nil {
 		return err
 	}
-
-	if nc.Options.NotifyOnOk != nil {
-		if *nc.Options.NotifyOnOk {
-			_ = data.Set("notify_when_ok", "true")
-		} else {
-			_ = data.Set("notify_when_ok", "false")
-		}
-	}
-
-	if nc.Options.NotifyOnResolve != nil {
-		if *nc.Options.NotifyOnResolve {
-			_ = data.Set("notify_when_resolved", "true")
-		} else {
-			_ = data.Set("notify_when_resolved", "false")
-		}
-	}
-
+	_ = data.Set("notify_when_ok", nc.Options.NotifyOnOk)
+	_ = data.Set("notify_when_resolved", nc.Options.NotifyOnResolve)
 	// do not update "send_test_notification" from the api response as it will always be "false" on subsequent reads because the fields is not persisted
 
 	return err

website/docs/r/monitor_alert_v2_change.md

@@ -76,7 +76,7 @@ It is a list of objects with the following fields:
 * `id` - (Required) The ID of the notification channel.
 * `renotify_every_minutes` - (Optional) the amount of minutes to wait before re sending the notification to this channel. `0` means no renotification enabled. Default: `0`.
 * `notify_on_resolve` - (Optional) Whether to send a notification when the alert is resolved. Default: `true`.
-* `notify_on_acknowledge` - (Optional) Whether to send a notification when the alert is acknowledged. If not defined, this option is inherited from the `notify_when_resolved` option from the specific notification channel selected. If it is not defined there, the default is to send notification on acknowledgement.
+* `notify_on_acknowledge` - (Optional) Whether to send a notification when the alert is acknowledged. If not defined, this option is inherited from the `notify_when_resolved` option from the specific notification channel selected.
 * `main_threshold` - (Optional) Whether this notification channel is used for the main threshold of the alert. Default: `true`.
 * `warning_threshold` - (Optional) Whether this notification channel is used for the warning threshold of the alert. Default: `false`.
 

website/docs/r/monitor_alert_v2_downtime.md

@@ -64,7 +64,7 @@ It is a list of objects with the following fields:
 * `id` - (Required) The ID of the notification channel.
 * `renotify_every_minutes` - (Optional) the amount of minutes to wait before re sending the notification to this channel. `0` means no renotification enabled. Default: `0`.
 * `notify_on_resolve` - (Optional) Whether to send a notification when the alert is resolved. Default: `true`.
-* `notify_on_acknowledge` - (Optional) Whether to send a notification when the alert is acknowledged. If not defined, this option is inherited from the `notify_when_resolved` option from the specific notification channel selected. If it is not defined there, the default is to send notification on acknowledgement.
+* `notify_on_acknowledge` - (Optional) Whether to send a notification when the alert is acknowledged. If not defined, this option is inherited from the `notify_when_resolved` option from the specific notification channel selected.
 
 ### `custom_notification`
 

website/docs/r/monitor_alert_v2_event.md

@@ -74,7 +74,7 @@ It is a list of objects with the following fields:
 * `id` - (Required) The ID of the notification channel.
 * `renotify_every_minutes` - (Optional) the amount of minutes to wait before re sending the notification to this channel. `0` means no renotification enabled. Default: `0`.
 * `notify_on_resolve` - (Optional) Whether to send a notification when the alert is resolved. Default: `true`.
-* `notify_on_acknowledge` - (Optional) Whether to send a notification when the alert is acknowledged. If not defined, this option is inherited from the `notify_when_resolved` option from the specific notification channel selected. If it is not defined there, the default is to send notification on acknowledgement.
+* `notify_on_acknowledge` - (Optional) Whether to send a notification when the alert is acknowledged. If not defined, this option is inherited from the `notify_when_resolved` option from the specific notification channel selected.
 * `main_threshold` - (Optional) Whether this notification channel is used for the main threshold of the alert. Default: `true`.
 * `warning_threshold` - (Optional) Whether this notification channel is used for the warning threshold of the alert. Default: `false`.
 

website/docs/r/monitor_alert_v2_form_based_prometheus.md

@@ -55,7 +55,7 @@ It is a list of objects with the following fields:
 * `id` - (Required) The ID of the notification channel.
 * `renotify_every_minutes` - (Optional) the amount of minutes to wait before re sending the notification to this channel. `0` means no renotification enabled.
 * `notify_on_resolve` - (Optional) Whether to send a notification when the alert is resolved. Default: `true`.
-* `notify_on_acknowledge` - (Optional) Whether to send a notification when the alert is acknowledged. If not defined, this option is inherited from the `notify_when_resolved` option from the specific notification channel selected. If it is not defined there, the default is to send notification on acknowledgement.
+* `notify_on_acknowledge` - (Optional) Whether to send a notification when the alert is acknowledged. If not defined, this option is inherited from the `notify_when_resolved` option from the specific notification channel selected.
 * `main_threshold` - (Optional) Whether this notification channel is used for the main threshold of the alert. Default: `true`.
 * `warning_threshold` - (Optional) Whether this notification channel is used for the warning threshold of the alert. Default: `false`.
 

website/docs/r/monitor_alert_v2_group_outlier.md

@@ -76,7 +76,7 @@ It is a list of objects with the following fields:
 * `id` - (Required) The ID of the notification channel.
 * `renotify_every_minutes` - (Optional) the amount of minutes to wait before re sending the notification to this channel. `0` means no renotification enabled. Default: `0`.
 * `notify_on_resolve` - (Optional) Whether to send a notification when the alert is resolved. Default: `true`.
-* `notify_on_acknowledge` - (Optional) Whether to send a notification when the alert is acknowledged. If not defined, this option is inherited from the `notify_when_resolved` option from the specific notification channel selected. If it is not defined there, the default is to send notification on acknowledgement.
+* `notify_on_acknowledge` - (Optional) Whether to send a notification when the alert is acknowledged. If not defined, this option is inherited from the `notify_when_resolved` option from the specific notification channel selected.
 * `main_threshold` - (Optional) Whether this notification channel is used for the main threshold of the alert. Default: `true`.
 * `warning_threshold` - (Optional) Whether this notification channel is used for the warning threshold of the alert. Default: `false`.
 

website/docs/r/monitor_alert_v2_metric.md

@@ -91,7 +91,7 @@ It is a list of objects with the following fields:
 * `id` - (Required) The ID of the notification channel.
 * `renotify_every_minutes` - (Optional) the amount of minutes to wait before re sending the notification to this channel. `0` means no renotification enabled. Default: `0`.
 * `notify_on_resolve` - (Optional) Whether to send a notification when the alert is resolved. Default: `true`.
-* `notify_on_acknowledge` - (Optional) Whether to send a notification when the alert is acknowledged. If not defined, this option is inherited from the `notify_when_resolved` option from the specific notification channel selected. If it is not defined there, the default is to send notification on acknowledgement.
+* `notify_on_acknowledge` - (Optional) Whether to send a notification when the alert is acknowledged. If not defined, this option is inherited from the `notify_when_resolved` option from the specific notification channel selected.
 * `main_threshold` - (Optional) Whether this notification channel is used for the main threshold of the alert. Default: `true`.
 * `warning_threshold` - (Optional) Whether this notification channel is used for the warning threshold of the alert. Default: `false`.