Addressing PR comments 2

Author: adcoelho

internal/kibana/alerting.go

@@ -8,7 +8,7 @@ import (
 
 	"github.com/elastic/terraform-provider-elasticstack/internal/clients"
 	"github.com/elastic/terraform-provider-elasticstack/internal/clients/kibana"
-	validation_utils "github.com/elastic/terraform-provider-elasticstack/internal/kibana/utils"
+	"github.com/elastic/terraform-provider-elasticstack/internal/kibana/validators"
 	"github.com/elastic/terraform-provider-elasticstack/internal/models"
 	"github.com/elastic/terraform-provider-elasticstack/internal/utils"
 	"github.com/hashicorp/go-version"
@@ -72,7 +72,7 @@ func ResourceAlertingRule() *schema.Resource {
 			Description:  "The check interval, which specifies how frequently the rule conditions are checked. The interval must be specified in seconds, minutes, hours or days.",
 			Type:         schema.TypeString,
 			Required:     true,
-			ValidateFunc: validation_utils.StringIsAlertingDurationSDKV2(),
+			ValidateFunc: validators.StringIsAlertingDurationSDKV2(),
 		},
 		"actions": {
 			Description: "An action that runs under defined conditions.",
@@ -121,7 +121,7 @@ func ResourceAlertingRule() *schema.Resource {
 									Description:  "Defines how often an alert generates repeated actions. This custom action interval must be specified in seconds, minutes, hours, or days. For example, 10m or 1h. This property is applicable only if `notify_when` is `onThrottleInterval`. NOTE: This is a rule level property; if you update the rule in Kibana, it is automatically changed to use action-specific `throttle` values.",
 									Type:         schema.TypeString,
 									Optional:     true,
-									ValidateFunc: validation_utils.StringIsAlertingDurationSDKV2(),
+									ValidateFunc: validators.StringIsAlertingDurationSDKV2(),
 								},
 							},
 						},
