Moving validation around.

Author: adcoelho

internal/kibana/alerting.go

@@ -4,11 +4,11 @@ import (
 	"context"
 	"encoding/json"
 	"fmt"
-	"regexp"
 	"strings"
 
 	"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/models"
 	"github.com/elastic/terraform-provider-elasticstack/internal/utils"
 	"github.com/hashicorp/go-version"
@@ -22,14 +22,6 @@ var frequencyMinSupportedVersion = version.Must(version.NewVersion("8.6.0"))
 var alertsFilterMinSupportedVersion = version.Must(version.NewVersion("8.9.0"))
 var alertDelayMinSupportedVersion = version.Must(version.NewVersion("8.13.0"))
 
-// Avoid lint error on deprecated SchemaValidateFunc usage.
-//
-//nolint:staticcheck
-func stringIsAlertingDuration() schema.SchemaValidateFunc {
-	r := regexp.MustCompile(`^[1-9][0-9]*(?:d|h|m|s)$`)
-	return validation.StringMatch(r, "string is not a valid Alerting duration in seconds (s), minutes (m), hours (h), or days (d)")
-}
-
 func ResourceAlertingRule() *schema.Resource {
 	apikeySchema := map[string]*schema.Schema{
 		"rule_id": {
@@ -80,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: stringIsAlertingDuration(),
+			ValidateFunc: validation_utils.StringIsAlertingDurationSDKV2(),
 		},
 		"actions": {
 			Description: "An action that runs under defined conditions.",
@@ -129,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: stringIsAlertingDuration(),
+									ValidateFunc: validation_utils.StringIsAlertingDurationSDKV2(),
 								},
 							},
 						},
@@ -207,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: stringIsAlertingDuration(),
+			ValidateFunc: validation_utils.StringIsAlertingDurationSDKV2(),
 		},
 		"scheduled_task_id": {
 			Description: "ID of the scheduled task that will execute the alert.",

internal/kibana/maintenance_window/schema.go

@@ -3,6 +3,7 @@ package maintenance_window
 import (
 	"context"
 
+	validation_utils "github.com/elastic/terraform-provider-elasticstack/internal/kibana/utils"
 	"github.com/hashicorp/terraform-plugin-framework-validators/int32validator"
 	"github.com/hashicorp/terraform-plugin-framework-validators/listvalidator"
 	"github.com/hashicorp/terraform-plugin-framework-validators/stringvalidator"
@@ -61,7 +62,7 @@ func (r *MaintenanceWindowResource) Schema(_ context.Context, _ resource.SchemaR
 						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{
-							StringIsAlertingDuration{},
+							validation_utils.StringIsAlertingDuration{},
 						},
 					},
 					"timezone": schema.StringAttribute{
@@ -81,7 +82,7 @@ func (r *MaintenanceWindowResource) Schema(_ context.Context, _ resource.SchemaR
 								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{
-									StringIsMaintenanceWindowIntervalFrequency{},
+									validation_utils.StringIsMaintenanceWindowIntervalFrequency{},
 								},
 							},
 							"occurrences": schema.Int32Attribute{
@@ -97,7 +98,7 @@ func (r *MaintenanceWindowResource) Schema(_ context.Context, _ resource.SchemaR
 								Optional:    true,
 								Validators: []validator.List{
 									listvalidator.ValueStringsAre(
-										StringIsMaintenanceWindowOnWeekDay{},
+										validation_utils.StringIsMaintenanceWindowOnWeekDay{},
 									),
 								},
 							},

internal/kibana/maintenance_window/validators.go renamed to internal/kibana/utils/validators.go

@@ -1,11 +1,13 @@
-package maintenance_window
+package validation_utils
 
 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"
 )
 
 func StringMatchesIntervalFrequencyRegex(s string) (matched bool, err error) {
@@ -68,10 +70,10 @@ func (s StringIsMaintenanceWindowOnWeekDay) ValidateString(_ context.Context, re
 	}
 }
 
-func StringMatchesAlertingDurationRegex(s string) (matched bool, err error) {
-	pattern := "^[1-9][0-9]*(?:d|h|m|s)$"
+var alertingDurationPattern = "^[1-9][0-9]*(?:d|h|m|s)$"
 
-	return regexp.MatchString(pattern, s)
+func StringMatchesAlertingDurationRegex(s string) (matched bool, err error) {
+	return regexp.MatchString(alertingDurationPattern, s)
 }
 
 type StringIsAlertingDuration struct{}
@@ -98,3 +100,11 @@ func (s StringIsAlertingDuration) ValidateString(_ context.Context, req validato
 		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/maintenance_window/validators_test.go renamed to internal/kibana/utils/validators_test.go

@@ -1,4 +1,4 @@
-package maintenance_window
+package validation_utils
 
 import (
 	"reflect"