linting

golang-migrate · dhui · Jan 15, 2020 · Jan 6, 2020 · Jan 6, 2020 · Jan 6, 2020
commit e994a5ddd5746095e19387bc95293323e883846a
diff --git a/Dockerfile b/Dockerfile
@@ -3,6 +3,14 @@ ARG VERSION
 
 RUN apk add --no-cache git gcc musl-dev
 
+# dependencies for neo4j
+RUN apk add --update --no-cache ca-certificates cmake make g++ openssl-dev git curl pkgconfig
+
+# build seabolt for neo4j driver
+RUN git clone -b 1.7 https://github.com/neo4j-drivers/seabolt.git /seabolt
+WORKDIR /seabolt/build
+RUN cmake -D CMAKE_BUILD_TYPE=Release -D CMAKE_INSTALL_LIBDIR=lib .. && cmake --build . --target install
+
 WORKDIR /go/src/github.com/golang-migrate/migrate
 
 COPY . ./

diff --git a/database/driver.go b/database/driver.go
@@ -13,7 +13,7 @@ import (
 )
 
 var (
-	ErrLocked = fmt.Errorf("can't acquire lock")
+	ErrLocked    = fmt.Errorf("can't acquire lock")
 	ErrNotLocked = fmt.Errorf("can't unlock, as not currently locked")
 )
 

