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

Do some cleanup for AzureDNS code (#551)

Browse Source
This commit is contained in:
Vatsalya Goel
2019-12-10 05:51:23 +11:00
committed by Craig Peterson
parent 0f396cd135
commit df3adef5ec
2 changed files with 6 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
docs/provider-list.md
View File

@ -70,6 +70,7 @@ Maintainers of contributed providers:
* ns1 @captncraig * ns1 @captncraig
* OVH @masterzen * OVH @masterzen
* Vultr @geek1011 * Vultr @geek1011
* Azure DNS @vatsalyagoel
### Requested providers ### Requested providers

36
providers/azuredns/azureDnsProvider.go
View File

@ -157,7 +157,7 @@ func (a *azureDnsProvider) GetDomainCorrections(dc *models.DomainConfig) ([]*mod
if len(recs) == 0 { if len(recs) == 0 {
var rrset *adns.RecordSet var rrset *adns.RecordSet
for _, r := range records { for _, r := range records {
if strings.TrimSuffix(*r.RecordSetProperties.Fqdn, ".") == k.NameFQDN && azureRecordToRecordType(r.Type) == nativeToRecordType(to.StringPtr(k.Type)) { if strings.TrimSuffix(*r.RecordSetProperties.Fqdn, ".") == k.NameFQDN && nativeToRecordType(r.Type) == nativeToRecordType(to.StringPtr(k.Type)) {
rrset = r rrset = r
break break
} }
@ -169,7 +169,7 @@ func (a *azureDnsProvider) GetDomainCorrections(dc *models.DomainConfig) ([]*mod
F: func() error { F: func() error {
ctx, cancel := context.WithTimeout(context.Background(), 6000*time.Second) ctx, cancel := context.WithTimeout(context.Background(), 6000*time.Second)
defer cancel() defer cancel()
_, err := a.recordsClient.Delete(ctx, *a.resourceGroup, *zone.Name, *rrset.Name, azureRecordToRecordType(rrset.Type), "") _, err := a.recordsClient.Delete(ctx, *a.resourceGroup, *zone.Name, *rrset.Name, nativeToRecordType(rrset.Type), "")
// Artifically slow things down after a delete, as the API can take time to register it. The tests fail if we delete and then recheck too quickly. // Artifically slow things down after a delete, as the API can take time to register it. The tests fail if we delete and then recheck too quickly.
time.Sleep(25 * time.Millisecond) time.Sleep(25 * time.Millisecond)
if err != nil { if err != nil {
@ -191,7 +191,7 @@ func (a *azureDnsProvider) GetDomainCorrections(dc *models.DomainConfig) ([]*mod
} }
for _, r := range records { for _, r := range records {
existingRecordType := azureRecordToRecordType(r.Type) existingRecordType := nativeToRecordType(r.Type)
changedRecordType := nativeToRecordType(to.StringPtr(k.Type)) changedRecordType := nativeToRecordType(to.StringPtr(k.Type))
if strings.TrimSuffix(*r.RecordSetProperties.Fqdn, ".") == k.NameFQDN && (changedRecordType == adns.CNAME || existingRecordType == adns.CNAME) { if strings.TrimSuffix(*r.RecordSetProperties.Fqdn, ".") == k.NameFQDN && (changedRecordType == adns.CNAME || existingRecordType == adns.CNAME) {
if existingRecordType == adns.A || existingRecordType == adns.AAAA || changedRecordType == adns.A || changedRecordType == adns.AAAA { //CNAME cannot coexist with an A or AA if existingRecordType == adns.A || existingRecordType == adns.AAAA || changedRecordType == adns.A || changedRecordType == adns.AAAA { //CNAME cannot coexist with an A or AA
@ -235,7 +235,8 @@ func (a *azureDnsProvider) GetDomainCorrections(dc *models.DomainConfig) ([]*mod
} }
func nativeToRecordType(recordType *string) adns.RecordType { func nativeToRecordType(recordType *string) adns.RecordType {
switch *recordType { recordTypeStripped := strings.TrimPrefix(*recordType, "Microsoft.Network/dnszones/")
switch recordTypeStripped {
case "A": case "A":
return adns.A return adns.A
case "AAAA": case "AAAA":
@ -261,33 +262,6 @@ func nativeToRecordType(recordType *string) adns.RecordType {
} }
} }
func azureRecordToRecordType(recordType *string) adns.RecordType {
switch *recordType {
case "Microsoft.Network/dnszones/A":
return adns.A
case "Microsoft.Network/dnszones/AAAA":
return adns.AAAA
case "Microsoft.Network/dnszones/CAA":
return adns.CAA
case "Microsoft.Network/dnszones/CNAME":
return adns.CNAME
case "Microsoft.Network/dnszones/MX":
return adns.MX
case "Microsoft.Network/dnszones/NS":
return adns.NS
case "Microsoft.Network/dnszones/PTR":
return adns.PTR
case "Microsoft.Network/dnszones/SRV":
return adns.SRV
case "Microsoft.Network/dnszones/TXT":
return adns.TXT
case "Microsoft.Network/dnszones/SOA":
return adns.SOA
default:
panic(errors.Errorf("rc.String rtype %v unimplemented", *recordType))
}
}
func nativeToRecords(set *adns.RecordSet, origin string) []*models.RecordConfig { func nativeToRecords(set *adns.RecordSet, origin string) []*models.RecordConfig {
var results []*models.RecordConfig var results []*models.RecordConfig
switch rtype := *set.Type; rtype { switch rtype := *set.Type; rtype {