fix postgres

adapters/couchdb_adapter_test.go

@@ -26,6 +26,8 @@ func TestCouchDB(t *testing.T) {
  if err != nil {
  return err
  }
+ defer client.Close(ctx)
+
  _, _, err = client.DB(databaseName).CreateDoc(ctx, map[string]interface{}{"test": "test"})
  return err
  }

adapters/mongo_adapter_test.go

@@ -29,6 +29,7 @@ func TestMongoDB(t *testing.T) {
  return err
  }
  defer client.Disconnect(ctx)
+
  _, err = client.Database(databaseName).Collection("test").InsertOne(ctx, map[string]interface{}{"test": "test"})
  return err
  }

adapters/mssql_adapter_test.go

@@ -26,17 +26,10 @@ func TestMsSqlDB(t *testing.T) {
  if err != nil {
  return err
  }
-
- if err = client.PingContext(ctx); err != nil {
- return err
- }
+ defer client.Close()
 
  _, err = client.ExecContext(ctx, "CREATE TABLE test (id int);")
- if err != nil {
- return err
- }
-
- return client.Close()
+ return err
  }
 
  testHelper(t, ctx, adapter, clientConnectTest)

adapters/mysql_adapter_test.go

@@ -26,6 +26,7 @@ func TestMySqlDB(t *testing.T) {
  if err != nil {
  return err
  }
+ defer client.Close()
 
  _, err = client.ExecContext(ctx, "CREATE TABLE test (id int);")
  return err

adapters/postgres_adapter.go

@@ -2,21 +2,19 @@ package adapters
 
 import (
  "context"
- "database/sql"
  "fmt"
 
- // load SQL driver for postgres
- _ "github.com/lib/pq"
+ "github.com/jackc/pgx/v4"
 )
 
 type postgresAdapter struct {
- db *sql.DB
+ db *pgx.Conn
 }
 
 func (adapter postgresAdapter) HasDatabase(ctx context.Context, database string) (bool, error) {
  var count int
  query := fmt.Sprintf("SELECT COUNT(*) FROM pg_database WHERE datname='%s'", database)
- err := adapter.db.QueryRowContext(ctx, query).Scan(&count)
+ err := adapter.db.QueryRow(ctx, query).Scan(&count)
  if err != nil {
  return false, err
  }
@@ -25,20 +23,20 @@ func (adapter postgresAdapter) HasDatabase(ctx context.Context, database string)
 
 func (adapter postgresAdapter) CreateDatabase(ctx context.Context, database string) error {
  query := fmt.Sprintf("CREATE DATABASE %s", database)
- _, err := adapter.db.ExecContext(ctx, query)
+ _, err := adapter.db.Exec(ctx, query)
  return err
 }
 
 func (adapter postgresAdapter) DeleteDatabase(ctx context.Context, database string) error {
  query := fmt.Sprintf("DROP DATABASE %s", database)
- _, err := adapter.db.ExecContext(ctx, query)
+ _, err := adapter.db.Exec(ctx, query)
  return err
 }
 
 func (adapter postgresAdapter) HasDatabaseUserWithAccess(ctx context.Context, database string, username string) (bool, error) {
  var hasPrivilege bool
  query := fmt.Sprintf("SELECT has_database_privilege('%s', '%s', 'CONNECT');", username, database)
- err := adapter.db.QueryRowContext(ctx, query).Scan(&hasPrivilege)
+ err := adapter.db.QueryRow(ctx, query).Scan(&hasPrivilege)
  if err != nil {
  return false, err
  }
@@ -49,41 +47,60 @@ func (adapter postgresAdapter) CreateDatabaseUser(ctx context.Context, database
  // make password sql safe
  quotedPassword := QuoteLiteral(password)
  query := fmt.Sprintf("CREATE USER %s WITH PASSWORD %s", username, quotedPassword)
- _, err := adapter.db.ExecContext(ctx, query)
+ _, err := adapter.db.Exec(ctx, query)
  if err != nil {
  return err
  }
 
  query = fmt.Sprintf("GRANT ALL PRIVILEGES ON DATABASE %s TO %s;", database, username)
- _, err = adapter.db.ExecContext(ctx, query)
+ _, err = adapter.db.Exec(ctx, query)
 
  return err
 }
 
 func (adapter postgresAdapter) DeleteDatabaseUser(ctx context.Context, database string, username string) error {
- query := fmt.Sprintf("REVOKE ALL PRIVILEGES ON DATABASE %s FROM %s; REVOKE ALL ON SCHEMA public FROM %s;", database, username, username)
- _, err := adapter.db.ExecContext(ctx, query)
+ config := adapter.db.Config()
+ rootUser := config.User
+ rootPassword := config.Password
+ host := config.Host
+ port := config.Port
+ // TODO: find prettier way to generate url from original url string
+ url := fmt.Sprintf("postgres:https://%s:%s@%s:%d/%s?sslmode=disable", rootUser, rootPassword, host, port, database)
+ conn, err := pgx.Connect(ctx, url)
  if err != nil {
  return err
  }
+ defer conn.Close(ctx)
 
- query = fmt.Sprintf("DROP OWNED BY %s; DROP USER %s;", username, username)
- _, err = adapter.db.ExecContext(ctx, query)
+ query := fmt.Sprintf("DROP OWNED BY %s;", username)
+ _, err = conn.Exec(ctx, query)
+ if err != nil {
+ return err
+ }
+
+ query = fmt.Sprintf("REVOKE ALL PRIVILEGES ON DATABASE %s FROM %s; REVOKE ALL ON SCHEMA public FROM %s;", database, username, username)
+ _, err = adapter.db.Exec(ctx, query)
+ if err != nil {
+ return err
+ }
+
+ query = fmt.Sprintf("DROP USER %s;", username)
+ _, err = adapter.db.Exec(ctx, query)
  return err
 }
 
 func (adapter postgresAdapter) Close(ctx context.Context) error {
- return adapter.db.Close()
+ return adapter.db.Close(ctx)
 }
 
 func GetPostgresConnection(ctx context.Context, url string) (*postgresAdapter, error) {
- db, err := sql.Open("postgres", url)
+ conn, err := pgx.Connect(ctx, url)
  if err != nil {
  return nil, err
  }
 
  adapter := postgresAdapter{
- db: db,
+ db: conn,
  }
 
  return &adapter, nil

adapters/postgres_adapter_test.go

@@ -5,9 +5,8 @@ import (
  "fmt"
  "testing"
 
- "database/sql"
-
  "github.com/anbraten/k8s-external-database-operator/adapters"
+ "github.com/jackc/pgx/v4"
 )
 
 func TestPostgresDB(t *testing.T) {
@@ -23,17 +22,14 @@ func TestPostgresDB(t *testing.T) {
 
  clientConnectTest := func(ctx context.Context, databaseName string, databaseUsername string, databasePassword string) error {
  url := fmt.Sprintf("postgres:https://%s:%s@%s:%s/%s?sslmode=disable", databaseUsername, databasePassword, databaseHost, databasePort, databaseName)
- client, err := sql.Open("postgres", url)
- if err != nil {
- return err
- }
-
- _, err = client.ExecContext(ctx, "CREATE TABLE test (id int);")
+ client, err := pgx.Connect(ctx, url)
  if err != nil {
  return err
  }
+ defer client.Close(ctx)
 
- return client.Close()
+ _, err = client.Exec(ctx, "CREATE TABLE test (id int);")
+ return err
  }
 
  testHelper(t, ctx, adapter, clientConnectTest)

adapters/utils.go

@@ -10,13 +10,10 @@ import (
 var IdentifierRegex = regexp.MustCompile(`^[a-zA-Z0-9]+?[a-zA-Z0-9_-]*?$`)
 
 func QuoteLiteral(txt string) string {
+ // TODO: find prettier solution without needing an additional lib :cry: https://github.com/jackc/pgx/issues/868
  return pq.QuoteLiteral(txt)
 }
 
-func QuoteIdentifier(txt string) string {
- return pq.QuoteIdentifier(txt)
-}
-
 func IsValidIdentifier(txt string) error {
  if IdentifierRegex.MatchString(txt) {
  return nil

go.mod

@@ -44,6 +44,14 @@ require (
  github.com/googleapis/gnostic v0.5.1 // indirect
  github.com/hashicorp/golang-lru v0.5.4 // indirect
  github.com/imdario/mergo v0.3.10 // indirect
+ github.com/jackc/chunkreader/v2 v2.0.1 // indirect
+ github.com/jackc/pgconn v1.12.0 // indirect
+ github.com/jackc/pgio v1.0.0 // indirect
+ github.com/jackc/pgpassfile v1.0.0 // indirect
+ github.com/jackc/pgproto3/v2 v2.3.0 // indirect
+ github.com/jackc/pgservicefile v0.0.0-20200714003250-2b9c44734f2b // indirect
+ github.com/jackc/pgtype v1.11.0 // indirect
+ github.com/jackc/pgx/v4 v4.16.0
  github.com/json-iterator/go v1.1.10 // indirect
  github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 // indirect
  github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
@@ -60,13 +68,13 @@ require (
  go.uber.org/atomic v1.6.0 // indirect
  go.uber.org/multierr v1.5.0 // indirect
  go.uber.org/zap v1.15.0 // indirect
- golang.org/x/crypto v0.0.0-20210322153248-0c34fe9e7dc2 // indirect
+ golang.org/x/crypto v0.0.0-20210711020723-a769d52b0f97 // indirect
  golang.org/x/net v0.0.0-20210610132358-84b48f89b13b // indirect
  golang.org/x/oauth2 v0.0.0-20191202225959-858c2ad4c8b6 // indirect
  golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9 // indirect
- golang.org/x/sys v0.0.0-20210423082822-04245dca01da // indirect
+ golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1 // indirect
  golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1 // indirect
- golang.org/x/text v0.3.6 // indirect
+ golang.org/x/text v0.3.7 // indirect
  golang.org/x/time v0.0.0-20201208040808-7e3f01d25324 // indirect
  golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect
  gomodules.xyz/jsonpatch/v2 v2.1.0 // indirect