Add gosimple linter

.golangci.yml

@@ -7,6 +7,7 @@ linters:
     - errcheck # Mandatory. Do not disable.
     - ineffassign # Mandatory. Do not disable.
     - staticcheck # Mandatory. Do not disable.
+    - gosimple
     - gosec
     - bodyclose # https://github.com/timakin/bodyclose
     - gomodguard

bounces.go

@@ -76,10 +76,8 @@ func (ci *BouncesIterator) Next(ctx context.Context, items *[]Bounce) bool {
 	cpy := make([]Bounce, len(ci.Items))
 	copy(cpy, ci.Items)
 	*items = cpy
-	if len(ci.Items) == 0 {
-		return false
-	}
-	return true
+
+	return len(ci.Items) != 0
 }
 
 // First retrieves the first page of items from the api. Returns false if there
@@ -134,10 +132,8 @@ func (ci *BouncesIterator) Previous(ctx context.Context, items *[]Bounce) bool {
 	cpy := make([]Bounce, len(ci.Items))
 	copy(cpy, ci.Items)
 	*items = cpy
-	if len(ci.Items) == 0 {
-		return false
-	}
-	return true
+
+	return len(ci.Items) != 0
 }
 
 func (ci *BouncesIterator) fetch(ctx context.Context, url string) error {

credentials.go

@@ -153,10 +153,8 @@ func (ri *CredentialsIterator) Previous(ctx context.Context, items *[]Credential
 	cpy := make([]Credential, len(ri.Items))
 	copy(cpy, ri.Items)
 	*items = cpy
-	if len(ri.Items) == 0 {
-		return false
-	}
-	return true
+
+	return len(ri.Items) != 0
 }
 
 func (ri *CredentialsIterator) fetch(ctx context.Context, skip, limit int) error {

domains.go

@@ -211,10 +211,8 @@ func (ri *DomainsIterator) Previous(ctx context.Context, items *[]Domain) bool {
 	cpy := make([]Domain, len(ri.Items))
 	copy(cpy, ri.Items)
 	*items = cpy
-	if len(ri.Items) == 0 {
-		return false
-	}
-	return true
+
+	return len(ri.Items) != 0
 }
 
 func (ri *DomainsIterator) fetch(ctx context.Context, skip, limit int) error {

events.go

@@ -153,10 +153,8 @@ func (ei *EventIterator) Previous(ctx context.Context, events *[]Event) bool {
 		return false
 	}
 	*events, ei.err = ParseEvents(ei.Items)
-	if len(ei.Items) == 0 {
-		return false
-	}
-	return true
+
+	return len(ei.Items) != 0
 }
 
 func (ei *EventIterator) fetch(ctx context.Context, url string) error {
@@ -248,7 +246,7 @@ func (ep *EventPoller) Poll(ctx context.Context, events *[]Event) bool {
 
 		// Attempt to get a page of events
 		var page []Event
-		if ep.it.Next(ctx, &page) == false {
+		if !ep.it.Next(ctx, &page) {
 			if ep.it.Err() == nil && len(page) == 0 {
 				// No events, sleep for our poll interval
 				goto SLEEP

httphelpers.go

@@ -371,7 +371,7 @@ func (r *httpRequest) generateUrlWithParameters() (string, error) {
 	}
 
 	q := uri.Query()
-	if r.Parameters != nil && len(r.Parameters) > 0 {
+	if len(r.Parameters) > 0 {
 		for name, values := range r.Parameters {
 			for _, value := range values {
 				q.Add(name, value)

mailing_lists.go

@@ -98,10 +98,8 @@ func (li *ListsIterator) Next(ctx context.Context, items *[]MailingList) bool {
 	cpy := make([]MailingList, len(li.Items))
 	copy(cpy, li.Items)
 	*items = cpy
-	if len(li.Items) == 0 {
-		return false
-	}
-	return true
+
+	return len(li.Items) != 0
 }
 
 // First retrieves the first page of items from the api. Returns false if there
@@ -156,10 +154,8 @@ func (li *ListsIterator) Previous(ctx context.Context, items *[]MailingList) boo
 	cpy := make([]MailingList, len(li.Items))
 	copy(cpy, li.Items)
 	*items = cpy
-	if len(li.Items) == 0 {
-		return false
-	}
-	return true
+
+	return len(li.Items) != 0
 }
 
 func (li *ListsIterator) fetch(ctx context.Context, url string) error {

members.go

@@ -89,10 +89,8 @@ func (li *MemberListIterator) Next(ctx context.Context, items *[]Member) bool {
 		return false
 	}
 	*items = li.Lists
-	if len(li.Lists) == 0 {
-		return false
-	}
-	return true
+
+	return len(li.Lists) != 0
 }
 
 // First retrieves the first page of items from the api. Returns false if there
@@ -141,10 +139,8 @@ func (li *MemberListIterator) Previous(ctx context.Context, items *[]Member) boo
 		return false
 	}
 	*items = li.Lists
-	if len(li.Lists) == 0 {
-		return false
-	}
-	return true
+
+	return len(li.Lists) != 0
 }
 
 func (li *MemberListIterator) fetch(ctx context.Context, url string) error {

routes.go

@@ -56,7 +56,7 @@ type ForwardedMessage struct {
 //	}
 //	forwardRoute := mailgun.ExtractForwardedMessage(r.PostForm)
 //	fmt.Printf("Forwarded message: %#v", forwardRoute)
-//}
+// }
 func ExtractForwardedMessage(formValues url.Values) ForwardedMessage {
 	forwardedMessage := ForwardedMessage{}
 	forwardedMessage.BodyPlain = formValues.Get("body-plain")
@@ -236,10 +236,8 @@ func (ri *RoutesIterator) Previous(ctx context.Context, items *[]Route) bool {
 	cpy := make([]Route, len(ri.Items))
 	copy(cpy, ri.Items)
 	*items = cpy
-	if len(ri.Items) == 0 {
-		return false
-	}
-	return true
+
+	return len(ri.Items) != 0
 }
 
 func (ri *RoutesIterator) fetch(ctx context.Context, skip, limit int) error {

spam_complaints.go

@@ -67,10 +67,8 @@ func (ci *ComplaintsIterator) Next(ctx context.Context, items *[]Complaint) bool
 	cpy := make([]Complaint, len(ci.Items))
 	copy(cpy, ci.Items)
 	*items = cpy
-	if len(ci.Items) == 0 {
-		return false
-	}
-	return true
+
+	return len(ci.Items) != 0
 }
 
 // First retrieves the first page of items from the api. Returns false if there
@@ -125,10 +123,8 @@ func (ci *ComplaintsIterator) Previous(ctx context.Context, items *[]Complaint)
 	cpy := make([]Complaint, len(ci.Items))
 	copy(cpy, ci.Items)
 	*items = cpy
-	if len(ci.Items) == 0 {
-		return false
-	}
-	return true
+
+	return len(ci.Items) != 0
 }
 
 func (ci *ComplaintsIterator) fetch(ctx context.Context, url string) error {

subaccounts.go

@@ -175,10 +175,8 @@ func (ri *SubaccountsIterator) Previous(ctx context.Context, items *[]Subaccount
 	cpy := make([]Subaccount, len(ri.Items))
 	copy(cpy, ri.Items)
 	*items = cpy
-	if len(ri.Items) == 0 {
-		return false
-	}
-	return true
+
+	return len(ri.Items) != 0
 }
 
 func (ri *SubaccountsIterator) fetch(ctx context.Context, skip, limit int) error {

tags.go

@@ -95,10 +95,8 @@ func (ti *TagIterator) Next(ctx context.Context, items *[]Tag) bool {
 		return false
 	}
 	*items = ti.Items
-	if len(ti.Items) == 0 {
-		return false
-	}
-	return true
+
+	return len(ti.Items) != 0
 }
 
 // Previous returns the previous page in the list of tags
@@ -120,10 +118,8 @@ func (ti *TagIterator) Previous(ctx context.Context, items *[]Tag) bool {
 		return false
 	}
 	*items = ti.Items
-	if len(ti.Items) == 0 {
-		return false
-	}
-	return true
+
+	return len(ti.Items) != 0
 }
 
 // First returns the first page in the list of tags

template.go

@@ -169,10 +169,8 @@ func (ti *TemplatesIterator) Next(ctx context.Context, items *[]Template) bool {
 	cpy := make([]Template, len(ti.Items))
 	copy(cpy, ti.Items)
 	*items = cpy
-	if len(ti.Items) == 0 {
-		return false
-	}
-	return true
+
+	return len(ti.Items) != 0
 }
 
 // First retrieves the first page of items from the api. Returns false if there
@@ -227,10 +225,8 @@ func (ti *TemplatesIterator) Previous(ctx context.Context, items *[]Template) bo
 	cpy := make([]Template, len(ti.Items))
 	copy(cpy, ti.Items)
 	*items = cpy
-	if len(ti.Items) == 0 {
-		return false
-	}
-	return true
+
+	return len(ti.Items) != 0
 }
 
 func (ti *TemplatesIterator) fetch(ctx context.Context, url string) error {

template_versions.go

@@ -144,10 +144,8 @@ func (li *TemplateVersionsIterator) Next(ctx context.Context, items *[]TemplateV
 	cpy := make([]TemplateVersion, len(li.Template.Versions))
 	copy(cpy, li.Template.Versions)
 	*items = cpy
-	if len(li.Template.Versions) == 0 {
-		return false
-	}
-	return true
+
+	return len(li.Template.Versions) != 0
 }
 
 // First retrieves the first page of items from the api. Returns false if there
@@ -202,10 +200,8 @@ func (li *TemplateVersionsIterator) Previous(ctx context.Context, items *[]Templ
 	cpy := make([]TemplateVersion, len(li.Template.Versions))
 	copy(cpy, li.Template.Versions)
 	*items = cpy
-	if len(li.Template.Versions) == 0 {
-		return false
-	}
-	return true
+
+	return len(li.Template.Versions) != 0
 }
 
 func (li *TemplateVersionsIterator) fetch(ctx context.Context, url string) error {

unsubscribes.go

@@ -60,10 +60,8 @@ func (ci *UnsubscribesIterator) Next(ctx context.Context, items *[]Unsubscribe)
 	cpy := make([]Unsubscribe, len(ci.Items))
 	copy(cpy, ci.Items)
 	*items = cpy
-	if len(ci.Items) == 0 {
-		return false
-	}
-	return true
+
+	return len(ci.Items) != 0
 }
 
 // First retrieves the first page of items from the api. Returns false if there
@@ -118,10 +116,8 @@ func (ci *UnsubscribesIterator) Previous(ctx context.Context, items *[]Unsubscri
 	cpy := make([]Unsubscribe, len(ci.Items))
 	copy(cpy, ci.Items)
 	*items = cpy
-	if len(ci.Items) == 0 {
-		return false
-	}
-	return true
+
+	return len(ci.Items) != 0
 }
 
 func (ci *UnsubscribesIterator) fetch(ctx context.Context, url string) error {