mirrors/external-dns
1
0
Fork 0
mirror of https://github.com/kubernetes-sigs/external-dns.git synced 2025-08-06 09:36:58 +02:00
Code Issues Packages Projects Releases Wiki Activity

resolve SZUECS' findings

Browse Source
This commit is contained in:
Jan Roehrich 2024-06-10 21:09:18 +02:00
parent 7ff4b3e8fa
commit 604a93670e
3 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
provider/aws/aws.go
View File

@ -37,7 +37,7 @@ import (
) )
const ( const (
DefaultAWSProfile = "default" defaultAWSProfile = "default"
recordTTL = 300 recordTTL = 300
// From the experiments, it seems that the default MaxItems applied is 100, // From the experiments, it seems that the default MaxItems applied is 100,
// and that, on the server side, there is a hard limit of 300 elements per page. // and that, on the server side, there is a hard limit of 300 elements per page.

40
provider/aws/aws_test.go
View File

@ -750,14 +750,14 @@ func TestAWSApplyChanges(t *testing.T) {
ctx := tt.setup(provider) ctx := tt.setup(provider)
provider.zonesCache = &zonesListCache{duration: 0 * time.Minute} provider.zonesCache = &zonesListCache{duration: 0 * time.Minute}
counter := NewRoute53APICounter(provider.clients[DefaultAWSProfile]) counter := NewRoute53APICounter(provider.clients[defaultAWSProfile])
provider.clients[DefaultAWSProfile] = counter provider.clients[defaultAWSProfile] = counter
require.NoError(t, provider.ApplyChanges(ctx, changes)) require.NoError(t, provider.ApplyChanges(ctx, changes))
assert.Equal(t, 1, counter.calls["ListHostedZonesPages"], tt.name) assert.Equal(t, 1, counter.calls["ListHostedZonesPages"], tt.name)
assert.Equal(t, tt.listRRSets, counter.calls["ListResourceRecordSetsPages"], tt.name) assert.Equal(t, tt.listRRSets, counter.calls["ListResourceRecordSetsPages"], tt.name)
validateRecords(t, listAWSRecords(t, provider.clients[DefaultAWSProfile], "/hostedzone/zone-1.ext-dns-test-2.teapot.zalan.do."), []*route53.ResourceRecordSet{ validateRecords(t, listAWSRecords(t, provider.clients[defaultAWSProfile], "/hostedzone/zone-1.ext-dns-test-2.teapot.zalan.do."), []*route53.ResourceRecordSet{
{ {
Name: aws.String("create-test.zone-1.ext-dns-test-2.teapot.zalan.do."), Name: aws.String("create-test.zone-1.ext-dns-test-2.teapot.zalan.do."),
Type: aws.String(route53.RRTypeA), Type: aws.String(route53.RRTypeA),
@ -854,7 +854,7 @@ func TestAWSApplyChanges(t *testing.T) {
ResourceRecords: []*route53.ResourceRecord{{Value: aws.String("10 mailhost1.foo.elb.amazonaws.com")}}, ResourceRecords: []*route53.ResourceRecord{{Value: aws.String("10 mailhost1.foo.elb.amazonaws.com")}},
}, },
}) })
validateRecords(t, listAWSRecords(t, provider.clients[DefaultAWSProfile], "/hostedzone/zone-2.ext-dns-test-2.teapot.zalan.do."), []*route53.ResourceRecordSet{ validateRecords(t, listAWSRecords(t, provider.clients[defaultAWSProfile], "/hostedzone/zone-2.ext-dns-test-2.teapot.zalan.do."), []*route53.ResourceRecordSet{
{ {
Name: aws.String("create-test.zone-2.ext-dns-test-2.teapot.zalan.do."), Name: aws.String("create-test.zone-2.ext-dns-test-2.teapot.zalan.do."),
Type: aws.String(route53.RRTypeA), Type: aws.String(route53.RRTypeA),
@ -1023,8 +1023,8 @@ func TestAWSApplyChangesDryRun(t *testing.T) {
validateRecords(t, validateRecords(t,
append( append(
listAWSRecords(t, provider.clients[DefaultAWSProfile], "/hostedzone/zone-1.ext-dns-test-2.teapot.zalan.do."), listAWSRecords(t, provider.clients[defaultAWSProfile], "/hostedzone/zone-1.ext-dns-test-2.teapot.zalan.do."),
listAWSRecords(t, provider.clients[DefaultAWSProfile], "/hostedzone/zone-2.ext-dns-test-2.teapot.zalan.do.")...), listAWSRecords(t, provider.clients[defaultAWSProfile], "/hostedzone/zone-2.ext-dns-test-2.teapot.zalan.do.")...),
originalRecords) originalRecords)
} }
@ -1066,21 +1066,21 @@ func TestAWSChangesByZones(t *testing.T) {
zones := map[string]*profiledZone{ zones := map[string]*profiledZone{
"foo-example-org": { "foo-example-org": {
profile: DefaultAWSProfile, profile: defaultAWSProfile,
zone: &route53.HostedZone{ zone: &route53.HostedZone{
Id: aws.String("foo-example-org"), Id: aws.String("foo-example-org"),
Name: aws.String("foo.example.org."), Name: aws.String("foo.example.org."),
}, },
}, },
"bar-example-org": { "bar-example-org": {
profile: DefaultAWSProfile, profile: defaultAWSProfile,
zone: &route53.HostedZone{ zone: &route53.HostedZone{
Id: aws.String("bar-example-org"), Id: aws.String("bar-example-org"),
Name: aws.String("bar.example.org."), Name: aws.String("bar.example.org."),
}, },
}, },
"bar-example-org-private": { "bar-example-org-private": {
profile: DefaultAWSProfile, profile: defaultAWSProfile,
zone: &route53.HostedZone{ zone: &route53.HostedZone{
Id: aws.String("bar-example-org-private"), Id: aws.String("bar-example-org-private"),
Name: aws.String("bar.example.org."), Name: aws.String("bar.example.org."),
@ -1088,7 +1088,7 @@ func TestAWSChangesByZones(t *testing.T) {
}, },
}, },
"baz-example-org": { "baz-example-org": {
profile: DefaultAWSProfile, profile: defaultAWSProfile,
zone: &route53.HostedZone{ zone: &route53.HostedZone{
Id: aws.String("baz-example-org"), Id: aws.String("baz-example-org"),
Name: aws.String("baz.example.org."), Name: aws.String("baz.example.org."),
@ -1648,7 +1648,7 @@ func TestAWSCreateRecordsWithCNAME(t *testing.T) {
Create: adjusted, Create: adjusted,
})) }))
recordSets := listAWSRecords(t, provider.clients[DefaultAWSProfile], "/hostedzone/zone-1.ext-dns-test-2.teapot.zalan.do.") recordSets := listAWSRecords(t, provider.clients[defaultAWSProfile], "/hostedzone/zone-1.ext-dns-test-2.teapot.zalan.do.")
validateRecords(t, recordSets, []*route53.ResourceRecordSet{ validateRecords(t, recordSets, []*route53.ResourceRecordSet{
{ {
@ -1712,7 +1712,7 @@ func TestAWSCreateRecordsWithALIAS(t *testing.T) {
Create: adjusted, Create: adjusted,
})) }))
recordSets := listAWSRecords(t, provider.clients[DefaultAWSProfile], "/hostedzone/zone-1.ext-dns-test-2.teapot.zalan.do.") recordSets := listAWSRecords(t, provider.clients[defaultAWSProfile], "/hostedzone/zone-1.ext-dns-test-2.teapot.zalan.do.")
validateRecords(t, recordSets, []*route53.ResourceRecordSet{ validateRecords(t, recordSets, []*route53.ResourceRecordSet{
{ {
@ -1803,15 +1803,15 @@ func TestAWSCanonicalHostedZone(t *testing.T) {
func TestAWSSuitableZones(t *testing.T) { func TestAWSSuitableZones(t *testing.T) {
zones := map[string]*profiledZone{ zones := map[string]*profiledZone{
// Public domain // Public domain
"example-org": {profile: DefaultAWSProfile, zone: &route53.HostedZone{Id: aws.String("example-org"), Name: aws.String("example.org.")}}, "example-org": {profile: defaultAWSProfile, zone: &route53.HostedZone{Id: aws.String("example-org"), Name: aws.String("example.org.")}},
// Public subdomain // Public subdomain
"bar-example-org": {profile: DefaultAWSProfile, zone: &route53.HostedZone{Id: aws.String("bar-example-org"), Name: aws.String("bar.example.org."), Config: &route53.HostedZoneConfig{PrivateZone: aws.Bool(false)}}}, "bar-example-org": {profile: defaultAWSProfile, zone: &route53.HostedZone{Id: aws.String("bar-example-org"), Name: aws.String("bar.example.org."), Config: &route53.HostedZoneConfig{PrivateZone: aws.Bool(false)}}},
// Public subdomain // Public subdomain
"longfoo-bar-example-org": {profile: DefaultAWSProfile, zone: &route53.HostedZone{Id: aws.String("longfoo-bar-example-org"), Name: aws.String("longfoo.bar.example.org.")}}, "longfoo-bar-example-org": {profile: defaultAWSProfile, zone: &route53.HostedZone{Id: aws.String("longfoo-bar-example-org"), Name: aws.String("longfoo.bar.example.org.")}},
// Private domain // Private domain
"example-org-private": {profile: DefaultAWSProfile, zone: &route53.HostedZone{Id: aws.String("example-org-private"), Name: aws.String("example.org."), Config: &route53.HostedZoneConfig{PrivateZone: aws.Bool(true)}}}, "example-org-private": {profile: defaultAWSProfile, zone: &route53.HostedZone{Id: aws.String("example-org-private"), Name: aws.String("example.org."), Config: &route53.HostedZoneConfig{PrivateZone: aws.Bool(true)}}},
// Private subdomain // Private subdomain
"bar-example-org-private": {profile: DefaultAWSProfile, zone: &route53.HostedZone{Id: aws.String("bar-example-org-private"), Name: aws.String("bar.example.org."), Config: &route53.HostedZoneConfig{PrivateZone: aws.Bool(true)}}}, "bar-example-org-private": {profile: defaultAWSProfile, zone: &route53.HostedZone{Id: aws.String("bar-example-org-private"), Name: aws.String("bar.example.org."), Config: &route53.HostedZoneConfig{PrivateZone: aws.Bool(true)}}},
} }
for _, tc := range []struct { for _, tc := range []struct {
@ -1847,7 +1847,7 @@ func createAWSZone(t *testing.T, provider *AWSProvider, zone *route53.HostedZone
HostedZoneConfig: zone.Config, HostedZoneConfig: zone.Config,
} }
if _, err := provider.clients[DefaultAWSProfile].CreateHostedZoneWithContext(context.Background(), params); err != nil { if _, err := provider.clients[defaultAWSProfile].CreateHostedZoneWithContext(context.Background(), params); err != nil {
require.EqualError(t, err, route53.ErrCodeHostedZoneAlreadyExists) require.EqualError(t, err, route53.ErrCodeHostedZoneAlreadyExists)
} }
} }
@ -1905,7 +1905,7 @@ func newAWSProviderWithTagFilter(t *testing.T, domainFilter endpoint.DomainFilte
client := NewRoute53APIStub(t) client := NewRoute53APIStub(t)
provider := &AWSProvider{ provider := &AWSProvider{
clients: map[string]Route53API{DefaultAWSProfile: client}, clients: map[string]Route53API{defaultAWSProfile: client},
batchChangeSize: defaultBatchChangeSize, batchChangeSize: defaultBatchChangeSize,
batchChangeSizeBytes: defaultBatchChangeSizeBytes, batchChangeSizeBytes: defaultBatchChangeSizeBytes,
batchChangeSizeValues: defaultBatchChangeSizeValues, batchChangeSizeValues: defaultBatchChangeSizeValues,
@ -1945,7 +1945,7 @@ func newAWSProviderWithTagFilter(t *testing.T, domainFilter endpoint.DomainFilte
Config: &route53.HostedZoneConfig{PrivateZone: aws.Bool(false)}, Config: &route53.HostedZoneConfig{PrivateZone: aws.Bool(false)},
}) })
setupZoneTags(provider.clients[DefaultAWSProfile].(*Route53APIStub)) setupZoneTags(provider.clients[defaultAWSProfile].(*Route53APIStub))
setAWSRecords(t, provider, records) setAWSRecords(t, provider, records)

2
provider/aws/session.go
View File

@ -66,7 +66,7 @@ func CreateSessions(cfg *externaldns.Config) map[string]*session.Session {
if err != nil { if err != nil {
logrus.Fatal(err) logrus.Fatal(err)
} }
result[DefaultAWSProfile] = session result[defaultAWSProfile] = session
} else { } else {
for _, profile := range cfg.AWSProfiles { for _, profile := range cfg.AWSProfiles {
session, err := newSession( session, err := newSession(