chore(deps): upgrade pgx to v5 (#6916)

Signed-off-by: Tomasz Janiszewski <tomek@redhat.com>
stackrox · Nov 8, 2023 · cb4fffa · cb4fffa
1 parent 1fedfc5
commit cb4fffa
Show file tree

Hide file tree

Showing 221 changed files with 501 additions and 640 deletions.
diff --git a/Makefile b/Makefile
@@ -6,6 +6,7 @@ TESTFLAGS=-race -p 4
 BASE_DIR=$(CURDIR)
 BENCHTIME ?= 1x
 BENCHTIMEOUT ?= 20m
+BENCHCOUNT ?= 1
 
 ifeq (,$(findstring podman,$(shell docker --version 2>/dev/null)))
 # Podman DTRT by running processes unprivileged in containers,
@@ -506,7 +507,7 @@ go-postgres-unit-tests: build-prep test-prep
 go-postgres-bench-tests: build-prep test-prep
 	@# The -p 1 passed to go test is required to ensure that tests of different packages are not run in parallel, so as to avoid conflicts when interacting with the DB.
 	set -o pipefail ; \
-	CGO_ENABLED=1 GODEBUG=cgocheck=2 MUTEX_WATCHDOG_TIMEOUT_SECS=30 ROX_POSTGRES_DATASTORE=true GOTAGS=$(GOTAGS),test,sql_integration scripts/go-test.sh -p 1 -run=nonthing -bench=. -benchtime=$(BENCHTIME) -benchmem -timeout $(BENCHTIMEOUT) -v \
+	CGO_ENABLED=1 GODEBUG=cgocheck=2 MUTEX_WATCHDOG_TIMEOUT_SECS=30 ROX_POSTGRES_DATASTORE=true GOTAGS=$(GOTAGS),test,sql_integration scripts/go-test.sh -p 1 -run=nonthing -bench=. -benchtime=$(BENCHTIME) -benchmem -timeout $(BENCHTIMEOUT) -count $(BENCHCOUNT) -v \
   $(shell git grep -rl "testing.B" central pkg migrator tools | sed -e 's@^@./@g' | xargs -n 1 dirname | sort | uniq | xargs go list -tags sql_integration | grep -v '^github.com/stackrox/rox/tests$$' | grep -Ev $(UNIT_TEST_IGNORE)) \
 		| tee $(GO_TEST_OUTPUT_PATH)
 

diff --git a/central/activecomponent/datastore/internal/store/postgres/store.go b/central/activecomponent/datastore/internal/store/postgres/store.go
diff --git a/central/administration/events/datastore/internal/store/postgres/store.go b/central/administration/events/datastore/internal/store/postgres/store.go
diff --git a/central/administration/usage/store/postgres/store.go b/central/administration/usage/store/postgres/store.go
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/auth/store/postgres/store.go b/central/auth/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/blob/datastore/store/postgres/store.go b/central/blob/datastore/store/postgres/store.go
diff --git a/central/blob/datastore/store/store.go b/central/blob/datastore/store/store.go
@@ -4,7 +4,7 @@ import (
 	"context"
 	"io"
 
-	"github.com/jackc/pgx/v4"
+	"github.com/jackc/pgx/v5"
 	"github.com/pkg/errors"
 	"github.com/stackrox/rox/central/blob/datastore/store/postgres"
 	v1 "github.com/stackrox/rox/generated/api/v1"

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/store.go b/central/cluster/store/clusterhealth/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/compliance_config/store.go b/central/compliance/datastore/internal/store/postgres/compliance_config/store.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/store.go b/central/compliance/datastore/internal/store/postgres/metadata/store.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/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/complianceoperator/v2/checkresults/store/postgres/store.go b/central/complianceoperator/v2/checkresults/store/postgres/store.go
diff --git a/central/complianceoperator/v2/integration/store/postgres/store.go b/central/complianceoperator/v2/integration/store/postgres/store.go
diff --git a/central/complianceoperator/v2/profiles/store/postgres/store.go b/central/complianceoperator/v2/profiles/store/postgres/store.go
diff --git a/central/complianceoperator/v2/rules/store/postgres/store.go b/central/complianceoperator/v2/rules/store/postgres/store.go
diff --git a/central/complianceoperator/v2/scanconfigurations/scanconfigstatus/store/postgres/store.go b/central/complianceoperator/v2/scanconfigurations/scanconfigstatus/store/postgres/store.go
diff --git a/central/complianceoperator/v2/scanconfigurations/store/postgres/store.go b/central/complianceoperator/v2/scanconfigurations/store/postgres/store.go
diff --git a/central/complianceoperator/v2/scans/store/postgres/store.go b/central/complianceoperator/v2/scans/store/postgres/store.go
diff --git a/central/cve/cluster/datastore/store/postgres/full_store.go b/central/cve/cluster/datastore/store/postgres/full_store.go
@@ -6,7 +6,7 @@ import (
 	"time"
 
 	protoTypes "github.com/gogo/protobuf/types"
-	"github.com/jackc/pgx/v4"
+	"github.com/jackc/pgx/v5"
 	"github.com/stackrox/rox/central/cve/cluster/datastore/store"
 	"github.com/stackrox/rox/central/cve/converter/v2"
 	"github.com/stackrox/rox/central/metrics"

diff --git a/central/cve/cluster/datastore/store/postgres/store.go b/central/cve/cluster/datastore/store/postgres/store.go
diff --git a/central/cve/image/datastore/store/postgres/store.go b/central/cve/image/datastore/store/postgres/store.go
diff --git a/central/cve/node/datastore/store/postgres/store.go b/central/cve/node/datastore/store/postgres/store.go
diff --git a/central/debug/service/service_test.go b/central/debug/service/service_test.go
@@ -9,7 +9,6 @@ import (
 	"testing"
 	"time"
 
-	"github.com/driftprogramming/pgxpoolmock"
 	"github.com/pkg/errors"
 	configMocks "github.com/stackrox/rox/central/config/datastore/mocks"
 	"github.com/stackrox/rox/central/globaldb"
@@ -19,6 +18,7 @@ import (
 	"github.com/stackrox/rox/generated/storage"
 	permissionsMocks "github.com/stackrox/rox/pkg/auth/permissions/mocks"
 	"github.com/stackrox/rox/pkg/httputil/mock"
+	pkgmocks "github.com/stackrox/rox/pkg/mocks/github.com/jackc/pgx/v5/mocks"
 	"github.com/stackrox/rox/pkg/postgres/mocks"
 	"github.com/stackrox/rox/pkg/sac"
 	"github.com/stackrox/rox/pkg/version/testutils"
@@ -188,9 +188,7 @@ func (s *debugServiceTestSuite) TestGetBundle() {
 	w := mock.NewResponseWriter()
 	testutils.SetVersion(s.T(), testutils.GetExampleVersion(s.T()))
 	db := mocks.NewMockDB(s.mockCtrl)
-	pgxRows := pgxpoolmock.NewRows([]string{"server_version"}).AddRow("15.1").ToPgxRows()
-	// Workaround for https://github.com/driftprogramming/pgxpoolmock/issues/8
-	pgxRows.Next()
+	pgxRows := pkgmocks.NewRows([]string{"server_version"}).AddRow("15.1").ToPgxRows()
 	db.EXPECT().QueryRow(gomock.Any(), "SHOW server_version;").Return(pgxRows)
 	globaldb.SetPostgresTest(s.T(), db)
 

diff --git a/central/declarativeconfig/health/datastore/store/postgres/store.go b/central/declarativeconfig/health/datastore/store/postgres/store.go
diff --git a/central/deployment/datastore/search_comparison_test.go b/central/deployment/datastore/search_comparison_test.go
@@ -19,7 +19,6 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 	"github.com/stretchr/testify/suite"
-	"go.uber.org/mock/gomock"
 )
 
 var (
@@ -33,7 +32,6 @@ func TestSearchComparison(t *testing.T) {
 type SearchComparisonTestSuite struct {
 	suite.Suite
 
-	mockCtrl            *gomock.Controller
 	testDB              *pgtest.TestPostgres
 	imageDatastore      imageDataStore.DataStore
 	deploymentDatastore DataStore

diff --git a/central/deployment/store/postgres/store.go b/central/deployment/store/postgres/store.go
diff --git a/central/externalbackups/internal/store/postgres/store.go b/central/externalbackups/internal/store/postgres/store.go
diff --git a/central/group/datastore/internal/store/postgres/store.go b/central/group/datastore/internal/store/postgres/store.go