Formatting issues

Aren't we running go-fmt.sh in CI?

api/agent/drivers/driver_test.go

@@ -94,14 +94,14 @@ func TestDecimate(t *testing.T) {
 
 func TestParseImage(t *testing.T) {
 	cases := map[string][]string{
-		"fnproject/hello":                                       {"", "fnproject/hello", "latest"},
-		"fnproject/hello:v1":                                    {"", "fnproject/hello", "v1"},
+		"fnproject/hello":                                   {"", "fnproject/hello", "latest"},
+		"fnproject/hello:v1":                                {"", "fnproject/hello", "v1"},
 		"my.registry/hello":                                 {"my.registry", "hello", "latest"},
 		"my.registry/hello:v1":                              {"my.registry", "hello", "v1"},
 		"mongo":                                             {"", "library/mongo", "latest"},
 		"mongo:v1":                                          {"", "library/mongo", "v1"},
-		"quay.com/fnproject/hello":                              {"quay.com", "fnproject/hello", "latest"},
-		"quay.com:8080/fnproject/hello:v2":                      {"quay.com:8080", "fnproject/hello", "v2"},
+		"quay.com/fnproject/hello":                          {"quay.com", "fnproject/hello", "latest"},
+		"quay.com:8080/fnproject/hello:v2":                  {"quay.com:8080", "fnproject/hello", "v2"},
 		"localhost.localdomain:5000/samalba/hipache:latest": {"localhost.localdomain:5000", "samalba/hipache", "latest"},
 	}
 

api/datastore/internal/datastoretest/test.go

@@ -13,9 +13,9 @@ import (
 	"reflect"
 	"time"
 
-	"github.com/sirupsen/logrus"
 	"github.com/gin-gonic/gin"
 	"github.com/go-openapi/strfmt"
+	"github.com/sirupsen/logrus"
 )
 
 func setLogBuffer() *bytes.Buffer {

api/datastore/sql/sql.go

@@ -12,7 +12,6 @@ import (
 	"path/filepath"
 	"strings"
 
-	"github.com/sirupsen/logrus"
 	"github.com/fnproject/fn/api/models"
 	"github.com/go-sql-driver/mysql"
 	_ "github.com/go-sql-driver/mysql"
@@ -21,6 +20,7 @@ import (
 	_ "github.com/lib/pq"
 	"github.com/mattn/go-sqlite3"
 	_ "github.com/mattn/go-sqlite3"
+	"github.com/sirupsen/logrus"
 )
 
 // this aims to be an ANSI-SQL compliant package that uses only question
@@ -71,23 +71,23 @@ const (
 )
 
 type sqlStore struct {
-	db *sqlx.DB
-	insertAppQuery string
-	updateAppQuery string
-	getAppQuery string
+	db                   *sqlx.DB
+	insertAppQuery       string
+	updateAppQuery       string
+	getAppQuery          string
 	selectAppConfigQuery string
-	removeAppQuery string
-	insertRouteQuery string
-	updateRouteQuery string
-	checkRouteAppQuery string
-	checkRouteQuery string
-	getRouteQuery string
-	removeRouteQuery string
-	insertCallQuery string
-	getCallQuery string
-	insertLogQuery string
-	getLogQuery string
-	deleteLogQuery string
+	removeAppQuery       string
+	insertRouteQuery     string
+	updateRouteQuery     string
+	checkRouteAppQuery   string
+	checkRouteQuery      string
+	getRouteQuery        string
+	removeRouteQuery     string
+	insertCallQuery      string
+	getCallQuery         string
+	insertLogQuery       string
+	getLogQuery          string
+	deleteLogQuery       string
 }
 
 // New will open the db specified by url, create any tables necessary
@@ -147,14 +147,14 @@ func New(url *url.URL) (models.Datastore, error) {
 	}
 
 	dstore := &sqlStore{
-		db: db,
-		insertAppQuery: db.Rebind("INSERT INTO apps (name, config) VALUES (?, ?);"),
+		db:                   db,
+		insertAppQuery:       db.Rebind("INSERT INTO apps (name, config) VALUES (?, ?);"),
 		selectAppConfigQuery: db.Rebind(`SELECT config FROM apps WHERE name=?`),
-		updateAppQuery: db.Rebind(`UPDATE apps SET config=? WHERE name=?`),
-		removeAppQuery: db.Rebind(`DELETE FROM apps WHERE name = ?`),
-		getAppQuery: db.Rebind(`SELECT name, config FROM apps WHERE name=?`),
-		checkRouteAppQuery: db.Rebind(`SELECT 1 FROM apps WHERE name=?`),
-		checkRouteQuery: db.Rebind(`SELECT 1 FROM routes WHERE app_name=? AND path=?`),
+		updateAppQuery:       db.Rebind(`UPDATE apps SET config=? WHERE name=?`),
+		removeAppQuery:       db.Rebind(`DELETE FROM apps WHERE name = ?`),
+		getAppQuery:          db.Rebind(`SELECT name, config FROM apps WHERE name=?`),
+		checkRouteAppQuery:   db.Rebind(`SELECT 1 FROM apps WHERE name=?`),
+		checkRouteQuery:      db.Rebind(`SELECT 1 FROM routes WHERE app_name=? AND path=?`),
 		insertRouteQuery: db.Rebind(`INSERT INTO routes (
 			app_name,
 			path,
@@ -190,9 +190,9 @@ func New(url *url.URL) (models.Datastore, error) {
 			path
 		)
 		VALUES (?, ?, ?, ?, ?, ?, ?);`),
-		getCallQuery: db.Rebind(fmt.Sprintf(`%s WHERE id=? AND app_name=?`, callSelector)),
+		getCallQuery:   db.Rebind(fmt.Sprintf(`%s WHERE id=? AND app_name=?`, callSelector)),
 		insertLogQuery: db.Rebind(`INSERT INTO logs (id, log) VALUES (?, ?);`),
-		getLogQuery: db.Rebind(`SELECT log FROM logs WHERE id=?`),
+		getLogQuery:    db.Rebind(`SELECT log FROM logs WHERE id=?`),
 		deleteLogQuery: db.Rebind(`DELETE FROM logs WHERE id=?`),
 	}
 	return dstore, nil

api/logs/log.go

@@ -4,9 +4,9 @@ import (
 	"fmt"
 	"net/url"
 
-	"github.com/sirupsen/logrus"
 	"github.com/fnproject/fn/api/datastore/sql"
 	"github.com/fnproject/fn/api/models"
+	"github.com/sirupsen/logrus"
 )
 
 func New(dbURL string) (models.LogStore, error) {

api/mqs/bolt.go

@@ -11,10 +11,10 @@ import (
 	"path/filepath"
 	"time"
 
-	"github.com/sirupsen/logrus"
 	"github.com/boltdb/bolt"
 	"github.com/fnproject/fn/api/common"
 	"github.com/fnproject/fn/api/models"
+	"github.com/sirupsen/logrus"
 )
 
 type BoltDbMQ struct {

api/mqs/ironmq.go

@@ -9,10 +9,10 @@ import (
 	"strings"
 	"sync"
 
-	"github.com/sirupsen/logrus"
 	"github.com/fnproject/fn/api/models"
 	mq_config "github.com/iron-io/iron_go3/config"
 	ironmq "github.com/iron-io/iron_go3/mq"
+	"github.com/sirupsen/logrus"
 )
 
 type assoc struct {

api/mqs/new.go

@@ -6,9 +6,9 @@ import (
 	"net/url"
 	"strings"
 
-	"github.com/sirupsen/logrus"
 	"github.com/fnproject/fn/api/models"
 	"github.com/opentracing/opentracing-go"
+	"github.com/sirupsen/logrus"
 )
 
 // New will parse the URL and return the correct MQ implementation.

api/server/apps_test.go

@@ -7,12 +7,12 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/sirupsen/logrus"
 	"github.com/fnproject/fn/api/datastore"
 	"github.com/fnproject/fn/api/logs"
 	"github.com/fnproject/fn/api/models"
 	"github.com/fnproject/fn/api/mqs"
 	"github.com/gin-gonic/gin"
+	"github.com/sirupsen/logrus"
 )
 
 func setLogBuffer() *bytes.Buffer {

api/server/init.go

@@ -7,8 +7,8 @@ import (
 	"os/signal"
 	"strings"
 
-	"github.com/sirupsen/logrus"
 	"github.com/gin-gonic/gin"
+	"github.com/sirupsen/logrus"
 	"github.com/spf13/viper"
 )
 

fnlb/lb/allgrouper.go

@@ -17,12 +17,12 @@ import (
 	"time"
 
 	"fmt"
-	"github.com/sirupsen/logrus"
 	"github.com/coreos/go-semver/semver"
 	"github.com/go-sql-driver/mysql"
 	"github.com/jmoiron/sqlx"
 	"github.com/lib/pq"
 	"github.com/mattn/go-sqlite3"
+	"github.com/sirupsen/logrus"
 )
 
 // NewAllGrouper returns a Grouper that will return the entire list of nodes

fnlb/lb/proxy.go

@@ -7,11 +7,11 @@ import (
 	"net/http/httputil"
 	"sync"
 
-	"github.com/sirupsen/logrus"
 	"github.com/coreos/go-semver/semver"
 	opentracing "github.com/opentracing/opentracing-go"
 	"github.com/opentracing/opentracing-go/ext"
 	"github.com/openzipkin/zipkin-go-opentracing"
+	"github.com/sirupsen/logrus"
 )
 
 // TODO the load balancers all need to have the same list of nodes. gossip?

fnlb/main.go

@@ -12,9 +12,9 @@ import (
 	"syscall"
 	"time"
 
-	"github.com/sirupsen/logrus"
 	"github.com/coreos/go-semver/semver"
 	"github.com/fnproject/fn/fnlb/lb"
+	"github.com/sirupsen/logrus"
 )
 
 const VERSION = "0.0.56"