diff --git a/integrationTest/integration_test.go b/integrationTest/integration_test.go index 4d8862566..24e66e638 100644 --- a/integrationTest/integration_test.go +++ b/integrationTest/integration_test.go @@ -338,6 +338,8 @@ func makeTests(t *testing.T) []*TestCase { tc("Delete one", a("@", "1.2.3.4").ttl(500), a("www", "5.6.7.8").ttl(400)), tc("Add back and change ttl", a("www", "5.6.7.8").ttl(700), a("www", "1.2.3.4").ttl(700)), tc("Change targets and ttls", a("www", "1.1.1.1"), a("www", "2.2.2.2")), + tc("Create wildcard", a("*", "1.2.3.4"), a("www", "1.1.1.1")), + tc("Delete wildcard", a("www", "1.1.1.1")), // CNAMES tc("Empty"), diff --git a/providers/route53/route53Provider.go b/providers/route53/route53Provider.go index ff0f831a6..b7b386d19 100644 --- a/providers/route53/route53Provider.go +++ b/providers/route53/route53Provider.go @@ -81,9 +81,7 @@ func (r *route53Provider) getZones() error { var nextMarker *string r.zones = make(map[string]*r53.HostedZone) for { - if nextMarker != nil { - fmt.Println(*nextMarker) - } + inp := &r53.ListHostedZonesInput{Marker: nextMarker} out, err := r.client.ListHostedZones(inp) if err != nil && strings.Contains(err.Error(), "is not authorized") { @@ -212,7 +210,7 @@ func (r *route53Provider) GetDomainCorrections(dc *models.DomainConfig) ([]*mode delDesc += strings.Join(namesToUpdate[k], "\n") + "\n" // on delete just submit the original resource set we got from r53. for _, r := range records { - if *r.Name == k.Name+"." && (*r.Type == k.Type || k.Type == "R53_ALIAS") { + if unescape(r.Name) == k.Name && (*r.Type == k.Type || k.Type == "R53_ALIAS") { rrset = r break }