use golangci-lint, improve code quality

circa10a · circa10a · commit da8221c21ed4 · 2020-11-07T18:39:58.000-06:00
diff --git a/.travis.yml b/.travis.yml
@@ -9,9 +9,11 @@ env:
 services:
   - docker
 
+before_install:
+  - curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(go env GOPATH)/bin v1.32.2
+
 script:
-- go vet ./...
-- make test
+  - make test
 
 after_success:
   - bash <(curl -s https://codecov.io/bash) -t "${CODECOV_TOKEN}" -f coverage.txt -Z
diff --git a/Makefile b/Makefile
@@ -2,11 +2,16 @@ GOCMD=go
 BINARY=awsnews
 BUILD_FLAGS=-ldflags="-s -w"
 PROJECT=circa10a/go-aws-news
-VERSION=1.0.0
+VERSION=1.1.0
 
 # First target for travis ci
 test:
 	$(GOCMD) test -v ./... -coverprofile=coverage.txt
+	@if ! command -v golangci-lint 1>/dev/null; then\
+		echo "Need to install golangci-lint";\
+		exit 1;\
+	fi;\
+	golangci-lint run
 
 coverage:
 	$(GOCMD) test -coverprofile=coverage.txt ./... && go tool cover -html=coverage.txt
diff --git a/go.mod b/go.mod
@@ -9,7 +9,7 @@ require (
 	github.com/olekukonko/tablewriter v0.0.4
 	github.com/sirupsen/logrus v1.7.0
 	github.com/stretchr/testify v1.6.1
-	golang.org/x/net v0.0.0-20201016165138-7b1cca2348c0 // indirect
-	golang.org/x/sys v0.0.0-20201017003518-b09fb700fbb7 // indirect
+	golang.org/x/net v0.0.0-20201031054903-ff519b6c9102 // indirect
+	golang.org/x/sys v0.0.0-20201107080550-4d91cf3a1aaf // indirect
 	gopkg.in/yaml.v2 v2.3.0
 )
diff --git a/go.sum b/go.sum
@@ -29,15 +29,15 @@ golang.org/x/net v0.0.0-20180218175443-cbe0f9307d01/go.mod h1:mL1N/T3taQHkDXs73r
 golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20200202094626-16171245cfb2 h1:CCH4IOTTfewWjGOlSp+zGcjutRKlBEZQ6wTn8ozI/nI=
 golang.org/x/net v0.0.0-20200202094626-16171245cfb2/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.0.0-20201016165138-7b1cca2348c0 h1:5kGOVHlq0euqwzgTC9Vu15p6fV1Wi0ArVi8da2urnVg=
-golang.org/x/net v0.0.0-20201016165138-7b1cca2348c0/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
+golang.org/x/net v0.0.0-20201031054903-ff519b6c9102 h1:42cLlJJdEh+ySyeUUbEQ5bsTiq8voBeTuweGVkY6Puw=
+golang.org/x/net v0.0.0-20201031054903-ff519b6c9102/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20191026070338-33540a1f6037 h1:YyJpGZS1sBuBCzLAR1VEpK193GlqGZbnPFnPV/5Rsb4=
 golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20201017003518-b09fb700fbb7 h1:XtNJkfEjb4zR3q20BBBcYUykVOEMgZeIUOpBPfNYgxg=
-golang.org/x/sys v0.0.0-20201017003518-b09fb700fbb7/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20201107080550-4d91cf3a1aaf h1:kt3wY1Lu5MJAnKTfoMR52Cu4gwvna4VTzNOiT8tY73s=
+golang.org/x/sys v0.0.0-20201107080550-4d91cf3a1aaf/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
diff --git a/news/announcements.go b/news/announcements.go
@@ -105,7 +105,7 @@ func Yesterday() (Announcements, error) {
 // Output: Jan 7, 2020
 // parseDate Extracts a standarized date format from the AWS html document.
 func parseDate(postDate string) string {
-	r, _ := regexp.Compile("[A-Z][a-z]{2}\\s[0-9]{1,2},\\s[0-9]{4}")
+	r, _ := regexp.Compile(`[A-Z][a-z]{2}\s[0-9]{1,2},\s[0-9]{4}`)
 	// AWS sometimes doesn't have a post date
 	if len(r.FindStringSubmatch(postDate)) > 0 {
 		return r.FindStringSubmatch(postDate)[0]
diff --git a/news/newsdoc.go b/news/newsdoc.go
@@ -2,6 +2,8 @@ package news
 
 import (
 	"fmt"
+	"net/http"
+	"time"
 
 	"github.com/PuerkitoBio/goquery"
 )
@@ -14,7 +16,18 @@ type newsDoc struct {
 // getNewsDocYear Fetches html from AWS depending on the year/month specified.
 func getNewsDocYear(year int) (*goquery.Document, error) {
 	url := fmt.Sprintf("https://aws.amazon.com/about-aws/whats-new/%d", year)
-	doc, err := goquery.NewDocument(url)
+	client := &http.Client{Timeout: 10 * time.Second}
+	req, err := http.NewRequest("GET", url, nil)
+	if err != nil {
+		return nil, err
+	}
+
+	r, err := client.Do(req)
+	if err != nil {
+		return nil, err
+	}
+	defer r.Body.Close()
+	doc, err := goquery.NewDocumentFromReader(r.Body)
 	if err != nil {
 		return doc, err
 	}
@@ -24,7 +37,18 @@ func getNewsDocYear(year int) (*goquery.Document, error) {
 // getNewsDocMonth Fetches html from AWS depending on the year/month specified.
 func getNewsDocMonth(year int, month int) (*goquery.Document, error) {
 	url := fmt.Sprintf("https://aws.amazon.com/about-aws/whats-new/%v/%02d/", year, month)
-	doc, err := goquery.NewDocument(url)
+	client := &http.Client{Timeout: 10 * time.Second}
+	req, err := http.NewRequest("GET", url, nil)
+	if err != nil {
+		return nil, err
+	}
+
+	r, err := client.Do(req)
+	if err != nil {
+		return nil, err
+	}
+	defer r.Body.Close()
+	doc, err := goquery.NewDocumentFromReader(r.Body)
 	if err != nil {
 		return doc, err
 	}
diff --git a/providers/smtp/smtp.go b/providers/smtp/smtp.go
@@ -84,7 +84,10 @@ func (p *Provider) Notify(news news.Announcements) {
 		auth = smtp.PlainAuth("", p.Username, p.Password, p.Server)
 	}
 
-	m.parseTemplate()
+	err := m.parseTemplate()
+	if err != nil {
+		log.Error(fmt.Sprintf("[%v] %v", p.GetName(), err))
+	}
 
 	log.Info(fmt.Sprintf("[%v] Firing notification", p.GetName()))
 	if err := m.sendMail(auth); err != nil {
