Upgrade lib/pq to v1.11.2 (#7283)

Author: friedrichg

go.mod

@@ -31,7 +31,7 @@ require (
 	github.com/hashicorp/memberlist v0.5.4
 	github.com/json-iterator/go v1.1.12
 	github.com/klauspost/compress v1.18.2
-	github.com/lib/pq v1.10.9
+	github.com/lib/pq v1.11.2 // indirect
 	github.com/minio/minio-go/v7 v7.0.98
 	github.com/mitchellh/go-wordwrap v1.0.1
 	github.com/oklog/ulid v1.3.1

go.sum

@@ -1482,8 +1482,8 @@ github.com/ledongthuc/pdf v0.0.0-20220302134840-0c2507a12d80/go.mod h1:imJHygn/1
 github.com/leesper/go_rng v0.0.0-20190531154944-a612b043e353 h1:X/79QL0b4YJVO5+OsPH9rF2u428CIrGL/jLmPsoOQQ4=
 github.com/leesper/go_rng v0.0.0-20190531154944-a612b043e353/go.mod h1:N0SVk0uhy+E1PZ3C9ctsPRlvOPAFPkCNlcPBDkt0N3U=
 github.com/leodido/go-urn v1.2.0/go.mod h1:+8+nEpDfqqsY+g338gtMEUOtuK+4dEMhiQEgxpxOKII=
-github.com/lib/pq v1.10.9 h1:YXG7RB+JIjhP29X+OtkiDnYaXQwpS4JEWq7dtCCRUEw=
-github.com/lib/pq v1.10.9/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o=
+github.com/lib/pq v1.11.2 h1:x6gxUeu39V0BHZiugWe8LXZYZ+Utk7hSJGThs8sdzfs=
+github.com/lib/pq v1.11.2/go.mod h1:/p+8NSbOcwzAEI7wiMXFlgydTwcgTr3OSKMsD2BitpA=
 github.com/linode/linodego v1.60.0 h1:SgsebJFRCi+lSmYy+C40wmKZeJllGGm+W12Qw4+yVdI=
 github.com/linode/linodego v1.60.0/go.mod h1:1+Bt0oTz5rBnDOJbGhccxn7LYVytXTIIfAy7QYmijDs=
 github.com/lyft/protoc-gen-star v0.6.0/go.mod h1:TGAoBVkt8w7MPG72TrKIu85MIdXwDuzJYeZuUPFPNwA=

pkg/configs/db/postgres/postgres.go

@@ -16,7 +16,6 @@ import (
 	"github.com/golang-migrate/migrate/v4"
 	_ "github.com/golang-migrate/migrate/v4/database/postgres" // Import the postgres migrations driver
 	_ "github.com/golang-migrate/migrate/v4/source/file"       // Import the postgres migrations driver
-	"github.com/lib/pq"                                        // Import the postgres sql driver
 	"github.com/pkg/errors"
 )
 
@@ -120,7 +119,7 @@ func (d DB) findConfigs(filter squirrel.Sqlizer) (map[string]userconfig.View, er
 		var cfg userconfig.View
 		var cfgBytes []byte
 		var userID string
-		var deletedAt pq.NullTime
+		var deletedAt sql.NullTime
 		err = rows.Scan(&cfg.ID, &userID, &cfgBytes, &deletedAt)
 		if err != nil {
 			return nil, err
@@ -146,7 +145,7 @@ func (d DB) findConfigs(filter squirrel.Sqlizer) (map[string]userconfig.View, er
 func (d DB) GetConfig(ctx context.Context, userID string) (userconfig.View, error) {
 	var cfgView userconfig.View
 	var cfgBytes []byte
-	var deletedAt pq.NullTime
+	var deletedAt sql.NullTime
 	err := d.Select("id", "config", "deleted_at").
 		From("configs").
 		Where(squirrel.And{allConfigs, squirrel.Eq{"owner_id": userID}}).
@@ -257,7 +256,7 @@ func (d DB) findRulesConfigs(filter squirrel.Sqlizer) (map[string]userconfig.Ver
 		var userID string
 		var cfgBytes []byte
 		var rfvBytes []byte
-		var deletedAt pq.NullTime
+		var deletedAt sql.NullTime
 		err = rows.Scan(&cfg.ID, &userID, &cfgBytes, &rfvBytes, &deletedAt)
 		if err != nil {
 			return nil, err
@@ -303,7 +302,7 @@ func (d DB) GetRulesConfigs(ctx context.Context, since userconfig.ID) (map[strin
 // SetDeletedAtConfig sets a deletedAt for configuration
 // by adding a single new row with deleted_at set
 // the same as SetConfig is actually insert
-func (d DB) SetDeletedAtConfig(ctx context.Context, userID string, deletedAt pq.NullTime, cfg userconfig.Config) error {
+func (d DB) SetDeletedAtConfig(ctx context.Context, userID string, deletedAt sql.NullTime, cfg userconfig.Config) error {
 	cfgBytes, err := json.Marshal(cfg)
 	if err != nil {
 		return err
@@ -321,7 +320,7 @@ func (d DB) DeactivateConfig(ctx context.Context, userID string) error {
 	if err != nil {
 		return err
 	}
-	return d.SetDeletedAtConfig(ctx, userID, pq.NullTime{Time: time.Now(), Valid: true}, cfg.Config)
+	return d.SetDeletedAtConfig(ctx, userID, sql.NullTime{Time: time.Now(), Valid: true}, cfg.Config)
 }
 
 // RestoreConfig restores configuration.
@@ -330,7 +329,7 @@ func (d DB) RestoreConfig(ctx context.Context, userID string) error {
 	if err != nil {
 		return err
 	}
-	return d.SetDeletedAtConfig(ctx, userID, pq.NullTime{}, cfg.Config)
+	return d.SetDeletedAtConfig(ctx, userID, sql.NullTime{}, cfg.Config)
 }
 
 // Transaction runs the given function in a postgres transaction. If fn returns