mirror/stackexchange-dnscontrol
1
0
Fork 0
mirror of https://github.com/StackExchange/dnscontrol.git synced 2024-05-11 05:55:12 +00:00
Code Issues Releases Activity

VULTR: fix failing integration tests (#1956)

Browse Source
This commit is contained in:
Nicolas Lorin
2023-01-20 19:32:25 +01:00
committed by GitHub
parent 4d7a43d3df
commit 178ec45254
2 changed files with 17 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
providers/vultr/auditrecords.go
View File

@@ -19,5 +19,7 @@ func AuditRecords(records []*models.RecordConfig) []error {
a.Add("TXT", rejectif.TxtHasMultipleSegments)
a.Add("CAA", rejectif.CaaTargetContainsWhitespace) // Last verified 2023-01-19
return a.Audit(records)
}

27
providers/vultr/vultrProvider.go
View File

@@ -137,6 +137,16 @@ func (api *vultrProvider) GetDomainCorrections(dc *models.DomainConfig) ([]*mode
})
}
for _, mod := range modify {
r := toVultrRecord(dc, mod.Desired, mod.Existing.Original.(govultr.DomainRecord).ID)
corrections = append(corrections, &models.Correction{
Msg: fmt.Sprintf("%s; Vultr RecordID: %v", mod.String(), r.ID),
F: func() error {
return api.client.DomainRecord.Update(context.Background(), dc.Name, r.ID, &govultr.DomainRecordReq{Name: r.Name, Type: r.Type, Data: r.Data, TTL: r.TTL, Priority: &r.Priority})
},
})
}
for _, mod := range create {
r := toVultrRecord(dc, mod.Desired, "0")
corrections = append(corrections, &models.Correction{
@@ -148,16 +158,6 @@ func (api *vultrProvider) GetDomainCorrections(dc *models.DomainConfig) ([]*mode
})
}
for _, mod := range modify {
r := toVultrRecord(dc, mod.Desired, mod.Existing.Original.(govultr.DomainRecord).ID)
corrections = append(corrections, &models.Correction{
Msg: fmt.Sprintf("%s; Vultr RecordID: %v", mod.String(), r.ID),
F: func() error {
return api.client.DomainRecord.Update(context.Background(), dc.Name, r.ID, &govultr.DomainRecordReq{Name: r.Name, Type: r.Type, Data: r.Data, TTL: r.TTL, Priority: &r.Priority})
},
})
}
return corrections, nil
}
@@ -238,6 +238,9 @@ func toRecordConfig(domain string, r govultr.DomainRecord) (*models.RecordConfig
return rc, rc.SetTargetMX(uint16(r.Priority), data)
case "SRV":
// Vultr returns SRV records in the format "[weight] [port] [target]".
if !strings.HasSuffix(data, ".") {
data = data + "."
}
return rc, rc.SetTargetSRVPriorityString(uint16(r.Priority), data)
case "TXT":
// TXT records from Vultr are always surrounded by quotes.
@@ -264,7 +267,7 @@ func toVultrRecord(dc *models.DomainConfig, rc *models.RecordConfig, vultrID str
data := rc.GetTargetField()
// Vultr does not use a period suffix for CNAME, NS, or MX.
// Vultr does not use a period suffix for CNAME, NS, MX or SRV.
data = strings.TrimSuffix(data, ".")
priority := 0
@@ -286,7 +289,7 @@ func toVultrRecord(dc *models.DomainConfig, rc *models.RecordConfig, vultrID str
}
switch rtype := rc.Type; rtype { // #rtype_variations
case "SRV":
r.Data = fmt.Sprintf("%v %v %s", rc.SrvWeight, rc.SrvPort, rc.GetTargetField())
r.Data = fmt.Sprintf("%v %v %s", rc.SrvWeight, rc.SrvPort, data)
case "CAA":
r.Data = fmt.Sprintf(`%v %s "%s"`, rc.CaaFlag, rc.CaaTag, rc.GetTargetField())
case "SSHFP":