From 7cc244e41c05f5dd47d2e4e1999cb42a6368c1c9 Mon Sep 17 00:00:00 2001 From: Sueeda Oezkaya Date: Thu, 16 Jul 2026 18:56:39 +0200 Subject: [PATCH 1/2] bugfix: add plan-time regex validation for telemetry link name and description --- .../services/telemetrylink/link/resource.go | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/stackit/internal/services/telemetrylink/link/resource.go b/stackit/internal/services/telemetrylink/link/resource.go index 5227bca1b..f060330c6 100644 --- a/stackit/internal/services/telemetrylink/link/resource.go +++ b/stackit/internal/services/telemetrylink/link/resource.go @@ -5,6 +5,7 @@ import ( "errors" "fmt" "net/http" + "regexp" "strings" "time" @@ -172,10 +173,22 @@ func (r *telemetryLinkResource) Schema(_ context.Context, _ resource.SchemaReque "display_name": schema.StringAttribute{ Description: schemaDescriptions["display_name"], Required: true, + Validators: []validator.String{ + stringvalidator.RegexMatches( + regexp.MustCompile(`^[a-zA-Z0-9][a-zA-Z0-9\-\ ]*$`), + "The display name must start with an alphanumeric character and can only contain letters, numbers, spaces, and hyphens.", + ), + }, }, "description": schema.StringAttribute{ Description: schemaDescriptions["description"], Optional: true, + Validators: []validator.String{ + stringvalidator.RegexMatches( + regexp.MustCompile(`^[a-zA-Z0-9][a-zA-Z0-9\-\ ]*$`), + "The description must start with an alphanumeric character and can only contain letters, numbers, spaces, and hyphens.", + ), + }, }, "region": schema.StringAttribute{ Description: schemaDescriptions["region"], From eb638adce55888ce07c514d257f4cffc72093960 Mon Sep 17 00:00:00 2001 From: Sueeda Oezkaya Date: Thu, 23 Jul 2026 11:28:57 +0200 Subject: [PATCH 2/2] match validation for telemetry router and telemetry link with api --- .../internal/services/telemetrylink/link/resource.go | 12 +++++++----- .../services/telemetryrouter/accesstoken/resource.go | 12 ++++++++++++ .../services/telemetryrouter/destination/resource.go | 11 +++++++++++ .../services/telemetryrouter/instance/resource.go | 11 +++++++++++ 4 files changed, 41 insertions(+), 5 deletions(-) diff --git a/stackit/internal/services/telemetrylink/link/resource.go b/stackit/internal/services/telemetrylink/link/resource.go index f060330c6..d1f82cbb9 100644 --- a/stackit/internal/services/telemetrylink/link/resource.go +++ b/stackit/internal/services/telemetrylink/link/resource.go @@ -174,8 +174,9 @@ func (r *telemetryLinkResource) Schema(_ context.Context, _ resource.SchemaReque Description: schemaDescriptions["display_name"], Required: true, Validators: []validator.String{ + stringvalidator.LengthBetween(1, 32), stringvalidator.RegexMatches( - regexp.MustCompile(`^[a-zA-Z0-9][a-zA-Z0-9\-\ ]*$`), + regexp.MustCompile(`^[a-zA-Z0-9][a-zA-Z0-9 \-]*$`), "The display name must start with an alphanumeric character and can only contain letters, numbers, spaces, and hyphens.", ), }, @@ -184,10 +185,11 @@ func (r *telemetryLinkResource) Schema(_ context.Context, _ resource.SchemaReque Description: schemaDescriptions["description"], Optional: true, Validators: []validator.String{ - stringvalidator.RegexMatches( - regexp.MustCompile(`^[a-zA-Z0-9][a-zA-Z0-9\-\ ]*$`), - "The description must start with an alphanumeric character and can only contain letters, numbers, spaces, and hyphens.", - ), + stringvalidator.LengthAtMost(1024), + stringvalidator.RegexMatches( + regexp.MustCompile(`^([a-zA-Z0-9][a-zA-Z0-9 \-]*)?$`), + "The description must start with an alphanumeric character and can only contain letters, numbers, spaces, and hyphens.", + ), }, }, "region": schema.StringAttribute{ diff --git a/stackit/internal/services/telemetryrouter/accesstoken/resource.go b/stackit/internal/services/telemetryrouter/accesstoken/resource.go index 4b50c427a..6ff3f69d7 100644 --- a/stackit/internal/services/telemetryrouter/accesstoken/resource.go +++ b/stackit/internal/services/telemetryrouter/accesstoken/resource.go @@ -5,6 +5,7 @@ import ( "errors" "fmt" "net/http" + "regexp" "strings" "time" @@ -14,6 +15,7 @@ import ( "github.com/hashicorp/terraform-plugin-framework/resource/schema/int32planmodifier" "github.com/hashicorp/terraform-plugin-framework/resource/schema/planmodifier" "github.com/hashicorp/terraform-plugin-framework/resource/schema/stringplanmodifier" + "github.com/hashicorp/terraform-plugin-framework-validators/stringvalidator" "github.com/hashicorp/terraform-plugin-framework/schema/validator" "github.com/hashicorp/terraform-plugin-framework/types" "github.com/hashicorp/terraform-plugin-log/tflog" @@ -172,6 +174,13 @@ func (r *telemetryRouterAccessTokenResource) Schema(_ context.Context, _ resourc "display_name": schema.StringAttribute{ Description: schemaDescriptions["display_name"], Required: true, + Validators: []validator.String{ + stringvalidator.LengthBetween(1, 32), + stringvalidator.RegexMatches( + regexp.MustCompile(`^[a-zA-Z0-9][a-zA-Z0-9 \-]*$`), + "must start with an alphanumeric character and contain only alphanumeric characters, spaces, and hyphens", + ), + }, }, "region": schema.StringAttribute{ Description: schemaDescriptions["region"], @@ -185,6 +194,9 @@ func (r *telemetryRouterAccessTokenResource) Schema(_ context.Context, _ resourc "description": schema.StringAttribute{ Description: schemaDescriptions["description"], Optional: true, + Validators: []validator.String{ + stringvalidator.LengthAtMost(1024), + }, }, "ttl": schema.Int32Attribute{ Description: schemaDescriptions["ttl"], diff --git a/stackit/internal/services/telemetryrouter/destination/resource.go b/stackit/internal/services/telemetryrouter/destination/resource.go index 692ee7648..7d975f5f5 100644 --- a/stackit/internal/services/telemetryrouter/destination/resource.go +++ b/stackit/internal/services/telemetryrouter/destination/resource.go @@ -5,6 +5,7 @@ import ( "errors" "fmt" "net/http" + "regexp" "strings" "time" @@ -293,6 +294,13 @@ func (r *telemetryRouterDestinationResource) Schema(_ context.Context, _ resourc "display_name": schema.StringAttribute{ Description: schemaDescriptions["display_name"], Required: true, + Validators: []validator.String{ + stringvalidator.LengthBetween(1, 32), + stringvalidator.RegexMatches( + regexp.MustCompile(`^[a-zA-Z0-9][a-zA-Z0-9 \-]*$`), + "must start with an alphanumeric character and contain only alphanumeric characters, spaces, and hyphens", + ), + }, }, "config": schema.SingleNestedAttribute{ Description: schemaDescriptions["config"], @@ -420,6 +428,9 @@ func (r *telemetryRouterDestinationResource) Schema(_ context.Context, _ resourc "description": schema.StringAttribute{ Description: schemaDescriptions["description"], Optional: true, + Validators: []validator.String{ + stringvalidator.LengthAtMost(1024), + }, }, "creation_time": schema.StringAttribute{ Description: schemaDescriptions["creation_time"], diff --git a/stackit/internal/services/telemetryrouter/instance/resource.go b/stackit/internal/services/telemetryrouter/instance/resource.go index 2ae17edc0..dff547b79 100644 --- a/stackit/internal/services/telemetryrouter/instance/resource.go +++ b/stackit/internal/services/telemetryrouter/instance/resource.go @@ -5,6 +5,7 @@ import ( "errors" "fmt" "net/http" + "regexp" "strings" "time" @@ -195,6 +196,13 @@ func (r *telemetryRouterInstanceResource) Schema(_ context.Context, _ resource.S "display_name": schema.StringAttribute{ Description: schemaDescriptions["display_name"], Required: true, + Validators: []validator.String{ + stringvalidator.LengthBetween(1, 32), + stringvalidator.RegexMatches( + regexp.MustCompile(`^[a-zA-Z0-9][a-zA-Z0-9 \-]*$`), + "must start with an alphanumeric character and contain only alphanumeric characters, spaces, and hyphens", + ), + }, }, "region": schema.StringAttribute{ Description: schemaDescriptions["region"], @@ -208,6 +216,9 @@ func (r *telemetryRouterInstanceResource) Schema(_ context.Context, _ resource.S "description": schema.StringAttribute{ Description: schemaDescriptions["description"], Optional: true, + Validators: []validator.String{ + stringvalidator.LengthAtMost(1024), + }, }, "filter": schema.SingleNestedAttribute{ Description: schemaDescriptions["filter"],