Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

specify --regex-domain-filter, alibaba provider cannot get any records #3073

Merged
merged 2 commits into from
Feb 8, 2023
Merged

specify --regex-domain-filter, alibaba provider cannot get any records #3073

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9d0a508
specify --regex-domain-filter, provider cannot get any records
stan-chen Oct 9, 2022
29ce78d
Merge branch 'master' into fix-alibaba-domain-filter
stan-chen Nov 6, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
57 changes: 19 additions & 38 deletions provider/alibabacloud/alibaba_cloud.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -389,6 +389,7 @@ func (p *AlibabaCloudProvider) records() ([]alidns.Record, error) {
}
} else {
for _, domainName := range p.domainFilter.Filters {
_, domainName = p.splitDNSName(domainName)
tmpResults, err := p.getDomainRecords(domainName)
if err != nil {
log.Errorf("getDomainRecords %s error %v", domainName, err)
Expand Down Expand Up @@ -439,7 +440,7 @@ func (p *AlibabaCloudProvider) getDomainRecords(domainName string) ([]alidns.Rec
}

for _, record := range response.DomainRecords.Record {
domainName := record.DomainName
domainName := record.RR + "." + record.DomainName
recordType := record.Type

if !p.domainFilter.Match(domainName) {
Expand Down Expand Up @@ -491,7 +492,7 @@ func (p *AlibabaCloudProvider) unescapeTXTRecordValue(value string) string {
}

func (p *AlibabaCloudProvider) createRecord(endpoint *endpoint.Endpoint, target string) error {
rr, domain := p.splitDNSName(endpoint)
rr, domain := p.splitDNSName(endpoint.DNSName)
request := alidns.CreateAddDomainRecordRequest()
request.DomainName = domain
request.Type = endpoint.RecordType
Expand Down Expand Up @@ -652,44 +653,24 @@ func (p *AlibabaCloudProvider) updateRecords(recordMap map[string][]alidns.Recor
return nil
}

func (p *AlibabaCloudProvider) splitDNSName(endpoint *endpoint.Endpoint) (rr string, domain string) {
name := strings.TrimSuffix(endpoint.DNSName, ".")

found := false

for _, filter := range p.domainFilter.Filters {
if strings.HasSuffix(name, "."+filter) {
rr = name[0 : len(name)-len(filter)-1]
domain = filter
found = true
break
} else if name == filter {
domain = filter
rr = ""
found = true
}
}

if !found {
parts := strings.Split(name, ".")
if len(parts) < 2 {
rr = name
domain = ""
} else {
domain = parts[len(parts)-2] + "." + parts[len(parts)-1]
rrIndex := strings.Index(name, domain)
if rrIndex < 1 {
rrIndex = 1
}
rr = name[0 : rrIndex-1]
func (p *AlibabaCloudProvider) splitDNSName(fullName string) (rr string, domain string) {
name := strings.TrimSuffix(fullName, ".")
parts := strings.Split(name, ".")
if len(parts) < 2 {
rr = name
domain = ""
} else {
domain = parts[len(parts)-2] + "." + parts[len(parts)-1]
rrIndex := strings.Index(name, domain)
if rrIndex < 1 {
rrIndex = 1
}
rr = name[0 : rrIndex-1]
}

if rr == "" {
rr = nullHostAlibabaCloud
}

return rr, domain
return
}

func (p *AlibabaCloudProvider) matchVPC(zoneID string) bool {
Expand Down Expand Up @@ -854,7 +835,7 @@ func (p *AlibabaCloudProvider) privateZoneRecords() (endpoints []*endpoint.Endpo
}

func (p *AlibabaCloudProvider) createPrivateZoneRecord(zones map[string]*alibabaPrivateZone, endpoint *endpoint.Endpoint, target string) error {
rr, domain := p.splitDNSName(endpoint)
rr, domain := p.splitDNSName(endpoint.DNSName)
zone := zones[domain]
if zone == nil {
err := fmt.Errorf("failed to find private zone '%s'", domain)
Expand Down Expand Up @@ -922,7 +903,7 @@ func (p *AlibabaCloudProvider) deletePrivateZoneRecord(recordID int64) error {

func (p *AlibabaCloudProvider) deletePrivateZoneRecords(zones map[string]*alibabaPrivateZone, endpoints []*endpoint.Endpoint) error {
for _, endpoint := range endpoints {
rr, domain := p.splitDNSName(endpoint)
rr, domain := p.splitDNSName(endpoint.DNSName)

zone := zones[domain]
if zone == nil {
Expand Down Expand Up @@ -1011,7 +992,7 @@ func (p *AlibabaCloudProvider) equalsPrivateZone(record pvtz.Record, endpoint *e

func (p *AlibabaCloudProvider) updatePrivateZoneRecords(zones map[string]*alibabaPrivateZone, endpoints []*endpoint.Endpoint) error {
for _, endpoint := range endpoints {
rr, domain := p.splitDNSName(endpoint)
rr, domain := p.splitDNSName(endpoint.DNSName)
zone := zones[domain]
if zone == nil {
err := fmt.Errorf("failed to find private zone '%s'", domain)
Expand Down
19 changes: 9 additions & 10 deletions provider/alibabacloud/alibaba_cloud_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,9 @@ package alibabacloud

import (
"context"
"testing"

"github.com/aliyun/alibaba-cloud-sdk-go/services/alidns"
"github.com/aliyun/alibaba-cloud-sdk-go/services/pvtz"
"testing"

"sigs.k8s.io/external-dns/endpoint"
"sigs.k8s.io/external-dns/plan"
Expand Down Expand Up @@ -393,42 +392,42 @@ func TestAlibabaCloudProvider_splitDNSName(t *testing.T) {
p := newTestAlibabaCloudProvider(false)
endpoint := &endpoint.Endpoint{}
endpoint.DNSName = "www.example.org"
rr, domain := p.splitDNSName(endpoint)
rr, domain := p.splitDNSName(endpoint.DNSName)
if rr != "www" || domain != "example.org" {
t.Errorf("Failed to splitDNSName for %s: rr=%s, domain=%s", endpoint.DNSName, rr, domain)
}
endpoint.DNSName = ".example.org"
rr, domain = p.splitDNSName(endpoint)
rr, domain = p.splitDNSName(endpoint.DNSName)
if rr != "@" || domain != "example.org" {
t.Errorf("Failed to splitDNSName for %s: rr=%s, domain=%s", endpoint.DNSName, rr, domain)
}
endpoint.DNSName = "www"
rr, domain = p.splitDNSName(endpoint)
rr, domain = p.splitDNSName(endpoint.DNSName)
if rr != "www" || domain != "" {
t.Errorf("Failed to splitDNSName for %s: rr=%s, domain=%s", endpoint.DNSName, rr, domain)
}
endpoint.DNSName = ""
rr, domain = p.splitDNSName(endpoint)
rr, domain = p.splitDNSName(endpoint.DNSName)
if rr != "@" || domain != "" {
t.Errorf("Failed to splitDNSName for %s: rr=%s, domain=%s", endpoint.DNSName, rr, domain)
}
endpoint.DNSName = "_30000._tcp.container-service.top"
rr, domain = p.splitDNSName(endpoint)
rr, domain = p.splitDNSName(endpoint.DNSName)
if rr != "_30000._tcp" || domain != "container-service.top" {
t.Errorf("Failed to splitDNSName for %s: rr=%s, domain=%s", endpoint.DNSName, rr, domain)
}
endpoint.DNSName = "container-service.top"
rr, domain = p.splitDNSName(endpoint)
rr, domain = p.splitDNSName(endpoint.DNSName)
if rr != "@" || domain != "container-service.top" {
t.Errorf("Failed to splitDNSName for %s: rr=%s, domain=%s", endpoint.DNSName, rr, domain)
}
endpoint.DNSName = "a.b.container-service.top"
rr, domain = p.splitDNSName(endpoint)
rr, domain = p.splitDNSName(endpoint.DNSName)
if rr != "a.b" || domain != "container-service.top" {
t.Errorf("Failed to splitDNSName for %s: rr=%s, domain=%s", endpoint.DNSName, rr, domain)
}
endpoint.DNSName = "a.b.c.container-service.top"
rr, domain = p.splitDNSName(endpoint)
rr, domain = p.splitDNSName(endpoint.DNSName)
if rr != "a.b.c" || domain != "container-service.top" {
t.Errorf("Failed to splitDNSName for %s: rr=%s, domain=%s", endpoint.DNSName, rr, domain)
}
Expand Down