Merge pull request #55 from ShiftLeftSecurity/chipaca/v2-is-v2

chipaca · web-flow · commit 873f46ef82c4 · 2021-06-28T15:49:16.000+01:00
update all the imports to also be v2
diff --git a/db/chain/chain.go b/db/chain/chain.go
@@ -18,7 +18,7 @@ import (
 	"strings"
 	"sync"
 
-	"github.com/ShiftLeftSecurity/gaum/db/connection"
+	"github.com/ShiftLeftSecurity/gaum/v2/db/connection"
 	"github.com/pkg/errors"
 )
 
diff --git a/db/chain/helpers.go b/db/chain/helpers.go
@@ -19,7 +19,7 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/ShiftLeftSecurity/gaum/db/errors"
+	"github.com/ShiftLeftSecurity/gaum/v2/db/errors"
 	"github.com/jackc/pgx/v4"
 )
 
diff --git a/db/chain/segment.go b/db/chain/segment.go
@@ -17,7 +17,7 @@ package chain
 import (
 	"strings"
 
-	"github.com/ShiftLeftSecurity/gaum/selectparse"
+	"github.com/ShiftLeftSecurity/gaum/v2/selectparse"
 )
 
 type sqlBool string
diff --git a/db/chain/terminations.go b/db/chain/terminations.go
@@ -17,8 +17,8 @@ package chain
 import (
 	"context"
 
-	"github.com/ShiftLeftSecurity/gaum/db/connection"
-	gaumErrors "github.com/ShiftLeftSecurity/gaum/db/errors"
+	"github.com/ShiftLeftSecurity/gaum/v2/db/connection"
+	gaumErrors "github.com/ShiftLeftSecurity/gaum/v2/db/errors"
 	"github.com/pkg/errors"
 )
 
diff --git a/db/connection/connection.go b/db/connection/connection.go
@@ -21,7 +21,7 @@ import (
 	"strings"
 	"time"
 
-	"github.com/ShiftLeftSecurity/gaum/db/logging"
+	"github.com/ShiftLeftSecurity/gaum/v2/db/logging"
 	"github.com/pkg/errors"
 )
 