diff --git a/database/neo4j/neo4j.go b/database/neo4j/neo4j.go
@@ -1,9 +1,8 @@
-// +build cgo
-
 package neo4j
 
 import (
 	"fmt"
+	"github.com/prometheus/common/log"
 	"io"
 	"io/ioutil"
 	neturl "net/url"
@@ -107,7 +106,12 @@ func (n *Neo4j) Run(migration io.Reader) error {
 	if err != nil {
 		return err
 	}
-	defer session.Close()
+	defer func() {
+		err := session.Close()
+		if err != nil {
+			log.Error(err)
+		}
+	}()
 
 	result, err := session.Run(string(body[:]), nil)
 	if err != nil {
@@ -121,7 +125,12 @@ func (n *Neo4j) SetVersion(version int, dirty bool) error {
 	if err != nil {
 		return err
 	}
-	defer session.Close()
+	defer func() {
+		err := session.Close()
+		if err != nil {
+			log.Error(err)
+		}
+	}()
 
 	query := fmt.Sprintf("MERGE (sm:%s {version: $version, dirty: $dirty})",
 		n.config.MigrationsLabel)
@@ -134,15 +143,20 @@ func (n *Neo4j) SetVersion(version int, dirty bool) error {
 
 type MigrationRecord struct {
 	Version int
-	Dirty bool
+	Dirty   bool
 }
 
 func (n *Neo4j) Version() (version int, dirty bool, err error) {
 	session, err := n.driver.Session(neo4j.AccessModeRead)
 	if err != nil {
 		return -1, false, err
 	}
-	defer session.Close()
+	defer func() {
+		err := session.Close()
+		if err != nil {
+			log.Error(err)
+		}
+	}()
 
 	query := fmt.Sprintf("MATCH (sm:%s) RETURN sm.version AS version, sm.dirty AS dirty ORDER BY sm.version DESC LIMIT 1",
 		n.config.MigrationsLabel)
@@ -181,22 +195,32 @@ func (n *Neo4j) Version() (version int, dirty bool, err error) {
 }
 
 func (n *Neo4j) Drop() error {
-	session, err := n.driver.Session(neo4j.AccessModeWrite);
+	session, err := n.driver.Session(neo4j.AccessModeWrite)
 	if err != nil {
 		return err
 	}
-	defer session.Close()
+	defer func() {
+		err := session.Close()
+		if err != nil {
+			log.Error(err)
+		}
+	}()
 
 	_, err = session.Run("MATCH (n) DETACH DELETE n", nil)
 	return err
 }
 
 func (n *Neo4j) ensureVersionConstraint() (err error) {
-	session, err := n.driver.Session(neo4j.AccessModeWrite);
+	session, err := n.driver.Session(neo4j.AccessModeWrite)
 	if err != nil {
 		return err
 	}
-	defer session.Close()
+	defer func() {
+		err := session.Close()
+		if err != nil {
+			log.Error(err)
+		}
+	}()
 
 	query := fmt.Sprintf("CREATE CONSTRAINT ON (a:%s) ASSERT a.version IS UNIQUE", n.config.MigrationsLabel)
 	result, err := session.Run(query, nil)

diff --git a/database/neo4j/neo4j_test.go b/database/neo4j/neo4j_test.go
@@ -1,5 +1,3 @@
-// +build cgo
-
 package neo4j
 
 import (
@@ -105,4 +103,4 @@ func TestMigrate(t *testing.T) {
 		}
 		dt.TestMigrate(t, m)
 	})
-}
+}
diff --git a/go.mod b/go.mod
@@ -35,6 +35,7 @@ require (
 	github.com/neo4j-drivers/gobolt v1.7.4 // indirect
 	github.com/neo4j/neo4j-go-driver v1.7.4
 	github.com/pkg/errors v0.8.1 // indirect
+	github.com/prometheus/common v0.2.0
 	github.com/satori/go.uuid v1.2.0 // indirect
 	github.com/shopspring/decimal v0.0.0-20180709203117-cd690d0c9e24 // indirect
 	github.com/sirupsen/logrus v1.4.1 // indirect

diff --git a/go.sum b/go.sum
@@ -13,7 +13,9 @@ github.com/Nvveen/Gotty v0.0.0-20120604004816-cd527374f1e5 h1:TngWCqHvy9oXAN6lEV
 github.com/Nvveen/Gotty v0.0.0-20120604004816-cd527374f1e5/go.mod h1:lmUJ/7eu/Q8D7ML55dXQrVaamCz2vxCfdQBasLZfHKk=
 github.com/Shopify/sarama v1.19.0/go.mod h1:FVkBWblsNy7DGZRfXLU0O9RCGt5g3g3yEuWXgklEdEo=
 github.com/Shopify/toxiproxy v2.1.4+incompatible/go.mod h1:OXgGpZ6Cli1/URJOF1DMxUHB2q5Ap20/P/eIdh4G0pI=
+github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc h1:cAKDfWh5VpdgMhJosfJnn5/FoN2SRZ4p7fJNX58YPaU=
 github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
+github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf h1:qet1QNfXsQxTZqLG4oE62mJzwPIB8+Tee4RNCL9ulrY=
 github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0=
 github.com/apache/thrift v0.12.0/go.mod h1:cp2SuWMxlEZw2r+iP2GNCdIi4C1qmUzdZFSVb+bacwQ=
 github.com/aws/aws-sdk-go v1.17.7 h1:/4+rDPe0W95KBmNGYCG+NUvdL8ssPYBMxL+aSCg6nIA=
@@ -171,6 +173,7 @@ github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXP
 github.com/prometheus/client_golang v0.9.3-0.20190127221311-3c4408c8b829/go.mod h1:p2iRAGwDERtqlqzRXnrOVns+ignqQo//hLXqYxZYVNs=
 github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo=
 github.com/prometheus/client_model v0.0.0-20190115171406-56726106282f/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo=
+github.com/prometheus/common v0.2.0 h1:kUZDBDTdBVBYBj5Tmh2NZLlF60mfjA27rM34b+cVwNU=
 github.com/prometheus/common v0.2.0/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4=
 github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=
 github.com/prometheus/procfs v0.0.0-20190117184657-bf6a532e95b1/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=
@@ -293,6 +296,7 @@ google.golang.org/grpc v1.19.0 h1:cfg4PD8YEdSFnm7qLV4++93WcmhH2nIUhMjhdCvl3j8=
 google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
 google.golang.org/grpc v1.20.1 h1:Hz2g2wirWK7H0qIIhGIqRGTuMwTE8HEKFnDZZ7lm9NU=
 google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38=
+gopkg.in/alecthomas/kingpin.v2 v2.2.6 h1:jMFz6MfLP0/4fUyZle81rXUoxOBFi19VUFKVDOQfozc=
 gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 h1:qIbj1fsPNlZgppZ+VLlY7N33q108Sa+fhmuc+sWQYwY=
-Original file line number
+Diff line change
@@ Expand Up / @@ -13,7 +13,7 @@ import ( @@
     )
     var (
-    	ErrLocked = fmt.Errorf("can't acquire lock")
+    	ErrLocked    = fmt.Errorf("can't acquire lock")
     	ErrNotLocked = fmt.Errorf("can't unlock, as not currently locked")
     )
@@ Expand Down @@