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

AZURE: Fixed bug related to having >100 Zones (#816)

Browse Source 
Resolves #792
This commit is contained in:
Sump Runlet
2020-08-18 21:13:08 +02:00
committed by GitHub
parent 960dc66bd2
commit 266f0b8f33
2 changed files with 36 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@@ -20,3 +20,4 @@ adzonedump.*
stack.sh
.idea/
*.nupkg
.DS_Store

38
providers/azuredns/azureDnsProvider.go
View File

@@ -73,6 +73,10 @@ func init() {
}
func (a *azureDNSProvider) getExistingZones() (*adns.ZoneListResult, error) {
// Please note — this function doesn't work with > 100 zones
// https://github.com/StackExchange/dnscontrol/issues/792
// Copied this code to getZones and ListZones and modified it for using a paging
// As a result getExistingZones is not used anymore
ctx, cancel := context.WithTimeout(context.Background(), 6000*time.Second)
defer cancel()
zonesIterator, zonesErr := a.zonesClient.ListByResourceGroupComplete(ctx, *a.resourceGroup, to.Int32Ptr(100))
@@ -86,17 +90,24 @@ func (a *azureDNSProvider) getExistingZones() (*adns.ZoneListResult, error) {
func (a *azureDNSProvider) getZones() error {
a.zones = make(map[string]*adns.Zone)
zonesResult, err := a.getExistingZones()
if err != nil {
return err
ctx, cancel := context.WithTimeout(context.Background(), 6000*time.Second)
defer cancel()
zonesIterator, zonesErr := a.zonesClient.ListByResourceGroup(ctx, *a.resourceGroup, to.Int32Ptr(100))
if zonesErr != nil {
fmt.Errorf("getZones: zonesErr %v", zonesErr.Error())
return zonesErr
}
// Check getExistingZones and https://github.com/StackExchange/dnscontrol/issues/792 for the details
for zonesIterator.NotDone() {
zonesResult := zonesIterator.Response()
for _, z := range *zonesResult.Value {
zone := z
domain := strings.TrimSuffix(*z.Name, ".")
a.zones[domain] = &zone
}
zonesIterator.NextWithContext(ctx)
}
return nil
}
@@ -125,18 +136,25 @@ func (a *azureDNSProvider) GetNameservers(domain string) ([]*models.Nameserver,
}
func (a *azureDNSProvider) ListZones() ([]string, error) {
zonesResult, err := a.getExistingZones()
if err != nil {
return nil, err
}
var zones []string
ctx, cancel := context.WithTimeout(context.Background(), 6000*time.Second)
defer cancel()
zonesIterator, zonesErr := a.zonesClient.ListByResourceGroup(ctx, *a.resourceGroup, to.Int32Ptr(100))
if zonesErr != nil {
fmt.Errorf("ListZones: zonesErr %v", zonesErr.Error())
return nil, zonesErr
}
// Check getExistingZones and https://github.com/StackExchange/dnscontrol/issues/792 for the details
for zonesIterator.NotDone() {
zonesResult := zonesIterator.Response()
for _, z := range *zonesResult.Value {
domain := strings.TrimSuffix(*z.Name, ".")
zones = append(zones, domain)
}
zonesIterator.NextWithContext(ctx)
}
return zones, nil
}