wip

Author: wandergeek

Makefile

@@ -113,6 +113,7 @@ setup-kibana-fleet: ## Creates the agent and integration policies required to ru
 .PHONY: docker-clean
 docker-clean: ## Try to remove provisioned nodes and assigned network
 	@ docker compose -f $(COMPOSE_FILE) down -v
+	@ docker rm terraform-elasticstack-acceptance-tests >/dev/null 2>&1 || true
 
 .PHONY: copy-kibana-ca
 copy-kibana-ca: ## Copy Kibana CA certificate to local machine

internal/clients/kibana/alerting.go

@@ -313,7 +313,14 @@ func UpdateAlertingRule(ctx context.Context, apiClient ApiClient, rule models.Al
 		}
 	}
 
-	return ruleResponseToModel(rule.SpaceID, ruleRes), diag.Diagnostics{}
+	result := ruleResponseToModel(rule.SpaceID, ruleRes)
+
+	// Set enabled to the requested value since we just called enable/disable
+	if rule.Enabled != nil {
+		result.Enabled = rule.Enabled
+	}
+
+	return result, diag.Diagnostics{}
 }
 
 func GetAlertingRule(ctx context.Context, apiClient *clients.ApiClient, id, spaceID string) (*models.AlertingRule, diag.Diagnostics) {

internal/kibana/alerting_rule/acc_test.go

@@ -39,7 +39,7 @@ func TestAccResourceAlertingRule(t *testing.T) {
 				},
 				Check: resource.ComposeTestCheckFunc(
 					resource.TestCheckResourceAttr("elasticstack_kibana_alerting_rule.test_rule", "name", ruleName),
-					resource.TestCheckResourceAttr("elasticstack_kibana_alerting_rule.test_rule", "rule_id", "af22bd1c-8fb3-4020-9249-a4ac5471624b"),
+					resource.TestCheckResourceAttr("elasticstack_kibana_alerting_rule.test_rule", "rule_id", "bf33ce2d-9fc4-5131-a350-b5bd6482735c"),
 					resource.TestCheckResourceAttr("elasticstack_kibana_alerting_rule.test_rule", "consumer", "alerts"),
 					resource.TestCheckResourceAttr("elasticstack_kibana_alerting_rule.test_rule", "notify_when", "onActiveAlert"),
 					resource.TestCheckResourceAttr("elasticstack_kibana_alerting_rule.test_rule", "rule_type_id", ".index-threshold"),
@@ -56,7 +56,7 @@ func TestAccResourceAlertingRule(t *testing.T) {
 				},
 				Check: resource.ComposeTestCheckFunc(
 					resource.TestCheckResourceAttr("elasticstack_kibana_alerting_rule.test_rule", "name", fmt.Sprintf("Updated %s", ruleName)),
-					resource.TestCheckResourceAttr("elasticstack_kibana_alerting_rule.test_rule", "rule_id", "af22bd1c-8fb3-4020-9249-a4ac5471624b"),
+					resource.TestCheckResourceAttr("elasticstack_kibana_alerting_rule.test_rule", "rule_id", "bf33ce2d-9fc4-5131-a350-b5bd6482735c"),
 					resource.TestCheckResourceAttr("elasticstack_kibana_alerting_rule.test_rule", "consumer", "alerts"),
 					resource.TestCheckResourceAttr("elasticstack_kibana_alerting_rule.test_rule", "notify_when", "onActiveAlert"),
 					resource.TestCheckResourceAttr("elasticstack_kibana_alerting_rule.test_rule", "rule_type_id", ".index-threshold"),
@@ -75,7 +75,7 @@ func TestAccResourceAlertingRule(t *testing.T) {
 				},
 				Check: resource.ComposeTestCheckFunc(
 					resource.TestCheckResourceAttr("elasticstack_kibana_alerting_rule.test_rule", "name", ruleName),
-					resource.TestCheckResourceAttr("elasticstack_kibana_alerting_rule.test_rule", "rule_id", "af22bd1c-8fb3-4020-9249-a4ac5471624b"),
+					resource.TestCheckResourceAttr("elasticstack_kibana_alerting_rule.test_rule", "rule_id", "bf33ce2d-9fc4-5131-a350-b5bd6482735c"),
 					resource.TestCheckResourceAttr("elasticstack_kibana_alerting_rule.test_rule", "consumer", "alerts"),
 					resource.TestCheckResourceAttr("elasticstack_kibana_alerting_rule.test_rule", "rule_type_id", ".index-threshold"),
 					resource.TestCheckResourceAttr("elasticstack_kibana_alerting_rule.test_rule", "interval", "1m"),
@@ -96,7 +96,7 @@ func TestAccResourceAlertingRule(t *testing.T) {
 				},
 				Check: resource.ComposeTestCheckFunc(
 					resource.TestCheckResourceAttr("elasticstack_kibana_alerting_rule.test_rule", "name", fmt.Sprintf("Updated %s", ruleName)),
-					resource.TestCheckResourceAttr("elasticstack_kibana_alerting_rule.test_rule", "rule_id", "af22bd1c-8fb3-4020-9249-a4ac5471624b"),
+					resource.TestCheckResourceAttr("elasticstack_kibana_alerting_rule.test_rule", "rule_id", "bf33ce2d-9fc4-5131-a350-b5bd6482735c"),
 					resource.TestCheckResourceAttr("elasticstack_kibana_alerting_rule.test_rule", "consumer", "alerts"),
 					resource.TestCheckResourceAttr("elasticstack_kibana_alerting_rule.test_rule", "rule_type_id", ".index-threshold"),
 					resource.TestCheckResourceAttr("elasticstack_kibana_alerting_rule.test_rule", "interval", "10m"),

internal/kibana/alerting_rule/testdata/TestAccResourceAlertingRule/create/rule.tf

@@ -9,7 +9,7 @@ provider "elasticstack" {
 
 resource "elasticstack_kibana_alerting_rule" "test_rule" {
   name        = var.name
-  rule_id     = "af22bd1c-8fb3-4020-9249-a4ac5471624b"
+  rule_id     = "bf33ce2d-9fc4-5131-a350-b5bd6482735c"
   consumer    = "alerts"
   notify_when = "onActiveAlert"
   params = jsonencode({

internal/kibana/alerting_rule/testdata/TestAccResourceAlertingRule/frequency_create/rule.tf

@@ -18,7 +18,7 @@ resource "elasticstack_kibana_action_connector" "index_example" {
 
 resource "elasticstack_kibana_alerting_rule" "test_rule" {
   name     = var.name
-  rule_id  = "af22bd1c-8fb3-4020-9249-a4ac5471624b"
+  rule_id  = "bf33ce2d-9fc4-5131-a350-b5bd6482735c"
   consumer = "alerts"
   params = jsonencode({
     aggType             = "avg"

internal/kibana/alerting_rule/testdata/TestAccResourceAlertingRule/frequency_update/rule.tf

@@ -18,7 +18,7 @@ resource "elasticstack_kibana_action_connector" "index_example" {
 
 resource "elasticstack_kibana_alerting_rule" "test_rule" {
   name     = var.name
-  rule_id  = "af22bd1c-8fb3-4020-9249-a4ac5471624b"
+  rule_id  = "bf33ce2d-9fc4-5131-a350-b5bd6482735c"
   consumer = "alerts"
   params = jsonencode({
     aggType             = "avg"

internal/kibana/alerting_rule/testdata/TestAccResourceAlertingRule/update/rule.tf

@@ -9,7 +9,7 @@ provider "elasticstack" {
 
 resource "elasticstack_kibana_alerting_rule" "test_rule" {
   name        = var.name
-  rule_id     = "af22bd1c-8fb3-4020-9249-a4ac5471624b"
+  rule_id     = "bf33ce2d-9fc4-5131-a350-b5bd6482735c"
   consumer    = "alerts"
   notify_when = "onActiveAlert"
   params = jsonencode({