Add support for multiple TXT RDATA (#368)

* Add support for multiple TXT RDATA

* Remove zone from test as it doesn't resolve the error

* Change to using an extra answer field

* Minor change to changelog

* Add doc

Author: fformica

CHANGELOG.md

@@ -1,3 +1,9 @@
+## 2.8.0 (Unreleased)
+ENHANCEMENTS
+* Add a new record answer field to specify multiple parts directly
+BUGFIX
+* Fix zones not specifying networks not being created as managed
+
 ## 2.7.3 (November 25, 2025)
 BUGFIX
 * Fix zone create with empty networks field

ns1/config.go

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

ns1/resource_record.go

@@ -122,8 +122,15 @@ It is suggested to migrate to a regular "answers" block. Using Terraform 0.12+,
 				Elem: &schema.Resource{
 					Schema: map[string]*schema.Schema{
 						"answer": {
-							Type:     schema.TypeString,
-							Optional: true,
+							Type:        schema.TypeString,
+							Optional:    true,
+							Description: "A single RDATA. This field cannot be set together with `answer_parts`",
+						},
+						"answer_parts": {
+							Type:        schema.TypeList,
+							Optional:    true,
+							Elem:        &schema.Schema{Type: schema.TypeString},
+							Description: "A list of individual RDATA fields. This field cannot be set together with `answer`",
 						},
 						"region": {
 							Type:     schema.TypeString,
@@ -310,8 +317,10 @@ func recordToResourceData(d *schema.ResourceData, r *dns.Record) error {
 	if len(r.Answers) > 0 {
 		ans := make([]map[string]interface{}, 0)
 		log.Printf("Got back from ns1 answers: %+v", r.Answers)
-		for _, answer := range r.Answers {
-			ans = append(ans, answerToMap(*answer))
+
+		stateAnswers := d.Get("answers").([]interface{})
+		for i, answer := range r.Answers {
+			ans = append(ans, answerToMap(*answer, i, stateAnswers, r.Type))
 		}
 		log.Printf("Setting answers %+v", ans)
 		err := d.Set("answers", ans)
@@ -355,9 +364,28 @@ func recordMapValueToString(configMap map[string]interface{}) map[string]interfa
 	return config
 }
 
-func answerToMap(a dns.Answer) map[string]interface{} {
+// answerToMap converts an answer to a terraform state map
+func answerToMap(a dns.Answer, index int, stateAnswers []any, rType string) map[string]any {
 	m := make(map[string]interface{})
-	m["answer"] = strings.Join(a.Rdata, " ")
+
+	// decide whether to use "answer" or "answer_parts" based on the current state, preferring the first if not available
+	useAnswerParts := false
+	if index < len(stateAnswers) {
+		if existingAnswer, ok := stateAnswers[index].(map[string]any); ok {
+			if answerParts, ok := existingAnswer["answer_parts"].([]any); ok && len(answerParts) > 0 {
+				useAnswerParts = true
+			}
+		}
+	} else if rType == "TXT" && len(a.Rdata) > 1 {
+		useAnswerParts = true
+	}
+
+	if useAnswerParts {
+		m["answer_parts"] = a.Rdata
+	} else {
+		m["answer"] = strings.Join(a.Rdata, " ")
+	}
+
 	if a.RegionName != "" {
 		m["region"] = a.RegionName
 	}
@@ -394,14 +422,37 @@ func resourceDataToRecord(r *dns.Record, d *schema.ResourceData) error {
 				answer := answerRaw.(map[string]interface{})
 				var a *dns.Answer
 
-				v := answer["answer"].(string)
-				switch d.Get("type") {
-				case "TXT", "SPF":
-					a = dns.NewTXTAnswer(v)
-				case "CAA":
-					a = dns.NewAnswer(strings.SplitN(v, " ", 3))
-				default:
-					a = dns.NewAnswer(strings.Split(v, " "))
+				// check for mutual exclusivity between answer and answer_parts
+				hasAnswer := false
+				hasAnswerParts := false
+				if v, ok := answer["answer"].(string); ok && v != "" {
+					hasAnswer = true
+				}
+				if answerParts, ok := answer["answer_parts"].([]interface{}); ok && len(answerParts) > 0 {
+					hasAnswerParts = true
+				}
+				if hasAnswer && hasAnswerParts {
+					return errors.New("cannot specify both 'answer' and 'answer_parts' in the same answers block")
+				}
+
+				if hasAnswerParts {
+					answerParts := answer["answer_parts"].([]interface{})
+					parts := make([]string, len(answerParts))
+					for i, part := range answerParts {
+						parts[i] = part.(string)
+					}
+					a = dns.NewAnswer(parts)
+
+				} else {
+					v := answer["answer"].(string)
+					switch d.Get("type") {
+					case "TXT", "SPF":
+						a = dns.NewTXTAnswer(v)
+					case "CAA":
+						a = dns.NewAnswer(strings.SplitN(v, " ", 3))
+					default:
+						a = dns.NewAnswer(strings.Split(v, " "))
+					}
 				}
 
 				if v, ok := answer["region"]; ok {

ns1/resource_record_test.go

@@ -506,7 +506,7 @@ func TestAccRecord_CAA(t *testing.T) {
 				Config: testAccRecordCAA(rString),
 				Check: resource.ComposeTestCheckFunc(
 					testAccCheckRecordExists("ns1_record.caa", &record),
-					testAccCheckRecordDomain(&record, zoneName),
+					testAccCheckRecordDomain(&record, "caa."+zoneName),
 					testAccCheckRecordTTL(&record, 3600),
 					testAccCheckRecordUseClientSubnet(&record, true),
 					testAccCheckRecordAnswerRdata(
@@ -520,7 +520,7 @@ func TestAccRecord_CAA(t *testing.T) {
 			{
 				ResourceName:      "ns1_record.caa",
 				ImportState:       true,
-				ImportStateId:     fmt.Sprintf("%[1]s/%[1]s/CAA", zoneName),
+				ImportStateId:     fmt.Sprintf("%s/%s/CAA", zoneName, "caa."+zoneName),
 				ImportStateVerify: true,
 			},
 			{
@@ -642,8 +642,9 @@ func TestAccRecord_validationError(t *testing.T) {
 				ExpectError: regexp.MustCompile(`(?s)(Error: (zone|domain) has an invalid (leading|trailing) "\.", got: .*){4}`),
 			},
 			{
-				Config:      testAccRecordNoAnswers(rString),
-				ExpectError: regexp.MustCompile(`Invalid body`),
+				Config: testAccRecordNoAnswers(rString),
+				// seems to have changed, was: ExpectError: regexp.MustCompile(`Invalid body`),
+				ExpectError: regexp.MustCompile(`404 zone not found`),
 			},
 		},
 	})
@@ -1113,6 +1114,70 @@ func TestAccRecord_Link(t *testing.T) {
 	})
 }
 
+func TestAccRecord_TXT(t *testing.T) {
+	var record dns.Record
+	rString := acctest.RandStringFromCharSet(15, acctest.CharSetAlphaNum)
+	zoneName := fmt.Sprintf("terraform-test-%s.io", rString)
+	domainName := fmt.Sprintf("txt-test.%s", zoneName)
+
+	resource.Test(t, resource.TestCase{
+		PreCheck:     func() { testAccPreCheck(t) },
+		Providers:    testAccProviders,
+		CheckDestroy: testAccCheckRecordDestroy,
+		Steps: []resource.TestStep{
+			{
+				Config:      testAccRecordTXTWithBothFields(rString),
+				ExpectError: regexp.MustCompile("cannot specify both 'answer' and 'answer_parts'"),
+			},
+			{
+				Config: testAccRecordTXTWithAnswerParts(rString),
+				Check: resource.ComposeTestCheckFunc(
+					testAccCheckRecordExists("ns1_record.txt_test", &record),
+					testAccCheckRecordDomain(&record, domainName),
+					testAccCheckRecordTTL(&record, 300),
+					testAccCheckRecordAnswerRdata(
+						t, &record, 0, []string{"foo", "bar", "qux"},
+					),
+				),
+			},
+			{
+				Config: testAccRecordTXTWithAnswer(rString),
+				Check: resource.ComposeTestCheckFunc(
+					testAccCheckRecordExists("ns1_record.txt_test", &record),
+					testAccCheckRecordDomain(&record, domainName),
+					testAccCheckRecordTTL(&record, 300),
+					testAccCheckRecordAnswerRdata(
+						t, &record, 0, []string{"foo bar qux"},
+					),
+				),
+			},
+			{
+				ResourceName:      "ns1_record.txt_test",
+				ImportState:       true,
+				ImportStateId:     fmt.Sprintf("%s/%s/TXT", zoneName, domainName),
+				ImportStateVerify: true,
+			},
+			{
+				Config: testAccRecordTXTWithAnswerPartsUpdated(rString),
+				Check: resource.ComposeTestCheckFunc(
+					testAccCheckRecordExists("ns1_record.txt_test", &record),
+					testAccCheckRecordDomain(&record, domainName),
+					testAccCheckRecordTTL(&record, 300),
+					testAccCheckRecordAnswerRdata(
+						t, &record, 0, []string{"foo", "bar", "baz", "qux"},
+					),
+				),
+			},
+			{
+				ResourceName:      "ns1_record.txt_test",
+				ImportState:       true,
+				ImportStateId:     fmt.Sprintf("%s/%s/TXT", zoneName, domainName),
+				ImportStateVerify: true,
+			},
+		},
+	})
+}
+
 func testAccCheckRecordExists(n string, record *dns.Record) resource.TestCheckFunc {
 	return func(s *terraform.State) error {
 		rs, ok := s.RootModule().Resources[n]
@@ -1717,11 +1782,11 @@ resource "ns1_record" "caa" {
   domain = "caa.${ns1_zone.test.zone}"
   type   = "CAA"
   ttl    = 3600
-  
+
   answers {
     answer = "0 issue \"letsencrypt.org\""
   }
-  
+
   answers {
     answer = "0 issuewild \";\""
   }
@@ -1745,7 +1810,7 @@ resource "ns1_record" "apl" {
 	answers {
 		answer = "1:127.0.0.0/16"
 	}
-	
+
 }
 `, zone, zone)
 }
@@ -2062,13 +2127,13 @@ func testAccRecordOPENPGPKEY(rString string) string {
 	resource "ns1_zone" "test" {
 	  zone = "terraform-test-%s.io"
 	}
-	
+
 	resource "ns1_record" "openpgpkey" {
 	  zone   = ns1_zone.test.zone
 	  domain = "openpgpkey.${ns1_zone.test.zone}"
 	  type   = "OPENPGPKEY"
 	  ttl    = 3600
-	
+
 	  answers {
 		answer = "abba"
 	  }
@@ -2208,6 +2273,83 @@ resource "ns1_zone" "test" {
 `, rString)
 }
 
+func testAccRecordTXTWithAnswerParts(rString string) string {
+	return fmt.Sprintf(`
+resource "ns1_record" "txt_test" {
+  zone              = "${ns1_zone.test.zone}"
+  domain            = "txt-test.${ns1_zone.test.zone}"
+  type              = "TXT"
+  ttl               = 300
+  use_client_subnet = "true"
+  answers {
+    answer_parts = ["foo", "bar", "qux"]
+  }
+}
+
+resource "ns1_zone" "test" {
+  zone = "terraform-test-%s.io"
+}
+`, rString)
+}
+
+func testAccRecordTXTWithAnswer(rString string) string {
+	return fmt.Sprintf(`
+resource "ns1_record" "txt_test" {
+  zone              = "${ns1_zone.test.zone}"
+  domain            = "txt-test.${ns1_zone.test.zone}"
+  type              = "TXT"
+  ttl               = 300
+  use_client_subnet = "true"
+  answers {
+    answer = "foo bar qux"
+  }
+}
+
+resource "ns1_zone" "test" {
+  zone = "terraform-test-%s.io"
+}
+`, rString)
+}
+
+func testAccRecordTXTWithAnswerPartsUpdated(rString string) string {
+	return fmt.Sprintf(`
+resource "ns1_record" "txt_test" {
+  zone              = "${ns1_zone.test.zone}"
+  domain            = "txt-test.${ns1_zone.test.zone}"
+  type              = "TXT"
+  ttl               = 300
+  use_client_subnet = "true"
+  answers {
+    answer_parts = ["foo", "bar", "baz", "qux"]
+  }
+}
+
+resource "ns1_zone" "test" {
+  zone = "terraform-test-%s.io"
+}
+`, rString)
+}
+
+func testAccRecordTXTWithBothFields(rString string) string {
+	return fmt.Sprintf(`
+resource "ns1_record" "txt_test" {
+  zone              = "${ns1_zone.test.zone}"
+  domain            = "txt-test.${ns1_zone.test.zone}"
+  type              = "TXT"
+  ttl               = 300
+  use_client_subnet = "true"
+  answers {
+    answer = "foo bar qux"
+    answer_parts = ["foo", "bar", "qux"]
+  }
+}
+
+resource "ns1_zone" "test" {
+  zone = "terraform-test-%s.io"
+}
+`, rString)
+}
+
 func TestRegionsMetaDiffSuppress(t *testing.T) {
 	metaKeys := []string{"georegion", "country", "us_state", "ca_province"}
 

website/docs/r/record.html.markdown

@@ -179,6 +179,8 @@ The following arguments are supported:
 
         answer = "v=DKIM1; k=rsa; p=XXXXXXXX"
 
+  Optionally, the individual parts of the answer can be expressed as a list in the field `answer_parts`.
+  Only one of `answer` or `answer_parts` can be specified.
 
 * `region` - (Optional) The region (Answer Group really) that this answer
   belongs to. This should be one of the names specified in `regions`. Only a