update linting

akerl · akerl · commit 6917e33f4eae · 2019-03-23T20:21:46.000-04:00
diff --git a/auth/main.go b/auth/main.go
@@ -12,7 +12,7 @@ import (
 type SessionCheck struct {
 	SessionManager session.Manager
 	AuthURL        string
-	AclHandler     func(events.Request, session.Session) (bool, error)
+	ACLHandler     func(events.Request, session.Session) (bool, error)
 }
 
 // AuthFunc checks for valid auth using GitHub OAuth
@@ -40,7 +40,7 @@ func (sc *SessionCheck) AuthFunc(req events.Request) (events.Response, error) {
 		return events.Redirect(authURL.String(), 303)
 	}
 
-	allowed, err := sc.AclHandler(req, sess)
+	allowed, err := sc.ACLHandler(req, sess)
 	if err != nil {
 		return events.Fail("failed to authenticate request")
 	}
diff --git a/custom.sh b/custom.sh
@@ -2,5 +2,5 @@
 
 set -xeuo pipefail
 
-go get github.com/omeid/go-resources/cmd/resources
+go get github.com/akerl/go-resources/cmd/resources
 go generate
diff --git a/go.mod b/go.mod
@@ -2,10 +2,10 @@ module github.com/akerl/github-auth-lambda
 
 require (
 	github.com/akerl/go-lambda v0.1.0
+	github.com/akerl/go-resources v0.0.0-20190324001828-2629d65f497f // indirect
 	github.com/google/go-github/v24 v24.0.1
 	github.com/google/uuid v1.1.1
 	github.com/gorilla/securecookie v1.1.1
-	github.com/omeid/go-resources v0.0.0-20171025031226-ca9993b7d1a4 // indirect
 	github.com/osteele/liquid v1.2.4 // indirect
 	github.com/osteele/tuesday v1.0.3 // indirect
 	golang.org/x/oauth2 v0.0.0-20190319182350-c85d3e98c914
diff --git a/go.sum b/go.sum
@@ -1,6 +1,8 @@
 cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
 github.com/akerl/go-lambda v0.1.0 h1:znaUi5ghiIRtnEcVY4zUZhW7tz7IxxVjRgwFWkFTMbY=
 github.com/akerl/go-lambda v0.1.0/go.mod h1:vyT/70Td9NXHw2U6y+FELwC4r1gZLlt3VwQfmLOoG+c=
+github.com/akerl/go-resources v0.0.0-20190324001828-2629d65f497f h1:U8/oCo1gQlDOHnmAtc91QrPetZl70xuRzlSqOICtbFo=
+github.com/akerl/go-resources v0.0.0-20190324001828-2629d65f497f/go.mod h1:kTD1nW2bNr87kMBl4Q/4tmKjb/C04vybCy0Wtgixk6M=
 github.com/aws/aws-lambda-go v1.8.1 h1:nHBpP6XC30bwF6qWKrw/BrK2A8i4GKmSZzajTBIJS4A=
 github.com/aws/aws-lambda-go v1.8.1/go.mod h1:zUsUQhAUjYzR8AuduJPCfhBuKWUaDbQiPOG+ouzmE1A=
 github.com/aws/aws-sdk-go-v2 v0.7.0 h1:a5xRI/tBmUFKuAA0SOyEY2P1YhQb+jVOEI9P/7KfrP0=
@@ -25,8 +27,6 @@ github.com/gucumber/gucumber v0.0.0-20180127021336-7d5c79e832a2/go.mod h1:YbdHRK
 github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af h1:pmfjZENx5imkbgOkpRUYLnmbU7UEFbjtDA2hxJ1ichM=
 github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af/go.mod h1:Nht3zPeWKUH0NzdCt2Blrr5ys8VGpn0CEB0cQHVjt7k=
 github.com/nlopes/slack v0.5.0/go.mod h1:jVI4BBK3lSktibKahxBF74txcK2vyvkza1z/+rRnVAM=
-github.com/omeid/go-resources v0.0.0-20171025031226-ca9993b7d1a4 h1:Uv6HZs0LhOEByIbxsZ+Ph0hMAfrv+aCkqhZpKVCY5wU=
-github.com/omeid/go-resources v0.0.0-20171025031226-ca9993b7d1a4/go.mod h1:SIESmZeFlCKsQZcd2NEiX8spNNmCWB1V/RbM/eBKDfo=
 github.com/osteele/liquid v1.2.4 h1:ydm/FoHn/cStyN7Fpar4L/ClyRKc9rZ+Qzb+S3OMOT4=
 github.com/osteele/liquid v1.2.4/go.mod h1:jhgMyQFVoV0grH2MKvpMbgxFSBezOoXUbgiwnYrKJ2c=
 github.com/osteele/tuesday v1.0.3 h1:SrCmo6sWwSgnvs1bivmXLvD7Ko9+aJvvkmDjB5G4FTU=
diff --git a/router.go b/router.go
@@ -33,8 +33,9 @@ func success(req events.Request, sess session.Session) (events.Response, error)
 }
 
 func redirect(req events.Request, sess session.Session, target string) (events.Response, error) {
-	if target == "" {
-		target = "https://" + req.Headers["Host"]
+	respTarget := target
+	if respTarget == "" {
+		respTarget = "https://" + req.Headers["Host"]
 	}
 
 	cookie, err := sm.Write(sess)
@@ -45,7 +46,7 @@ func redirect(req events.Request, sess session.Session, target string) (events.R
 	return events.Response{
 		StatusCode: 303,
 		Headers: map[string]string{
-			"Location":   target,
+			"Location":   respTarget,
 			"Set-Cookie": cookie,
 		},
 	}, nil
diff --git a/static.go b/static.go
@@ -76,7 +76,7 @@ func (f *File) Close() error {
 }
 
 // Readdir implements http.File.Readdir
-func (f *File) Readdir(count int) ([]os.FileInfo, error) {
+func (f *File) Readdir(_ int) ([]os.FileInfo, error) {
 	return nil, os.ErrNotExist
 }
 
@@ -123,7 +123,7 @@ func (f *FileInfo) IsDir() bool {
 }
 
 // Readdir implements os.FileInfo.Readdir
-func (f *FileInfo) Readdir(count int) ([]os.FileInfo, error) {
+func (f *FileInfo) Readdir(_ int) ([]os.FileInfo, error) {
 	return f.files, nil
 }
 

Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ import (`
`12`	`12`	`type SessionCheck struct {`
`13`	`13`	`SessionManager session.Manager`
`14`	`14`	`AuthURL string`
`15`		`- AclHandler func(events.Request, session.Session) (bool, error)`
	`15`	`+ ACLHandler func(events.Request, session.Session) (bool, error)`
`16`	`16`	`}`
`17`	`17`
`18`	`18`	`// AuthFunc checks for valid auth using GitHub OAuth`
`@@ -40,7 +40,7 @@ func (sc *SessionCheck) AuthFunc(req events.Request) (events.Response, error) {`
`40`	`40`	`return events.Redirect(authURL.String(), 303)`
`41`	`41`	`}`
`42`	`42`
`43`		`- allowed, err := sc.AclHandler(req, sess)`
	`43`	`+ allowed, err := sc.ACLHandler(req, sess)`
`44`	`44`	`if err != nil {`
`45`	`45`	`return events.Fail("failed to authenticate request")`
`46`	`46`	`}`
Original file line number	Diff line number	Diff line change
`@@ -76,7 +76,7 @@ func (f *File) Close() error {`
`76`	`76`	`}`
`77`	`77`
`78`	`78`	`// Readdir implements http.File.Readdir`
`79`		`-func (f *File) Readdir(count int) ([]os.FileInfo, error) {`
	`79`	`+func (f *File) Readdir(_ int) ([]os.FileInfo, error) {`
`80`	`80`	`return nil, os.ErrNotExist`
`81`	`81`	`}`
`82`	`82`
`@@ -123,7 +123,7 @@ func (f *FileInfo) IsDir() bool {`
`123`	`123`	`}`
`124`	`124`
`125`	`125`	`// Readdir implements os.FileInfo.Readdir`
`126`		`-func (f *FileInfo) Readdir(count int) ([]os.FileInfo, error) {`
	`126`	`+func (f *FileInfo) Readdir(_ int) ([]os.FileInfo, error) {`
`127`	`127`	`return f.files, nil`
`128`	`128`	`}`
`129`	`129`