diff --git a/db/connection_testing/connection_testing.go b/db/connection_testing/connection_testing.go
@@ -21,8 +21,8 @@ import (
 	"testing"
 	"time"
 
-	"github.com/ShiftLeftSecurity/gaum/db/chain"
-	"github.com/ShiftLeftSecurity/gaum/db/connection"
+	"github.com/ShiftLeftSecurity/gaum/v2/db/chain"
+	"github.com/ShiftLeftSecurity/gaum/v2/db/connection"
 	"github.com/jackc/pgconn"
 	"github.com/pkg/errors"
 	uuid "github.com/satori/go.uuid"
diff --git a/db/postgres/connection.go b/db/postgres/connection.go
@@ -21,10 +21,10 @@ import (
 	"os"
 	"reflect"
 
-	"github.com/ShiftLeftSecurity/gaum/db/connection"
-	gaumErrors "github.com/ShiftLeftSecurity/gaum/db/errors"
-	"github.com/ShiftLeftSecurity/gaum/db/logging"
-	"github.com/ShiftLeftSecurity/gaum/db/srm"
+	"github.com/ShiftLeftSecurity/gaum/v2/db/connection"
+	gaumErrors "github.com/ShiftLeftSecurity/gaum/v2/db/errors"
+	"github.com/ShiftLeftSecurity/gaum/v2/db/logging"
+	"github.com/ShiftLeftSecurity/gaum/v2/db/srm"
 	"github.com/jackc/pgconn"
 	"github.com/jackc/pgx/v4"
 	"github.com/jackc/pgx/v4/pgxpool"
diff --git a/db/postgres/connection_test.go b/db/postgres/connection_test.go
@@ -20,9 +20,9 @@ import (
 	"os"
 	"testing"
 
-	"github.com/ShiftLeftSecurity/gaum/db/connection"
-	"github.com/ShiftLeftSecurity/gaum/db/connection_testing"
-	"github.com/ShiftLeftSecurity/gaum/db/logging"
+	"github.com/ShiftLeftSecurity/gaum/v2/db/connection"
+	"github.com/ShiftLeftSecurity/gaum/v2/db/connection_testing"
+	"github.com/ShiftLeftSecurity/gaum/v2/db/logging"
 )
 
 func newDB(t *testing.T) connection.DB {
diff --git a/db/postgrespq/connection.go b/db/postgrespq/connection.go
@@ -21,10 +21,10 @@ import (
 	"os"
 	"reflect"
 
-	"github.com/ShiftLeftSecurity/gaum/db/connection"
-	gaumErrors "github.com/ShiftLeftSecurity/gaum/db/errors"
-	"github.com/ShiftLeftSecurity/gaum/db/logging"
-	"github.com/ShiftLeftSecurity/gaum/db/srm"
+	"github.com/ShiftLeftSecurity/gaum/v2/db/connection"
+	gaumErrors "github.com/ShiftLeftSecurity/gaum/v2/db/errors"
+	"github.com/ShiftLeftSecurity/gaum/v2/db/logging"
+	"github.com/ShiftLeftSecurity/gaum/v2/db/srm"
 	"github.com/jackc/pgx/v4"
 	"github.com/jackc/pgx/v4/pgxpool"
 	"github.com/jackc/pgx/v4/stdlib"
diff --git a/db/postgrespq/connection_test.go b/db/postgrespq/connection_test.go
@@ -20,9 +20,9 @@ import (
 	"os"
 	"testing"
 
-	"github.com/ShiftLeftSecurity/gaum/db/connection"
-	"github.com/ShiftLeftSecurity/gaum/db/connection_testing"
-	"github.com/ShiftLeftSecurity/gaum/db/logging"
+	"github.com/ShiftLeftSecurity/gaum/v2/db/connection"
+	"github.com/ShiftLeftSecurity/gaum/v2/db/connection_testing"
+	"github.com/ShiftLeftSecurity/gaum/v2/db/logging"
 )
 
 func newDB(t *testing.T) connection.DB {
diff --git a/db/q/query.go b/db/q/query.go
@@ -26,11 +26,11 @@ import (
 
 	"github.com/pkg/errors"
 
-	c "github.com/ShiftLeftSecurity/gaum/db/chain"
-	"github.com/ShiftLeftSecurity/gaum/db/connection"
-	"github.com/ShiftLeftSecurity/gaum/db/logging"
-	"github.com/ShiftLeftSecurity/gaum/db/postgres"
-	"github.com/ShiftLeftSecurity/gaum/db/postgrespq"
+	c "github.com/ShiftLeftSecurity/gaum/v2/db/chain"
+	"github.com/ShiftLeftSecurity/gaum/v2/db/connection"
+	"github.com/ShiftLeftSecurity/gaum/v2/db/logging"
+	"github.com/ShiftLeftSecurity/gaum/v2/db/postgres"
+	"github.com/ShiftLeftSecurity/gaum/v2/db/postgrespq"
 )
 
 // Driver represent the possible db connection drivers.
diff --git a/db/srm/reflection.go b/db/srm/reflection.go
@@ -21,7 +21,7 @@ import (
 	"time"
 	"unicode"
 
-	"github.com/ShiftLeftSecurity/gaum/db/logging"
+	"github.com/ShiftLeftSecurity/gaum/v2/db/logging"
 	"github.com/pkg/errors"
 )
 
diff --git a/gaum.go b/gaum.go
@@ -17,8 +17,8 @@ package gaum
 import (
 	"context"
 
-	"github.com/ShiftLeftSecurity/gaum/db/connection"
-	"github.com/ShiftLeftSecurity/gaum/db/postgres"
+	"github.com/ShiftLeftSecurity/gaum/v2/db/connection"
+	"github.com/ShiftLeftSecurity/gaum/v2/db/postgres"
 	"github.com/pkg/errors"
 )
 
diff --git a/vendor/modules.txt b/vendor/modules.txt
@@ -1,6 +1,7 @@
 # github.com/jackc/chunkreader/v2 v2.0.1
 github.com/jackc/chunkreader/v2
 # github.com/jackc/pgconn v1.8.1
+## explicit
 github.com/jackc/pgconn
 github.com/jackc/pgconn/internal/ctxwatch
 github.com/jackc/pgconn/stmtcache
@@ -9,25 +10,30 @@ github.com/jackc/pgio
 # github.com/jackc/pgpassfile v1.0.0
 github.com/jackc/pgpassfile
 # github.com/jackc/pgproto3/v2 v2.0.7
+## explicit
 github.com/jackc/pgproto3/v2
 # github.com/jackc/pgservicefile v0.0.0-20200714003250-2b9c44734f2b
 github.com/jackc/pgservicefile
 # github.com/jackc/pgtype v1.7.0
 github.com/jackc/pgtype
 # github.com/jackc/pgx/v4 v4.11.0
+## explicit
 github.com/jackc/pgx/v4
 github.com/jackc/pgx/v4/internal/sanitize
 github.com/jackc/pgx/v4/pgxpool
 github.com/jackc/pgx/v4/stdlib
 # github.com/jackc/puddle v1.1.3
 github.com/jackc/puddle
 # github.com/pkg/errors v0.8.1
+## explicit
 github.com/pkg/errors
 # github.com/satori/go.uuid v1.2.0
+## explicit
 github.com/satori/go.uuid
 # golang.org/x/crypto v0.0.0-20210322153248-0c34fe9e7dc2
 golang.org/x/crypto/pbkdf2
 # golang.org/x/text v0.3.6
+## explicit
 golang.org/x/text/cases
 golang.org/x/text/internal
 golang.org/x/text/internal/language
@@ -41,3 +47,5 @@ golang.org/x/text/transform
 golang.org/x/text/unicode/bidi
 golang.org/x/text/unicode/norm
 golang.org/x/text/width
+# gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15
+## explicit

Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ import (`
`18`	`18`	`"strings"`
`19`	`19`	`"sync"`
`20`	`20`
`21`		`- "github.com/ShiftLeftSecurity/gaum/db/connection"`
	`21`	`+ "github.com/ShiftLeftSecurity/gaum/v2/db/connection"`
`22`	`22`	`"github.com/pkg/errors"`
`23`	`23`	`)`
`24`	`24`
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ import (`
`19`	`19`	`"fmt"`
`20`	`20`	`"strings"`
`21`	`21`
`22`		`- "github.com/ShiftLeftSecurity/gaum/db/errors"`
	`22`	`+ "github.com/ShiftLeftSecurity/gaum/v2/db/errors"`
`23`	`23`	`"github.com/jackc/pgx/v4"`
`24`	`24`	`)`
`25`	`25`
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ package chain`
`17`	`17`	`import (`
`18`	`18`	`"strings"`
`19`	`19`
`20`		`- "github.com/ShiftLeftSecurity/gaum/selectparse"`
	`20`	`+ "github.com/ShiftLeftSecurity/gaum/v2/selectparse"`
`21`	`21`	`)`
`22`	`22`
`23`	`23`	`type sqlBool string`
Original file line number	Diff line number	Diff line change
`@@ -17,8 +17,8 @@ package chain`
`17`	`17`	`import (`
`18`	`18`	`"context"`
`19`	`19`
`20`		`- "github.com/ShiftLeftSecurity/gaum/db/connection"`
`21`		`- gaumErrors "github.com/ShiftLeftSecurity/gaum/db/errors"`
	`20`	`+ "github.com/ShiftLeftSecurity/gaum/v2/db/connection"`
	`21`	`+ gaumErrors "github.com/ShiftLeftSecurity/gaum/v2/db/errors"`
`22`	`22`	`"github.com/pkg/errors"`
`23`	`23`	`)`
`24`	`24`
Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ import (`
`21`	`21`	`"strings"`
`22`	`22`	`"time"`
`23`	`23`
`24`		`- "github.com/ShiftLeftSecurity/gaum/db/logging"`
	`24`	`+ "github.com/ShiftLeftSecurity/gaum/v2/db/logging"`
`25`	`25`	`"github.com/pkg/errors"`
`26`	`26`	`)`
`27`	`27`