Addressing PR comments.

Author: adcoelho

internal/kibana/maintenance_window/create.go

@@ -7,6 +7,7 @@ import (
 	"github.com/elastic/terraform-provider-elasticstack/internal/utils"
 	"github.com/hashicorp/go-version"
 	"github.com/hashicorp/terraform-plugin-framework/resource"
+	"github.com/hashicorp/terraform-plugin-framework/types"
 )
 
 func (r *MaintenanceWindowResource) Create(ctx context.Context, req resource.CreateRequest, resp *resource.CreateResponse) {
@@ -74,6 +75,9 @@ func (r *MaintenanceWindowResource) Create(ctx context.Context, req resource.Cre
 		return
 	}
 
+	planMaintenanceWindow.ID = types.StringValue(maintenanceWindowID)
+	planMaintenanceWindow.SpaceID = types.StringValue(spaceID)
+
 	diags = resp.State.Set(ctx, planMaintenanceWindow)
 	resp.Diagnostics.Append(diags...)
 }

internal/kibana/maintenance_window/models.go

@@ -157,12 +157,6 @@ func (model MaintenanceWindowModel) getMaintenanceWindowIDAndSpaceID() (maintena
 func (model *MaintenanceWindowModel) _fromAPIResponse(ctx context.Context, response ResponseJson) diag.Diagnostics {
 	var diags = diag.Diagnostics{}
 
-	resourceID := clients.CompositeId{
-		ClusterId:  model.SpaceID.ValueString(),
-		ResourceId: response.Id,
-	}
-
-	model.ID = types.StringValue(resourceID.String())
 	model.Title = types.StringValue(response.Title)
 	model.Enabled = types.BoolValue(response.Enabled)
 

internal/kibana/maintenance_window/read.go

@@ -6,6 +6,7 @@ import (
 	"github.com/elastic/terraform-provider-elasticstack/internal/clients/kibana_oapi"
 	"github.com/hashicorp/terraform-plugin-framework/path"
 	"github.com/hashicorp/terraform-plugin-framework/resource"
+	"github.com/hashicorp/terraform-plugin-framework/types"
 )
 
 func (r *MaintenanceWindowResource) Read(ctx context.Context, req resource.ReadRequest, resp *resource.ReadResponse) {
@@ -53,6 +54,9 @@ func (r *MaintenanceWindowResource) Read(ctx context.Context, req resource.ReadR
 		return
 	}
 
+	stateModel.ID = types.StringValue(maintenanceWindowID)
+	stateModel.SpaceID = types.StringValue(spaceID)
+
 	diags = resp.State.Set(ctx, stateModel)
 	resp.Diagnostics.Append(diags...)
 }

internal/kibana/maintenance_window/update.go

@@ -5,6 +5,7 @@ import (
 
 	"github.com/elastic/terraform-provider-elasticstack/internal/clients/kibana_oapi"
 	"github.com/hashicorp/terraform-plugin-framework/resource"
+	"github.com/hashicorp/terraform-plugin-framework/types"
 )
 
 func (r *MaintenanceWindowResource) Update(ctx context.Context, req resource.UpdateRequest, resp *resource.UpdateResponse) {
@@ -71,6 +72,9 @@ func (r *MaintenanceWindowResource) Update(ctx context.Context, req resource.Upd
 		return
 	}
 
+	planMaintenanceWindow.ID = types.StringValue(maintenanceWindowID)
+	planMaintenanceWindow.SpaceID = types.StringValue(spaceID)
+
 	diags = resp.State.Set(ctx, planMaintenanceWindow)
 	resp.Diagnostics.Append(diags...)
 }

internal/kibana/validators/is_alerting_duration.go

@@ -2,7 +2,6 @@ package validators
 
 import (
 	"context"
-	"fmt"
 	"regexp"
 
 	"github.com/hashicorp/terraform-plugin-framework/schema/validator"
@@ -35,7 +34,7 @@ func (s StringIsAlertingDuration) ValidateString(_ context.Context, req validato
 		resp.Diagnostics.AddAttributeError(
 			req.Path,
 			"expected value to be a valid alerting duration",
-			fmt.Sprintf("This value must be a valid alerting duration in seconds (s), minutes (m), hours (h), or days (d) %s", err),
+			"This value must be a valid alerting duration in seconds (s), minutes (m), hours (h), or days (d).",
 		)
 		return
 	}
@@ -46,5 +45,5 @@ func (s StringIsAlertingDuration) ValidateString(_ context.Context, req validato
 //nolint:staticcheck
 func StringIsAlertingDurationSDKV2() schema.SchemaValidateFunc {
 	r := regexp.MustCompile(alertingDurationPattern)
-	return validation.StringMatch(r, "string is not a valid Alerting duration in seconds (s), minutes (m), hours (h), or days (d)")
+	return validation.StringMatch(r, "string is not a valid Alerting duration in seconds (s), minutes (m), hours (h), or days (d).")
 }

internal/kibana/validators/is_iso8601_string.go

@@ -2,7 +2,6 @@ package validators
 
 import (
 	"context"
-	"fmt"
 	"regexp"
 
 	"github.com/hashicorp/terraform-plugin-framework/schema/validator"
@@ -32,7 +31,7 @@ func (s StringIsISO8601) ValidateString(_ context.Context, req validator.StringR
 		resp.Diagnostics.AddAttributeError(
 			req.Path,
 			"expected value to be a valid ISO8601 string",
-			fmt.Sprintf("This value must be a valid ISO8601 date and time formatted string %s", err),
+			"This value must be a valid ISO8601 date and time formatted string.",
 		)
 		return
 	}

internal/kibana/validators/is_maintenance_window_interval.go

@@ -2,7 +2,6 @@ package validators
 
 import (
 	"context"
-	"fmt"
 	"regexp"
 
 	"github.com/hashicorp/terraform-plugin-framework/schema/validator"
@@ -32,7 +31,7 @@ func (s StringIsMaintenanceWindowIntervalFrequency) ValidateString(_ context.Con
 		resp.Diagnostics.AddAttributeError(
 			req.Path,
 			"expected value to be a valid interval/frequency",
-			fmt.Sprintf("This value must be a valid interval/frequency. Allowed values are in the `<integer><unit>` format. `<unit>` is one of `d`, `w`, `M`, or `y` for days, weeks, months, years. For example: `15d`, `2w`, `3m`, `1y`. %s", err),
+			"This value must be a valid interval/frequency. Allowed values are in the `<integer><unit>` format. `<unit>` is one of `d`, `w`, `M`, or `y` for days, weeks, months, years. For example: `15d`, `2w`, `3m`, `1y`.",
 		)
 		return
 	}

internal/kibana/validators/is_maintenance_window_week_day.go

@@ -2,7 +2,6 @@ package validators
 
 import (
 	"context"
-	"fmt"
 	"regexp"
 
 	"github.com/hashicorp/terraform-plugin-framework/schema/validator"
@@ -32,7 +31,7 @@ func (s StringIsMaintenanceWindowOnWeekDay) ValidateString(_ context.Context, re
 		resp.Diagnostics.AddAttributeError(
 			req.Path,
 			"expected value to be a valid OnWeekDay",
-			fmt.Sprintf("This value must be a valid OnWeekDay. Accepted values are specific days of the week (`[MO,TU,WE,TH,FR,SA,SU]`) or nth day of month (`[+1MO, -3FR, +2WE, -4SA, -5SU]`). %s", err),
+			"This value must be a valid OnWeekDay. Accepted values are specific days of the week (`[MO,TU,WE,TH,FR,SA,SU]`) or nth day of month (`[+1MO, -3FR, +2WE, -4SA, -5SU]`).",
 		)
 		return
 	}