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

loop through all hosted zones to match the domain record #3695

Merged
merged 7 commits into from
Aug 25, 2023
Merged

loop through all hosted zones to match the domain record #3695

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
035080d
loop through all zones to match the domain name
allurisravanth Jun 16, 2023
688e039
review comments
allurisravanth Jul 3, 2023
200c3f3
review comments
allurisravanth Jul 6, 2023
0576055
review comments
allurisravanth Jul 6, 2023
61c679d
review comments
allurisravanth Jul 9, 2023
da5b6ef
review comments
allurisravanth Jul 10, 2023
38d4a2e
review comments
allurisravanth Jul 11, 2023
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
107 changes: 74 additions & 33 deletions provider/alibabacloud/alibaba_cloud.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ import (
"context"
"fmt"
"os"
"sort"
"strings"
"sync"
"time"
Expand Down Expand Up @@ -373,24 +374,23 @@ func (p *AlibabaCloudProvider) groupRecords(records []alidns.Record) (endpointMa
func (p *AlibabaCloudProvider) records() ([]alidns.Record, error) {
log.Infof("Retrieving Alibaba Cloud DNS Domain Records")
var results []alidns.Record

if len(p.domainFilter.Filters) == 0 {
domainNames, tmpErr := p.getDomainList()
if tmpErr != nil {
log.Errorf("AlibabaCloudProvider getDomainList error %v", tmpErr)
return results, tmpErr
}
for _, tmpDomainName := range domainNames {
tmpResults, err := p.getDomainRecords(tmpDomainName)
hostedZoneDomains, err := p.getDomainList()
if err != nil {
log.Errorf("getDomainList: %v", err)
return results, err
allurisravanth marked this conversation as resolved.
Show resolved Hide resolved
}
if !p.domainFilter.IsConfigured() {
for _, zoneDomain := range hostedZoneDomains {
domainRecords, err := p.getDomainRecords(zoneDomain)
if err != nil {
log.Errorf("AlibabaCloudProvider getDomainRecords %s error %v", tmpDomainName, err)
continue
log.Errorf("AlibabaCloudProvider getDomainRecords %q error %v", zoneDomain, err)
return nil, err
allurisravanth marked this conversation as resolved.
Show resolved Hide resolved
}
results = append(results, tmpResults...)
results = append(results, domainRecords...)
}
} else {
for _, domainName := range p.domainFilter.Filters {
_, domainName = p.splitDNSName(domainName)
_, domainName = p.splitDNSName(domainName, hostedZoneDomains)
tmpResults, err := p.getDomainRecords(domainName)
if err != nil {
log.Errorf("getDomainRecords %s error %v", domainName, err)
Expand Down Expand Up @@ -494,8 +494,8 @@ func (p *AlibabaCloudProvider) unescapeTXTRecordValue(value string) string {
return value
}

func (p *AlibabaCloudProvider) createRecord(endpoint *endpoint.Endpoint, target string) error {
rr, domain := p.splitDNSName(endpoint.DNSName)
func (p *AlibabaCloudProvider) createRecord(endpoint *endpoint.Endpoint, target string, hostedZoneDomains []string) error {
rr, domain := p.splitDNSName(endpoint.DNSName, hostedZoneDomains)
request := alidns.CreateAddDomainRecordRequest()
request.DomainName = domain
request.Type = endpoint.RecordType
Expand Down Expand Up @@ -528,9 +528,13 @@ func (p *AlibabaCloudProvider) createRecord(endpoint *endpoint.Endpoint, target
}

func (p *AlibabaCloudProvider) createRecords(endpoints []*endpoint.Endpoint) error {
hostedZoneDomains, err := p.getDomainList()
allurisravanth marked this conversation as resolved.
Show resolved Hide resolved
if err != nil {
return err
allurisravanth marked this conversation as resolved.
Show resolved Hide resolved
}
for _, endpoint := range endpoints {
for _, target := range endpoint.Targets {
p.createRecord(endpoint, target)
p.createRecord(endpoint, target, hostedZoneDomains)
}
}
return nil
Expand Down Expand Up @@ -616,6 +620,10 @@ func (p *AlibabaCloudProvider) equals(record alidns.Record, endpoint *endpoint.E
}

func (p *AlibabaCloudProvider) updateRecords(recordMap map[string][]alidns.Record, endpoints []*endpoint.Endpoint) error {
hostedZoneDomains, err := p.getDomainList()
if err != nil {
return err
allurisravanth marked this conversation as resolved.
Show resolved Hide resolved
}
for _, endpoint := range endpoints {
key := p.getRecordKeyByEndpoint(endpoint)
records := recordMap[key]
Expand Down Expand Up @@ -652,31 +660,54 @@ func (p *AlibabaCloudProvider) updateRecords(recordMap map[string][]alidns.Recor
}
}
if !found {
p.createRecord(endpoint, target)
p.createRecord(endpoint, target, hostedZoneDomains)
}
}
}
return nil
}

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
func (p *AlibabaCloudProvider) splitDNSName(dnsName string, hostedZoneDomains []string) (rr string, domain string) {
name := strings.TrimSuffix(dnsName, ".")

// sort zones by dot count; make sure subdomains sort earlier
sort.Slice(hostedZoneDomains, func(i, j int) bool {
return strings.Count(hostedZoneDomains[i], ".") > strings.Count(hostedZoneDomains[j], ".")
})

found := false

for _, filter := range hostedZoneDomains {
if strings.HasSuffix(name, "."+filter) {
rr = name[0 : len(name)-len(filter)-1]
domain = filter
found = true
break
allurisravanth marked this conversation as resolved.
Show resolved Hide resolved
} else if name == filter {
domain = filter
rr = ""
found = true
}
}

if !found {
parts := strings.Split(name, ".")
if len(parts) < 2 {
allurisravanth marked this conversation as resolved.
Show resolved Hide resolved
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]
}
rr = name[0 : rrIndex-1]
}
if rr == "" {
rr = nullHostAlibabaCloud
}
return
return rr, domain
}

func (p *AlibabaCloudProvider) matchVPC(zoneID string) bool {
Expand Down Expand Up @@ -844,7 +875,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.DNSName)
rr, domain := p.splitDNSName(endpoint.DNSName, keys(zones))
zone := zones[domain]
if zone == nil {
err := fmt.Errorf("failed to find private zone '%s'", domain)
Expand Down Expand Up @@ -913,8 +944,9 @@ func (p *AlibabaCloudProvider) deletePrivateZoneRecord(recordID int64) error {
}

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

zone := zones[domain]
if zone == nil {
Expand Down Expand Up @@ -1003,8 +1035,9 @@ func (p *AlibabaCloudProvider) equalsPrivateZone(record pvtz.Record, endpoint *e
}

func (p *AlibabaCloudProvider) updatePrivateZoneRecords(zones map[string]*alibabaPrivateZone, endpoints []*endpoint.Endpoint) error {
zoneNames := keys(zones)
for _, endpoint := range endpoints {
rr, domain := p.splitDNSName(endpoint.DNSName)
rr, domain := p.splitDNSName(endpoint.DNSName, zoneNames)
zone := zones[domain]
if zone == nil {
err := fmt.Errorf("failed to find private zone '%s'", domain)
Expand Down Expand Up @@ -1059,3 +1092,11 @@ func (p *AlibabaCloudProvider) updatePrivateZoneRecords(zones map[string]*alibab
}
return nil
}

func keys[T any](value map[string]T) []string {
var results []string
for k := range value {
results = append(results, k)
}
return results
}
30 changes: 21 additions & 9 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,9 +18,10 @@ 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 @@ -392,45 +393,56 @@ func TestAlibabaCloudProvider_splitDNSName(t *testing.T) {
p := newTestAlibabaCloudProvider(false)
endpoint := &endpoint.Endpoint{}
endpoint.DNSName = "www.example.org"
rr, domain := p.splitDNSName(endpoint.DNSName)
rr, domain := p.splitDNSName(endpoint.DNSName, nil)
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.DNSName)
rr, domain = p.splitDNSName(endpoint.DNSName, nil)
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.DNSName)
rr, domain = p.splitDNSName(endpoint.DNSName, nil)
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.DNSName)
rr, domain = p.splitDNSName(endpoint.DNSName, nil)
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.DNSName)
rr, domain = p.splitDNSName(endpoint.DNSName, nil)
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.DNSName)
rr, domain = p.splitDNSName(endpoint.DNSName, nil)
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.DNSName)
rr, domain = p.splitDNSName(endpoint.DNSName, nil)
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.DNSName)
rr, domain = p.splitDNSName(endpoint.DNSName, nil)
if rr != "a.b.c" || 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.DNSName, []string{"c.container-service.top"})
if rr != "a.b" || domain != "c.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.DNSName, []string{"container-service.top", "c.container-service.top"})
if rr != "a.b" || domain != "c.container-service.top" {
t.Errorf("Failed to splitDNSName for %s: rr=%s, domain=%s", endpoint.DNSName, rr, domain)
}
allurisravanth marked this conversation as resolved.
Show resolved Hide resolved
}

func TestAlibabaCloudProvider_TXTEndpoint(t *testing.T) {
Expand Down