@@ -199,7 +199,7 @@ func ResourceAlertingRule() *schema.Resource {
 			Description:  "Deprecated in 8.13.0. Defines how often an alert generates repeated actions. This custom action interval must be specified in seconds, minutes, hours, or days. For example, 10m or 1h. This property is applicable only if `notify_when` is `onThrottleInterval`. NOTE: This is a rule level property; if you update the rule in Kibana, it is automatically changed to use action-specific `throttle` values.",
 			Type:         schema.TypeString,
 			Optional:     true,
-			ValidateFunc: validation_utils.StringIsAlertingDurationSDKV2(),
+			ValidateFunc: validators.StringIsAlertingDurationSDKV2(),
 		},
 		"scheduled_task_id": {
 			Description: "ID of the scheduled task that will execute the alert.",

internal/kibana/maintenance_window/read.go

@@ -12,6 +12,7 @@ func (r *MaintenanceWindowResource) Read(ctx context.Context, req resource.ReadR
 	var stateModel MaintenanceWindowModel
 
 	req.State.GetAttribute(ctx, path.Root("id"), &stateModel.ID)
+	req.State.GetAttribute(ctx, path.Root("space_id"), &stateModel.SpaceID)
 
 	serverVersion, sdkDiags := r.client.ServerVersion(ctx)
 	if sdkDiags.HasError() {

internal/kibana/maintenance_window/resource.go

@@ -10,8 +10,8 @@ import (
 )
 
 var (
-	_ resource.Resource              = &MaintenanceWindowResource{}
-	_ resource.ResourceWithConfigure = &MaintenanceWindowResource{}
+	_ resource.Resource                = &MaintenanceWindowResource{}
+	_ resource.ResourceWithConfigure   = &MaintenanceWindowResource{}
 	_ resource.ResourceWithImportState = &MaintenanceWindowResource{}
 )
 

internal/kibana/maintenance_window/schema.go

@@ -3,7 +3,7 @@ package maintenance_window
 import (
 	"context"
 
-	validation_utils "github.com/elastic/terraform-provider-elasticstack/internal/kibana/utils"
+	"github.com/elastic/terraform-provider-elasticstack/internal/kibana/validators"
 	"github.com/hashicorp/terraform-plugin-framework-validators/int32validator"
 	"github.com/hashicorp/terraform-plugin-framework-validators/listvalidator"
 	"github.com/hashicorp/terraform-plugin-framework-validators/stringvalidator"
@@ -58,14 +58,14 @@ func (r *MaintenanceWindowResource) Schema(_ context.Context, _ resource.SchemaR
 						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`.",
 						Required:    true,
 						Validators: []validator.String{
-							validation_utils.StringIsISO8601{},
+							validators.StringIsISO8601{},
 						},
 					},
 					"duration": schema.StringAttribute{
 						Description: "The duration of the schedule. It allows values in `<integer><unit>` format. `<unit>` is one of `d`, `h`, `m`, or `s` for hours, minutes, seconds. For example: `1d`, `5h`, `30m`, `5000s`.",
 						Required:    true,
 						Validators: []validator.String{
-							validation_utils.StringIsAlertingDuration{},
+							validators.StringIsAlertingDuration{},
 						},
 					},
 					"timezone": schema.StringAttribute{
@@ -81,14 +81,14 @@ func (r *MaintenanceWindowResource) Schema(_ context.Context, _ resource.SchemaR
 								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,
 								Validators: []validator.String{
-									validation_utils.StringIsISO8601{},
+									validators.StringIsISO8601{},
 								},
 							},
 							"every": schema.StringAttribute{
 								Description: "The duration of the schedule. It allows values in `<integer><unit>` format. `<unit>` is one of `d`, `h`, `m`, or `s` for hours, minutes, seconds. For example: `1d`, `5h`, `30m`, `5000s`.",
 								Optional:    true,
 								Validators: []validator.String{
-									validation_utils.StringIsMaintenanceWindowIntervalFrequency{},
+									validators.StringIsMaintenanceWindowIntervalFrequency{},
 								},
 							},
 							"occurrences": schema.Int32Attribute{
@@ -104,7 +104,7 @@ func (r *MaintenanceWindowResource) Schema(_ context.Context, _ resource.SchemaR
 								Optional:    true,
 								Validators: []validator.List{
 									listvalidator.ValueStringsAre(
-										validation_utils.StringIsMaintenanceWindowOnWeekDay{},
+										validators.StringIsMaintenanceWindowOnWeekDay{},
 									),
 								},
 							},

internal/kibana/utils/validators.go

@@ -0,0 +1,50 @@
+package validators
+
+import (
+	"context"
+	"fmt"
+	"regexp"
+
+	"github.com/hashicorp/terraform-plugin-framework/schema/validator"
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation"
+)
+
+var alertingDurationPattern = "^[1-9][0-9]*(?:d|h|m|s)$"
+
+func StringMatchesAlertingDurationRegex(s string) (matched bool, err error) {
+	return regexp.MatchString(alertingDurationPattern, s)
+}
+
+type StringIsAlertingDuration struct{}
+
+func (s StringIsAlertingDuration) Description(_ context.Context) string {
+	return "a valid alerting duration in seconds (s), minutes (m), hours (h), or days (d)"
+}
+
+func (s StringIsAlertingDuration) MarkdownDescription(ctx context.Context) string {
+	return s.Description(ctx)
+}
+
+func (s StringIsAlertingDuration) ValidateString(_ context.Context, req validator.StringRequest, resp *validator.StringResponse) {
+	if req.ConfigValue.IsNull() || req.ConfigValue.IsUnknown() {
+		return
+	}
+
+	if matched, err := StringMatchesAlertingDurationRegex(req.ConfigValue.ValueString()); err != nil || !matched {
+		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),
+		)
+		return
+	}
+}
+
+// Avoid lint error on deprecated SchemaValidateFunc usage.
+//
+//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)")
+}

internal/kibana/validators/is_alerting_duration.go

@@ -0,0 +1,39 @@
+package validators
+
+import (
+	"context"
+	"fmt"
+	"regexp"
+
+	"github.com/hashicorp/terraform-plugin-framework/schema/validator"
+)
+
+func StringMatchesISO8601Regex(s string) (matched bool, err error) {
+	pattern := `(\d{4}-[01]\d-[0-3]\dT[0-2]\d:[0-5]\d:[0-5]\d\.\d+([+-][0-2]\d:[0-5]\d|Z))|(\d{4}-[01]\d-[0-3]\dT[0-2]\d:[0-5]\d:[0-5]\d([+-][0-2]\d:[0-5]\d|Z))|(\d{4}-[01]\d-[0-3]\dT[0-2]\d:[0-5]\d([+-][0-2]\d:[0-5]\d|Z))`
+	return regexp.MatchString(pattern, s)
+}
+
+type StringIsISO8601 struct{}
+
+func (s StringIsISO8601) Description(_ context.Context) string {
+	return "a valid ISO8601 date and time formatted string"
+}
+
+func (s StringIsISO8601) MarkdownDescription(ctx context.Context) string {
+	return s.Description(ctx)
+}
+
+func (s StringIsISO8601) ValidateString(_ context.Context, req validator.StringRequest, resp *validator.StringResponse) {
+	if req.ConfigValue.IsNull() || req.ConfigValue.IsUnknown() {
+		return
+	}
+
+	if matched, err := StringMatchesISO8601Regex(req.ConfigValue.ValueString()); err != nil || !matched {
+		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),
+		)
+		return
+	}
+}

internal/kibana/validators/is_iso8601_string.go

@@ -0,0 +1,39 @@
+package validators
+
+import (
+	"context"
+	"fmt"
+	"regexp"
+
+	"github.com/hashicorp/terraform-plugin-framework/schema/validator"
+)
+
+func StringMatchesIntervalFrequencyRegex(s string) (matched bool, err error) {
+	pattern := `^[1-9][0-9]*(?:d|w|M|y)$`
+	return regexp.MatchString(pattern, s)
+}
+
+type StringIsMaintenanceWindowIntervalFrequency struct{}
+
+func (s StringIsMaintenanceWindowIntervalFrequency) Description(_ context.Context) string {
+	return "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`."
+}
+
+func (s StringIsMaintenanceWindowIntervalFrequency) MarkdownDescription(ctx context.Context) string {
+	return s.Description(ctx)
+}
+
+func (s StringIsMaintenanceWindowIntervalFrequency) ValidateString(_ context.Context, req validator.StringRequest, resp *validator.StringResponse) {
+	if req.ConfigValue.IsNull() || req.ConfigValue.IsUnknown() {
+		return
+	}
+
+	if matched, err := StringMatchesIntervalFrequencyRegex(req.ConfigValue.ValueString()); err != nil || !matched {
+		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),
+		)
+		return
+	}
+}