From ff020f14ff05967454252c00ba477f007ffe4995 Mon Sep 17 00:00:00 2001 From: Boshi Lian Date: Wed, 26 Dec 2018 22:56:47 +0000 Subject: [PATCH] fix lint --- sshpiperd/challenger/pam/pam_challenger.go | 2 +- sshpiperd/upstream/database/model.go | 6 +++--- sshpiperd/upstream/database/mysql.go | 2 +- sshpiperd/upstream/database/plugin.go | 1 - sshpiperd/upstream/database/postgres.go | 2 +- sshpiperd/upstream/database/sqlite.go | 2 +- 6 files changed, 7 insertions(+), 8 deletions(-) diff --git a/sshpiperd/challenger/pam/pam_challenger.go b/sshpiperd/challenger/pam/pam_challenger.go index 5d03431a..0ab73fbf 100644 --- a/sshpiperd/challenger/pam/pam_challenger.go +++ b/sshpiperd/challenger/pam/pam_challenger.go @@ -3,9 +3,9 @@ package pam import ( + "errors" "fmt" "os" - "errors" "golang.org/x/crypto/ssh" diff --git a/sshpiperd/upstream/database/model.go b/sshpiperd/upstream/database/model.go index a3a949c8..869acd4e 100644 --- a/sshpiperd/upstream/database/model.go +++ b/sshpiperd/upstream/database/model.go @@ -22,14 +22,14 @@ type keydata struct { type privateKey struct { Key keydata - KeyId int + KeyID int UpstreamID int } type hostKey struct { Key keydata - KeyId int + KeyID int ServerID int } @@ -61,7 +61,7 @@ type upstream struct { type authorizedKey struct { Key keydata - KeyId int + KeyID int DownstreamID int } diff --git a/sshpiperd/upstream/database/mysql.go b/sshpiperd/upstream/database/mysql.go index 73ba3061..d02783b4 100644 --- a/sshpiperd/upstream/database/mysql.go +++ b/sshpiperd/upstream/database/mysql.go @@ -5,7 +5,7 @@ import ( mysqldriver "github.com/go-sql-driver/mysql" "github.com/jinzhu/gorm" - _ "github.com/jinzhu/gorm/dialects/mysql" + _ "github.com/jinzhu/gorm/dialects/mysql" // gorm dialiect upstreamprovider "github.com/tg123/sshpiper/sshpiperd/upstream" ) diff --git a/sshpiperd/upstream/database/plugin.go b/sshpiperd/upstream/database/plugin.go index 90c0ba32..44979449 100644 --- a/sshpiperd/upstream/database/plugin.go +++ b/sshpiperd/upstream/database/plugin.go @@ -4,7 +4,6 @@ import ( "log" "github.com/jinzhu/gorm" - _ "github.com/jinzhu/gorm/dialects/mysql" upstreamprovider "github.com/tg123/sshpiper/sshpiperd/upstream" ) diff --git a/sshpiperd/upstream/database/postgres.go b/sshpiperd/upstream/database/postgres.go index b68982a1..8eee036e 100644 --- a/sshpiperd/upstream/database/postgres.go +++ b/sshpiperd/upstream/database/postgres.go @@ -4,7 +4,7 @@ import ( "fmt" "github.com/jinzhu/gorm" - _ "github.com/jinzhu/gorm/dialects/postgres" + _ "github.com/jinzhu/gorm/dialects/postgres" // gorm dialect upstreamprovider "github.com/tg123/sshpiper/sshpiperd/upstream" ) diff --git a/sshpiperd/upstream/database/sqlite.go b/sshpiperd/upstream/database/sqlite.go index 8e620ce0..8cb586c9 100644 --- a/sshpiperd/upstream/database/sqlite.go +++ b/sshpiperd/upstream/database/sqlite.go @@ -2,7 +2,7 @@ package database import ( "github.com/jinzhu/gorm" - _ "github.com/jinzhu/gorm/dialects/sqlite" + _ "github.com/jinzhu/gorm/dialects/sqlite" // gorm dialect upstreamprovider "github.com/tg123/sshpiper/sshpiperd/upstream" )