Merge 088df59 into 432d069

.golangci.yml

@@ -20,3 +20,4 @@ linters:
     - misspell
     - unconvert
     - staticcheck
+    - gosimple

.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

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/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/dyn.go

@@ -604,7 +604,7 @@ func (d *dynProviderState) Records(ctx context.Context) ([]*endpoint.Endpoint, e
 	for _, zone := range zones {
 		serial, err := d.fetchZoneSerial(client, zone)
 		if err != nil {
-			if strings.Index(err.Error(), "404 Not Found") >= 0 {
+			if strings.Contains(err.Error(), "404 Not Found") {
 				log.Infof("Ignore zone %s as it does not exist", zone)
 				continue
 			}

provider/ns1.go

@@ -115,7 +115,7 @@ func newNS1ProviderWithHTTPClient(config NS1Config, client *http.Client) (*NS1Pr
 		clientArgs = append(clientArgs, api.SetEndpoint(config.NS1Endpoint))
 	}
 
-	if config.NS1IgnoreSSL == true {
+	if config.NS1IgnoreSSL {
 		log.Info("ns1-ignoressl flag is True, skipping SSL verification")
 		defaultTransport := http.DefaultTransport.(*http.Transport)
 		tr := &http.Transport{

source/gateway.go

@@ -95,7 +95,7 @@ func NewIstioGatewaySource(
 
 	// wait for the local cache to be populated.
 	err = wait.Poll(time.Second, 60*time.Second, func() (bool, error) {
-		return serviceInformer.Informer().HasSynced() == true, nil
+		return serviceInformer.Informer().HasSynced(), nil
 	})
 	if err != nil {
 		return nil, fmt.Errorf("failed to sync cache: %v", err)

source/ingress.go

@@ -91,7 +91,7 @@ func NewIngressSource(kubeClient kubernetes.Interface, namespace, annotationFilt
 
 	// wait for the local cache to be populated.
 	err = wait.Poll(time.Second, 60*time.Second, func() (bool, error) {
-		return ingressInformer.Informer().HasSynced() == true, nil
+		return ingressInformer.Informer().HasSynced(), nil
 	})
 	if err != nil {
 		return nil, fmt.Errorf("failed to sync cache: %v", err)

source/ingressroute.go

@@ -104,7 +104,7 @@ func NewContourIngressRouteSource(
 
 	// wait for the local cache to be populated.
 	err = wait.Poll(time.Second, 60*time.Second, func() (bool, error) {
-		return ingressRouteInformer.Informer().HasSynced() == true, nil
+		return ingressRouteInformer.Informer().HasSynced(), nil
 	})
 	if err != nil {
 		return nil, fmt.Errorf("failed to sync cache: %v", err)

source/node.go

@@ -78,7 +78,7 @@ func NewNodeSource(kubeClient kubernetes.Interface, annotationFilter, fqdnTempla
 
 	// wait for the local cache to be populated.
 	err = wait.Poll(time.Second, 60*time.Second, func() (bool, error) {
-		return nodeInformer.Informer().HasSynced() == true, nil
+		return nodeInformer.Informer().HasSynced(), nil
 	})
 	if err != nil {
 		return nil, fmt.Errorf("failed to sync cache: %v", err)

source/service.go

@@ -113,7 +113,7 @@ func NewServiceSource(kubeClient kubernetes.Interface, namespace, annotationFilt
 
 	// wait for the local cache to be populated.
 	err = wait.Poll(time.Second, 60*time.Second, func() (bool, error) {
-		return serviceInformer.Informer().HasSynced() == true, nil
+		return serviceInformer.Informer().HasSynced(), nil
 	})
 	if err != nil {
 		return nil, fmt.Errorf("failed to sync cache: %v", err)
@@ -234,9 +234,9 @@ func (sc *serviceSource) extractHeadlessEndpoints(svc *v1.Service, hostname stri
 			headlessDomains = append(headlessDomains, fmt.Sprintf("%s.%s", v.Spec.Hostname, hostname))
 		}
 		for _, headlessDomain := range headlessDomains {
-			if sc.publishHostIP == true {
+			if sc.publishHostIP {
 				log.Debugf("Generating matching endpoint %s with HostIP %s", headlessDomain, v.Status.HostIP)
-				// To reduce traffice on the DNS API only add record for running Pods. Good Idea?
+				// To reduce traffic on the DNS API only add record for running Pods. Good Idea?
 				if v.Status.Phase == v1.PodRunning {
 					targetsByHeadlessDomain[headlessDomain] = append(targetsByHeadlessDomain[headlessDomain], v.Status.HostIP)
 				} else {