From a63cbccbdc2db65cb8c40bb6e643c2ddf27171c8 Mon Sep 17 00:00:00 2001 From: ivan katliarchuk Date: Fri, 24 Jan 2025 12:58:43 +0000 Subject: [PATCH] fix(aws-provider): ListTagsForResource incorrect zone-id handling. added tests Signed-off-by: ivan katliarchuk --- provider/aws/aws_test.go | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/provider/aws/aws_test.go b/provider/aws/aws_test.go index eaa9b88d5..992b0444b 100644 --- a/provider/aws/aws_test.go +++ b/provider/aws/aws_test.go @@ -334,11 +334,9 @@ func TestAWSZones(t *testing.T) { {"tag filter", provider.NewZoneIDFilter([]string{}), provider.NewZoneTypeFilter(""), provider.NewZoneTagFilter([]string{"zone=3"}), privateZones}, } { t.Run(ti.msg, func(t *testing.T) { - provider, _ := newAWSProviderWithTagFilter(t, endpoint.NewDomainFilter([]string{"ext-dns-test-2.teapot.zalan.do."}), ti.zoneIDFilter, ti.zoneTypeFilter, ti.zoneTagFilter, defaultEvaluateTargetHealth, false, nil, true) - + provider, _ := newAWSProviderWithTagFilter(t, endpoint.NewDomainFilter([]string{"ext-dns-test-2.teapot.zalan.do."}), ti.zoneIDFilter, ti.zoneTypeFilter, ti.zoneTagFilter, defaultEvaluateTargetHealth, false, nil) zones, err := provider.Zones(context.Background()) require.NoError(t, err) - validateAWSZones(t, zones, ti.expectedZones) }) } @@ -346,7 +344,6 @@ func TestAWSZones(t *testing.T) { func TestAWSZonesWithTagFilterError(t *testing.T) { client := NewRoute53APIStub(t) - provider := &AWSProvider{ clients: map[string]Route53API{defaultAWSProfile: client}, zoneTagFilter: provider.NewZoneTagFilter([]string{"zone=2"}), @@ -2007,10 +2004,10 @@ func listAWSRecords(t *testing.T, client Route53API, zone string) []route53types } func newAWSProvider(t *testing.T, domainFilter endpoint.DomainFilter, zoneIDFilter provider.ZoneIDFilter, zoneTypeFilter provider.ZoneTypeFilter, evaluateTargetHealth, dryRun bool, records []route53types.ResourceRecordSet) (*AWSProvider, *Route53APIStub) { - return newAWSProviderWithTagFilter(t, domainFilter, zoneIDFilter, zoneTypeFilter, provider.NewZoneTagFilter([]string{}), evaluateTargetHealth, dryRun, records, true) + return newAWSProviderWithTagFilter(t, domainFilter, zoneIDFilter, zoneTypeFilter, provider.NewZoneTagFilter([]string{}), evaluateTargetHealth, dryRun, records) } -func newAWSProviderWithTagFilter(t *testing.T, domainFilter endpoint.DomainFilter, zoneIDFilter provider.ZoneIDFilter, zoneTypeFilter provider.ZoneTypeFilter, zoneTagFilter provider.ZoneTagFilter, evaluateTargetHealth, dryRun bool, records []route53types.ResourceRecordSet, validateErrors bool) (*AWSProvider, *Route53APIStub) { +func newAWSProviderWithTagFilter(t *testing.T, domainFilter endpoint.DomainFilter, zoneIDFilter provider.ZoneIDFilter, zoneTypeFilter provider.ZoneTypeFilter, zoneTagFilter provider.ZoneTagFilter, evaluateTargetHealth, dryRun bool, records []route53types.ResourceRecordSet) (*AWSProvider, *Route53APIStub) { client := NewRoute53APIStub(t) provider := &AWSProvider{