Update tests

Author: tlimoncelli

integrationTest/helpers_integration_test.go

@@ -404,9 +404,14 @@ func dname(name, target string) *models.RecordConfig {
 }
 
 func ds(name string, keyTag uint16, algorithm, digestType uint8, digest string) *models.RecordConfig {
-	r := makeRec(name, "", "DS")
-	panicOnErr(r.SetTargetDS(keyTag, algorithm, digestType, digest))
-	return r
+	rec, err := rtypecontrol.NewRecordConfigFromRaw(rtypecontrol.FromRawOpts{
+		Type: "DS",
+		TTL:  300,
+		Args: []any{name, keyTag, algorithm, digestType, digest},
+		DCN:  globalDCN,
+	})
+	panicOnErr(err)
+	return rec
 }
 
 func dnskey(name string, flags uint16, protocol, algorithm uint8, publicKey string) *models.RecordConfig {

pkg/rtype/ds.go

@@ -0,0 +1,61 @@
+package rtype
+
+import (
+	"fmt"
+
+	"github.com/StackExchange/dnscontrol/v4/models"
+	"github.com/StackExchange/dnscontrol/v4/pkg/domaintags"
+	"github.com/StackExchange/dnscontrol/v4/pkg/rtypecontrol"
+	"github.com/miekg/dns"
+)
+
+func init() {
+	rtypecontrol.Register(&DS{})
+}
+
+// DS RR.
+type DS struct {
+	dns.DS
+}
+
+// Name returns the DNS record type as a string.
+func (handle *DS) Name() string {
+	return "DS"
+}
+
+// FromArgs fills in the RecordConfig from []any, which is typically from a parsed config file.
+func (handle *DS) FromArgs(dcn *domaintags.DomainNameVarieties, rec *models.RecordConfig, args []any) error {
+	if err := rtypecontrol.PaveArgs(args[1:], "wbbs"); err != nil {
+		return fmt.Errorf("ERROR: (%s) [DS(%q, %v)]: %w",
+			rec.FilePos,
+			rec.Name, rtypecontrol.StringifyQuoted(args[1:]),
+			err)
+	}
+	fields := &DS{
+		dns.DS{
+			KeyTag:     args[1].(uint16),
+			Algorithm:  args[2].(uint8),
+			DigestType: args[3].(uint8),
+			Digest:     args[4].(string),
+		},
+	}
+
+	return handle.FromStruct(dcn, rec, args[0].(string), fields)
+}
+
+// FromStruct fills in the RecordConfig from a struct, typically from an API response.
+func (handle *DS) FromStruct(dcn *domaintags.DomainNameVarieties, rec *models.RecordConfig, name string, fields any) error {
+	rec.F = fields
+
+	rec.ZonefilePartial = rec.GetTargetRFC1035Quoted()
+	rec.Comparable = rec.ZonefilePartial
+
+	handle.CopyToLegacyFields(rec)
+	return nil
+}
+
+// CopyToLegacyFields populates the legacy fields of the RecordConfig using the fields in .F.
+func (handle *DS) CopyToLegacyFields(rec *models.RecordConfig) {
+	ds := rec.F.(*DS)
+	_ = rec.SetTargetDS(ds.KeyTag, ds.Algorithm, ds.DigestType, ds.Digest)
+}