TrueCloudLab/coredns
16
0
Fork 2
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions

fix record missing for zone with many of records (#4328)

Browse source 
* fix record missing for zone with many of records

* Update debug log

* Update debug mesg

* update test_clouddns
This commit is contained in:
luanphantiki 2021-01-12 19:38:18 +07:00 • committed by GitHub
parent 0f307cf728
commit ed891c5c4e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 18 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

2
plugin/clouddns/clouddns.go
View file

@ -189,7 +189,7 @@ func (h *CloudDNS) updateZones(ctx context.Context) error {
for i, hostedZone := range z {
newZ := file.NewZone(zName, "")
newZ.Upstream = h.upstream
rrListResponse, err = h.client.listRRSets(hostedZone.projectName, hostedZone.zoneName)
rrListResponse, err = h.client.listRRSets(ctx, hostedZone.projectName, hostedZone.zoneName)
if err != nil {
err = fmt.Errorf("failed to list resource records for %v:%v:%v from gcp: %v", zName, hostedZone.projectName, hostedZone.zoneName, err)
return

2
plugin/clouddns/clouddns_test.go
View file

@ -24,7 +24,7 @@ func (c fakeGCPClient) zoneExists(projectName, hostedZoneName string) error {
return nil
}
func (c fakeGCPClient) listRRSets(projectName, hostedZoneName string) (*gcp.ResourceRecordSetsListResponse, error) {
func (c fakeGCPClient) listRRSets(ctx context.Context, projectName, hostedZoneName string) (*gcp.ResourceRecordSetsListResponse, error) {
if projectName == "bad-project" || hostedZoneName == "bad-zone" {
return nil, errors.New("the 'parameters.managedZone' resource named 'bad-zone' does not exist")
}

22
plugin/clouddns/gcp.go
View file

@ -1,10 +1,14 @@
package clouddns
import gcp "google.golang.org/api/dns/v1"
import (
"context"
gcp "google.golang.org/api/dns/v1"
)
type gcpDNS interface {
zoneExists(projectName, hostedZoneName string) error
listRRSets(projectName, hostedZoneName string) (*gcp.ResourceRecordSetsListResponse, error)
listRRSets(ctx context.Context, projectName, hostedZoneName string) (*gcp.ResourceRecordSetsListResponse, error)
}
type gcpClient struct {
@ -23,10 +27,16 @@ func (c gcpClient) zoneExists(projectName, hostedZoneName string) error {
// listRRSets is a wrapper method around `gcp.Service.ResourceRecordSets.List`
// it fetches and returns the record sets for a hosted zone.
func (c gcpClient) listRRSets(projectName, hostedZoneName string) (*gcp.ResourceRecordSetsListResponse, error) {
rr, err := c.ResourceRecordSets.List(projectName, hostedZoneName).Do()
if err != nil {
func (c gcpClient) listRRSets(ctx context.Context, projectName, hostedZoneName string) (*gcp.ResourceRecordSetsListResponse, error) {
req := c.ResourceRecordSets.List(projectName, hostedZoneName)
var rs []*gcp.ResourceRecordSet
if err := req.Pages(ctx, func(page *gcp.ResourceRecordSetsListResponse) error {
for _, rr := range page.Rrsets {
rs = append(rs, rr)
}
return nil
}); err != nil {
return nil, err
}
return rr, nil
return &gcp.ResourceRecordSetsListResponse{Rrsets: rs}, nil
}