Allow underscore in redirects but not certificates (HTTP only) (#339)

CHANGELOG.md

@@ -1,3 +1,7 @@
+## 2.5.1 (February 5, 2025)
+ENHANCEMENTS
+* Allow underscore for non-HTTPS redirects
+
 ## 2.5.0 (December 13, 2024)
 ENHANCEMENTS
 * Adds support for alert endpoints

ns1/config.go

@@ -19,7 +19,7 @@ import (
 )
 
 var (
-	clientVersion     = "2.5.0"
+	clientVersion     = "2.5.1"
 	providerUserAgent = "tf-ns1" + "/" + clientVersion
 	defaultRetryMax   = 3
 )

ns1/resource_redirect.go

@@ -338,7 +338,7 @@ func RedirectCertUpdate(d *schema.ResourceData, meta interface{}) error {
 func validateDomain(val interface{}, key string) (warns []string, errs []error) {
 	v := val.(string)
 
-	match, err := regexp.MatchString("^(\\*\\.)?([a-zA-Z0-9-]{1,63}\\.)+[a-zA-Z0-9-]{0,62}[a-zA-Z0-9]$", v)
+	match, err := regexp.MatchString("^(\\*\\.)?([a-zA-Z0-9-_]{1,63}\\.)+[a-zA-Z0-9-]{0,62}[a-zA-Z0-9]$", v)
 	if err != nil {
 		errs = append(errs, fmt.Errorf("%s is invalid, got: %s, error: %e", key, v, err))
 	}

ns1/resource_redirect_test.go

@@ -148,6 +148,31 @@ func TestAccRedirectConfig_https_to_http(t *testing.T) {
 	})
 }
 
+func TestAccRedirectConfig_with_underscore(t *testing.T) {
+	var redirect redirect.Configuration
+	rString := acctest.RandStringFromCharSet(15, acctest.CharSetAlphaNum)
+	domainName := fmt.Sprintf("terraform-test-%s.io", rString)
+
+	resource.Test(t, resource.TestCase{
+		PreCheck:     func() { testAccPreCheck(t); testAccRedirectPreCheck(t) },
+		Providers:    testAccProviders,
+		CheckDestroy: testAccCheckRedirectDestroy,
+		Steps: []resource.TestStep{
+			{
+				Config: testAccRedirectHTTPWithUnderscore(rString),
+				Check: resource.ComposeTestCheckFunc(
+					testAccCheckRedirectConfigExists("ns1_redirect.it", &redirect),
+					testAccCheckRedirectConfigDomain(&redirect, "test_with_underscore."+domainName),
+					testAccCheckRedirectConfigFwType(&redirect, "permanent"),
+					testAccCheckRedirectConfigTags(&redirect, []string{}),
+					testAccCheckRedirectConfigHTTPS(&redirect, false),
+					testAccCheckRedirectConfigCertIdPresent(&redirect, false),
+				),
+			},
+		},
+	})
+}
+
 func TestAccRedirectConfig_remoteChanges(t *testing.T) {
 	var redirect redirect.Configuration
 	rString := acctest.RandStringFromCharSet(15, acctest.CharSetAlphaNum)
@@ -273,6 +298,24 @@ resource "ns1_zone" "test" {
 `, rString)
 }
 
+func testAccRedirectHTTPWithUnderscore(rString string) string {
+	return fmt.Sprintf(`
+resource "ns1_redirect" "it" {
+  domain           = "test_with_underscore.${ns1_zone.test.zone}"
+  path             = "/from/path/*"
+  target           = "https://url.com/target/path"
+  forwarding_mode  = "all"
+  forwarding_type  = "permanent"
+  https_forced     = false
+  tags             = [ ]
+}
+
+resource "ns1_zone" "test" {
+  zone = "terraform-test-%s.io"
+}
+`, rString)
+}
+
 func testAccCheckRedirectDestroy(s *terraform.State) error {
 	client := testAccProvider.Meta().(*ns1.Client)