From 31ce8e9a3ce48d8fae08e6be6dee3248b5b63a7a Mon Sep 17 00:00:00 2001
From: Niall Sheridan <nsheridan@gmail.com>
Date: Mon, 13 Jun 2016 22:14:19 +0100
Subject: [PATCH] Run the linter as part of tests.
Fix lint warnings.
---
.travis.yml | 4 ++++
server/auth/github/github.go | 6 +++---
server/fs/s3.go | 1 +
templates/token.go | 1 +
4 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index dc81a35c..3f16b07f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,9 +8,13 @@ go:
- 1.6.2
- tip
+before_install:
+ - go get -v github.com/golang/lint/golint
+
sudo: false
script:
- go build -v ./...
- go list ./... |grep -v vendor/ |xargs go test
- gofmt -d $(find -type f -name '*.go' -not -path './vendor/*')
- go list ./... |grep -v vendor/ |xargs go vet
+ - go list ./... |grep -v vendor/ |xargs -L1 golint
diff --git a/server/auth/github/github.go b/server/auth/github/github.go
index 7904e262..9bbd8f62 100644
--- a/server/auth/github/github.go
+++ b/server/auth/github/github.go
@@ -67,9 +67,9 @@ func (c *Config) Valid(token *oauth2.Token) bool {
return member
}
-// GitHub doesn't seem to allow token revocation - tokens are indefinite and
-// there are no refresh options etc. Returns nil to satisfy the Provider
-// interface.
+// Revoke is a no-op revoke method. GitHub doesn't seem to allow token
+// revocation - tokens are indefinite and there are no refresh options etc.
+// Returns nil to satisfy the Provider interface.
func (c *Config) Revoke(token *oauth2.Token) error {
return nil
}
diff --git a/server/fs/s3.go b/server/fs/s3.go
index 4e82bb49..e16e7d6f 100644
--- a/server/fs/s3.go
+++ b/server/fs/s3.go
@@ -19,6 +19,7 @@ import (
"github.com/nsheridan/cashier/server/config"
)
+// Register the /s3/ filesystem as a well-known filesystem.
func Register(config *config.AWS) {
ac := &aws.Config{}
// If region is unset the SDK will attempt to read the region from the environment.
diff --git a/templates/token.go b/templates/token.go
index dbad371f..270055b2 100644
--- a/templates/token.go
+++ b/templates/token.go
@@ -1,5 +1,6 @@
package templates
+// Token is the page users see when authenticated.
const Token = `<html>
<head>
<title>YOUR TOKEN!</title>
--
GitLab