diff --git a/go.mod b/go.mod index 57e6856cb..23b9abe67 100644 --- a/go.mod +++ b/go.mod @@ -22,6 +22,7 @@ require ( github.com/aws/aws-sdk-go-v2/credentials v1.17.27 github.com/aws/aws-sdk-go-v2/feature/dynamodb/attributevalue v1.14.10 github.com/aws/aws-sdk-go-v2/service/dynamodb v1.34.4 + github.com/aws/aws-sdk-go-v2/service/route53 v1.42.3 github.com/aws/aws-sdk-go-v2/service/servicediscovery v1.31.3 github.com/aws/aws-sdk-go-v2/service/sts v1.30.3 github.com/bodgit/tsig v1.2.2 diff --git a/go.sum b/go.sum index c500ada73..ea9c32dcc 100644 --- a/go.sum +++ b/go.sum @@ -145,6 +145,8 @@ github.com/aws/aws-sdk-go-v2/service/internal/endpoint-discovery v1.9.16 h1:lhAX github.com/aws/aws-sdk-go-v2/service/internal/endpoint-discovery v1.9.16/go.mod h1:AblAlCwvi7Q/SFowvckgN+8M3uFPlopSYeLlbNDArhA= github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.11.17 h1:HGErhhrxZlQ044RiM+WdoZxp0p+EGM62y3L6pwA4olE= github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.11.17/go.mod h1:RkZEx4l0EHYDJpWppMJ3nD9wZJAa8/0lq9aVC+r2UII= +github.com/aws/aws-sdk-go-v2/service/route53 v1.42.3 h1:MmLCRqP4U4Cw9gJ4bNrCG0mWqEtBlmAVleyelcHARMU= +github.com/aws/aws-sdk-go-v2/service/route53 v1.42.3/go.mod h1:AMPjK2YnRh0YgOID3PqhJA1BRNfXDfGOnSsKHtAe8yA= github.com/aws/aws-sdk-go-v2/service/servicediscovery v1.31.3 h1:EthA93BNgTnk36FoI9DCKtv4S0m63WzdGDYlBp/CvHQ= github.com/aws/aws-sdk-go-v2/service/servicediscovery v1.31.3/go.mod h1:4xh/h0pevPhBkA4b2iYosZaqrThccxFREQxiGuZpJlc= github.com/aws/aws-sdk-go-v2/service/sso v1.22.4 h1:BXx0ZIxvrJdSgSvKTZ+yRBeSqqgPM89VPlulEcl37tM= diff --git a/main.go b/main.go index e75b6795a..985124349 100644 --- a/main.go +++ b/main.go @@ -26,8 +26,8 @@ import ( "time" "github.com/aws/aws-sdk-go-v2/service/dynamodb" + "github.com/aws/aws-sdk-go-v2/service/route53" sd "github.com/aws/aws-sdk-go-v2/service/servicediscovery" - "github.com/aws/aws-sdk-go/service/route53" "github.com/go-logr/logr" "github.com/prometheus/client_golang/prometheus/promhttp" log "github.com/sirupsen/logrus" @@ -205,10 +205,10 @@ func main() { case "alibabacloud": p, err = alibabacloud.NewAlibabaCloudProvider(cfg.AlibabaCloudConfigFile, domainFilter, zoneIDFilter, cfg.AlibabaCloudZoneType, cfg.DryRun) case "aws": - sessions := aws.CreateSessions(cfg) - clients := make(map[string]aws.Route53API, len(sessions)) - for profile, session := range sessions { - clients[profile] = route53.New(session) + configs := aws.CreateV2Configs(cfg) + clients := make(map[string]aws.Route53API, len(configs)) + for profile, config := range configs { + clients[profile] = route53.NewFromConfig(config) } p, err = aws.NewAWSProvider( diff --git a/provider/aws/aws.go b/provider/aws/aws.go index 1955efb16..0e2926bf4 100644 --- a/provider/aws/aws.go +++ b/provider/aws/aws.go @@ -25,10 +25,9 @@ import ( "strings" "time" - "github.com/aws/aws-sdk-go/aws" - "github.com/aws/aws-sdk-go/aws/awserr" - "github.com/aws/aws-sdk-go/aws/request" - "github.com/aws/aws-sdk-go/service/route53" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/route53" + route53types "github.com/aws/aws-sdk-go-v2/service/route53/types" log "github.com/sirupsen/logrus" "sigs.k8s.io/external-dns/endpoint" @@ -41,11 +40,11 @@ const ( recordTTL = 300 // 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. - // After a discussion with AWS representants, clients should accept - // when less items are returned, and still paginate accordingly. + // After a discussion with AWS representatives, clients should accept + // when fewer items are returned, and still paginate accordingly. // As we are using the standard AWS client, this should already be compliant. - // Hence, ifever AWS decides to raise this limit, we will automatically reduce the pressure on rate limits - route53PageSize = "300" + // Hence, if AWS ever decides to raise this limit, we will automatically reduce the pressure on rate limits + route53PageSize int32 = 300 // providerSpecificAlias specifies whether a CNAME endpoint maps to an AWS ALIAS record. providerSpecificAlias = "alias" providerSpecificTargetHostedZone = "aws/target-hosted-zone" @@ -199,16 +198,16 @@ var canonicalHostedZones = map[string]string{ // Route53API is the subset of the AWS Route53 API that we actually use. Add methods as required. Signatures must match exactly. // mostly taken from: https://github.com/kubernetes/kubernetes/blob/853167624edb6bc0cfdcdfb88e746e178f5db36c/federation/pkg/dnsprovider/providers/aws/route53/stubs/route53api.go type Route53API interface { - ListResourceRecordSetsPagesWithContext(ctx context.Context, input *route53.ListResourceRecordSetsInput, fn func(resp *route53.ListResourceRecordSetsOutput, lastPage bool) (shouldContinue bool), opts ...request.Option) error - ChangeResourceRecordSetsWithContext(ctx context.Context, input *route53.ChangeResourceRecordSetsInput, opts ...request.Option) (*route53.ChangeResourceRecordSetsOutput, error) - CreateHostedZoneWithContext(ctx context.Context, input *route53.CreateHostedZoneInput, opts ...request.Option) (*route53.CreateHostedZoneOutput, error) - ListHostedZonesPagesWithContext(ctx context.Context, input *route53.ListHostedZonesInput, fn func(resp *route53.ListHostedZonesOutput, lastPage bool) (shouldContinue bool), opts ...request.Option) error - ListTagsForResourceWithContext(ctx context.Context, input *route53.ListTagsForResourceInput, opts ...request.Option) (*route53.ListTagsForResourceOutput, error) + ListResourceRecordSets(ctx context.Context, input *route53.ListResourceRecordSetsInput, optFns ...func(options *route53.Options)) (*route53.ListResourceRecordSetsOutput, error) + ChangeResourceRecordSets(ctx context.Context, input *route53.ChangeResourceRecordSetsInput, optFns ...func(options *route53.Options)) (*route53.ChangeResourceRecordSetsOutput, error) + CreateHostedZone(ctx context.Context, input *route53.CreateHostedZoneInput, optFns ...func(*route53.Options)) (*route53.CreateHostedZoneOutput, error) + ListHostedZones(ctx context.Context, input *route53.ListHostedZonesInput, optFns ...func(options *route53.Options)) (*route53.ListHostedZonesOutput, error) + ListTagsForResource(ctx context.Context, input *route53.ListTagsForResourceInput, optFns ...func(options *route53.Options)) (*route53.ListTagsForResourceOutput, error) } // wrapper to handle ownership relation throughout the provider implementation type Route53Change struct { - route53.Change + route53types.Change OwnedRecord string sizeBytes int sizeValues int @@ -218,13 +217,13 @@ type Route53Changes []*Route53Change type profiledZone struct { profile string - zone *route53.HostedZone + zone *route53types.HostedZone } -func (cs Route53Changes) Route53Changes() []*route53.Change { - ret := []*route53.Change{} +func (cs Route53Changes) Route53Changes() []route53types.Change { + ret := []route53types.Change{} for _, c := range cs { - ret = append(ret, &c.Change) + ret = append(ret, c.Change) } return ret } @@ -253,7 +252,7 @@ type AWSProvider struct { zoneTypeFilter provider.ZoneTypeFilter // filter hosted zones by tags zoneTagFilter provider.ZoneTagFilter - // extend filter for sub-domains in the zone (e.g. first.us-east-1.example.com) + // extend filter for subdomains in the zone (e.g. first.us-east-1.example.com) zoneMatchParent bool preferCNAME bool zonesCache *zonesListCache @@ -302,13 +301,13 @@ func NewAWSProvider(awsConfig AWSConfig, clients map[string]Route53API) (*AWSPro } // Zones returns the list of hosted zones. -func (p *AWSProvider) Zones(ctx context.Context) (map[string]*route53.HostedZone, error) { +func (p *AWSProvider) Zones(ctx context.Context) (map[string]*route53types.HostedZone, error) { zones, err := p.zones(ctx) if err != nil { return nil, err } - result := make(map[string]*route53.HostedZone, len(zones)) + result := make(map[string]*route53types.HostedZone, len(zones)) for id, zone := range zones { result[id] = zone.zone } @@ -324,61 +323,57 @@ func (p *AWSProvider) zones(ctx context.Context) (map[string]*profiledZone, erro log.Debug("Refreshing zones list cache") zones := make(map[string]*profiledZone) - var profile string - var tagErr error - f := func(resp *route53.ListHostedZonesOutput, lastPage bool) (shouldContinue bool) { - for _, zone := range resp.HostedZones { - if !p.zoneIDFilter.Match(aws.StringValue(zone.Id)) { - continue - } - if !p.zoneTypeFilter.Match(zone) { - continue - } + for profile, client := range p.clients { + var tagErr error + paginator := route53.NewListHostedZonesPaginator(client, &route53.ListHostedZonesInput{}) - if !p.domainFilter.Match(aws.StringValue(zone.Name)) { - if !p.zoneMatchParent { - continue - } - if !p.domainFilter.MatchParent(aws.StringValue(zone.Name)) { - continue - } - } - - // Only fetch tags if a tag filter was specified - if !p.zoneTagFilter.IsEmpty() { - tags, err := p.tagsForZone(ctx, *zone.Id, profile) - if err != nil { - tagErr = err - return false - } - if !p.zoneTagFilter.Match(tags) { - continue - } - } - - zones[aws.StringValue(zone.Id)] = &profiledZone{ - profile: profile, - zone: zone, - } - } - - return true - } - - for p, client := range p.clients { - profile = p - err := client.ListHostedZonesPagesWithContext(ctx, &route53.ListHostedZonesInput{}, f) - if err != nil { - var awsErr awserr.Error - if errors.As(err, &awsErr) { - if awsErr.Code() == route53.ErrCodeThrottlingException { - log.Warnf("Skipping AWS profile %q due to provider side throttling: %v", profile, awsErr.Message()) + for paginator.HasMorePages() { + resp, err := paginator.NextPage(ctx) + if err != nil { + var te *route53types.ThrottlingException + if errors.As(err, &te) { + log.Infof("Skipping AWS profile %q due to provider side throttling: %v", profile, te.ErrorMessage()) continue } // nothing to do here. Falling through to general error handling + return nil, provider.NewSoftError(fmt.Errorf("failed to list hosted zones: %w", err)) + } + for _, zone := range resp.HostedZones { + if !p.zoneIDFilter.Match(*zone.Id) { + continue + } + + if !p.zoneTypeFilter.Match(zone) { + continue + } + + if !p.domainFilter.Match(*zone.Name) { + if !p.zoneMatchParent { + continue + } + if !p.domainFilter.MatchParent(*zone.Name) { + continue + } + } + + // Only fetch tags if a tag filter was specified + if !p.zoneTagFilter.IsEmpty() { + tags, err := p.tagsForZone(ctx, *zone.Id, profile) + if err != nil { + tagErr = err + break + } + if !p.zoneTagFilter.Match(tags) { + continue + } + } + + zones[*zone.Id] = &profiledZone{ + profile: profile, + zone: &zone, + } } - return nil, provider.NewSoftError(fmt.Errorf("failed to list hosted zones: %w", err)) } if tagErr != nil { return nil, provider.NewSoftError(fmt.Errorf("failed to list zones tags: %w", tagErr)) @@ -386,7 +381,7 @@ func (p *AWSProvider) zones(ctx context.Context) (map[string]*profiledZone, erro } for _, zone := range zones { - log.Debugf("Considering zone: %s (domain: %s)", aws.StringValue(zone.zone.Id), aws.StringValue(zone.zone.Name)) + log.Debugf("Considering zone: %s (domain: %s)", *zone.zone.Id, *zone.zone.Name) } if p.zonesCache.duration > time.Duration(0) { @@ -415,92 +410,93 @@ func (p *AWSProvider) Records(ctx context.Context) (endpoints []*endpoint.Endpoi func (p *AWSProvider) records(ctx context.Context, zones map[string]*profiledZone) ([]*endpoint.Endpoint, error) { endpoints := make([]*endpoint.Endpoint, 0) - f := func(resp *route53.ListResourceRecordSetsOutput, lastPage bool) (shouldContinue bool) { - for _, r := range resp.ResourceRecordSets { - newEndpoints := make([]*endpoint.Endpoint, 0) - - if !p.SupportedRecordType(aws.StringValue(r.Type)) { - continue - } - - var ttl endpoint.TTL - if r.TTL != nil { - ttl = endpoint.TTL(*r.TTL) - } - - if len(r.ResourceRecords) > 0 { - targets := make([]string, len(r.ResourceRecords)) - for idx, rr := range r.ResourceRecords { - targets[idx] = aws.StringValue(rr.Value) - } - - ep := endpoint.NewEndpointWithTTL(wildcardUnescape(aws.StringValue(r.Name)), aws.StringValue(r.Type), ttl, targets...) - if aws.StringValue(r.Type) == endpoint.RecordTypeCNAME { - ep = ep.WithProviderSpecific(providerSpecificAlias, "false") - } - newEndpoints = append(newEndpoints, ep) - } - - if r.AliasTarget != nil { - // Alias records don't have TTLs so provide the default to match the TXT generation - if ttl == 0 { - ttl = recordTTL - } - ep := endpoint. - NewEndpointWithTTL(wildcardUnescape(aws.StringValue(r.Name)), endpoint.RecordTypeA, ttl, aws.StringValue(r.AliasTarget.DNSName)). - WithProviderSpecific(providerSpecificEvaluateTargetHealth, fmt.Sprintf("%t", aws.BoolValue(r.AliasTarget.EvaluateTargetHealth))). - WithProviderSpecific(providerSpecificAlias, "true") - newEndpoints = append(newEndpoints, ep) - } - - for _, ep := range newEndpoints { - if r.SetIdentifier != nil { - ep.SetIdentifier = aws.StringValue(r.SetIdentifier) - switch { - case r.Weight != nil: - ep.WithProviderSpecific(providerSpecificWeight, fmt.Sprintf("%d", aws.Int64Value(r.Weight))) - case r.Region != nil: - ep.WithProviderSpecific(providerSpecificRegion, aws.StringValue(r.Region)) - case r.Failover != nil: - ep.WithProviderSpecific(providerSpecificFailover, aws.StringValue(r.Failover)) - case r.MultiValueAnswer != nil && aws.BoolValue(r.MultiValueAnswer): - ep.WithProviderSpecific(providerSpecificMultiValueAnswer, "") - case r.GeoLocation != nil: - if r.GeoLocation.ContinentCode != nil { - ep.WithProviderSpecific(providerSpecificGeolocationContinentCode, aws.StringValue(r.GeoLocation.ContinentCode)) - } else { - if r.GeoLocation.CountryCode != nil { - ep.WithProviderSpecific(providerSpecificGeolocationCountryCode, aws.StringValue(r.GeoLocation.CountryCode)) - } - if r.GeoLocation.SubdivisionCode != nil { - ep.WithProviderSpecific(providerSpecificGeolocationSubdivisionCode, aws.StringValue(r.GeoLocation.SubdivisionCode)) - } - } - default: - // one of the above needs to be set, otherwise SetIdentifier doesn't make sense - } - } - - if r.HealthCheckId != nil { - ep.WithProviderSpecific(providerSpecificHealthCheckID, aws.StringValue(r.HealthCheckId)) - } - - endpoints = append(endpoints, ep) - } - } - - return true - } for _, z := range zones { - params := &route53.ListResourceRecordSetsInput{ - HostedZoneId: z.zone.Id, - MaxItems: aws.String(route53PageSize), - } - client := p.clients[z.profile] - if err := client.ListResourceRecordSetsPagesWithContext(ctx, params, f); err != nil { - return nil, fmt.Errorf("failed to list resource records sets for zone %s using aws profile %q: %w", *z.zone.Id, z.profile, err) + + paginator := route53.NewListResourceRecordSetsPaginator(client, &route53.ListResourceRecordSetsInput{ + HostedZoneId: z.zone.Id, + MaxItems: aws.Int32(route53PageSize), + }) + + for paginator.HasMorePages() { + resp, err := paginator.NextPage(ctx) + if err != nil { + return nil, fmt.Errorf("failed to list resource records sets for zone %s using aws profile %q: %w", *z.zone.Id, z.profile, err) + } + + for _, r := range resp.ResourceRecordSets { + newEndpoints := make([]*endpoint.Endpoint, 0) + + if !p.SupportedRecordType(r.Type) { + continue + } + + var ttl endpoint.TTL + if r.TTL != nil { + ttl = endpoint.TTL(*r.TTL) + } + + if len(r.ResourceRecords) > 0 { + targets := make([]string, len(r.ResourceRecords)) + for idx, rr := range r.ResourceRecords { + targets[idx] = *rr.Value + } + + ep := endpoint.NewEndpointWithTTL(wildcardUnescape(*r.Name), string(r.Type), ttl, targets...) + if r.Type == endpoint.RecordTypeCNAME { + ep = ep.WithProviderSpecific(providerSpecificAlias, "false") + } + newEndpoints = append(newEndpoints, ep) + } + + if r.AliasTarget != nil { + // Alias records don't have TTLs so provide the default to match the TXT generation + if ttl == 0 { + ttl = recordTTL + } + ep := endpoint. + NewEndpointWithTTL(wildcardUnescape(*r.Name), endpoint.RecordTypeA, ttl, *r.AliasTarget.DNSName). + WithProviderSpecific(providerSpecificEvaluateTargetHealth, fmt.Sprintf("%t", r.AliasTarget.EvaluateTargetHealth)). + WithProviderSpecific(providerSpecificAlias, "true") + newEndpoints = append(newEndpoints, ep) + } + + for _, ep := range newEndpoints { + if r.SetIdentifier != nil { + ep.SetIdentifier = *r.SetIdentifier + switch { + case r.Weight != nil: + ep.WithProviderSpecific(providerSpecificWeight, fmt.Sprintf("%d", *r.Weight)) + case r.Region != "": + ep.WithProviderSpecific(providerSpecificRegion, string(r.Region)) + case r.Failover != "": + ep.WithProviderSpecific(providerSpecificFailover, string(r.Failover)) + case r.MultiValueAnswer != nil && *r.MultiValueAnswer: + ep.WithProviderSpecific(providerSpecificMultiValueAnswer, "") + case r.GeoLocation != nil: + if r.GeoLocation.ContinentCode != nil { + ep.WithProviderSpecific(providerSpecificGeolocationContinentCode, *r.GeoLocation.ContinentCode) + } else { + if r.GeoLocation.CountryCode != nil { + ep.WithProviderSpecific(providerSpecificGeolocationCountryCode, *r.GeoLocation.CountryCode) + } + if r.GeoLocation.SubdivisionCode != nil { + ep.WithProviderSpecific(providerSpecificGeolocationSubdivisionCode, *r.GeoLocation.SubdivisionCode) + } + } + default: + // one of the above needs to be set, otherwise SetIdentifier doesn't make sense + } + } + + if r.HealthCheckId != nil { + ep.WithProviderSpecific(providerSpecificHealthCheckID, *r.HealthCheckId) + } + + endpoints = append(endpoints, ep) + } + } } } @@ -560,9 +556,9 @@ func (p *AWSProvider) createUpdateChanges(newEndpoints, oldEndpoints []*endpoint } combined := make(Route53Changes, 0, len(deletes)+len(creates)+len(updates)) - combined = append(combined, p.newChanges(route53.ChangeActionCreate, creates)...) - combined = append(combined, p.newChanges(route53.ChangeActionUpsert, updates)...) - combined = append(combined, p.newChanges(route53.ChangeActionDelete, deletes)...) + combined = append(combined, p.newChanges(route53types.ChangeActionCreate, creates)...) + combined = append(combined, p.newChanges(route53types.ChangeActionUpsert, updates)...) + combined = append(combined, p.newChanges(route53types.ChangeActionDelete, deletes)...) return combined } @@ -575,7 +571,7 @@ func (p *AWSProvider) GetDomainFilter() endpoint.DomainFilterInterface { } zoneNames := []string(nil) for _, z := range zones { - zoneNames = append(zoneNames, aws.StringValue(z.Name), "."+aws.StringValue(z.Name)) + zoneNames = append(zoneNames, *z.Name, "."+*z.Name) } log.Infof("Applying provider record filter for domains: %v", zoneNames) return endpoint.NewDomainFilter(zoneNames) @@ -591,8 +587,8 @@ func (p *AWSProvider) ApplyChanges(ctx context.Context, changes *plan.Changes) e updateChanges := p.createUpdateChanges(changes.UpdateNew, changes.UpdateOld) combinedChanges := make(Route53Changes, 0, len(changes.Delete)+len(changes.Create)+len(updateChanges)) - combinedChanges = append(combinedChanges, p.newChanges(route53.ChangeActionCreate, changes.Create)...) - combinedChanges = append(combinedChanges, p.newChanges(route53.ChangeActionDelete, changes.Delete)...) + combinedChanges = append(combinedChanges, p.newChanges(route53types.ChangeActionCreate, changes.Create)...) + combinedChanges = append(combinedChanges, p.newChanges(route53types.ChangeActionDelete, changes.Delete)...) combinedChanges = append(combinedChanges, updateChanges...) return p.submitChanges(ctx, combinedChanges, zones) @@ -615,7 +611,7 @@ func (p *AWSProvider) submitChanges(ctx context.Context, changes Route53Changes, var failedZones []string for z, cs := range changesByZone { log := log.WithFields(log.Fields{ - "zoneName": aws.StringValue(zones[z].zone.Name), + "zoneName": *zones[z].zone.Name, "zoneID": z, "profile": zones[z].profile, }) @@ -634,13 +630,13 @@ func (p *AWSProvider) submitChanges(ctx context.Context, changes Route53Changes, } for _, c := range b { - log.Infof("Desired change: %s %s %s", *c.Action, *c.ResourceRecordSet.Name, *c.ResourceRecordSet.Type) + log.Infof("Desired change: %s %s %s", c.Action, *c.ResourceRecordSet.Name, c.ResourceRecordSet.Type) } if !p.dryRun { params := &route53.ChangeResourceRecordSetsInput{ HostedZoneId: aws.String(z), - ChangeBatch: &route53.ChangeBatch{ + ChangeBatch: &route53types.ChangeBatch{ Changes: b.Route53Changes(), }, } @@ -648,8 +644,8 @@ func (p *AWSProvider) submitChanges(ctx context.Context, changes Route53Changes, successfulChanges := 0 client := p.clients[zones[z].profile] - if _, err := client.ChangeResourceRecordSetsWithContext(ctx, params); err != nil { - log.Errorf("Failure in zone %s when submitting change batch: %v", aws.StringValue(zones[z].zone.Name), err) + if _, err := client.ChangeResourceRecordSets(ctx, params); err != nil { + log.Errorf("Failure in zone %s when submitting change batch: %v", *zones[z].zone.Name, err) changesByOwnership := groupChangesByNameAndOwnershipRelation(b) @@ -658,12 +654,12 @@ func (p *AWSProvider) submitChanges(ctx context.Context, changes Route53Changes, for _, changes := range changesByOwnership { for _, c := range changes { - log.Debugf("Desired change: %s %s %s", *c.Action, *c.ResourceRecordSet.Name, *c.ResourceRecordSet.Type) + log.Debugf("Desired change: %s %s %s", c.Action, *c.ResourceRecordSet.Name, c.ResourceRecordSet.Type) } - params.ChangeBatch = &route53.ChangeBatch{ + params.ChangeBatch = &route53types.ChangeBatch{ Changes: changes.Route53Changes(), } - if _, err := client.ChangeResourceRecordSetsWithContext(ctx, params); err != nil { + if _, err := client.ChangeResourceRecordSets(ctx, params); err != nil { failedUpdate = true log.Errorf("Failed submitting change (error: %v), it will be retried in a separate change batch in the next iteration", err) p.failedChangesQueue[z] = append(p.failedChangesQueue[z], changes...) @@ -702,7 +698,7 @@ func (p *AWSProvider) submitChanges(ctx context.Context, changes Route53Changes, } // newChanges returns a collection of Changes based on the given records and action. -func (p *AWSProvider) newChanges(action string, endpoints []*endpoint.Endpoint) Route53Changes { +func (p *AWSProvider) newChanges(action route53types.ChangeAction, endpoints []*endpoint.Endpoint) Route53Changes { changes := make(Route53Changes, 0, len(endpoints)) for _, endpoint := range endpoints { @@ -711,8 +707,10 @@ func (p *AWSProvider) newChanges(action string, endpoints []*endpoint.Endpoint) if dualstack { // make a copy of change, modify RRS type to AAAA, then add new change rrs := *change.ResourceRecordSet - change2 := &Route53Change{Change: route53.Change{Action: change.Action, ResourceRecordSet: &rrs}} - change2.ResourceRecordSet.Type = aws.String(route53.RRTypeAaaa) + change2 := &Route53Change{ + Change: route53types.Change{Action: change.Action, ResourceRecordSet: &rrs}, + } + change2.ResourceRecordSet.Type = route53types.RRTypeAaaa changes = append(changes, change2) } } @@ -774,11 +772,11 @@ func (p *AWSProvider) AdjustEndpoints(endpoints []*endpoint.Endpoint) ([]*endpoi // returned Change is based on the given record by the given action, e.g. // action=ChangeActionCreate returns a change for creation of the record and // action=ChangeActionDelete returns a change for deletion of the record. -func (p *AWSProvider) newChange(action string, ep *endpoint.Endpoint) (*Route53Change, bool) { +func (p *AWSProvider) newChange(action route53types.ChangeAction, ep *endpoint.Endpoint) (*Route53Change, bool) { change := &Route53Change{ - Change: route53.Change{ - Action: aws.String(action), - ResourceRecordSet: &route53.ResourceRecordSet{ + Change: route53types.Change{ + Action: action, + ResourceRecordSet: &route53types.ResourceRecordSet{ Name: aws.String(ep.DNSName), }, }, @@ -793,24 +791,24 @@ func (p *AWSProvider) newChange(action string, ep *endpoint.Endpoint) (*Route53C if val, ok := ep.Labels[endpoint.DualstackLabelKey]; ok { dualstack = val == "true" } - change.ResourceRecordSet.Type = aws.String(route53.RRTypeA) - change.ResourceRecordSet.AliasTarget = &route53.AliasTarget{ + change.ResourceRecordSet.Type = route53types.RRTypeA + change.ResourceRecordSet.AliasTarget = &route53types.AliasTarget{ DNSName: aws.String(ep.Targets[0]), HostedZoneId: aws.String(cleanZoneID(targetHostedZone)), - EvaluateTargetHealth: aws.Bool(evalTargetHealth), + EvaluateTargetHealth: evalTargetHealth, } change.sizeBytes += len([]byte(ep.Targets[0])) change.sizeValues += 1 } else { - change.ResourceRecordSet.Type = aws.String(ep.RecordType) + change.ResourceRecordSet.Type = route53types.RRType(ep.RecordType) if !ep.RecordTTL.IsConfigured() { change.ResourceRecordSet.TTL = aws.Int64(recordTTL) } else { change.ResourceRecordSet.TTL = aws.Int64(int64(ep.RecordTTL)) } - change.ResourceRecordSet.ResourceRecords = make([]*route53.ResourceRecord, len(ep.Targets)) + change.ResourceRecordSet.ResourceRecords = make([]route53types.ResourceRecord, len(ep.Targets)) for idx, val := range ep.Targets { - change.ResourceRecordSet.ResourceRecords[idx] = &route53.ResourceRecord{ + change.ResourceRecordSet.ResourceRecords[idx] = route53types.ResourceRecord{ Value: aws.String(val), } change.sizeBytes += len([]byte(val)) @@ -818,7 +816,7 @@ func (p *AWSProvider) newChange(action string, ep *endpoint.Endpoint) (*Route53C } } - if action == route53.ChangeActionUpsert { + if action == route53types.ChangeActionUpsert { // If the value of the Action element is UPSERT, each ResourceRecord element and each character in a Value // element is counted twice change.sizeBytes *= 2 @@ -837,16 +835,16 @@ func (p *AWSProvider) newChange(action string, ep *endpoint.Endpoint) (*Route53C change.ResourceRecordSet.Weight = aws.Int64(weight) } if prop, ok := ep.GetProviderSpecificProperty(providerSpecificRegion); ok { - change.ResourceRecordSet.Region = aws.String(prop) + change.ResourceRecordSet.Region = route53types.ResourceRecordSetRegion(prop) } if prop, ok := ep.GetProviderSpecificProperty(providerSpecificFailover); ok { - change.ResourceRecordSet.Failover = aws.String(prop) + change.ResourceRecordSet.Failover = route53types.ResourceRecordSetFailover(prop) } if _, ok := ep.GetProviderSpecificProperty(providerSpecificMultiValueAnswer); ok { change.ResourceRecordSet.MultiValueAnswer = aws.Bool(true) } - geolocation := &route53.GeoLocation{} + geolocation := &route53types.GeoLocation{} useGeolocation := false if prop, ok := ep.GetProviderSpecificProperty(providerSpecificGeolocationContinentCode); ok { geolocation.ContinentCode = aws.String(prop) @@ -908,7 +906,7 @@ func groupChangesByNameAndOwnershipRelation(cs Route53Changes) map[string]Route5 for _, v := range cs { key := v.OwnedRecord if key == "" { - key = aws.StringValue(v.ResourceRecordSet.Name) + key = *v.ResourceRecordSet.Name } changesByOwnership[key] = append(changesByOwnership[key], v) } @@ -918,8 +916,8 @@ func groupChangesByNameAndOwnershipRelation(cs Route53Changes) map[string]Route5 func (p *AWSProvider) tagsForZone(ctx context.Context, zoneID string, profile string) (map[string]string, error) { client := p.clients[profile] - response, err := client.ListTagsForResourceWithContext(ctx, &route53.ListTagsForResourceInput{ - ResourceType: aws.String("hostedzone"), + response, err := client.ListTagsForResource(ctx, &route53.ListTagsForResourceInput{ + ResourceType: route53types.TagResourceTypeHostedzone, ResourceId: aws.String(zoneID), }) if err != nil { @@ -1006,10 +1004,10 @@ func batchChangeSet(cs Route53Changes, batchSize int, batchSizeBytes int, batchS func sortChangesByActionNameType(cs Route53Changes) Route53Changes { sort.SliceStable(cs, func(i, j int) bool { - if *cs[i].Action > *cs[j].Action { + if cs[i].Action > cs[j].Action { return true } - if *cs[i].Action < *cs[j].Action { + if cs[i].Action < cs[j].Action { return false } if *cs[i].ResourceRecordSet.Name < *cs[j].ResourceRecordSet.Name { @@ -1018,7 +1016,7 @@ func sortChangesByActionNameType(cs Route53Changes) Route53Changes { if *cs[i].ResourceRecordSet.Name > *cs[j].ResourceRecordSet.Name { return false } - return *cs[i].ResourceRecordSet.Type < *cs[j].ResourceRecordSet.Type + return cs[i].ResourceRecordSet.Type < cs[j].ResourceRecordSet.Type }) return cs @@ -1029,34 +1027,34 @@ func changesByZone(zones map[string]*profiledZone, changeSet Route53Changes) map changes := make(map[string]Route53Changes) for _, z := range zones { - changes[aws.StringValue(z.zone.Id)] = Route53Changes{} + changes[*z.zone.Id] = Route53Changes{} } for _, c := range changeSet { - hostname := provider.EnsureTrailingDot(aws.StringValue(c.ResourceRecordSet.Name)) + hostname := provider.EnsureTrailingDot(*c.ResourceRecordSet.Name) zones := suitableZones(hostname, zones) if len(zones) == 0 { - log.Debugf("Skipping record %s because no hosted zone matching record DNS Name was detected", c.String()) + log.Debugf("Skipping record %s because no hosted zone matching record DNS Name was detected", *c.ResourceRecordSet.Name) continue } for _, z := range zones { - if c.ResourceRecordSet.AliasTarget != nil && aws.StringValue(c.ResourceRecordSet.AliasTarget.HostedZoneId) == sameZoneAlias { + if c.ResourceRecordSet.AliasTarget != nil && *c.ResourceRecordSet.AliasTarget.HostedZoneId == sameZoneAlias { // alias record is to be created; target needs to be in the same zone as endpoint // if it's not, this will fail rrset := *c.ResourceRecordSet aliasTarget := *rrset.AliasTarget - aliasTarget.HostedZoneId = aws.String(cleanZoneID(aws.StringValue(z.zone.Id))) + aliasTarget.HostedZoneId = aws.String(cleanZoneID(*z.zone.Id)) rrset.AliasTarget = &aliasTarget c = &Route53Change{ - Change: route53.Change{ + Change: route53types.Change{ Action: c.Action, ResourceRecordSet: &rrset, }, } } - changes[aws.StringValue(z.zone.Id)] = append(changes[aws.StringValue(z.zone.Id)], c) - log.Debugf("Adding %s to zone %s [Id: %s]", hostname, aws.StringValue(z.zone.Name), aws.StringValue(z.zone.Id)) + changes[*z.zone.Id] = append(changes[*z.zone.Id], c) + log.Debugf("Adding %s to zone %s [Id: %s]", hostname, *z.zone.Name, *z.zone.Id) } } @@ -1078,10 +1076,10 @@ func suitableZones(hostname string, zones map[string]*profiledZone) []*profiledZ var publicZone *profiledZone for _, z := range zones { - if aws.StringValue(z.zone.Name) == hostname || strings.HasSuffix(hostname, "."+aws.StringValue(z.zone.Name)) { - if z.zone.Config == nil || !aws.BoolValue(z.zone.Config.PrivateZone) { + if *z.zone.Name == hostname || strings.HasSuffix(hostname, "."+*z.zone.Name) { + if z.zone.Config == nil || !z.zone.Config.PrivateZone { // Only select the best matching public zone - if publicZone == nil || len(aws.StringValue(z.zone.Name)) > len(aws.StringValue(publicZone.zone.Name)) { + if publicZone == nil || len(*z.zone.Name) > len(*publicZone.zone.Name) { publicZone = z } } else { @@ -1156,11 +1154,11 @@ func cleanZoneID(id string) string { return strings.TrimPrefix(id, "/hostedzone/") } -func (p *AWSProvider) SupportedRecordType(recordType string) bool { +func (p *AWSProvider) SupportedRecordType(recordType route53types.RRType) bool { switch recordType { - case "MX": + case route53types.RRTypeMx: return true default: - return provider.SupportedRecordType(recordType) + return provider.SupportedRecordType(string(recordType)) } } diff --git a/provider/aws/aws_test.go b/provider/aws/aws_test.go index 6968e7c76..806ed1d5c 100644 --- a/provider/aws/aws_test.go +++ b/provider/aws/aws_test.go @@ -26,9 +26,9 @@ import ( "testing" "time" - "github.com/aws/aws-sdk-go/aws" - "github.com/aws/aws-sdk-go/aws/request" - "github.com/aws/aws-sdk-go/service/route53" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/route53" + route53types "github.com/aws/aws-sdk-go-v2/service/route53/types" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" "github.com/stretchr/testify/require" @@ -55,9 +55,9 @@ var _ Route53API = &Route53APIStub{} // of all of its methods. // mostly taken from: https://github.com/kubernetes/kubernetes/blob/853167624edb6bc0cfdcdfb88e746e178f5db36c/federation/pkg/dnsprovider/providers/aws/route53/stubs/route53api.go type Route53APIStub struct { - zones map[string]*route53.HostedZone - recordSets map[string]map[string][]*route53.ResourceRecordSet - zoneTags map[string][]*route53.Tag + zones map[string]*route53types.HostedZone + recordSets map[string]map[string][]route53types.ResourceRecordSet + zoneTags map[string][]route53types.Tag m dynamicMock t *testing.T } @@ -73,29 +73,27 @@ func (r *Route53APIStub) MockMethod(method string, args ...interface{}) *mock.Ca // NewRoute53APIStub returns an initialized Route53APIStub func NewRoute53APIStub(t *testing.T) *Route53APIStub { return &Route53APIStub{ - zones: make(map[string]*route53.HostedZone), - recordSets: make(map[string]map[string][]*route53.ResourceRecordSet), - zoneTags: make(map[string][]*route53.Tag), + zones: make(map[string]*route53types.HostedZone), + recordSets: make(map[string]map[string][]route53types.ResourceRecordSet), + zoneTags: make(map[string][]route53types.Tag), t: t, } } -func (r *Route53APIStub) ListResourceRecordSetsPagesWithContext(ctx context.Context, input *route53.ListResourceRecordSetsInput, fn func(p *route53.ListResourceRecordSetsOutput, lastPage bool) (shouldContinue bool), opts ...request.Option) error { - output := route53.ListResourceRecordSetsOutput{} // TODO: Support optional input args. +func (r *Route53APIStub) ListResourceRecordSets(ctx context.Context, input *route53.ListResourceRecordSetsInput, optFns ...func(options *route53.Options)) (*route53.ListResourceRecordSetsOutput, error) { + output := &route53.ListResourceRecordSetsOutput{} // TODO: Support optional input args. require.NotNil(r.t, input.MaxItems) assert.EqualValues(r.t, route53PageSize, *input.MaxItems) if len(r.recordSets) == 0 { - output.ResourceRecordSets = []*route53.ResourceRecordSet{} - } else if _, ok := r.recordSets[aws.StringValue(input.HostedZoneId)]; !ok { - output.ResourceRecordSets = []*route53.ResourceRecordSet{} + output.ResourceRecordSets = []route53types.ResourceRecordSet{} + } else if _, ok := r.recordSets[*input.HostedZoneId]; !ok { + output.ResourceRecordSets = []route53types.ResourceRecordSet{} } else { - for _, rrsets := range r.recordSets[aws.StringValue(input.HostedZoneId)] { + for _, rrsets := range r.recordSets[*input.HostedZoneId] { output.ResourceRecordSets = append(output.ResourceRecordSets, rrsets...) } } - lastPage := true - fn(&output, lastPage) - return nil + return output, nil } type Route53APICounter struct { @@ -110,29 +108,29 @@ func NewRoute53APICounter(w Route53API) *Route53APICounter { } } -func (c *Route53APICounter) ListResourceRecordSetsPagesWithContext(ctx context.Context, input *route53.ListResourceRecordSetsInput, fn func(resp *route53.ListResourceRecordSetsOutput, lastPage bool) (shouldContinue bool), opts ...request.Option) error { +func (c *Route53APICounter) ListResourceRecordSets(ctx context.Context, input *route53.ListResourceRecordSetsInput, optFns ...func(options *route53.Options)) (*route53.ListResourceRecordSetsOutput, error) { c.calls["ListResourceRecordSetsPages"]++ - return c.wrapped.ListResourceRecordSetsPagesWithContext(ctx, input, fn) + return c.wrapped.ListResourceRecordSets(ctx, input, optFns...) } -func (c *Route53APICounter) ChangeResourceRecordSetsWithContext(ctx context.Context, input *route53.ChangeResourceRecordSetsInput, opts ...request.Option) (*route53.ChangeResourceRecordSetsOutput, error) { +func (c *Route53APICounter) ChangeResourceRecordSets(ctx context.Context, input *route53.ChangeResourceRecordSetsInput, optFns ...func(*route53.Options)) (*route53.ChangeResourceRecordSetsOutput, error) { c.calls["ChangeResourceRecordSets"]++ - return c.wrapped.ChangeResourceRecordSetsWithContext(ctx, input) + return c.wrapped.ChangeResourceRecordSets(ctx, input, optFns...) } -func (c *Route53APICounter) CreateHostedZoneWithContext(ctx context.Context, input *route53.CreateHostedZoneInput, opts ...request.Option) (*route53.CreateHostedZoneOutput, error) { +func (c *Route53APICounter) CreateHostedZone(ctx context.Context, input *route53.CreateHostedZoneInput, optFns ...func(*route53.Options)) (*route53.CreateHostedZoneOutput, error) { c.calls["CreateHostedZone"]++ - return c.wrapped.CreateHostedZoneWithContext(ctx, input) + return c.wrapped.CreateHostedZone(ctx, input, optFns...) } -func (c *Route53APICounter) ListHostedZonesPagesWithContext(ctx context.Context, input *route53.ListHostedZonesInput, fn func(resp *route53.ListHostedZonesOutput, lastPage bool) (shouldContinue bool), opts ...request.Option) error { +func (c *Route53APICounter) ListHostedZones(ctx context.Context, input *route53.ListHostedZonesInput, optFns ...func(options *route53.Options)) (*route53.ListHostedZonesOutput, error) { c.calls["ListHostedZonesPages"]++ - return c.wrapped.ListHostedZonesPagesWithContext(ctx, input, fn) + return c.wrapped.ListHostedZones(ctx, input, optFns...) } -func (c *Route53APICounter) ListTagsForResourceWithContext(ctx context.Context, input *route53.ListTagsForResourceInput, opts ...request.Option) (*route53.ListTagsForResourceOutput, error) { +func (c *Route53APICounter) ListTagsForResource(ctx context.Context, input *route53.ListTagsForResourceInput, optFns ...func(options *route53.Options)) (*route53.ListTagsForResourceOutput, error) { c.calls["ListTagsForResource"]++ - return c.wrapped.ListTagsForResourceWithContext(ctx, input) + return c.wrapped.ListTagsForResource(ctx, input, optFns...) } // Route53 stores wildcards escaped: http://docs.aws.amazon.com/Route53/latest/DeveloperGuide/DomainNameFormat.html?shortFooter=true#domain-name-format-asterisk @@ -143,11 +141,11 @@ func wildcardEscape(s string) string { return s } -func (r *Route53APIStub) ListTagsForResourceWithContext(ctx context.Context, input *route53.ListTagsForResourceInput, opts ...request.Option) (*route53.ListTagsForResourceOutput, error) { - if aws.StringValue(input.ResourceType) == "hostedzone" { - tags := r.zoneTags[aws.StringValue(input.ResourceId)] +func (r *Route53APIStub) ListTagsForResource(ctx context.Context, input *route53.ListTagsForResourceInput, optFns ...func(options *route53.Options)) (*route53.ListTagsForResourceOutput, error) { + if input.ResourceType == route53types.TagResourceTypeHostedzone { + tags := r.zoneTags[*input.ResourceId] return &route53.ListTagsForResourceOutput{ - ResourceTagSet: &route53.ResourceTagSet{ + ResourceTagSet: &route53types.ResourceTagSet{ ResourceId: input.ResourceId, ResourceType: input.ResourceType, Tags: tags, @@ -157,14 +155,14 @@ func (r *Route53APIStub) ListTagsForResourceWithContext(ctx context.Context, inp return &route53.ListTagsForResourceOutput{}, nil } -func (r *Route53APIStub) ChangeResourceRecordSetsWithContext(ctx context.Context, input *route53.ChangeResourceRecordSetsInput, opts ...request.Option) (*route53.ChangeResourceRecordSetsOutput, error) { +func (r *Route53APIStub) ChangeResourceRecordSets(ctx context.Context, input *route53.ChangeResourceRecordSetsInput, optFns ...func(options *route53.Options)) (*route53.ChangeResourceRecordSetsOutput, error) { if r.m.isMocked("ChangeResourceRecordSets", input) { return r.m.ChangeResourceRecordSets(input) } - _, ok := r.zones[aws.StringValue(input.HostedZoneId)] + _, ok := r.zones[*input.HostedZoneId] if !ok { - return nil, fmt.Errorf("Hosted zone doesn't exist: %s", aws.StringValue(input.HostedZoneId)) + return nil, fmt.Errorf("Hosted zone doesn't exist: %s", *input.HostedZoneId) } if len(input.ChangeBatch.Changes) == 0 { @@ -172,67 +170,65 @@ func (r *Route53APIStub) ChangeResourceRecordSetsWithContext(ctx context.Context } output := &route53.ChangeResourceRecordSetsOutput{} - recordSets, ok := r.recordSets[aws.StringValue(input.HostedZoneId)] + recordSets, ok := r.recordSets[*input.HostedZoneId] if !ok { - recordSets = make(map[string][]*route53.ResourceRecordSet) + recordSets = make(map[string][]route53types.ResourceRecordSet) } for _, change := range input.ChangeBatch.Changes { - if aws.StringValue(change.ResourceRecordSet.Type) == route53.RRTypeA { + if change.ResourceRecordSet.Type == route53types.RRTypeA { for _, rrs := range change.ResourceRecordSet.ResourceRecords { - if net.ParseIP(aws.StringValue(rrs.Value)) == nil { + if net.ParseIP(*rrs.Value) == nil { return nil, fmt.Errorf("A records must point to IPs") } } } - change.ResourceRecordSet.Name = aws.String(wildcardEscape(provider.EnsureTrailingDot(aws.StringValue(change.ResourceRecordSet.Name)))) + change.ResourceRecordSet.Name = aws.String(wildcardEscape(provider.EnsureTrailingDot(*change.ResourceRecordSet.Name))) if change.ResourceRecordSet.AliasTarget != nil { - change.ResourceRecordSet.AliasTarget.DNSName = aws.String(wildcardEscape(provider.EnsureTrailingDot(aws.StringValue(change.ResourceRecordSet.AliasTarget.DNSName)))) + change.ResourceRecordSet.AliasTarget.DNSName = aws.String(wildcardEscape(provider.EnsureTrailingDot(*change.ResourceRecordSet.AliasTarget.DNSName))) } setID := "" if change.ResourceRecordSet.SetIdentifier != nil { - setID = aws.StringValue(change.ResourceRecordSet.SetIdentifier) + setID = *change.ResourceRecordSet.SetIdentifier } - key := aws.StringValue(change.ResourceRecordSet.Name) + "::" + aws.StringValue(change.ResourceRecordSet.Type) + "::" + setID - switch aws.StringValue(change.Action) { - case route53.ChangeActionCreate: + key := *change.ResourceRecordSet.Name + "::" + string(change.ResourceRecordSet.Type) + "::" + setID + switch change.Action { + case route53types.ChangeActionCreate: if _, found := recordSets[key]; found { return nil, fmt.Errorf("Attempt to create duplicate rrset %s", key) // TODO: Return AWS errors with codes etc } - recordSets[key] = append(recordSets[key], change.ResourceRecordSet) - case route53.ChangeActionDelete: + recordSets[key] = append(recordSets[key], *change.ResourceRecordSet) + case route53types.ChangeActionDelete: if _, found := recordSets[key]; !found { return nil, fmt.Errorf("Attempt to delete non-existent rrset %s", key) // TODO: Check other fields too } delete(recordSets, key) - case route53.ChangeActionUpsert: - recordSets[key] = []*route53.ResourceRecordSet{change.ResourceRecordSet} + case route53types.ChangeActionUpsert: + recordSets[key] = []route53types.ResourceRecordSet{*change.ResourceRecordSet} } } - r.recordSets[aws.StringValue(input.HostedZoneId)] = recordSets + r.recordSets[*input.HostedZoneId] = recordSets return output, nil // TODO: We should ideally return status etc, but we don't' use that yet. } -func (r *Route53APIStub) ListHostedZonesPagesWithContext(ctx context.Context, input *route53.ListHostedZonesInput, fn func(p *route53.ListHostedZonesOutput, lastPage bool) (shouldContinue bool), opts ...request.Option) error { +func (r *Route53APIStub) ListHostedZones(ctx context.Context, input *route53.ListHostedZonesInput, optFns ...func(options *route53.Options)) (*route53.ListHostedZonesOutput, error) { output := &route53.ListHostedZonesOutput{} for _, zone := range r.zones { - output.HostedZones = append(output.HostedZones, zone) + output.HostedZones = append(output.HostedZones, *zone) } - lastPage := true - fn(output, lastPage) - return nil + return output, nil } -func (r *Route53APIStub) CreateHostedZoneWithContext(ctx context.Context, input *route53.CreateHostedZoneInput, opts ...request.Option) (*route53.CreateHostedZoneOutput, error) { - name := aws.StringValue(input.Name) +func (r *Route53APIStub) CreateHostedZone(ctx context.Context, input *route53.CreateHostedZoneInput, optFns ...func(options *route53.Options)) (*route53.CreateHostedZoneOutput, error) { + name := *input.Name id := "/hostedzone/" + name if _, ok := r.zones[id]; ok { return nil, fmt.Errorf("Error creating hosted DNS zone: %s already exists", id) } - r.zones[id] = &route53.HostedZone{ + r.zones[id] = &route53types.HostedZone{ Id: aws.String(id), Name: aws.String(name), Config: input.HostedZoneConfig, @@ -265,7 +261,7 @@ func (m *dynamicMock) isMocked(method string, arguments ...interface{}) bool { } func TestAWSZones(t *testing.T) { - publicZones := map[string]*route53.HostedZone{ + publicZones := map[string]*route53types.HostedZone{ "/hostedzone/zone-1.ext-dns-test-2.teapot.zalan.do.": { Id: aws.String("/hostedzone/zone-1.ext-dns-test-2.teapot.zalan.do."), Name: aws.String("zone-1.ext-dns-test-2.teapot.zalan.do."), @@ -276,14 +272,14 @@ func TestAWSZones(t *testing.T) { }, } - privateZones := map[string]*route53.HostedZone{ + privateZones := map[string]*route53types.HostedZone{ "/hostedzone/zone-3.ext-dns-test-2.teapot.zalan.do.": { Id: aws.String("/hostedzone/zone-3.ext-dns-test-2.teapot.zalan.do."), Name: aws.String("zone-3.ext-dns-test-2.teapot.zalan.do."), }, } - allZones := map[string]*route53.HostedZone{} + allZones := map[string]*route53types.HostedZone{} for k, v := range publicZones { allZones[k] = v } @@ -291,14 +287,14 @@ func TestAWSZones(t *testing.T) { allZones[k] = v } - noZones := map[string]*route53.HostedZone{} + noZones := map[string]*route53types.HostedZone{} for _, ti := range []struct { msg string zoneIDFilter provider.ZoneIDFilter zoneTypeFilter provider.ZoneTypeFilter zoneTagFilter provider.ZoneTagFilter - expectedZones map[string]*route53.HostedZone + expectedZones map[string]*route53types.HostedZone }{ {"no filter", provider.NewZoneIDFilter([]string{}), provider.NewZoneTypeFilter(""), provider.NewZoneTagFilter([]string{}), allZones}, {"public filter", provider.NewZoneIDFilter([]string{}), provider.NewZoneTypeFilter("public"), provider.NewZoneTagFilter([]string{}), publicZones}, @@ -307,12 +303,14 @@ func TestAWSZones(t *testing.T) { {"zone id filter", provider.NewZoneIDFilter([]string{"/hostedzone/zone-3.ext-dns-test-2.teapot.zalan.do."}), provider.NewZoneTypeFilter(""), provider.NewZoneTagFilter([]string{}), privateZones}, {"tag filter", provider.NewZoneIDFilter([]string{}), provider.NewZoneTypeFilter(""), provider.NewZoneTagFilter([]string{"zone=3"}), privateZones}, } { - provider, _ := newAWSProviderWithTagFilter(t, endpoint.NewDomainFilter([]string{"ext-dns-test-2.teapot.zalan.do."}), ti.zoneIDFilter, ti.zoneTypeFilter, ti.zoneTagFilter, defaultEvaluateTargetHealth, false, nil) + 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) - zones, err := provider.Zones(context.Background()) - require.NoError(t, err) + zones, err := provider.Zones(context.Background()) + require.NoError(t, err) - validateAWSZones(t, zones, ti.expectedZones) + validateAWSZones(t, zones, ti.expectedZones) + }) } } @@ -340,157 +338,157 @@ func TestAWSRecordsFilter(t *testing.T) { } func TestAWSRecords(t *testing.T) { - provider, _ := newAWSProvider(t, endpoint.NewDomainFilter([]string{"ext-dns-test-2.teapot.zalan.do."}), provider.NewZoneIDFilter([]string{}), provider.NewZoneTypeFilter(""), false, false, []*route53.ResourceRecordSet{ + provider, _ := newAWSProvider(t, endpoint.NewDomainFilter([]string{"ext-dns-test-2.teapot.zalan.do."}), provider.NewZoneIDFilter([]string{}), provider.NewZoneTypeFilter(""), false, false, []route53types.ResourceRecordSet{ { Name: aws.String("list-test.zone-1.ext-dns-test-2.teapot.zalan.do."), - Type: aws.String(route53.RRTypeA), + Type: route53types.RRTypeA, TTL: aws.Int64(recordTTL), - ResourceRecords: []*route53.ResourceRecord{{Value: aws.String("1.2.3.4")}}, + ResourceRecords: []route53types.ResourceRecord{{Value: aws.String("1.2.3.4")}}, }, { Name: aws.String("list-test.zone-2.ext-dns-test-2.teapot.zalan.do."), - Type: aws.String(route53.RRTypeA), + Type: route53types.RRTypeA, TTL: aws.Int64(recordTTL), - ResourceRecords: []*route53.ResourceRecord{{Value: aws.String("8.8.8.8")}}, + ResourceRecords: []route53types.ResourceRecord{{Value: aws.String("8.8.8.8")}}, }, { Name: aws.String("*.wildcard-test.zone-2.ext-dns-test-2.teapot.zalan.do."), - Type: aws.String(route53.RRTypeA), + Type: route53types.RRTypeA, TTL: aws.Int64(recordTTL), - ResourceRecords: []*route53.ResourceRecord{{Value: aws.String("8.8.8.8")}}, + ResourceRecords: []route53types.ResourceRecord{{Value: aws.String("8.8.8.8")}}, }, { Name: aws.String("list-test-alias.zone-1.ext-dns-test-2.teapot.zalan.do."), - Type: aws.String(route53.RRTypeA), - AliasTarget: &route53.AliasTarget{ + Type: route53types.RRTypeA, + AliasTarget: &route53types.AliasTarget{ DNSName: aws.String("foo.eu-central-1.elb.amazonaws.com."), - EvaluateTargetHealth: aws.Bool(false), + EvaluateTargetHealth: false, HostedZoneId: aws.String("Z215JYRZR1TBD5"), }, }, { Name: aws.String("*.wildcard-test-alias.zone-1.ext-dns-test-2.teapot.zalan.do."), - Type: aws.String(route53.RRTypeA), - AliasTarget: &route53.AliasTarget{ + Type: route53types.RRTypeA, + AliasTarget: &route53types.AliasTarget{ DNSName: aws.String("foo.eu-central-1.elb.amazonaws.com."), - EvaluateTargetHealth: aws.Bool(false), + EvaluateTargetHealth: false, HostedZoneId: aws.String("Z215JYRZR1TBD5"), }, }, { Name: aws.String("list-test-alias-evaluate.zone-1.ext-dns-test-2.teapot.zalan.do."), - Type: aws.String(route53.RRTypeA), - AliasTarget: &route53.AliasTarget{ + Type: route53types.RRTypeA, + AliasTarget: &route53types.AliasTarget{ DNSName: aws.String("foo.eu-central-1.elb.amazonaws.com."), - EvaluateTargetHealth: aws.Bool(true), + EvaluateTargetHealth: true, HostedZoneId: aws.String("Z215JYRZR1TBD5"), }, }, { Name: aws.String("list-test-multiple.zone-1.ext-dns-test-2.teapot.zalan.do."), - Type: aws.String(route53.RRTypeA), + Type: route53types.RRTypeA, TTL: aws.Int64(recordTTL), - ResourceRecords: []*route53.ResourceRecord{{Value: aws.String("8.8.8.8")}, {Value: aws.String("8.8.4.4")}}, + ResourceRecords: []route53types.ResourceRecord{{Value: aws.String("8.8.8.8")}, {Value: aws.String("8.8.4.4")}}, }, { Name: aws.String("prefix-*.wildcard.zone-1.ext-dns-test-2.teapot.zalan.do."), - Type: aws.String(route53.RRTypeTxt), + Type: route53types.RRTypeTxt, TTL: aws.Int64(recordTTL), - ResourceRecords: []*route53.ResourceRecord{{Value: aws.String("random")}}, + ResourceRecords: []route53types.ResourceRecord{{Value: aws.String("random")}}, }, { Name: aws.String("weight-test.zone-1.ext-dns-test-2.teapot.zalan.do."), - Type: aws.String(route53.RRTypeA), + Type: route53types.RRTypeA, TTL: aws.Int64(recordTTL), - ResourceRecords: []*route53.ResourceRecord{{Value: aws.String("1.2.3.4")}}, + ResourceRecords: []route53types.ResourceRecord{{Value: aws.String("1.2.3.4")}}, SetIdentifier: aws.String("test-set-1"), Weight: aws.Int64(10), }, { Name: aws.String("weight-test.zone-1.ext-dns-test-2.teapot.zalan.do."), - Type: aws.String(route53.RRTypeA), + Type: route53types.RRTypeA, TTL: aws.Int64(recordTTL), - ResourceRecords: []*route53.ResourceRecord{{Value: aws.String("4.3.2.1")}}, + ResourceRecords: []route53types.ResourceRecord{{Value: aws.String("4.3.2.1")}}, SetIdentifier: aws.String("test-set-2"), Weight: aws.Int64(20), }, { Name: aws.String("latency-test.zone-1.ext-dns-test-2.teapot.zalan.do."), - Type: aws.String(route53.RRTypeA), + Type: route53types.RRTypeA, TTL: aws.Int64(recordTTL), - ResourceRecords: []*route53.ResourceRecord{{Value: aws.String("1.2.3.4")}}, + ResourceRecords: []route53types.ResourceRecord{{Value: aws.String("1.2.3.4")}}, SetIdentifier: aws.String("test-set"), - Region: aws.String("us-east-1"), + Region: route53types.ResourceRecordSetRegionUsEast1, }, { Name: aws.String("failover-test.zone-1.ext-dns-test-2.teapot.zalan.do."), - Type: aws.String(route53.RRTypeA), + Type: route53types.RRTypeA, TTL: aws.Int64(recordTTL), - ResourceRecords: []*route53.ResourceRecord{{Value: aws.String("1.2.3.4")}}, + ResourceRecords: []route53types.ResourceRecord{{Value: aws.String("1.2.3.4")}}, SetIdentifier: aws.String("test-set"), - Failover: aws.String("PRIMARY"), + Failover: route53types.ResourceRecordSetFailoverPrimary, }, { Name: aws.String("multi-value-answer-test.zone-1.ext-dns-test-2.teapot.zalan.do."), - Type: aws.String(route53.RRTypeA), + Type: route53types.RRTypeA, TTL: aws.Int64(recordTTL), - ResourceRecords: []*route53.ResourceRecord{{Value: aws.String("1.2.3.4")}}, + ResourceRecords: []route53types.ResourceRecord{{Value: aws.String("1.2.3.4")}}, SetIdentifier: aws.String("test-set"), MultiValueAnswer: aws.Bool(true), }, { Name: aws.String("geolocation-test.zone-1.ext-dns-test-2.teapot.zalan.do."), - Type: aws.String(route53.RRTypeA), + Type: route53types.RRTypeA, TTL: aws.Int64(recordTTL), - ResourceRecords: []*route53.ResourceRecord{{Value: aws.String("1.2.3.4")}}, + ResourceRecords: []route53types.ResourceRecord{{Value: aws.String("1.2.3.4")}}, SetIdentifier: aws.String("test-set-1"), - GeoLocation: &route53.GeoLocation{ + GeoLocation: &route53types.GeoLocation{ ContinentCode: aws.String("EU"), }, }, { Name: aws.String("geolocation-test.zone-1.ext-dns-test-2.teapot.zalan.do."), - Type: aws.String(route53.RRTypeA), + Type: route53types.RRTypeA, TTL: aws.Int64(recordTTL), - ResourceRecords: []*route53.ResourceRecord{{Value: aws.String("4.3.2.1")}}, + ResourceRecords: []route53types.ResourceRecord{{Value: aws.String("4.3.2.1")}}, SetIdentifier: aws.String("test-set-2"), - GeoLocation: &route53.GeoLocation{ + GeoLocation: &route53types.GeoLocation{ CountryCode: aws.String("DE"), }, }, { Name: aws.String("geolocation-subdivision-test.zone-1.ext-dns-test-2.teapot.zalan.do."), - Type: aws.String(route53.RRTypeA), + Type: route53types.RRTypeA, TTL: aws.Int64(recordTTL), - ResourceRecords: []*route53.ResourceRecord{{Value: aws.String("1.2.3.4")}}, + ResourceRecords: []route53types.ResourceRecord{{Value: aws.String("1.2.3.4")}}, SetIdentifier: aws.String("test-set-1"), - GeoLocation: &route53.GeoLocation{ + GeoLocation: &route53types.GeoLocation{ SubdivisionCode: aws.String("NY"), }, }, { Name: aws.String("healthcheck-test.zone-1.ext-dns-test-2.teapot.zalan.do."), - Type: aws.String(route53.RRTypeCname), + Type: route53types.RRTypeCname, TTL: aws.Int64(recordTTL), - ResourceRecords: []*route53.ResourceRecord{{Value: aws.String("foo.example.com")}}, + ResourceRecords: []route53types.ResourceRecord{{Value: aws.String("foo.example.com")}}, SetIdentifier: aws.String("test-set-1"), HealthCheckId: aws.String("foo-bar-healthcheck-id"), Weight: aws.Int64(10), }, { Name: aws.String("healthcheck-test.zone-1.ext-dns-test-2.teapot.zalan.do."), - Type: aws.String(route53.RRTypeA), + Type: route53types.RRTypeA, TTL: aws.Int64(recordTTL), - ResourceRecords: []*route53.ResourceRecord{{Value: aws.String("4.3.2.1")}}, + ResourceRecords: []route53types.ResourceRecord{{Value: aws.String("4.3.2.1")}}, SetIdentifier: aws.String("test-set-2"), HealthCheckId: aws.String("abc-def-healthcheck-id"), Weight: aws.Int64(20), }, { Name: aws.String("mail.zone-1.ext-dns-test-2.teapot.zalan.do."), - Type: aws.String(route53.RRTypeMx), + Type: route53types.RRTypeMx, TTL: aws.Int64(recordTTL), - ResourceRecords: []*route53.ResourceRecord{{Value: aws.String("10 mailhost1.example.com")}, {Value: aws.String("20 mailhost2.example.com")}}, + ResourceRecords: []route53types.ResourceRecord{{Value: aws.String("10 mailhost1.example.com")}, {Value: aws.String("20 mailhost2.example.com")}}, }, }) @@ -563,131 +561,131 @@ func TestAWSApplyChanges(t *testing.T) { } for _, tt := range tests { - provider, _ := newAWSProvider(t, endpoint.NewDomainFilter([]string{"ext-dns-test-2.teapot.zalan.do."}), provider.NewZoneIDFilter([]string{}), provider.NewZoneTypeFilter(""), defaultEvaluateTargetHealth, false, []*route53.ResourceRecordSet{ + provider, _ := newAWSProvider(t, endpoint.NewDomainFilter([]string{"ext-dns-test-2.teapot.zalan.do."}), provider.NewZoneIDFilter([]string{}), provider.NewZoneTypeFilter(""), defaultEvaluateTargetHealth, false, []route53types.ResourceRecordSet{ { Name: aws.String("update-test.zone-1.ext-dns-test-2.teapot.zalan.do."), - Type: aws.String(route53.RRTypeA), + Type: route53types.RRTypeA, TTL: aws.Int64(recordTTL), - ResourceRecords: []*route53.ResourceRecord{{Value: aws.String("8.8.8.8")}}, + ResourceRecords: []route53types.ResourceRecord{{Value: aws.String("8.8.8.8")}}, }, { Name: aws.String("delete-test.zone-1.ext-dns-test-2.teapot.zalan.do."), - Type: aws.String(route53.RRTypeA), + Type: route53types.RRTypeA, TTL: aws.Int64(recordTTL), - ResourceRecords: []*route53.ResourceRecord{{Value: aws.String("8.8.8.8")}}, + ResourceRecords: []route53types.ResourceRecord{{Value: aws.String("8.8.8.8")}}, }, { Name: aws.String("update-test.zone-2.ext-dns-test-2.teapot.zalan.do."), - Type: aws.String(route53.RRTypeA), + Type: route53types.RRTypeA, TTL: aws.Int64(recordTTL), - ResourceRecords: []*route53.ResourceRecord{{Value: aws.String("8.8.4.4")}}, + ResourceRecords: []route53types.ResourceRecord{{Value: aws.String("8.8.4.4")}}, }, { Name: aws.String("delete-test.zone-2.ext-dns-test-2.teapot.zalan.do."), - Type: aws.String(route53.RRTypeA), + Type: route53types.RRTypeA, TTL: aws.Int64(recordTTL), - ResourceRecords: []*route53.ResourceRecord{{Value: aws.String("8.8.4.4")}}, + ResourceRecords: []route53types.ResourceRecord{{Value: aws.String("8.8.4.4")}}, }, { Name: aws.String("update-test-a-to-cname.zone-1.ext-dns-test-2.teapot.zalan.do."), - Type: aws.String(route53.RRTypeA), + Type: route53types.RRTypeA, TTL: aws.Int64(recordTTL), - ResourceRecords: []*route53.ResourceRecord{{Value: aws.String("1.1.1.1")}}, + ResourceRecords: []route53types.ResourceRecord{{Value: aws.String("1.1.1.1")}}, }, { Name: aws.String("update-test-alias-to-cname.zone-1.ext-dns-test-2.teapot.zalan.do."), - Type: aws.String(route53.RRTypeA), - AliasTarget: &route53.AliasTarget{ + Type: route53types.RRTypeA, + AliasTarget: &route53types.AliasTarget{ DNSName: aws.String("foo.eu-central-1.elb.amazonaws.com."), - EvaluateTargetHealth: aws.Bool(true), + EvaluateTargetHealth: true, HostedZoneId: aws.String("Z215JYRZR1TBD5"), }, }, { Name: aws.String("update-test-cname.zone-1.ext-dns-test-2.teapot.zalan.do."), - Type: aws.String(route53.RRTypeCname), + Type: route53types.RRTypeCname, TTL: aws.Int64(recordTTL), - ResourceRecords: []*route53.ResourceRecord{{Value: aws.String("bar.elb.amazonaws.com")}}, + ResourceRecords: []route53types.ResourceRecord{{Value: aws.String("bar.elb.amazonaws.com")}}, }, { Name: aws.String("delete-test-cname.zone-1.ext-dns-test-2.teapot.zalan.do."), - Type: aws.String(route53.RRTypeCname), + Type: route53types.RRTypeCname, TTL: aws.Int64(recordTTL), - ResourceRecords: []*route53.ResourceRecord{{Value: aws.String("qux.elb.amazonaws.com")}}, + ResourceRecords: []route53types.ResourceRecord{{Value: aws.String("qux.elb.amazonaws.com")}}, }, { Name: aws.String("update-test-cname-alias.zone-1.ext-dns-test-2.teapot.zalan.do."), - Type: aws.String(route53.RRTypeCname), + Type: route53types.RRTypeCname, TTL: aws.Int64(recordTTL), - ResourceRecords: []*route53.ResourceRecord{{Value: aws.String("bar.elb.amazonaws.com")}}, + ResourceRecords: []route53types.ResourceRecord{{Value: aws.String("bar.elb.amazonaws.com")}}, }, { Name: aws.String("delete-test-cname-alias.zone-1.ext-dns-test-2.teapot.zalan.do."), - Type: aws.String(route53.RRTypeCname), + Type: route53types.RRTypeCname, TTL: aws.Int64(recordTTL), - ResourceRecords: []*route53.ResourceRecord{{Value: aws.String("qux.elb.amazonaws.com")}}, + ResourceRecords: []route53types.ResourceRecord{{Value: aws.String("qux.elb.amazonaws.com")}}, }, { Name: aws.String("update-test-multiple.zone-2.ext-dns-test-2.teapot.zalan.do."), - Type: aws.String(route53.RRTypeA), + Type: route53types.RRTypeA, TTL: aws.Int64(recordTTL), - ResourceRecords: []*route53.ResourceRecord{{Value: aws.String("8.8.8.8")}, {Value: aws.String("8.8.4.4")}}, + ResourceRecords: []route53types.ResourceRecord{{Value: aws.String("8.8.8.8")}, {Value: aws.String("8.8.4.4")}}, }, { Name: aws.String("delete-test-multiple.zone-2.ext-dns-test-2.teapot.zalan.do."), - Type: aws.String(route53.RRTypeA), + Type: route53types.RRTypeA, TTL: aws.Int64(recordTTL), - ResourceRecords: []*route53.ResourceRecord{{Value: aws.String("1.2.3.4")}, {Value: aws.String("4.3.2.1")}}, + ResourceRecords: []route53types.ResourceRecord{{Value: aws.String("1.2.3.4")}, {Value: aws.String("4.3.2.1")}}, }, { Name: aws.String("weighted-to-simple.zone-1.ext-dns-test-2.teapot.zalan.do."), - Type: aws.String(route53.RRTypeA), + Type: route53types.RRTypeA, TTL: aws.Int64(recordTTL), - ResourceRecords: []*route53.ResourceRecord{{Value: aws.String("1.2.3.4")}}, + ResourceRecords: []route53types.ResourceRecord{{Value: aws.String("1.2.3.4")}}, SetIdentifier: aws.String("weighted-to-simple"), Weight: aws.Int64(10), }, { Name: aws.String("simple-to-weighted.zone-1.ext-dns-test-2.teapot.zalan.do."), - Type: aws.String(route53.RRTypeA), + Type: route53types.RRTypeA, TTL: aws.Int64(recordTTL), - ResourceRecords: []*route53.ResourceRecord{{Value: aws.String("1.2.3.4")}}, + ResourceRecords: []route53types.ResourceRecord{{Value: aws.String("1.2.3.4")}}, }, { Name: aws.String("policy-change.zone-1.ext-dns-test-2.teapot.zalan.do."), - Type: aws.String(route53.RRTypeA), + Type: route53types.RRTypeA, TTL: aws.Int64(recordTTL), - ResourceRecords: []*route53.ResourceRecord{{Value: aws.String("1.2.3.4")}}, + ResourceRecords: []route53types.ResourceRecord{{Value: aws.String("1.2.3.4")}}, SetIdentifier: aws.String("policy-change"), Weight: aws.Int64(10), }, { Name: aws.String("set-identifier-change.zone-1.ext-dns-test-2.teapot.zalan.do."), - Type: aws.String(route53.RRTypeA), + Type: route53types.RRTypeA, TTL: aws.Int64(recordTTL), - ResourceRecords: []*route53.ResourceRecord{{Value: aws.String("1.2.3.4")}}, + ResourceRecords: []route53types.ResourceRecord{{Value: aws.String("1.2.3.4")}}, SetIdentifier: aws.String("before"), Weight: aws.Int64(10), }, { Name: aws.String("set-identifier-no-change.zone-1.ext-dns-test-2.teapot.zalan.do."), - Type: aws.String(route53.RRTypeA), + Type: route53types.RRTypeA, TTL: aws.Int64(recordTTL), - ResourceRecords: []*route53.ResourceRecord{{Value: aws.String("1.2.3.4")}}, + ResourceRecords: []route53types.ResourceRecord{{Value: aws.String("1.2.3.4")}}, SetIdentifier: aws.String("no-change"), Weight: aws.Int64(10), }, { Name: aws.String("update-test-mx.zone-2.ext-dns-test-2.teapot.zalan.do."), - Type: aws.String(route53.RRTypeMx), + Type: route53types.RRTypeMx, TTL: aws.Int64(recordTTL), - ResourceRecords: []*route53.ResourceRecord{{Value: aws.String("10 mailhost2.bar.elb.amazonaws.com")}}, + ResourceRecords: []route53types.ResourceRecord{{Value: aws.String("10 mailhost2.bar.elb.amazonaws.com")}}, }, { Name: aws.String("delete-test-mx.zone-2.ext-dns-test-2.teapot.zalan.do."), - Type: aws.String(route53.RRTypeMx), + Type: route53types.RRTypeMx, TTL: aws.Int64(recordTTL), - ResourceRecords: []*route53.ResourceRecord{{Value: aws.String("30 mailhost1.foo.elb.amazonaws.com")}}, + ResourceRecords: []route53types.ResourceRecord{{Value: aws.String("30 mailhost1.foo.elb.amazonaws.com")}}, }, }) @@ -757,217 +755,217 @@ func TestAWSApplyChanges(t *testing.T) { assert.Equal(t, 1, counter.calls["ListHostedZonesPages"], 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."), []route53types.ResourceRecordSet{ { Name: aws.String("create-test.zone-1.ext-dns-test-2.teapot.zalan.do."), - Type: aws.String(route53.RRTypeA), + Type: route53types.RRTypeA, TTL: aws.Int64(recordTTL), - ResourceRecords: []*route53.ResourceRecord{{Value: aws.String("8.8.8.8")}}, + ResourceRecords: []route53types.ResourceRecord{{Value: aws.String("8.8.8.8")}}, }, { Name: aws.String("update-test.zone-1.ext-dns-test-2.teapot.zalan.do."), - Type: aws.String(route53.RRTypeA), + Type: route53types.RRTypeA, TTL: aws.Int64(recordTTL), - ResourceRecords: []*route53.ResourceRecord{{Value: aws.String("1.2.3.4")}}, + ResourceRecords: []route53types.ResourceRecord{{Value: aws.String("1.2.3.4")}}, }, { Name: aws.String("update-test-a-to-cname.zone-1.ext-dns-test-2.teapot.zalan.do."), - Type: aws.String(route53.RRTypeA), - AliasTarget: &route53.AliasTarget{ + Type: route53types.RRTypeA, + AliasTarget: &route53types.AliasTarget{ DNSName: aws.String("foo.elb.amazonaws.com."), - EvaluateTargetHealth: aws.Bool(true), + EvaluateTargetHealth: true, HostedZoneId: aws.String("zone-1.ext-dns-test-2.teapot.zalan.do."), }, }, { Name: aws.String("update-test-alias-to-cname.zone-1.ext-dns-test-2.teapot.zalan.do."), - Type: aws.String(route53.RRTypeCname), + Type: route53types.RRTypeCname, TTL: aws.Int64(recordTTL), - ResourceRecords: []*route53.ResourceRecord{{Value: aws.String("my-internal-host.example.com")}}, + ResourceRecords: []route53types.ResourceRecord{{Value: aws.String("my-internal-host.example.com")}}, }, { Name: aws.String("create-test-cname.zone-1.ext-dns-test-2.teapot.zalan.do."), - Type: aws.String(route53.RRTypeCname), + Type: route53types.RRTypeCname, TTL: aws.Int64(recordTTL), - ResourceRecords: []*route53.ResourceRecord{{Value: aws.String("foo.elb.amazonaws.com")}}, + ResourceRecords: []route53types.ResourceRecord{{Value: aws.String("foo.elb.amazonaws.com")}}, }, { Name: aws.String("update-test-cname.zone-1.ext-dns-test-2.teapot.zalan.do."), - Type: aws.String(route53.RRTypeCname), + Type: route53types.RRTypeCname, TTL: aws.Int64(recordTTL), - ResourceRecords: []*route53.ResourceRecord{{Value: aws.String("baz.elb.amazonaws.com")}}, + ResourceRecords: []route53types.ResourceRecord{{Value: aws.String("baz.elb.amazonaws.com")}}, }, { Name: aws.String("create-test-cname-alias.zone-1.ext-dns-test-2.teapot.zalan.do."), - Type: aws.String(route53.RRTypeCname), + Type: route53types.RRTypeCname, TTL: aws.Int64(recordTTL), - ResourceRecords: []*route53.ResourceRecord{{Value: aws.String("foo.elb.amazonaws.com")}}, + ResourceRecords: []route53types.ResourceRecord{{Value: aws.String("foo.elb.amazonaws.com")}}, }, { Name: aws.String("update-test-cname-alias.zone-1.ext-dns-test-2.teapot.zalan.do."), - Type: aws.String(route53.RRTypeCname), + Type: route53types.RRTypeCname, TTL: aws.Int64(recordTTL), - ResourceRecords: []*route53.ResourceRecord{{Value: aws.String("baz.elb.amazonaws.com")}}, + ResourceRecords: []route53types.ResourceRecord{{Value: aws.String("baz.elb.amazonaws.com")}}, }, { Name: aws.String("weighted-to-simple.zone-1.ext-dns-test-2.teapot.zalan.do."), - Type: aws.String(route53.RRTypeA), + Type: route53types.RRTypeA, TTL: aws.Int64(recordTTL), - ResourceRecords: []*route53.ResourceRecord{{Value: aws.String("1.2.3.4")}}, + ResourceRecords: []route53types.ResourceRecord{{Value: aws.String("1.2.3.4")}}, }, { Name: aws.String("simple-to-weighted.zone-1.ext-dns-test-2.teapot.zalan.do."), - Type: aws.String(route53.RRTypeA), + Type: route53types.RRTypeA, TTL: aws.Int64(recordTTL), - ResourceRecords: []*route53.ResourceRecord{{Value: aws.String("1.2.3.4")}}, + ResourceRecords: []route53types.ResourceRecord{{Value: aws.String("1.2.3.4")}}, SetIdentifier: aws.String("simple-to-weighted"), Weight: aws.Int64(10), }, { Name: aws.String("policy-change.zone-1.ext-dns-test-2.teapot.zalan.do."), - Type: aws.String(route53.RRTypeA), + Type: route53types.RRTypeA, TTL: aws.Int64(recordTTL), - ResourceRecords: []*route53.ResourceRecord{{Value: aws.String("1.2.3.4")}}, + ResourceRecords: []route53types.ResourceRecord{{Value: aws.String("1.2.3.4")}}, SetIdentifier: aws.String("policy-change"), - Region: aws.String("us-east-1"), + Region: route53types.ResourceRecordSetRegionUsEast1, }, { Name: aws.String("set-identifier-change.zone-1.ext-dns-test-2.teapot.zalan.do."), - Type: aws.String(route53.RRTypeA), + Type: route53types.RRTypeA, TTL: aws.Int64(recordTTL), - ResourceRecords: []*route53.ResourceRecord{{Value: aws.String("1.2.3.4")}}, + ResourceRecords: []route53types.ResourceRecord{{Value: aws.String("1.2.3.4")}}, SetIdentifier: aws.String("after"), Weight: aws.Int64(10), }, { Name: aws.String("set-identifier-no-change.zone-1.ext-dns-test-2.teapot.zalan.do."), - Type: aws.String(route53.RRTypeA), + Type: route53types.RRTypeA, TTL: aws.Int64(recordTTL), - ResourceRecords: []*route53.ResourceRecord{{Value: aws.String("1.2.3.4")}}, + ResourceRecords: []route53types.ResourceRecord{{Value: aws.String("1.2.3.4")}}, SetIdentifier: aws.String("no-change"), Weight: aws.Int64(20), }, { Name: aws.String("create-test-mx.zone-1.ext-dns-test-2.teapot.zalan.do."), - Type: aws.String(route53.RRTypeMx), + Type: route53types.RRTypeMx, TTL: aws.Int64(recordTTL), - ResourceRecords: []*route53.ResourceRecord{{Value: aws.String("10 mailhost1.foo.elb.amazonaws.com")}}, + ResourceRecords: []route53types.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."), []route53types.ResourceRecordSet{ { Name: aws.String("create-test.zone-2.ext-dns-test-2.teapot.zalan.do."), - Type: aws.String(route53.RRTypeA), + Type: route53types.RRTypeA, TTL: aws.Int64(recordTTL), - ResourceRecords: []*route53.ResourceRecord{{Value: aws.String("8.8.4.4")}}, + ResourceRecords: []route53types.ResourceRecord{{Value: aws.String("8.8.4.4")}}, }, { Name: aws.String("update-test.zone-2.ext-dns-test-2.teapot.zalan.do."), - Type: aws.String(route53.RRTypeA), + Type: route53types.RRTypeA, TTL: aws.Int64(recordTTL), - ResourceRecords: []*route53.ResourceRecord{{Value: aws.String("4.3.2.1")}}, + ResourceRecords: []route53types.ResourceRecord{{Value: aws.String("4.3.2.1")}}, }, { Name: aws.String("create-test-multiple.zone-2.ext-dns-test-2.teapot.zalan.do."), - Type: aws.String(route53.RRTypeA), + Type: route53types.RRTypeA, TTL: aws.Int64(recordTTL), - ResourceRecords: []*route53.ResourceRecord{{Value: aws.String("8.8.8.8")}, {Value: aws.String("8.8.4.4")}}, + ResourceRecords: []route53types.ResourceRecord{{Value: aws.String("8.8.8.8")}, {Value: aws.String("8.8.4.4")}}, }, { Name: aws.String("update-test-multiple.zone-2.ext-dns-test-2.teapot.zalan.do."), - Type: aws.String(route53.RRTypeA), + Type: route53types.RRTypeA, TTL: aws.Int64(recordTTL), - ResourceRecords: []*route53.ResourceRecord{{Value: aws.String("1.2.3.4")}, {Value: aws.String("4.3.2.1")}}, + ResourceRecords: []route53types.ResourceRecord{{Value: aws.String("1.2.3.4")}, {Value: aws.String("4.3.2.1")}}, }, { Name: aws.String("update-test-mx.zone-2.ext-dns-test-2.teapot.zalan.do."), - Type: aws.String(route53.RRTypeMx), + Type: route53types.RRTypeMx, TTL: aws.Int64(recordTTL), - ResourceRecords: []*route53.ResourceRecord{{Value: aws.String("20 mailhost3.foo.elb.amazonaws.com")}}, + ResourceRecords: []route53types.ResourceRecord{{Value: aws.String("20 mailhost3.foo.elb.amazonaws.com")}}, }, }) } } func TestAWSApplyChangesDryRun(t *testing.T) { - originalRecords := []*route53.ResourceRecordSet{ + originalRecords := []route53types.ResourceRecordSet{ { Name: aws.String("update-test.zone-1.ext-dns-test-2.teapot.zalan.do."), - Type: aws.String(route53.RRTypeA), + Type: route53types.RRTypeA, TTL: aws.Int64(recordTTL), - ResourceRecords: []*route53.ResourceRecord{{Value: aws.String("8.8.8.8")}}, + ResourceRecords: []route53types.ResourceRecord{{Value: aws.String("8.8.8.8")}}, }, { Name: aws.String("delete-test.zone-1.ext-dns-test-2.teapot.zalan.do."), - Type: aws.String(route53.RRTypeA), + Type: route53types.RRTypeA, TTL: aws.Int64(recordTTL), - ResourceRecords: []*route53.ResourceRecord{{Value: aws.String("8.8.8.8")}}, + ResourceRecords: []route53types.ResourceRecord{{Value: aws.String("8.8.8.8")}}, }, { Name: aws.String("update-test.zone-2.ext-dns-test-2.teapot.zalan.do."), - Type: aws.String(route53.RRTypeA), + Type: route53types.RRTypeA, TTL: aws.Int64(recordTTL), - ResourceRecords: []*route53.ResourceRecord{{Value: aws.String("8.8.4.4")}}, + ResourceRecords: []route53types.ResourceRecord{{Value: aws.String("8.8.4.4")}}, }, { Name: aws.String("delete-test.zone-2.ext-dns-test-2.teapot.zalan.do."), - Type: aws.String(route53.RRTypeA), + Type: route53types.RRTypeA, TTL: aws.Int64(recordTTL), - ResourceRecords: []*route53.ResourceRecord{{Value: aws.String("8.8.4.4")}}, + ResourceRecords: []route53types.ResourceRecord{{Value: aws.String("8.8.4.4")}}, }, { Name: aws.String("update-test-a-to-cname.zone-1.ext-dns-test-2.teapot.zalan.do."), - Type: aws.String(route53.RRTypeA), + Type: route53types.RRTypeA, TTL: aws.Int64(recordTTL), - ResourceRecords: []*route53.ResourceRecord{{Value: aws.String("1.1.1.1")}}, + ResourceRecords: []route53types.ResourceRecord{{Value: aws.String("1.1.1.1")}}, }, { Name: aws.String("update-test-cname.zone-1.ext-dns-test-2.teapot.zalan.do."), - Type: aws.String(route53.RRTypeCname), + Type: route53types.RRTypeCname, TTL: aws.Int64(recordTTL), - ResourceRecords: []*route53.ResourceRecord{{Value: aws.String("bar.elb.amazonaws.com")}}, + ResourceRecords: []route53types.ResourceRecord{{Value: aws.String("bar.elb.amazonaws.com")}}, }, { Name: aws.String("delete-test-cname.zone-1.ext-dns-test-2.teapot.zalan.do."), - Type: aws.String(route53.RRTypeCname), + Type: route53types.RRTypeCname, TTL: aws.Int64(recordTTL), - ResourceRecords: []*route53.ResourceRecord{{Value: aws.String("qux.elb.amazonaws.com")}}, + ResourceRecords: []route53types.ResourceRecord{{Value: aws.String("qux.elb.amazonaws.com")}}, }, { Name: aws.String("update-test-cname-alias.zone-1.ext-dns-test-2.teapot.zalan.do."), - Type: aws.String(route53.RRTypeCname), + Type: route53types.RRTypeCname, TTL: aws.Int64(recordTTL), - ResourceRecords: []*route53.ResourceRecord{{Value: aws.String("bar.elb.amazonaws.com")}}, + ResourceRecords: []route53types.ResourceRecord{{Value: aws.String("bar.elb.amazonaws.com")}}, }, { Name: aws.String("delete-test-cname-alias.zone-1.ext-dns-test-2.teapot.zalan.do."), - Type: aws.String(route53.RRTypeCname), + Type: route53types.RRTypeCname, TTL: aws.Int64(recordTTL), - ResourceRecords: []*route53.ResourceRecord{{Value: aws.String("qux.elb.amazonaws.com")}}, + ResourceRecords: []route53types.ResourceRecord{{Value: aws.String("qux.elb.amazonaws.com")}}, }, { Name: aws.String("update-test-multiple.zone-2.ext-dns-test-2.teapot.zalan.do."), - Type: aws.String(route53.RRTypeA), + Type: route53types.RRTypeA, TTL: aws.Int64(recordTTL), - ResourceRecords: []*route53.ResourceRecord{{Value: aws.String("8.8.8.8")}, {Value: aws.String("8.8.4.4")}}, + ResourceRecords: []route53types.ResourceRecord{{Value: aws.String("8.8.8.8")}, {Value: aws.String("8.8.4.4")}}, }, { Name: aws.String("delete-test-multiple.zone-2.ext-dns-test-2.teapot.zalan.do."), - Type: aws.String(route53.RRTypeA), + Type: route53types.RRTypeA, TTL: aws.Int64(recordTTL), - ResourceRecords: []*route53.ResourceRecord{{Value: aws.String("1.2.3.4")}, {Value: aws.String("4.3.2.1")}}, + ResourceRecords: []route53types.ResourceRecord{{Value: aws.String("1.2.3.4")}, {Value: aws.String("4.3.2.1")}}, }, { Name: aws.String("update-test-mx.zone-1.ext-dns-test-2.teapot.zalan.do."), - Type: aws.String(route53.RRTypeMx), + Type: route53types.RRTypeMx, TTL: aws.Int64(recordTTL), - ResourceRecords: []*route53.ResourceRecord{{Value: aws.String("20 mail.foo.elb.amazonaws.com")}}, + ResourceRecords: []route53types.ResourceRecord{{Value: aws.String("20 mail.foo.elb.amazonaws.com")}}, }, { Name: aws.String("delete-test-mx.zone-2.ext-dns-test-2.teapot.zalan.do."), - Type: aws.String(route53.RRTypeMx), + Type: route53types.RRTypeMx, TTL: aws.Int64(recordTTL), - ResourceRecords: []*route53.ResourceRecord{{Value: aws.String("10 mail.bar.elb.amazonaws.com")}}, + ResourceRecords: []route53types.ResourceRecord{{Value: aws.String("10 mail.bar.elb.amazonaws.com")}}, }, } @@ -1031,33 +1029,33 @@ func TestAWSApplyChangesDryRun(t *testing.T) { func TestAWSChangesByZones(t *testing.T) { changes := Route53Changes{ { - Change: route53.Change{ - Action: aws.String(route53.ChangeActionCreate), - ResourceRecordSet: &route53.ResourceRecordSet{ + Change: route53types.Change{ + Action: route53types.ChangeActionCreate, + ResourceRecordSet: &route53types.ResourceRecordSet{ Name: aws.String("qux.foo.example.org"), TTL: aws.Int64(1), }, }, }, { - Change: route53.Change{ - Action: aws.String(route53.ChangeActionCreate), - ResourceRecordSet: &route53.ResourceRecordSet{ + Change: route53types.Change{ + Action: route53types.ChangeActionCreate, + ResourceRecordSet: &route53types.ResourceRecordSet{ Name: aws.String("qux.bar.example.org"), TTL: aws.Int64(2), }, }, }, { - Change: route53.Change{ - Action: aws.String(route53.ChangeActionDelete), - ResourceRecordSet: &route53.ResourceRecordSet{ + Change: route53types.Change{ + Action: route53types.ChangeActionDelete, + ResourceRecordSet: &route53types.ResourceRecordSet{ Name: aws.String("wambo.foo.example.org"), TTL: aws.Int64(10), }, }, }, { - Change: route53.Change{ - Action: aws.String(route53.ChangeActionDelete), - ResourceRecordSet: &route53.ResourceRecordSet{ + Change: route53types.Change{ + Action: route53types.ChangeActionDelete, + ResourceRecordSet: &route53types.ResourceRecordSet{ Name: aws.String("wambo.bar.example.org"), TTL: aws.Int64(20), }, }, @@ -1067,29 +1065,29 @@ func TestAWSChangesByZones(t *testing.T) { zones := map[string]*profiledZone{ "foo-example-org": { profile: defaultAWSProfile, - zone: &route53.HostedZone{ + zone: &route53types.HostedZone{ Id: aws.String("foo-example-org"), Name: aws.String("foo.example.org."), }, }, "bar-example-org": { profile: defaultAWSProfile, - zone: &route53.HostedZone{ + zone: &route53types.HostedZone{ Id: aws.String("bar-example-org"), Name: aws.String("bar.example.org."), }, }, "bar-example-org-private": { profile: defaultAWSProfile, - zone: &route53.HostedZone{ + zone: &route53types.HostedZone{ Id: aws.String("bar-example-org-private"), Name: aws.String("bar.example.org."), - Config: &route53.HostedZoneConfig{PrivateZone: aws.Bool(true)}, + Config: &route53types.HostedZoneConfig{PrivateZone: true}, }, }, "baz-example-org": { profile: defaultAWSProfile, - zone: &route53.HostedZone{ + zone: &route53types.HostedZone{ Id: aws.String("baz-example-org"), Name: aws.String("baz.example.org."), }, @@ -1101,17 +1099,17 @@ func TestAWSChangesByZones(t *testing.T) { validateAWSChangeRecords(t, changesByZone["foo-example-org"], Route53Changes{ { - Change: route53.Change{ - Action: aws.String(route53.ChangeActionCreate), - ResourceRecordSet: &route53.ResourceRecordSet{ + Change: route53types.Change{ + Action: route53types.ChangeActionCreate, + ResourceRecordSet: &route53types.ResourceRecordSet{ Name: aws.String("qux.foo.example.org"), TTL: aws.Int64(1), }, }, }, { - Change: route53.Change{ - Action: aws.String(route53.ChangeActionDelete), - ResourceRecordSet: &route53.ResourceRecordSet{ + Change: route53types.Change{ + Action: route53types.ChangeActionDelete, + ResourceRecordSet: &route53types.ResourceRecordSet{ Name: aws.String("wambo.foo.example.org"), TTL: aws.Int64(10), }, }, @@ -1120,17 +1118,17 @@ func TestAWSChangesByZones(t *testing.T) { validateAWSChangeRecords(t, changesByZone["bar-example-org"], Route53Changes{ { - Change: route53.Change{ - Action: aws.String(route53.ChangeActionCreate), - ResourceRecordSet: &route53.ResourceRecordSet{ + Change: route53types.Change{ + Action: route53types.ChangeActionCreate, + ResourceRecordSet: &route53types.ResourceRecordSet{ Name: aws.String("qux.bar.example.org"), TTL: aws.Int64(2), }, }, }, { - Change: route53.Change{ - Action: aws.String(route53.ChangeActionDelete), - ResourceRecordSet: &route53.ResourceRecordSet{ + Change: route53types.Change{ + Action: route53types.ChangeActionDelete, + ResourceRecordSet: &route53types.ResourceRecordSet{ Name: aws.String("wambo.bar.example.org"), TTL: aws.Int64(20), }, }, @@ -1139,17 +1137,17 @@ func TestAWSChangesByZones(t *testing.T) { validateAWSChangeRecords(t, changesByZone["bar-example-org-private"], Route53Changes{ { - Change: route53.Change{ - Action: aws.String(route53.ChangeActionCreate), - ResourceRecordSet: &route53.ResourceRecordSet{ + Change: route53types.Change{ + Action: route53types.ChangeActionCreate, + ResourceRecordSet: &route53types.ResourceRecordSet{ Name: aws.String("qux.bar.example.org"), TTL: aws.Int64(2), }, }, }, { - Change: route53.Change{ - Action: aws.String(route53.ChangeActionDelete), - ResourceRecordSet: &route53.ResourceRecordSet{ + Change: route53types.Change{ + Action: route53types.ChangeActionDelete, + ResourceRecordSet: &route53types.ResourceRecordSet{ Name: aws.String("wambo.bar.example.org"), TTL: aws.Int64(20), }, }, @@ -1176,7 +1174,7 @@ func TestAWSsubmitChanges(t *testing.T) { zones, _ := provider.zones(ctx) records, _ := provider.Records(ctx) cs := make(Route53Changes, 0, len(endpoints)) - cs = append(cs, provider.newChanges(route53.ChangeActionCreate, endpoints)...) + cs = append(cs, provider.newChanges(route53types.ChangeActionCreate, endpoints)...) require.NoError(t, provider.submitChanges(ctx, cs, zones)) @@ -1195,7 +1193,7 @@ func TestAWSsubmitChangesError(t *testing.T) { require.NoError(t, err) ep := endpoint.NewEndpointWithTTL("fail.zone-1.ext-dns-test-2.teapot.zalan.do", endpoint.RecordTypeA, endpoint.TTL(recordTTL), "1.0.0.1") - cs := provider.newChanges(route53.ChangeActionCreate, []*endpoint.Endpoint{ep}) + cs := provider.newChanges(route53types.ChangeActionCreate, []*endpoint.Endpoint{ep}) require.Error(t, provider.submitChanges(ctx, cs, zones)) } @@ -1217,20 +1215,20 @@ func TestAWSsubmitChangesRetryOnError(t *testing.T) { } // "success" and "fail" are created in the first step, both are submitted in the same batch; this should fail - cs1 := provider.newChanges(route53.ChangeActionCreate, []*endpoint.Endpoint{ep2, ep2txt, ep1}) + cs1 := provider.newChanges(route53types.ChangeActionCreate, []*endpoint.Endpoint{ep2, ep2txt, ep1}) input1 := &route53.ChangeResourceRecordSetsInput{ HostedZoneId: aws.String("/hostedzone/zone-1.ext-dns-test-2.teapot.zalan.do."), - ChangeBatch: &route53.ChangeBatch{ + ChangeBatch: &route53types.ChangeBatch{ Changes: cs1.Route53Changes(), }, } clientStub.MockMethod("ChangeResourceRecordSets", input1).Return(nil, fmt.Errorf("Mock route53 failure")) // because of the failure, changes will be retried one by one; make "fail" submitted in its own batch fail as well - cs2 := provider.newChanges(route53.ChangeActionCreate, []*endpoint.Endpoint{ep2, ep2txt}) + cs2 := provider.newChanges(route53types.ChangeActionCreate, []*endpoint.Endpoint{ep2, ep2txt}) input2 := &route53.ChangeResourceRecordSetsInput{ HostedZoneId: aws.String("/hostedzone/zone-1.ext-dns-test-2.teapot.zalan.do."), - ChangeBatch: &route53.ChangeBatch{ + ChangeBatch: &route53types.ChangeBatch{ Changes: cs2.Route53Changes(), }, } @@ -1247,7 +1245,7 @@ func TestAWSsubmitChangesRetryOnError(t *testing.T) { require.False(t, containsRecordWithDNSName(records, "fail__edns_housekeeping.zone-1.ext-dns-test-2.teapot.zalan.do")) // next batch should contain "fail" and "success2", should succeed this time - cs3 := provider.newChanges(route53.ChangeActionCreate, []*endpoint.Endpoint{ep2, ep2txt, ep3}) + cs3 := provider.newChanges(route53types.ChangeActionCreate, []*endpoint.Endpoint{ep2, ep2txt, ep3}) require.NoError(t, provider.submitChanges(ctx, cs3, zones)) // verify all records are there @@ -1264,20 +1262,20 @@ func TestAWSBatchChangeSet(t *testing.T) { for i := 1; i <= defaultBatchChangeSize; i += 2 { cs = append(cs, &Route53Change{ - Change: route53.Change{ - Action: aws.String(route53.ChangeActionCreate), - ResourceRecordSet: &route53.ResourceRecordSet{ + Change: route53types.Change{ + Action: route53types.ChangeActionCreate, + ResourceRecordSet: &route53types.ResourceRecordSet{ Name: aws.String(fmt.Sprintf("host-%d", i)), - Type: aws.String("A"), + Type: route53types.RRTypeA, }, }, }) cs = append(cs, &Route53Change{ - Change: route53.Change{ - Action: aws.String(route53.ChangeActionCreate), - ResourceRecordSet: &route53.ResourceRecordSet{ + Change: route53types.Change{ + Action: route53types.ChangeActionCreate, + ResourceRecordSet: &route53types.ResourceRecordSet{ Name: aws.String(fmt.Sprintf("host-%d", i)), - Type: aws.String("TXT"), + Type: route53types.RRTypeTxt, }, }, }) @@ -1301,20 +1299,20 @@ func TestAWSBatchChangeSetExceeding(t *testing.T) { for i := 1; i <= testCount; i += 2 { cs = append(cs, &Route53Change{ - Change: route53.Change{ - Action: aws.String(route53.ChangeActionCreate), - ResourceRecordSet: &route53.ResourceRecordSet{ + Change: route53types.Change{ + Action: route53types.ChangeActionCreate, + ResourceRecordSet: &route53types.ResourceRecordSet{ Name: aws.String(fmt.Sprintf("host-%d", i)), - Type: aws.String("A"), + Type: route53types.RRTypeA, }, }, }, &Route53Change{ - Change: route53.Change{ - Action: aws.String(route53.ChangeActionCreate), - ResourceRecordSet: &route53.ResourceRecordSet{ + Change: route53types.Change{ + Action: route53types.ChangeActionCreate, + ResourceRecordSet: &route53types.ResourceRecordSet{ Name: aws.String(fmt.Sprintf("host-%d", i)), - Type: aws.String("TXT"), + Type: route53types.RRTypeTxt, }, }, }, @@ -1339,20 +1337,20 @@ func TestAWSBatchChangeSetExceedingNameChange(t *testing.T) { for i := 1; i <= testCount; i += 2 { cs = append(cs, &Route53Change{ - Change: route53.Change{ - Action: aws.String(route53.ChangeActionCreate), - ResourceRecordSet: &route53.ResourceRecordSet{ + Change: route53types.Change{ + Action: route53types.ChangeActionCreate, + ResourceRecordSet: &route53types.ResourceRecordSet{ Name: aws.String(fmt.Sprintf("host-%d", i)), - Type: aws.String("A"), + Type: route53types.RRTypeA, }, }, }, &Route53Change{ - Change: route53.Change{ - Action: aws.String(route53.ChangeActionCreate), - ResourceRecordSet: &route53.ResourceRecordSet{ + Change: route53types.Change{ + Action: route53types.ChangeActionCreate, + ResourceRecordSet: &route53types.ResourceRecordSet{ Name: aws.String(fmt.Sprintf("host-%d", i)), - Type: aws.String("TXT"), + Type: route53types.RRTypeTxt, }, }, }, @@ -1384,12 +1382,12 @@ func TestAWSBatchChangeSetExceedingBytesLimit(t *testing.T) { for i := 1; i <= testCount; i += groupSize { cs = append(cs, &Route53Change{ - Change: route53.Change{ - Action: aws.String(route53.ChangeActionCreate), - ResourceRecordSet: &route53.ResourceRecordSet{ + Change: route53types.Change{ + Action: route53types.ChangeActionCreate, + ResourceRecordSet: &route53types.ResourceRecordSet{ Name: aws.String(fmt.Sprintf("host-%d", i)), - Type: aws.String("A"), - ResourceRecords: []*route53.ResourceRecord{ + Type: route53types.RRTypeA, + ResourceRecords: []route53types.ResourceRecord{ { Value: aws.String("1.2.3.4"), }, @@ -1400,12 +1398,12 @@ func TestAWSBatchChangeSetExceedingBytesLimit(t *testing.T) { sizeValues: 1, }, &Route53Change{ - Change: route53.Change{ - Action: aws.String(route53.ChangeActionCreate), - ResourceRecordSet: &route53.ResourceRecordSet{ + Change: route53types.Change{ + Action: route53types.ChangeActionCreate, + ResourceRecordSet: &route53types.ResourceRecordSet{ Name: aws.String(fmt.Sprintf("host-%d", i)), - Type: aws.String("TXT"), - ResourceRecords: []*route53.ResourceRecord{ + Type: route53types.RRTypeTxt, + ResourceRecords: []route53types.ResourceRecord{ { Value: aws.String("txt-record"), }, @@ -1443,12 +1441,12 @@ func TestAWSBatchChangeSetExceedingBytesLimitUpsert(t *testing.T) { for i := 1; i <= testCount; i += groupSize { cs = append(cs, &Route53Change{ - Change: route53.Change{ - Action: aws.String(route53.ChangeActionUpsert), - ResourceRecordSet: &route53.ResourceRecordSet{ + Change: route53types.Change{ + Action: route53types.ChangeActionUpsert, + ResourceRecordSet: &route53types.ResourceRecordSet{ Name: aws.String(fmt.Sprintf("host-%d", i)), - Type: aws.String("A"), - ResourceRecords: []*route53.ResourceRecord{ + Type: route53types.RRTypeA, + ResourceRecords: []route53types.ResourceRecord{ { Value: aws.String("1.2.3.4"), }, @@ -1459,12 +1457,12 @@ func TestAWSBatchChangeSetExceedingBytesLimitUpsert(t *testing.T) { sizeValues: 1, }, &Route53Change{ - Change: route53.Change{ - Action: aws.String(route53.ChangeActionUpsert), - ResourceRecordSet: &route53.ResourceRecordSet{ + Change: route53types.Change{ + Action: route53types.ChangeActionUpsert, + ResourceRecordSet: &route53types.ResourceRecordSet{ Name: aws.String(fmt.Sprintf("host-%d", i)), - Type: aws.String("TXT"), - ResourceRecords: []*route53.ResourceRecord{ + Type: route53types.RRTypeTxt, + ResourceRecords: []route53types.ResourceRecord{ { Value: aws.String("txt-record"), }, @@ -1502,12 +1500,12 @@ func TestAWSBatchChangeSetExceedingValuesLimit(t *testing.T) { for i := 1; i <= testCount; i += groupSize { cs = append(cs, &Route53Change{ - Change: route53.Change{ - Action: aws.String(route53.ChangeActionCreate), - ResourceRecordSet: &route53.ResourceRecordSet{ + Change: route53types.Change{ + Action: route53types.ChangeActionCreate, + ResourceRecordSet: &route53types.ResourceRecordSet{ Name: aws.String(fmt.Sprintf("host-%d", i)), - Type: aws.String("A"), - ResourceRecords: []*route53.ResourceRecord{ + Type: route53types.RRTypeA, + ResourceRecords: []route53types.ResourceRecord{ { Value: aws.String("1.2.3.4"), }, @@ -1518,12 +1516,12 @@ func TestAWSBatchChangeSetExceedingValuesLimit(t *testing.T) { sizeValues: 1, }, &Route53Change{ - Change: route53.Change{ - Action: aws.String(route53.ChangeActionCreate), - ResourceRecordSet: &route53.ResourceRecordSet{ + Change: route53types.Change{ + Action: route53types.ChangeActionCreate, + ResourceRecordSet: &route53types.ResourceRecordSet{ Name: aws.String(fmt.Sprintf("host-%d", i)), - Type: aws.String("TXT"), - ResourceRecords: []*route53.ResourceRecord{ + Type: route53types.RRTypeTxt, + ResourceRecords: []route53types.ResourceRecord{ { Value: aws.String("txt-record"), }, @@ -1561,12 +1559,12 @@ func TestAWSBatchChangeSetExceedingValuesLimitUpsert(t *testing.T) { for i := 1; i <= testCount; i += groupSize { cs = append(cs, &Route53Change{ - Change: route53.Change{ - Action: aws.String(route53.ChangeActionUpsert), - ResourceRecordSet: &route53.ResourceRecordSet{ + Change: route53types.Change{ + Action: route53types.ChangeActionUpsert, + ResourceRecordSet: &route53types.ResourceRecordSet{ Name: aws.String(fmt.Sprintf("host-%d", i)), - Type: aws.String("A"), - ResourceRecords: []*route53.ResourceRecord{ + Type: route53types.RRTypeA, + ResourceRecords: []route53types.ResourceRecord{ { Value: aws.String("1.2.3.4"), }, @@ -1577,12 +1575,12 @@ func TestAWSBatchChangeSetExceedingValuesLimitUpsert(t *testing.T) { sizeValues: 1, }, &Route53Change{ - Change: route53.Change{ - Action: aws.String(route53.ChangeActionUpsert), - ResourceRecordSet: &route53.ResourceRecordSet{ + Change: route53types.Change{ + Action: route53types.ChangeActionUpsert, + ResourceRecordSet: &route53types.ResourceRecordSet{ Name: aws.String(fmt.Sprintf("host-%d", i)), - Type: aws.String("TXT"), - ResourceRecords: []*route53.ResourceRecord{ + Type: route53types.RRTypeTxt, + ResourceRecords: []route53types.ResourceRecord{ { Value: aws.String("txt-record"), }, @@ -1608,7 +1606,7 @@ func validateEndpoints(t *testing.T, provider *AWSProvider, endpoints []*endpoin assert.True(t, testutils.SameEndpoints(normalized, expected), "actual and normalized endpoints don't match. %+v:%+v", endpoints, normalized) } -func validateAWSZones(t *testing.T, zones map[string]*route53.HostedZone, expected map[string]*route53.HostedZone) { +func validateAWSZones(t *testing.T, zones map[string]*route53types.HostedZone, expected map[string]*route53types.HostedZone) { require.Len(t, zones, len(expected)) for i, zone := range zones { @@ -1616,9 +1614,9 @@ func validateAWSZones(t *testing.T, zones map[string]*route53.HostedZone, expect } } -func validateAWSZone(t *testing.T, zone *route53.HostedZone, expected *route53.HostedZone) { - assert.Equal(t, aws.StringValue(expected.Id), aws.StringValue(zone.Id)) - assert.Equal(t, aws.StringValue(expected.Name), aws.StringValue(zone.Name)) +func validateAWSZone(t *testing.T, zone *route53types.HostedZone, expected *route53types.HostedZone) { + assert.Equal(t, *expected.Id, *zone.Id) + assert.Equal(t, *expected.Name, *zone.Name) } func validateAWSChangeRecords(t *testing.T, records Route53Changes, expected Route53Changes) { @@ -1630,9 +1628,9 @@ func validateAWSChangeRecords(t *testing.T, records Route53Changes, expected Rou } func validateAWSChangeRecord(t *testing.T, record *Route53Change, expected *Route53Change) { - assert.Equal(t, aws.StringValue(expected.Action), aws.StringValue(record.Action)) - assert.Equal(t, aws.StringValue(expected.ResourceRecordSet.Name), aws.StringValue(record.ResourceRecordSet.Name)) - assert.Equal(t, aws.StringValue(expected.ResourceRecordSet.Type), aws.StringValue(record.ResourceRecordSet.Type)) + assert.Equal(t, expected.Action, record.Action) + assert.Equal(t, *expected.ResourceRecordSet.Name, *record.ResourceRecordSet.Name) + assert.Equal(t, expected.ResourceRecordSet.Type, record.ResourceRecordSet.Type) } func TestAWSCreateRecordsWithCNAME(t *testing.T) { @@ -1650,12 +1648,12 @@ func TestAWSCreateRecordsWithCNAME(t *testing.T) { recordSets := listAWSRecords(t, provider.clients[defaultAWSProfile], "/hostedzone/zone-1.ext-dns-test-2.teapot.zalan.do.") - validateRecords(t, recordSets, []*route53.ResourceRecordSet{ + validateRecords(t, recordSets, []route53types.ResourceRecordSet{ { Name: aws.String("create-test.zone-1.ext-dns-test-2.teapot.zalan.do."), - Type: aws.String(endpoint.RecordTypeCNAME), + Type: route53types.RRTypeCname, TTL: aws.Int64(300), - ResourceRecords: []*route53.ResourceRecord{ + ResourceRecords: []route53types.ResourceRecord{ { Value: aws.String("foo.example.org"), }, @@ -1714,33 +1712,33 @@ func TestAWSCreateRecordsWithALIAS(t *testing.T) { recordSets := listAWSRecords(t, provider.clients[defaultAWSProfile], "/hostedzone/zone-1.ext-dns-test-2.teapot.zalan.do.") - validateRecords(t, recordSets, []*route53.ResourceRecordSet{ + validateRecords(t, recordSets, []route53types.ResourceRecordSet{ { - AliasTarget: &route53.AliasTarget{ + AliasTarget: &route53types.AliasTarget{ DNSName: aws.String("foo.eu-central-1.elb.amazonaws.com."), - EvaluateTargetHealth: aws.Bool(evaluateTargetHealth), + EvaluateTargetHealth: evaluateTargetHealth, HostedZoneId: aws.String("Z215JYRZR1TBD5"), }, Name: aws.String("create-test.zone-1.ext-dns-test-2.teapot.zalan.do."), - Type: aws.String(route53.RRTypeA), + Type: route53types.RRTypeA, }, { - AliasTarget: &route53.AliasTarget{ + AliasTarget: &route53types.AliasTarget{ DNSName: aws.String("bar.eu-central-1.elb.amazonaws.com."), - EvaluateTargetHealth: aws.Bool(evaluateTargetHealth), + EvaluateTargetHealth: evaluateTargetHealth, HostedZoneId: aws.String("Z215JYRZR1TBD5"), }, Name: aws.String("create-test-dualstack.zone-1.ext-dns-test-2.teapot.zalan.do."), - Type: aws.String(route53.RRTypeA), + Type: route53types.RRTypeA, }, { - AliasTarget: &route53.AliasTarget{ + AliasTarget: &route53types.AliasTarget{ DNSName: aws.String("bar.eu-central-1.elb.amazonaws.com."), - EvaluateTargetHealth: aws.Bool(evaluateTargetHealth), + EvaluateTargetHealth: evaluateTargetHealth, HostedZoneId: aws.String("Z215JYRZR1TBD5"), }, Name: aws.String("create-test-dualstack.zone-1.ext-dns-test-2.teapot.zalan.do."), - Type: aws.String(route53.RRTypeAaaa), + Type: route53types.RRTypeAaaa, }, }) } @@ -1803,15 +1801,15 @@ func TestAWSCanonicalHostedZone(t *testing.T) { func TestAWSSuitableZones(t *testing.T) { zones := map[string]*profiledZone{ // Public domain - "example-org": {profile: defaultAWSProfile, zone: &route53.HostedZone{Id: aws.String("example-org"), Name: aws.String("example.org.")}}, + "example-org": {profile: defaultAWSProfile, zone: &route53types.HostedZone{Id: aws.String("example-org"), Name: aws.String("example.org.")}}, // 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: &route53types.HostedZone{Id: aws.String("bar-example-org"), Name: aws.String("bar.example.org."), Config: &route53types.HostedZoneConfig{PrivateZone: false}}}, // 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: &route53types.HostedZone{Id: aws.String("longfoo-bar-example-org"), Name: aws.String("longfoo.bar.example.org.")}}, // 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: &route53types.HostedZone{Id: aws.String("example-org-private"), Name: aws.String("example.org."), Config: &route53types.HostedZoneConfig{PrivateZone: true}}}, // 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: &route53types.HostedZone{Id: aws.String("bar-example-org-private"), Name: aws.String("bar.example.org."), Config: &route53types.HostedZoneConfig{PrivateZone: true}}}, } for _, tc := range []struct { @@ -1840,19 +1838,20 @@ func TestAWSSuitableZones(t *testing.T) { } } -func createAWSZone(t *testing.T, provider *AWSProvider, zone *route53.HostedZone) { +func createAWSZone(t *testing.T, provider *AWSProvider, zone *route53types.HostedZone) { params := &route53.CreateHostedZoneInput{ CallerReference: aws.String("external-dns.alpha.kubernetes.io/test-zone"), Name: zone.Name, HostedZoneConfig: zone.Config, } - if _, err := provider.clients[defaultAWSProfile].CreateHostedZoneWithContext(context.Background(), params); err != nil { - require.EqualError(t, err, route53.ErrCodeHostedZoneAlreadyExists) + if _, err := provider.clients[defaultAWSProfile].CreateHostedZone(context.Background(), params); err != nil { + var hzExists *route53types.HostedZoneAlreadyExists + require.ErrorAs(t, err, &hzExists) } } -func setAWSRecords(t *testing.T, provider *AWSProvider, records []*route53.ResourceRecordSet) { +func setAWSRecords(t *testing.T, provider *AWSProvider, records []route53types.ResourceRecordSet) { dryRun := provider.dryRun provider.dryRun = false defer func() { @@ -1868,9 +1867,9 @@ func setAWSRecords(t *testing.T, provider *AWSProvider, records []*route53.Resou var changes Route53Changes for _, record := range records { changes = append(changes, &Route53Change{ - Change: route53.Change{ - Action: aws.String(route53.ChangeActionCreate), - ResourceRecordSet: record, + Change: route53types.Change{ + Action: route53types.ChangeActionCreate, + ResourceRecordSet: &record, }, }) } @@ -1884,24 +1883,21 @@ func setAWSRecords(t *testing.T, provider *AWSProvider, records []*route53.Resou require.NoError(t, err) } -func listAWSRecords(t *testing.T, client Route53API, zone string) []*route53.ResourceRecordSet { - recordSets := []*route53.ResourceRecordSet{} - require.NoError(t, client.ListResourceRecordSetsPagesWithContext(context.Background(), &route53.ListResourceRecordSetsInput{ +func listAWSRecords(t *testing.T, client Route53API, zone string) []route53types.ResourceRecordSet { + resp, err := client.ListResourceRecordSets(context.Background(), &route53.ListResourceRecordSetsInput{ HostedZoneId: aws.String(zone), - MaxItems: aws.String(route53PageSize), - }, func(resp *route53.ListResourceRecordSetsOutput, _ bool) bool { - recordSets = append(recordSets, resp.ResourceRecordSets...) - return true - })) + MaxItems: aws.Int32(route53PageSize), + }) + require.NoError(t, err) - return recordSets + return resp.ResourceRecordSets } -func newAWSProvider(t *testing.T, domainFilter endpoint.DomainFilter, zoneIDFilter provider.ZoneIDFilter, zoneTypeFilter provider.ZoneTypeFilter, evaluateTargetHealth, dryRun bool, records []*route53.ResourceRecordSet) (*AWSProvider, *Route53APIStub) { +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) } -func newAWSProviderWithTagFilter(t *testing.T, domainFilter endpoint.DomainFilter, zoneIDFilter provider.ZoneIDFilter, zoneTypeFilter provider.ZoneTypeFilter, zoneTagFilter provider.ZoneTagFilter, evaluateTargetHealth, dryRun bool, records []*route53.ResourceRecordSet) (*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{ @@ -1920,29 +1916,29 @@ func newAWSProviderWithTagFilter(t *testing.T, domainFilter endpoint.DomainFilte failedChangesQueue: make(map[string]Route53Changes), } - createAWSZone(t, provider, &route53.HostedZone{ + createAWSZone(t, provider, &route53types.HostedZone{ Id: aws.String("/hostedzone/zone-1.ext-dns-test-2.teapot.zalan.do."), Name: aws.String("zone-1.ext-dns-test-2.teapot.zalan.do."), - Config: &route53.HostedZoneConfig{PrivateZone: aws.Bool(false)}, + Config: &route53types.HostedZoneConfig{PrivateZone: false}, }) - createAWSZone(t, provider, &route53.HostedZone{ + createAWSZone(t, provider, &route53types.HostedZone{ Id: aws.String("/hostedzone/zone-2.ext-dns-test-2.teapot.zalan.do."), Name: aws.String("zone-2.ext-dns-test-2.teapot.zalan.do."), - Config: &route53.HostedZoneConfig{PrivateZone: aws.Bool(false)}, + Config: &route53types.HostedZoneConfig{PrivateZone: false}, }) - createAWSZone(t, provider, &route53.HostedZone{ + createAWSZone(t, provider, &route53types.HostedZone{ Id: aws.String("/hostedzone/zone-3.ext-dns-test-2.teapot.zalan.do."), Name: aws.String("zone-3.ext-dns-test-2.teapot.zalan.do."), - Config: &route53.HostedZoneConfig{PrivateZone: aws.Bool(true)}, + Config: &route53types.HostedZoneConfig{PrivateZone: true}, }) // filtered out by domain filter - createAWSZone(t, provider, &route53.HostedZone{ + createAWSZone(t, provider, &route53types.HostedZone{ Id: aws.String("/hostedzone/zone-4.ext-dns-test-3.teapot.zalan.do."), Name: aws.String("zone-4.ext-dns-test-3.teapot.zalan.do."), - Config: &route53.HostedZoneConfig{PrivateZone: aws.Bool(false)}, + Config: &route53types.HostedZoneConfig{PrivateZone: false}, }) setupZoneTags(provider.clients[defaultAWSProfile].(*Route53APIStub)) @@ -1977,10 +1973,10 @@ func setupZoneTags(client *Route53APIStub) { }) } -func addZoneTags(tagMap map[string][]*route53.Tag, zoneID string, tags map[string]string) { - tagList := make([]*route53.Tag, 0, len(tags)) +func addZoneTags(tagMap map[string][]route53types.Tag, zoneID string, tags map[string]string) { + tagList := make([]route53types.Tag, 0, len(tags)) for k, v := range tags { - tagList = append(tagList, &route53.Tag{ + tagList = append(tagList, route53types.Tag{ Key: aws.String(k), Value: aws.String(v), }) @@ -1988,7 +1984,7 @@ func addZoneTags(tagMap map[string][]*route53.Tag, zoneID string, tags map[strin tagMap[zoneID] = tagList } -func validateRecords(t *testing.T, records []*route53.ResourceRecordSet, expected []*route53.ResourceRecordSet) { +func validateRecords(t *testing.T, records []route53types.ResourceRecordSet, expected []route53types.ResourceRecordSet) { assert.ElementsMatch(t, expected, records) } diff --git a/provider/aws/session.go b/provider/aws/session.go index 8de5d0f40..038963bb5 100644 --- a/provider/aws/session.go +++ b/provider/aws/session.go @@ -59,6 +59,30 @@ func CreateDefaultV2Config(cfg *externaldns.Config) awsv2.Config { return result } +func CreateV2Configs(cfg *externaldns.Config) map[string]awsv2.Config { + result := make(map[string]awsv2.Config) + if len(cfg.AWSProfiles) == 0 || (len(cfg.AWSProfiles) == 1 && cfg.AWSProfiles[0] == "") { + cfg := CreateDefaultV2Config(cfg) + result[defaultAWSProfile] = cfg + } else { + for _, profile := range cfg.AWSProfiles { + cfg, err := newV2Config( + AWSSessionConfig{ + AssumeRole: cfg.AWSAssumeRole, + AssumeRoleExternalID: cfg.AWSAssumeRoleExternalID, + APIRetries: cfg.AWSAPIRetries, + Profile: profile, + }, + ) + if err != nil { + logrus.Fatal(err) + } + result[profile] = cfg + } + } + return result +} + func CreateDefaultSession(cfg *externaldns.Config) *session.Session { result, err := newSession( AWSSessionConfig{ diff --git a/provider/zone_type_filter.go b/provider/zone_type_filter.go index 14ceac0e8..c595a4a9c 100644 --- a/provider/zone_type_filter.go +++ b/provider/zone_type_filter.go @@ -17,8 +17,7 @@ limitations under the License. package provider import ( - "github.com/aws/aws-sdk-go/aws" - "github.com/aws/aws-sdk-go/service/route53" + route53types "github.com/aws/aws-sdk-go-v2/service/route53/types" ) const ( @@ -52,7 +51,7 @@ func (f ZoneTypeFilter) Match(rawZoneType interface{}) bool { case zoneTypePrivate: return zoneType == zoneTypePrivate } - case *route53.HostedZone: + case route53types.HostedZone: // If the zone has no config we assume it's a public zone since the config's field // `PrivateZone` is false by default in go. if zoneType.Config == nil { @@ -61,9 +60,9 @@ func (f ZoneTypeFilter) Match(rawZoneType interface{}) bool { switch f.zoneType { case zoneTypePublic: - return !aws.BoolValue(zoneType.Config.PrivateZone) + return !zoneType.Config.PrivateZone case zoneTypePrivate: - return aws.BoolValue(zoneType.Config.PrivateZone) + return zoneType.Config.PrivateZone } } diff --git a/provider/zone_type_filter_test.go b/provider/zone_type_filter_test.go index 8677e6fb0..903d8e876 100644 --- a/provider/zone_type_filter_test.go +++ b/provider/zone_type_filter_test.go @@ -19,8 +19,7 @@ package provider import ( "testing" - "github.com/aws/aws-sdk-go/aws" - "github.com/aws/aws-sdk-go/service/route53" + route53types "github.com/aws/aws-sdk-go-v2/service/route53/types" "github.com/stretchr/testify/assert" ) @@ -28,8 +27,8 @@ import ( func TestZoneTypeFilterMatch(t *testing.T) { publicZoneStr := "public" privateZoneStr := "private" - publicZoneAWS := &route53.HostedZone{Config: &route53.HostedZoneConfig{PrivateZone: aws.Bool(false)}} - privateZoneAWS := &route53.HostedZone{Config: &route53.HostedZoneConfig{PrivateZone: aws.Bool(true)}} + publicZoneAWS := route53types.HostedZone{Config: &route53types.HostedZoneConfig{PrivateZone: false}} + privateZoneAWS := route53types.HostedZone{Config: &route53types.HostedZoneConfig{PrivateZone: true}} for _, tc := range []struct { zoneTypeFilter string @@ -37,10 +36,10 @@ func TestZoneTypeFilterMatch(t *testing.T) { zones []interface{} }{ { - "", true, []interface{}{publicZoneStr, privateZoneStr, &route53.HostedZone{}}, + "", true, []interface{}{publicZoneStr, privateZoneStr, route53types.HostedZone{}}, }, { - "public", true, []interface{}{publicZoneStr, publicZoneAWS, &route53.HostedZone{}}, + "public", true, []interface{}{publicZoneStr, publicZoneAWS, route53types.HostedZone{}}, }, { "public", false, []interface{}{privateZoneStr, privateZoneAWS}, @@ -49,15 +48,17 @@ func TestZoneTypeFilterMatch(t *testing.T) { "private", true, []interface{}{privateZoneStr, privateZoneAWS}, }, { - "private", false, []interface{}{publicZoneStr, publicZoneAWS, &route53.HostedZone{}}, + "private", false, []interface{}{publicZoneStr, publicZoneAWS, route53types.HostedZone{}}, }, { "unknown", false, []interface{}{publicZoneStr}, }, } { - zoneTypeFilter := NewZoneTypeFilter(tc.zoneTypeFilter) - for _, zone := range tc.zones { - assert.Equal(t, tc.matches, zoneTypeFilter.Match(zone)) - } + t.Run(tc.zoneTypeFilter, func(t *testing.T) { + zoneTypeFilter := NewZoneTypeFilter(tc.zoneTypeFilter) + for _, zone := range tc.zones { + assert.Equal(t, tc.matches, zoneTypeFilter.Match(zone)) + } + }) } }