StackExchange/dnscontrol
1
1
Fork 0
mirror of https://github.com/StackExchange/dnscontrol.git synced 2025-09-06 13:14:25 +08:00
Code Issues Projects Releases Packages Wiki Activity

AZURE: Bug: Wrong domain updated in query (#615)

Browse source
This commit is contained in:
Vatsalya Goel 2020-02-06 10:19:24 +11:00 • committed by GitHub
parent 891c4162df
commit 450accf0a5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
providers/azuredns/azureDnsProvider.go
View file

@ -121,8 +121,9 @@ func (a *azureDnsProvider) GetDomainCorrections(dc *models.DomainConfig) ([]*mod
if !ok { if !ok {
return nil, errNoExist{dc.Name} return nil, errNoExist{dc.Name}
} }
var zoneName string
records, err := a.fetchRecordSets(zone.Name) zoneName = *zone.Name
records, err := a.fetchRecordSets(zoneName)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@ -168,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, nativeToRecordType(rrset.Type), "") _, err := a.recordsClient.Delete(ctx, *a.resourceGroup, zoneName, *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 {
@ -200,7 +201,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, recordName, existingRecordType, "") _, err := a.recordsClient.Delete(ctx, *a.resourceGroup, zoneName, recordName, existingRecordType, "")
// 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 {
@ -219,7 +220,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.CreateOrUpdate(ctx, *a.resourceGroup, *zone.Name, recordName, recordType, *rrset, "", "") _, err := a.recordsClient.CreateOrUpdate(ctx, *a.resourceGroup, zoneName, recordName, recordType, *rrset, "", "")
// 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 {
@ -394,14 +395,14 @@ func recordToNative(recordKey models.RecordKey, recordConfig []*models.RecordCon
return recordSet, nativeToRecordType(to.StringPtr(recordKey.Type)) return recordSet, nativeToRecordType(to.StringPtr(recordKey.Type))
} }
func (a *azureDnsProvider) fetchRecordSets(zoneName *string) ([]*adns.RecordSet, error) { func (a *azureDnsProvider) fetchRecordSets(zoneName string) ([]*adns.RecordSet, error) {
if zoneName == nil || *zoneName == "" { if zoneName == "" {
return nil, nil return nil, nil
} }
var records []*adns.RecordSet var records []*adns.RecordSet
ctx, cancel := context.WithTimeout(context.Background(), 6000*time.Second) ctx, cancel := context.WithTimeout(context.Background(), 6000*time.Second)
defer cancel() defer cancel()
recordsIterator, recordsErr := a.recordsClient.ListAllByDNSZoneComplete(ctx, *a.resourceGroup, *zoneName, to.Int32Ptr(1000), "") recordsIterator, recordsErr := a.recordsClient.ListAllByDNSZoneComplete(ctx, *a.resourceGroup, zoneName, to.Int32Ptr(1000), "")
if recordsErr != nil { if recordsErr != nil {
return nil, recordsErr return nil, recordsErr
} }