Upgrade to pgx and pgxpool v5

stackrox · Feb 2, 2023 · 141cda2 · 141cda2
1 parent 7e0f686
commit 141cda2
Show file tree

Hide file tree

Showing 405 changed files with 595 additions and 599 deletions.
diff --git a/central/activecomponent/datastore/datastore.go b/central/activecomponent/datastore/datastore.go
@@ -4,7 +4,7 @@ import (
 	"context"
 	"testing"
 
-	"github.com/jackc/pgx/v4/pgxpool"
+	"github.com/jackc/pgx/v5/pgxpool"
 	"github.com/stackrox/rox/central/activecomponent/datastore/index"
 	"github.com/stackrox/rox/central/activecomponent/datastore/internal/store"
 	"github.com/stackrox/rox/central/activecomponent/datastore/internal/store/postgres"

diff --git a/central/activecomponent/datastore/internal/store/postgres/index.go b/central/activecomponent/datastore/internal/store/postgres/index.go
diff --git a/central/activecomponent/datastore/internal/store/postgres/store.go b/central/activecomponent/datastore/internal/store/postgres/store.go
diff --git a/central/alert/datastore/bench_postgres_test.go b/central/alert/datastore/bench_postgres_test.go
@@ -8,7 +8,7 @@ import (
 	"fmt"
 	"testing"
 
-	"github.com/jackc/pgx/v4/pgxpool"
+	"github.com/jackc/pgx/v5/pgxpool"
 	"github.com/stackrox/rox/central/alert/datastore/internal/search"
 	postgresStore "github.com/stackrox/rox/central/alert/datastore/internal/store/postgres"
 	"github.com/stackrox/rox/pkg/env"
@@ -29,7 +29,7 @@ func BenchmarkDBsWithPostgres(b *testing.B) {
 	source := pgtest.GetConnectionString(b)
 	config, err := pgxpool.ParseConfig(source)
 	require.NoError(b, err)
-	db, err := pgxpool.ConnectConfig(ctx, config)
+	db, err := pgxpool.NewWithConfig(ctx, config)
 	require.NoError(b, err)
 	gormDB := pgtest.OpenGormDB(b, source)
 	defer pgtest.CloseGormDB(b, gormDB)

diff --git a/central/alert/datastore/datastore.go b/central/alert/datastore/datastore.go
@@ -5,7 +5,7 @@ import (
 	"testing"
 
 	"github.com/blevesearch/bleve"
-	"github.com/jackc/pgx/v4/pgxpool"
+	"github.com/jackc/pgx/v5/pgxpool"
 	"github.com/stackrox/rox/central/alert/datastore/internal/index"
 	"github.com/stackrox/rox/central/alert/datastore/internal/search"
 	"github.com/stackrox/rox/central/alert/datastore/internal/store"

diff --git a/central/alert/datastore/datastore_sac_test.go b/central/alert/datastore/datastore_sac_test.go
@@ -5,7 +5,7 @@ import (
 	"testing"
 
 	"github.com/blevesearch/bleve"
-	"github.com/jackc/pgx/v4/pgxpool"
+	"github.com/jackc/pgx/v5/pgxpool"
 	"github.com/stackrox/rox/central/alert/mappings"
 	"github.com/stackrox/rox/central/globalindex"
 	"github.com/stackrox/rox/central/role/resources"

diff --git a/central/alert/datastore/internal/store/postgres/index.go b/central/alert/datastore/internal/store/postgres/index.go
diff --git a/central/alert/datastore/internal/store/postgres/index_test.go b/central/alert/datastore/internal/store/postgres/index_test.go
@@ -7,7 +7,7 @@ import (
 	"context"
 	"testing"
 
-	"github.com/jackc/pgx/v4/pgxpool"
+	"github.com/jackc/pgx/v5/pgxpool"
 	"github.com/stackrox/rox/generated/storage"
 	"github.com/stackrox/rox/pkg/env"
 	"github.com/stackrox/rox/pkg/fixtures"
@@ -44,7 +44,7 @@ func (s *AlertsIndexSuite) SetupTest() {
 	source := pgtest.GetConnectionString(s.T())
 	config, err := pgxpool.ParseConfig(source)
 	s.Require().NoError(err)
-	s.pool, err = pgxpool.ConnectConfig(context.Background(), config)
+	s.pool, err = pgxpool.NewWithConfig(context.Background(), config)
 	s.Require().NoError(err)
 
 	Destroy(ctx, s.pool)

diff --git a/central/alert/datastore/internal/store/postgres/index_wrapper.go b/central/alert/datastore/internal/store/postgres/index_wrapper.go
@@ -3,7 +3,7 @@ package postgres
 import (
 	"context"
 
-	"github.com/jackc/pgx/v4/pgxpool"
+	"github.com/jackc/pgx/v5/pgxpool"
 	v1 "github.com/stackrox/rox/generated/api/v1"
 	"github.com/stackrox/rox/generated/storage"
 	"github.com/stackrox/rox/pkg/search"

diff --git a/central/alert/datastore/internal/store/postgres/store.go b/central/alert/datastore/internal/store/postgres/store.go
diff --git a/central/apitoken/datastore/internal/store/postgres/store.go b/central/apitoken/datastore/internal/store/postgres/store.go
diff --git a/central/authprovider/datastore/internal/store/postgres/store.go b/central/authprovider/datastore/internal/store/postgres/store.go
diff --git a/central/cluster/datastore/datastore_test_constructors.go b/central/cluster/datastore/datastore_test_constructors.go
@@ -4,7 +4,7 @@ import (
 	"testing"
 
 	"github.com/blevesearch/bleve"
-	"github.com/jackc/pgx/v4/pgxpool"
+	"github.com/jackc/pgx/v5/pgxpool"
 	alertDataStore "github.com/stackrox/rox/central/alert/datastore"
 	"github.com/stackrox/rox/central/cluster/index"
 	clusterPostgresStore "github.com/stackrox/rox/central/cluster/store/cluster/postgres"

diff --git a/central/cluster/store/cluster/postgres/index.go b/central/cluster/store/cluster/postgres/index.go
diff --git a/central/cluster/store/cluster/postgres/store.go b/central/cluster/store/cluster/postgres/store.go
diff --git a/central/cluster/store/clusterhealth/postgres/index.go b/central/cluster/store/clusterhealth/postgres/index.go
diff --git a/central/cluster/store/clusterhealth/postgres/store.go b/central/cluster/store/clusterhealth/postgres/store.go
diff --git a/central/clustercveedge/datastore/datastore_test_constructors.go b/central/clustercveedge/datastore/datastore_test_constructors.go
@@ -4,7 +4,7 @@ import (
 	"testing"
 
 	"github.com/blevesearch/bleve"
-	"github.com/jackc/pgx/v4/pgxpool"
+	"github.com/jackc/pgx/v5/pgxpool"
 	"github.com/stackrox/rox/central/clustercveedge/datastore/store/postgres"
 	"github.com/stackrox/rox/central/clustercveedge/index"
 	"github.com/stackrox/rox/central/clustercveedge/search"

diff --git a/central/clustercveedge/datastore/store/postgres/full_store.go b/central/clustercveedge/datastore/store/postgres/full_store.go
@@ -4,7 +4,7 @@ import (
 	"context"
 	"testing"
 
-	"github.com/jackc/pgx/v4/pgxpool"
+	"github.com/jackc/pgx/v5/pgxpool"
 	"github.com/pkg/errors"
 	"github.com/stackrox/rox/central/clustercveedge/store"
 	"github.com/stackrox/rox/central/cve/converter"

diff --git a/central/clustercveedge/datastore/store/postgres/index.go b/central/clustercveedge/datastore/store/postgres/index.go
diff --git a/central/clustercveedge/datastore/store/postgres/store.go b/central/clustercveedge/datastore/store/postgres/store.go
diff --git a/central/clusterinit/store/postgres/store.go b/central/clusterinit/store/postgres/store.go
diff --git a/central/compliance/datastore/internal/store/postgres/domain/index.go b/central/compliance/datastore/internal/store/postgres/domain/index.go
diff --git a/central/compliance/datastore/internal/store/postgres/domain/store.go b/central/compliance/datastore/internal/store/postgres/domain/store.go
diff --git a/central/compliance/datastore/internal/store/postgres/metadata/index.go b/central/compliance/datastore/internal/store/postgres/metadata/index.go
diff --git a/central/compliance/datastore/internal/store/postgres/metadata/store.go b/central/compliance/datastore/internal/store/postgres/metadata/store.go
diff --git a/central/compliance/datastore/internal/store/postgres/results/index.go b/central/compliance/datastore/internal/store/postgres/results/index.go
diff --git a/central/compliance/datastore/internal/store/postgres/results/store.go b/central/compliance/datastore/internal/store/postgres/results/store.go
diff --git a/central/compliance/datastore/internal/store/postgres/store.go b/central/compliance/datastore/internal/store/postgres/store.go
@@ -4,7 +4,7 @@ import (
 	"context"
 	"time"
 
-	"github.com/jackc/pgx/v4/pgxpool"
+	"github.com/jackc/pgx/v5/pgxpool"
 	"github.com/pkg/errors"
 	"github.com/stackrox/rox/central/compliance"
 	"github.com/stackrox/rox/central/compliance/datastore/internal/store"

diff --git a/central/compliance/datastore/internal/store/postgres/strings/store.go b/central/compliance/datastore/internal/store/postgres/strings/store.go
diff --git a/central/complianceoperator/checkresults/store/postgres/store.go b/central/complianceoperator/checkresults/store/postgres/store.go
diff --git a/central/complianceoperator/profiles/store/postgres/store.go b/central/complianceoperator/profiles/store/postgres/store.go
diff --git a/central/complianceoperator/rules/store/postgres/store.go b/central/complianceoperator/rules/store/postgres/store.go
diff --git a/central/complianceoperator/scans/store/postgres/store.go b/central/complianceoperator/scans/store/postgres/store.go
diff --git a/central/complianceoperator/scansettingbinding/store/postgres/store.go b/central/complianceoperator/scansettingbinding/store/postgres/store.go
diff --git a/central/componentcveedge/datastore/datastore.go b/central/componentcveedge/datastore/datastore.go
@@ -5,7 +5,7 @@ import (
 	"testing"
 
 	"github.com/blevesearch/bleve"
-	"github.com/jackc/pgx/v4/pgxpool"
+	"github.com/jackc/pgx/v5/pgxpool"
 	clusterIndex "github.com/stackrox/rox/central/cluster/index"
 	"github.com/stackrox/rox/central/componentcveedge/datastore/store/postgres"
 	"github.com/stackrox/rox/central/componentcveedge/index"

diff --git a/central/componentcveedge/datastore/store/postgres/index.go b/central/componentcveedge/datastore/store/postgres/index.go
diff --git a/central/componentcveedge/datastore/store/postgres/store.go b/central/componentcveedge/datastore/store/postgres/store.go