feat(cockpit): add default_preconfigured_alert_ids field to track API defaults

Author: jremy42

docs/resources/cockpit_alert_manager.md

@@ -89,7 +89,7 @@ resource "scaleway_cockpit_alert_manager" "alert_manager" {
 
 This section lists the arguments that are supported:
 
-- `preconfigured_alert_ids` - (Optional, Set of String) A set of preconfigured alert rule IDs to enable. Use the [`scaleway_cockpit_preconfigured_alert`](../data-sources/cockpit_preconfigured_alert.md) data source to list available alerts.
+- `preconfigured_alert_ids` - (Optional, Set of String) A set of preconfigured alert rule IDs to enable explicitly. Use the [`scaleway_cockpit_preconfigured_alert`](../data-sources/cockpit_preconfigured_alert.md) data source to list available alerts.
 - `enable_managed_alerts` - **Deprecated** (Optional, Boolean) Use `preconfigured_alert_ids` instead. This field will be removed in a future version.
 - `contact_points` - (Optional, List of Map) A list of contact points with email addresses that will receive alerts. Each map should contain a single key `email`.
 - `project_id` - (Defaults to the Project ID specified in the [provider configuration](../index.md#project_id)) The ID of the Project the Cockpit is associated with.
@@ -100,6 +100,7 @@ This section lists the arguments that are supported:
 In addition to all arguments above, the following attributes are exported:
 
 - `alert_manager_url` - The URL of the alert manager.
+- `default_preconfigured_alert_ids` - (Set of String) A set of preconfigured alert rule IDs that are enabled automatically by the API when the alert manager is activated. This is a computed field that shows which alerts the API enables by default.
 
 
 ## Import

internal/services/cockpit/alert_manager.go

@@ -36,7 +36,13 @@ func ResourceCockpitAlertManager() *schema.Resource {
 			"preconfigured_alert_ids": {
 				Type:        schema.TypeSet,
 				Optional:    true,
-				Description: "List of preconfigured alert rule IDs to enable. Use the scaleway_cockpit_preconfigured_alert data source to list available alerts.",
+				Description: "List of preconfigured alert rule IDs to enable explicitly. Use the scaleway_cockpit_preconfigured_alert data source to list available alerts.",
+				Elem:        &schema.Schema{Type: schema.TypeString},
+			},
+			"default_preconfigured_alert_ids": {
+				Type:        schema.TypeSet,
+				Computed:    true,
+				Description: "List of preconfigured alert rule IDs enabled automatically by the API when alert manager is activated.",
 				Elem:        &schema.Schema{Type: schema.TypeString},
 			},
 			"contact_points": {
@@ -94,8 +100,8 @@ func ResourceCockpitAlertManagerCreate(ctx context.Context, d *schema.ResourceDa
 				return diag.FromErr(err)
 			}
 
-		// Note: Waiting for alerts to be enabled will be handled by SDK waiters when available
-		// For now, we continue without waiting as the Read function handles enabling/enabled states
+			// Note: Waiting for alerts to be enabled will be handled by SDK waiters when available
+			// For now, we continue without waiting as the Read function handles enabling/enabled states
 		}
 	}
 
@@ -158,49 +164,59 @@ func ResourceCockpitAlertManagerRead(ctx context.Context, d *schema.ResourceData
 	_ = d.Set("alert_manager_url", alertManager.AlertManagerURL)
 	_ = d.Set("project_id", projectID)
 
-	// Get enabled preconfigured alerts
-	// Only track the alerts that were explicitly requested by the user in the configuration.
-	// The API may enable additional alerts automatically, but we ignore those to prevent perpetual drift.
-	// We set the field based on what was requested in the config, not what the API returns.
-	if v, ok := d.GetOk("preconfigured_alert_ids"); ok {
-		requestedIDs := expandStringSet(v.(*schema.Set))
-		
-		// List all preconfigured alerts to verify their status
-		alerts, err := api.ListAlerts(&cockpit.RegionalAPIListAlertsRequest{
-			Region:          region,
-			ProjectID:       projectID,
-			IsPreconfigured: scw.BoolPtr(true),
-		}, scw.WithContext(ctx), scw.WithAllPages())
-		if err != nil {
-			return diag.FromErr(err)
+	// Get enabled preconfigured alerts and separate user-requested vs API-default alerts
+	alerts, err := api.ListAlerts(&cockpit.RegionalAPIListAlertsRequest{
+		Region:          region,
+		ProjectID:       projectID,
+		IsPreconfigured: scw.BoolPtr(true),
+	}, scw.WithContext(ctx), scw.WithAllPages())
+	if err != nil {
+		return diag.FromErr(err)
+	}
+
+	// Build a map of alert statuses
+	alertStatusMap := make(map[string]cockpit.AlertStatus)
+	for _, alert := range alerts.Alerts {
+		if alert.PreconfiguredData != nil && alert.PreconfiguredData.PreconfiguredRuleID != "" {
+			alertStatusMap[alert.PreconfiguredData.PreconfiguredRuleID] = alert.RuleStatus
 		}
+	}
 
-		// Build a map of alert statuses
-		alertStatusMap := make(map[string]cockpit.AlertStatus)
-		for _, alert := range alerts.Alerts {
-			if alert.PreconfiguredData != nil && alert.PreconfiguredData.PreconfiguredRuleID != "" {
-				alertStatusMap[alert.PreconfiguredData.PreconfiguredRuleID] = alert.RuleStatus
-			}
+	// Separate user-requested alerts from API-default alerts
+	var userRequestedIDs []string
+	var defaultEnabledIDs []string
+
+	if v, ok := d.GetOk("preconfigured_alert_ids"); ok {
+		requestedIDs := expandStringSet(v.(*schema.Set))
+		requestedMap := make(map[string]bool)
+		for _, id := range requestedIDs {
+			requestedMap[id] = true
 		}
 
-		// Keep the requested IDs that are enabled/enabling
-		// This ensures we only track what the user explicitly configured
-		var enabledRequestedIDs []string
-		for _, requestedID := range requestedIDs {
-			if status, found := alertStatusMap[requestedID]; found {
-				// Include if enabled or enabling
-				if status == cockpit.AlertStatusEnabled || status == cockpit.AlertStatusEnabling {
-					enabledRequestedIDs = append(enabledRequestedIDs, requestedID)
+		// Check all enabled/enabling alerts
+		for ruleID, status := range alertStatusMap {
+			if status == cockpit.AlertStatusEnabled || status == cockpit.AlertStatusEnabling {
+				if requestedMap[ruleID] {
+					// This alert was explicitly requested by the user
+					userRequestedIDs = append(userRequestedIDs, ruleID)
+				} else {
+					// This alert was enabled automatically by the API
+					defaultEnabledIDs = append(defaultEnabledIDs, ruleID)
 				}
 			}
 		}
-
-		_ = d.Set("preconfigured_alert_ids", enabledRequestedIDs)
 	} else {
-		// No alerts requested, set empty list
-		_ = d.Set("preconfigured_alert_ids", []string{})
+		// No alerts explicitly requested, all enabled alerts are API defaults
+		for ruleID, status := range alertStatusMap {
+			if status == cockpit.AlertStatusEnabled || status == cockpit.AlertStatusEnabling {
+				defaultEnabledIDs = append(defaultEnabledIDs, ruleID)
+			}
+		}
 	}
 
+	_ = d.Set("preconfigured_alert_ids", userRequestedIDs)
+	_ = d.Set("default_preconfigured_alert_ids", defaultEnabledIDs)
+
 	contactPoints, err := api.ListContactPoints(&cockpit.RegionalAPIListContactPointsRequest{
 		Region:    region,
 		ProjectID: projectID,
@@ -254,7 +270,7 @@ func ResourceCockpitAlertManagerUpdate(ctx context.Context, d *schema.ResourceDa
 				return diag.FromErr(err)
 			}
 
-		// Note: Waiting for alerts to be disabled will be handled by SDK waiters when available
+			// Note: Waiting for alerts to be disabled will be handled by SDK waiters when available
 		}
 
 		// IDs to enable: in new but not in old
@@ -269,7 +285,7 @@ func ResourceCockpitAlertManagerUpdate(ctx context.Context, d *schema.ResourceDa
 				return diag.FromErr(err)
 			}
 
-		// Note: Waiting for alerts to be enabled will be handled by SDK waiters when available
+			// Note: Waiting for alerts to be enabled will be handled by SDK waiters when available
 		}
 	}
 

internal/services/cockpit/alert_manager_test.go

@@ -413,6 +413,11 @@ func TestAccCockpitAlertManager_WithPreconfiguredAlerts(t *testing.T) {
 					resource.TestCheckResourceAttrSet("scaleway_cockpit_alert_manager.main", "region"),
 					resource.TestCheckResourceAttrSet("scaleway_cockpit_alert_manager.main", "alert_manager_url"),
 					resource.TestCheckResourceAttr("scaleway_cockpit_alert_manager.main", "contact_points.0.email", "[email protected]"),
+					resource.TestCheckResourceAttr("scaleway_cockpit_alert_manager.main", "preconfigured_alert_ids.#", "2"),
+					resource.TestCheckTypeSetElemAttr("scaleway_cockpit_alert_manager.main", "preconfigured_alert_ids.*", "6c6843af-1815-46df-9e52-6feafcf31fd7"),
+					resource.TestCheckTypeSetElemAttr("scaleway_cockpit_alert_manager.main", "preconfigured_alert_ids.*", "eb8a941e-698d-47d6-b62d-4b6c13f7b4b7"),
+					// Check that default alerts may be present (computed field)
+					resource.TestCheckResourceAttrSet("scaleway_cockpit_alert_manager.main", "default_preconfigured_alert_ids.#"),
 				),
 			},
 		},
@@ -449,6 +454,10 @@ func TestAccCockpitAlertManager_UpdatePreconfiguredAlerts(t *testing.T) {
 				Check: resource.ComposeTestCheckFunc(
 					resource.TestCheckResourceAttrSet("scaleway_cockpit_alert_manager.main", "project_id"),
 					testAccCheckPreconfiguredAlertsCount(tt, "scaleway_cockpit_alert_manager.main", 1),
+					resource.TestCheckResourceAttr("scaleway_cockpit_alert_manager.main", "preconfigured_alert_ids.#", "1"),
+					resource.TestCheckTypeSetElemAttr("scaleway_cockpit_alert_manager.main", "preconfigured_alert_ids.*", "6c6843af-1815-46df-9e52-6feafcf31fd7"),
+					// Check that default alerts may be present (computed field)
+					resource.TestCheckResourceAttrSet("scaleway_cockpit_alert_manager.main", "default_preconfigured_alert_ids.#"),
 				),
 			},
 			{
@@ -473,6 +482,11 @@ func TestAccCockpitAlertManager_UpdatePreconfiguredAlerts(t *testing.T) {
 				`,
 				Check: resource.ComposeTestCheckFunc(
 					testAccCheckPreconfiguredAlertsCount(tt, "scaleway_cockpit_alert_manager.main", 2),
+					resource.TestCheckResourceAttr("scaleway_cockpit_alert_manager.main", "preconfigured_alert_ids.#", "2"),
+					resource.TestCheckTypeSetElemAttr("scaleway_cockpit_alert_manager.main", "preconfigured_alert_ids.*", "6c6843af-1815-46df-9e52-6feafcf31fd7"),
+					resource.TestCheckTypeSetElemAttr("scaleway_cockpit_alert_manager.main", "preconfigured_alert_ids.*", "eb8a941e-698d-47d6-b62d-4b6c13f7b4b7"),
+					// Check that default alerts may be present (computed field)
+					resource.TestCheckResourceAttrSet("scaleway_cockpit_alert_manager.main", "default_preconfigured_alert_ids.#"),
 				),
 			},
 			{
@@ -495,6 +509,8 @@ func TestAccCockpitAlertManager_UpdatePreconfiguredAlerts(t *testing.T) {
 				Check: resource.ComposeTestCheckFunc(
 					resource.TestCheckResourceAttr("scaleway_cockpit_alert_manager.main", "preconfigured_alert_ids.#", "0"),
 					testAccCheckPreconfiguredAlertsCount(tt, "scaleway_cockpit_alert_manager.main", 0),
+					// Default alerts might still be present even when user requests none
+					resource.TestCheckResourceAttrSet("scaleway_cockpit_alert_manager.main", "default_preconfigured_alert_ids.#"),
 				),
 			},
 		},

templates/resources/cockpit_alert_manager.md.tmpl

@@ -90,7 +90,7 @@ resource "scaleway_cockpit_alert_manager" "alert_manager" {
 
 This section lists the arguments that are supported:
 
-- `preconfigured_alert_ids` - (Optional, Set of String) A set of preconfigured alert rule IDs to enable. Use the [`scaleway_cockpit_preconfigured_alert`](../data-sources/cockpit_preconfigured_alert.md) data source to list available alerts.
+- `preconfigured_alert_ids` - (Optional, Set of String) A set of preconfigured alert rule IDs to enable explicitly. Use the [`scaleway_cockpit_preconfigured_alert`](../data-sources/cockpit_preconfigured_alert.md) data source to list available alerts.
 - `enable_managed_alerts` - **Deprecated** (Optional, Boolean) Use `preconfigured_alert_ids` instead. This field will be removed in a future version.
 - `contact_points` - (Optional, List of Map) A list of contact points with email addresses that will receive alerts. Each map should contain a single key `email`.
 - `project_id` - (Defaults to the Project ID specified in the [provider configuration](../index.md#project_id)) The ID of the Project the Cockpit is associated with.
@@ -101,6 +101,7 @@ This section lists the arguments that are supported:
 In addition to all arguments above, the following attributes are exported:
 
 - `alert_manager_url` - The URL of the alert manager.
+- `default_preconfigured_alert_ids` - (Set of String) A set of preconfigured alert rule IDs that are enabled automatically by the API when the alert manager is activated. This is a computed field that shows which alerts the API enables by default.
 
 
 ## Import