Addressing PR comments 1

Author: adcoelho

examples/resources/elasticstack_kibana_maintenance_window/resource.tf

@@ -7,20 +7,20 @@ resource "elasticstack_kibana_maintenance_window" "my_maintenance_window" {
   title   = "UPDATE TEST"
   enabled = true
 
-  custom_schedule {
+  custom_schedule = {
     start    = "1993-01-01T05:00:00.200Z"
     duration = "12d"
 
-    recurring {
+    recurring = {
       every        = "21d"
       on_week_day  = ["MO", "+3TU", "-2FR"]
       on_month_day = [1, 2, 4, 6, 7]
       on_month     = [12]
     }
   }
 
-  scope {
-    alerting {
+  scope = {
+    alerting = {
       kql = "_id: '1234'"
     }
   }

internal/kibana/maintenance_window/delete.go

@@ -16,21 +16,6 @@ func (r *MaintenanceWindowResource) Delete(ctx context.Context, req resource.Del
 		return
 	}
 
-	serverVersion, sdkDiags := r.client.ServerVersion(ctx)
-	if sdkDiags.HasError() {
-		return
-	}
-
-	serverFlavor, sdkDiags := r.client.ServerFlavor(ctx)
-	if sdkDiags.HasError() {
-		return
-	}
-
-	diags = validateMaintenanceWindowServer(serverVersion, serverFlavor)
-	if diags.HasError() {
-		return
-	}
-
 	client, err := r.client.GetKibanaOapiClient()
 	if err != nil {
 		resp.Diagnostics.AddError(err.Error(), "")

internal/kibana/maintenance_window/models.go

@@ -6,6 +6,7 @@ import (
 
 	"github.com/elastic/terraform-provider-elasticstack/generated/kbapi"
 	"github.com/elastic/terraform-provider-elasticstack/internal/clients"
+	"github.com/elastic/terraform-provider-elasticstack/internal/utils"
 	"github.com/hashicorp/terraform-plugin-framework/diag"
 	"github.com/hashicorp/terraform-plugin-framework/types"
 )
@@ -79,19 +80,19 @@ func (model MaintenanceWindowModel) toAPICreateRequest(ctx context.Context) (kba
 			body.Schedule.Custom.Recurring.Occurrences = &occurrences
 		}
 
-		if !model.CustomSchedule.Recurring.OnWeekDay.IsNull() && !model.CustomSchedule.Recurring.OnWeekDay.IsUnknown() {
+		if utils.IsKnown(model.CustomSchedule.Recurring.OnWeekDay) {
 			var onWeekDay []string
 			diags.Append(model.CustomSchedule.Recurring.OnWeekDay.ElementsAs(ctx, &onWeekDay, true)...)
 			body.Schedule.Custom.Recurring.OnWeekDay = &onWeekDay
 		}
 
-		if !model.CustomSchedule.Recurring.OnMonth.IsNull() && !model.CustomSchedule.Recurring.OnMonth.IsUnknown() {
+		if utils.IsKnown(model.CustomSchedule.Recurring.OnMonth) {
 			var onMonth []float32
 			diags.Append(model.CustomSchedule.Recurring.OnMonth.ElementsAs(ctx, &onMonth, true)...)
 			body.Schedule.Custom.Recurring.OnMonth = &onMonth
 		}
 
-		if !model.CustomSchedule.Recurring.OnMonthDay.IsNull() && !model.CustomSchedule.Recurring.OnMonthDay.IsUnknown() {
+		if utils.IsKnown(model.CustomSchedule.Recurring.OnMonthDay) {
 			var onMonthDay []float32
 			diags.Append(model.CustomSchedule.Recurring.OnMonthDay.ElementsAs(ctx, &onMonthDay, true)...)
 			body.Schedule.Custom.Recurring.OnMonthDay = &onMonthDay
@@ -162,14 +163,9 @@ func (model *MaintenanceWindowModel) fromAPIReadResponse(ctx context.Context, da
 func (model MaintenanceWindowModel) toAPIUpdateRequest(ctx context.Context) (kbapi.PatchMaintenanceWindowIdJSONRequestBody, diag.Diagnostics) {
 	var diags = diag.Diagnostics{}
 
-	body := kbapi.PatchMaintenanceWindowIdJSONRequestBody{}
-
-	if !model.Enabled.IsNull() {
-		body.Enabled = model.Enabled.ValueBoolPointer()
-	}
-
-	if !model.Title.IsNull() {
-		body.Title = model.Title.ValueStringPointer()
+	body := kbapi.PatchMaintenanceWindowIdJSONRequestBody{
+		Enabled: model.Enabled.ValueBoolPointer(),
+		Title:   model.Title.ValueStringPointer(),
 	}
 
 	schedule := struct {
@@ -207,7 +203,7 @@ func (model MaintenanceWindowModel) toAPIUpdateRequest(ctx context.Context) (kba
 
 	body.Schedule = &schedule
 
-	if !model.CustomSchedule.Timezone.IsNull() && !model.CustomSchedule.Timezone.IsUnknown() {
+	if utils.IsKnown(model.CustomSchedule.Timezone) {
 		body.Schedule.Custom.Timezone = model.CustomSchedule.Timezone.ValueStringPointer()
 	}
 

internal/kibana/maintenance_window/read.go

@@ -38,18 +38,18 @@ func (r *MaintenanceWindowResource) Read(ctx context.Context, req resource.ReadR
 	}
 
 	viewID, spaceID := stateModel.getMaintenanceWindowIDAndSpaceID()
-	dataView, diags := kibana_oapi.GetMaintenanceWindow(ctx, client, spaceID, viewID)
+	maintenanceWindow, diags := kibana_oapi.GetMaintenanceWindow(ctx, client, spaceID, viewID)
 	resp.Diagnostics.Append(diags...)
 	if resp.Diagnostics.HasError() {
 		return
 	}
 
-	if dataView == nil {
+	if maintenanceWindow == nil {
 		resp.State.RemoveResource(ctx)
 		return
 	}
 
-	diags = stateModel.fromAPIReadResponse(ctx, dataView)
+	diags = stateModel.fromAPIReadResponse(ctx, maintenanceWindow)
 	resp.Diagnostics.Append(diags...)
 	if resp.Diagnostics.HasError() {
 		return

internal/kibana/maintenance_window/schema.go

@@ -74,7 +74,7 @@ func (r *MaintenanceWindowResource) Schema(_ context.Context, _ resource.SchemaR
 						Required:    true,
 						Attributes: map[string]schema.Attribute{
 							"end": schema.StringAttribute{
-								Description: "The start date and time of the schedule, provided in ISO 8601 format and set to the UTC timezone. For example: `2025-03-12T12:00:00.000Z`.",
+								Description: "The end date and time of the schedule, provided in ISO 8601 format and set to the UTC timezone. For example: `2025-03-12T12:00:00.000Z`.",
 								Optional:    true,
 							},
 							"every": schema.StringAttribute{