Merge 394f46c into 432d069

.golangci.yml

@@ -19,4 +19,5 @@ linters:
     - goimports
     - misspell
     - unconvert
-    - staticcheck
+    - megacheck
+    - interfacer

.travis.yml

@@ -14,7 +14,7 @@ matrix:
   - go: tip
 
 env:
-- GOLANGCI_RELEASE="v1.22.2"
+- GOLANGCI_RELEASE="v1.23.1"
 
 before_install:
 - GO111MODULE=off go get github.com/mattn/goveralls

endpoint/labels_test.go

@@ -31,7 +31,6 @@ type LabelsSuite struct {
 	barText              string
 	barTextAsMap         Labels
 	noHeritageText       string
-	noHeritageAsMap      Labels
 	wrongHeritageText    string
 	multipleHeritageText string //considered invalid
 }

provider/akamai.go

@@ -289,16 +289,6 @@ func (p *AkamaiProvider) newAkamaiRecord(dnsName, recordType string, targets ...
 	}
 }
 
-func (p *AkamaiProvider) newAkamaiRecordsets(dnsName, recordType string, targets ...string) *akamaiRecordsets {
-	akamaiRecords := make([]akamaiRecord, 0)
-	akamaiRecord := p.newAkamaiRecord(dnsName, recordType, targets...)
-	akamaiRecords = append(akamaiRecords, *akamaiRecord)
-
-	return &akamaiRecordsets{
-		Recordsets: akamaiRecords,
-	}
-}
-
 func (p *AkamaiProvider) createRecords(zoneNameIDMapper zoneIDName, endpoints []*endpoint.Endpoint) (created []*endpoint.Endpoint, failed []*endpoint.Endpoint) {
 	for _, endpoint := range endpoints {
 

provider/akamai_test.go

@@ -62,10 +62,7 @@ func (m *mockAkamaiClient) Do(config edgegrid.Config, req *http.Request) (*http.
 	handler := func(w http.ResponseWriter, r *http.Request) (isError bool) {
 		b, _ := ioutil.ReadAll(r.Body)
 		io.WriteString(w, string(b))
-		if string(b) == "{\"status\": 404 }" {
-			return true
-		}
-		return false
+		return string(b) == "{\"status\": 404 }"
 	}
 	w := httptest.NewRecorder()
 	err := handler(w, req)

provider/alibaba_cloud.go

@@ -68,7 +68,6 @@ type AlibabaCloudPrivateZoneAPI interface {
 type AlibabaCloudProvider struct {
 	domainFilter         DomainFilter
 	zoneIDFilter         ZoneIDFilter // Private Zone only
-	zoneTypeFilter       ZoneTypeFilter
 	MaxChangeCount       int
 	EvaluateTargetHealth bool
 	AssumeRole           string

provider/aws.go

@@ -591,7 +591,7 @@ func batchChangeSet(cs []*route53.Change, batchSize int) [][]*route53.Change {
 
 	batchChanges := make([][]*route53.Change, 0)
 
-	changesByName := make(map[string][]*route53.Change, 0)
+	changesByName := make(map[string][]*route53.Change)
 	for _, v := range cs {
 		changesByName[*v.ResourceRecordSet.Name] = append(changesByName[*v.ResourceRecordSet.Name], v)
 	}

provider/aws_test.go

@@ -82,9 +82,7 @@ func (r *Route53APIStub) ListResourceRecordSetsPagesWithContext(ctx context.Cont
 		output.ResourceRecordSets = []*route53.ResourceRecordSet{}
 	} else {
 		for _, rrsets := range r.recordSets[aws.StringValue(input.HostedZoneId)] {
-			for _, rrset := range rrsets {
-				output.ResourceRecordSets = append(output.ResourceRecordSets, rrset)
-			}
+			output.ResourceRecordSets = append(output.ResourceRecordSets, rrsets...)
 		}
 	}
 	lastPage := true
@@ -1131,9 +1129,7 @@ func listAWSRecords(t *testing.T, client Route53API, zone string) []*route53.Res
 	require.NoError(t, client.ListResourceRecordSetsPagesWithContext(context.Background(), &route53.ListResourceRecordSetsInput{
 		HostedZoneId: aws.String(zone),
 	}, func(resp *route53.ListResourceRecordSetsOutput, _ bool) bool {
-		for _, recordSet := range resp.ResourceRecordSets {
-			recordSets = append(recordSets, recordSet)
-		}
+		recordSets = append(recordSets, resp.ResourceRecordSets...)
 		return true
 	}))
 

provider/azure_private_dns.go

@@ -21,23 +21,16 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/Azure/go-autorest/autorest"
-
-	log "github.com/sirupsen/logrus"
-
 	"github.com/Azure/azure-sdk-for-go/profiles/latest/privatedns/mgmt/privatedns"
+	"github.com/Azure/go-autorest/autorest"
 	"github.com/Azure/go-autorest/autorest/azure/auth"
 	"github.com/Azure/go-autorest/autorest/to"
+	log "github.com/sirupsen/logrus"
 
 	"sigs.k8s.io/external-dns/endpoint"
 	"sigs.k8s.io/external-dns/plan"
 )
 
-type azurePrivateDNSConfig struct {
-	SubscriptionID string `json:"subscriptionId" yaml:"subscriptionId"`
-	ResourceGroup  string `json:"resourceGroup" yaml:"resourceGroup"`
-}
-
 // PrivateZonesClient is an interface of privatedns.PrivateZoneClient that can be stubbed for testing.
 type PrivateZonesClient interface {
 	ListByResourceGroupComplete(ctx context.Context, resourceGroupName string, top *int32) (result privatedns.PrivateZoneListResultIterator, err error)

provider/cloudflare_test.go

@@ -78,70 +78,6 @@ func (m *mockCloudFlareClient) ListZonesContext(ctx context.Context, opts ...clo
 	}, nil
 }
 
-type mockCloudFlareUserDetailsFail struct{}
-
-func (m *mockCloudFlareUserDetailsFail) CreateDNSRecord(zoneID string, rr cloudflare.DNSRecord) (*cloudflare.DNSRecordResponse, error) {
-	return nil, nil
-}
-
-func (m *mockCloudFlareUserDetailsFail) DNSRecords(zoneID string, rr cloudflare.DNSRecord) ([]cloudflare.DNSRecord, error) {
-	return []cloudflare.DNSRecord{}, nil
-}
-
-func (m *mockCloudFlareUserDetailsFail) UpdateDNSRecord(zoneID, recordID string, rr cloudflare.DNSRecord) error {
-	return nil
-}
-
-func (m *mockCloudFlareUserDetailsFail) DeleteDNSRecord(zoneID, recordID string) error {
-	return nil
-}
-
-func (m *mockCloudFlareUserDetailsFail) UserDetails() (cloudflare.User, error) {
-	return cloudflare.User{}, fmt.Errorf("could not get ID from zone name")
-}
-
-func (m *mockCloudFlareUserDetailsFail) ZoneIDByName(zoneName string) (string, error) {
-	return "", nil
-}
-
-func (m *mockCloudFlareUserDetailsFail) ListZones(zoneID ...string) ([]cloudflare.Zone, error) {
-	return []cloudflare.Zone{{Name: "ext-dns-test.zalando.to."}}, nil
-}
-
-func (m *mockCloudFlareUserDetailsFail) ListZonesContext(ctx context.Context, opts ...cloudflare.ReqOption) (cloudflare.ZonesResponse, error) {
-	return cloudflare.ZonesResponse{}, nil
-}
-
-type mockCloudFlareCreateZoneFail struct{}
-
-func (m *mockCloudFlareCreateZoneFail) CreateDNSRecord(zoneID string, rr cloudflare.DNSRecord) (*cloudflare.DNSRecordResponse, error) {
-	return nil, nil
-}
-
-func (m *mockCloudFlareCreateZoneFail) DNSRecords(zoneID string, rr cloudflare.DNSRecord) ([]cloudflare.DNSRecord, error) {
-	return []cloudflare.DNSRecord{}, nil
-}
-
-func (m *mockCloudFlareCreateZoneFail) UpdateDNSRecord(zoneID, recordID string, rr cloudflare.DNSRecord) error {
-	return nil
-}
-
-func (m *mockCloudFlareCreateZoneFail) DeleteDNSRecord(zoneID, recordID string) error {
-	return nil
-}
-
-func (m *mockCloudFlareCreateZoneFail) UserDetails() (cloudflare.User, error) {
-	return cloudflare.User{ID: "xxxxxxxxxxxxxxxxxxx"}, nil
-}
-
-func (m *mockCloudFlareCreateZoneFail) ZoneIDByName(zoneName string) (string, error) {
-	return "", nil
-}
-
-func (m *mockCloudFlareCreateZoneFail) ListZones(zoneID ...string) ([]cloudflare.Zone, error) {
-	return []cloudflare.Zone{{Name: "ext-dns-test.zalando.to."}}, nil
-}
-
 type mockCloudFlareDNSRecordsFail struct{}
 
 func (m *mockCloudFlareDNSRecordsFail) CreateDNSRecord(zoneID string, rr cloudflare.DNSRecord) (*cloudflare.DNSRecordResponse, error) {
@@ -182,66 +118,6 @@ func (m *mockCloudFlareDNSRecordsFail) ListZonesContext(ctx context.Context, opt
 	}, nil
 }
 
-type mockCloudFlareZoneIDByNameFail struct{}
-
-func (m *mockCloudFlareZoneIDByNameFail) CreateDNSRecord(zoneID string, rr cloudflare.DNSRecord) (*cloudflare.DNSRecordResponse, error) {
-	return nil, nil
-}
-
-func (m *mockCloudFlareZoneIDByNameFail) DNSRecords(zoneID string, rr cloudflare.DNSRecord) ([]cloudflare.DNSRecord, error) {
-	return []cloudflare.DNSRecord{}, nil
-}
-
-func (m *mockCloudFlareZoneIDByNameFail) UpdateDNSRecord(zoneID, recordID string, rr cloudflare.DNSRecord) error {
-	return nil
-}
-
-func (m *mockCloudFlareZoneIDByNameFail) DeleteDNSRecord(zoneID, recordID string) error {
-	return nil
-}
-
-func (m *mockCloudFlareZoneIDByNameFail) UserDetails() (cloudflare.User, error) {
-	return cloudflare.User{}, nil
-}
-
-func (m *mockCloudFlareZoneIDByNameFail) ZoneIDByName(zoneName string) (string, error) {
-	return "", fmt.Errorf("no ID for zone found")
-}
-
-func (m *mockCloudFlareZoneIDByNameFail) ListZones(zoneID ...string) ([]cloudflare.Zone, error) {
-	return []cloudflare.Zone{{Name: "ext-dns-test.zalando.to."}}, nil
-}
-
-type mockCloudFlareDeleteZoneFail struct{}
-
-func (m *mockCloudFlareDeleteZoneFail) CreateDNSRecord(zoneID string, rr cloudflare.DNSRecord) (*cloudflare.DNSRecordResponse, error) {
-	return nil, nil
-}
-
-func (m *mockCloudFlareDeleteZoneFail) DNSRecords(zoneID string, rr cloudflare.DNSRecord) ([]cloudflare.DNSRecord, error) {
-	return []cloudflare.DNSRecord{}, nil
-}
-
-func (m *mockCloudFlareDeleteZoneFail) UpdateDNSRecord(zoneID, recordID string, rr cloudflare.DNSRecord) error {
-	return nil
-}
-
-func (m *mockCloudFlareDeleteZoneFail) DeleteDNSRecord(zoneID, recordID string) error {
-	return nil
-}
-
-func (m *mockCloudFlareDeleteZoneFail) UserDetails() (cloudflare.User, error) {
-	return cloudflare.User{}, nil
-}
-
-func (m *mockCloudFlareDeleteZoneFail) ZoneIDByName(zoneName string) (string, error) {
-	return "1234567890", nil
-}
-
-func (m *mockCloudFlareDeleteZoneFail) ListZones(zoneID ...string) ([]cloudflare.Zone, error) {
-	return []cloudflare.Zone{{Name: "ext-dns-test.zalando.to."}}, nil
-}
-
 type mockCloudFlareListZonesFail struct{}
 
 func (m *mockCloudFlareListZonesFail) CreateDNSRecord(zoneID string, rr cloudflare.DNSRecord) (*cloudflare.DNSRecordResponse, error) {
@@ -276,108 +152,6 @@ func (m *mockCloudFlareListZonesFail) ListZonesContext(ctx context.Context, opts
 	return cloudflare.ZonesResponse{}, fmt.Errorf("no zones available")
 }
 
-type mockCloudFlareCreateRecordsFail struct{}
-
-func (m *mockCloudFlareCreateRecordsFail) CreateDNSRecord(zoneID string, rr cloudflare.DNSRecord) (*cloudflare.DNSRecordResponse, error) {
-	return nil, fmt.Errorf("could not create record")
-}
-
-func (m *mockCloudFlareCreateRecordsFail) DNSRecords(zoneID string, rr cloudflare.DNSRecord) ([]cloudflare.DNSRecord, error) {
-	return []cloudflare.DNSRecord{{ID: "1234567890", Name: "foobar.ext-dns-test.zalando.to."}}, nil
-}
-
-func (m *mockCloudFlareCreateRecordsFail) UpdateDNSRecord(zoneID, recordID string, rr cloudflare.DNSRecord) error {
-	return nil
-}
-
-func (m *mockCloudFlareCreateRecordsFail) DeleteDNSRecord(zoneID, recordID string) error {
-	return nil
-}
-
-func (m *mockCloudFlareCreateRecordsFail) UserDetails() (cloudflare.User, error) {
-	return cloudflare.User{ID: "xxxxxxxxxxxxxxxxxxx"}, nil
-}
-
-func (m *mockCloudFlareCreateRecordsFail) ZoneIDByName(zoneName string) (string, error) {
-	return "1234567890", nil
-}
-
-func (m *mockCloudFlareCreateRecordsFail) ListZones(zoneID ...string) ([]cloudflare.Zone, error) {
-	return []cloudflare.Zone{{}}, fmt.Errorf("no zones available")
-}
-
-func (m *mockCloudFlareCreateRecordsFail) ListZonesContext(ctx context.Context, opts ...cloudflare.ReqOption) (cloudflare.ZonesResponse, error) {
-	return cloudflare.ZonesResponse{}, nil
-}
-
-type mockCloudFlareDeleteRecordsFail struct{}
-
-func (m *mockCloudFlareDeleteRecordsFail) CreateDNSRecord(zoneID string, rr cloudflare.DNSRecord) (*cloudflare.DNSRecordResponse, error) {
-	return nil, nil
-}
-
-func (m *mockCloudFlareDeleteRecordsFail) DNSRecords(zoneID string, rr cloudflare.DNSRecord) ([]cloudflare.DNSRecord, error) {
-	return []cloudflare.DNSRecord{{ID: "1234567890", Name: "foobar.ext-dns-test.zalando.to."}}, nil
-}
-
-func (m *mockCloudFlareDeleteRecordsFail) UpdateDNSRecord(zoneID, recordID string, rr cloudflare.DNSRecord) error {
-	return nil
-}
-
-func (m *mockCloudFlareDeleteRecordsFail) DeleteDNSRecord(zoneID, recordID string) error {
-	return fmt.Errorf("could not delete record")
-}
-
-func (m *mockCloudFlareDeleteRecordsFail) UserDetails() (cloudflare.User, error) {
-	return cloudflare.User{ID: "xxxxxxxxxxxxxxxxxxx"}, nil
-}
-
-func (m *mockCloudFlareDeleteRecordsFail) ZoneIDByName(zoneName string) (string, error) {
-	return "1234567890", nil
-}
-
-func (m *mockCloudFlareDeleteRecordsFail) ListZones(zoneID ...string) ([]cloudflare.Zone, error) {
-	return []cloudflare.Zone{{Name: "ext-dns-test.zalando.to."}}, nil
-}
-
-func (m *mockCloudFlareDeleteRecordsFail) ListZonesContext(ctx context.Context, opts ...cloudflare.ReqOption) (cloudflare.ZonesResponse, error) {
-	return cloudflare.ZonesResponse{}, nil
-}
-
-type mockCloudFlareUpdateRecordsFail struct{}
-
-func (m *mockCloudFlareUpdateRecordsFail) CreateDNSRecord(zoneID string, rr cloudflare.DNSRecord) (*cloudflare.DNSRecordResponse, error) {
-	return nil, nil
-}
-
-func (m *mockCloudFlareUpdateRecordsFail) DNSRecords(zoneID string, rr cloudflare.DNSRecord) ([]cloudflare.DNSRecord, error) {
-	return []cloudflare.DNSRecord{{ID: "1234567890", Name: "foobar.ext-dns-test.zalando.to."}}, nil
-}
-
-func (m *mockCloudFlareUpdateRecordsFail) UpdateDNSRecord(zoneID, recordID string, rr cloudflare.DNSRecord) error {
-	return fmt.Errorf("could not update record")
-}
-
-func (m *mockCloudFlareUpdateRecordsFail) DeleteDNSRecord(zoneID, recordID string) error {
-	return nil
-}
-
-func (m *mockCloudFlareUpdateRecordsFail) UserDetails() (cloudflare.User, error) {
-	return cloudflare.User{ID: "xxxxxxxxxxxxxxxxxxx"}, nil
-}
-
-func (m *mockCloudFlareUpdateRecordsFail) ZoneIDByName(zoneName string) (string, error) {
-	return "1234567890", nil
-}
-
-func (m *mockCloudFlareUpdateRecordsFail) ListZones(zoneID ...string) ([]cloudflare.Zone, error) {
-	return []cloudflare.Zone{{Name: "ext-dns-test.zalando.to."}}, nil
-}
-
-func (m *mockCloudFlareUpdateRecordsFail) ListZonesContext(ctx context.Context, opts ...cloudflare.ReqOption) (cloudflare.ZonesResponse, error) {
-	return cloudflare.ZonesResponse{}, nil
-}
-
 func TestNewCloudFlareChanges(t *testing.T) {
 	expect := []struct {
 		Name string