Allow underscore on stack labels and values for labels. (#2379)

Author: nachogiljaldo

docs/data-sources/cloud_stack.md

@@ -59,7 +59,7 @@ available at “https://<stack_slug>.grafana.net".
 - `graphite_user_id` (Number)
 - `id` (String) The stack id assigned to this stack by Grafana.
 - `influx_url` (String) Base URL of the InfluxDB instance configured for this stack. The username is the same as the metrics' (`prometheus_user_id` attribute of this resource). See https://grafana.com/docs/grafana-cloud/send-data/metrics/metrics-influxdb/push-from-telegraf/ for docs on how to use this.
-- `labels` (Map of String) A map of labels to assign to the stack. Label keys and values must match the following regexp: "^[a-zA-Z0-9/\\-.]+$" and stacks cannot have more than 10 labels.
+- `labels` (Map of String) A map of labels to assign to the stack. Label keys and values must match the following regexp: "^[a-zA-Z0-9/\\-._]+$" and stacks cannot have more than 10 labels.
 - `logs_ip_allow_list_cname` (String) Comma-separated list of CNAMEs that can be whitelisted to access the Logs instance (Optional)
 - `logs_name` (String)
 - `logs_private_connectivity_info_private_dns` (String) Private DNS for Logs when using AWS PrivateLink (only for AWS stacks)

docs/resources/cloud_stack.md

@@ -41,7 +41,7 @@ resource "grafana_cloud_stack" "test" {
 
 - `delete_protection` (Boolean) Whether to enable delete protection for the stack, preventing accidental deletion. Defaults to `true`.
 - `description` (String) Description of stack.
-- `labels` (Map of String) A map of labels to assign to the stack. Label keys and values must match the following regexp: "^[a-zA-Z0-9/\\-.]+$" and stacks cannot have more than 10 labels.
+- `labels` (Map of String) A map of labels to assign to the stack. Label keys and values must match the following regexp: "^[a-zA-Z0-9/\\-._]+$" and stacks cannot have more than 10 labels.
 - `region_slug` (String) Region slug to assign to this stack. Changing region will destroy the existing stack and create a new one in the desired region. Use the region list API to get the list of available regions: https://grafana.com/docs/grafana-cloud/developer-resources/api-reference/cloud-api/#list-regions.
 - `url` (String) Custom URL for the Grafana instance. Must have a CNAME setup to point to `.grafana.net` before creating the stack
 - `wait_for_readiness` (Boolean) Whether to wait for readiness of the stack after creating it. The check is a HEAD request to the stack URL (Grafana instance). Defaults to `true`.

internal/resources/cloud/resource_cloud_stack.go

@@ -23,7 +23,7 @@ import (
 const defaultReadinessTimeout = time.Minute * 5
 
 var (
-	stackLabelRegex = regexp.MustCompile(`^[a-zA-Z0-9/\-.]+$`)
+	stackLabelRegex = regexp.MustCompile(`^[a-zA-Z0-9/\-._]+$`)
 	stackSlugRegex  = regexp.MustCompile(`^[a-z][a-z0-9]+$`)
 	resourceStackID = common.NewResourceID(common.StringIDField("stackSlugOrID"))
 )

internal/resources/cloud/resource_cloud_stack_test.go

@@ -176,10 +176,10 @@ func TestResourceStack_Invalid(t *testing.T) {
 					name = "test"
 					slug = "test"
 					labels = {
-						invalid_key = "true" // Can't have an underscore
+						"invalid_key!" = "true" // Can't have an underscore
 					}
 				}`,
-				ExpectError: regexp.MustCompile(`Error: label key "invalid_key" does not match .+"`),
+				ExpectError: regexp.MustCompile(`Error: label key "invalid_key!" does not match .+"`),
 			},
 			{
 				Config: `resource "grafana_cloud_stack" "test" {