Skip to content

Commit

Permalink
chore(deps): copy code from unmatinained dep
Browse files Browse the repository at this point in the history
  • Loading branch information
janisz committed Jul 13, 2023
1 parent 3152b48 commit ccf9ccd
Show file tree
Hide file tree
Showing 4 changed files with 237 additions and 150 deletions.
6 changes: 2 additions & 4 deletions central/debug/service/service_test.go
Expand Up @@ -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"
Expand All @@ -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"
Expand Down Expand Up @@ -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)

Expand Down
5 changes: 0 additions & 5 deletions go.mod
Expand Up @@ -29,7 +29,6 @@ require (
github.com/docker/docker v23.0.6+incompatible
github.com/docker/go-connections v0.4.0
github.com/docker/go-units v0.5.0
github.com/driftprogramming/pgxpoolmock v1.1.0
github.com/facebookincubator/nvdtools v0.1.5
github.com/fatih/color v1.15.0
github.com/fullsailor/pkcs7 v0.0.0
Expand Down Expand Up @@ -246,13 +245,9 @@ require (
github.com/inconshreveable/mousetrap v1.1.0 // indirect
github.com/itchyny/gojq v0.12.13 // indirect
github.com/itchyny/timefmt-go v0.1.5 // indirect
github.com/jackc/chunkreader/v2 v2.0.1 // indirect
github.com/jackc/pgconn v1.14.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.2 // indirect
github.com/jackc/pgservicefile v0.0.0-20221227161230-091c0ba34f0a // indirect
github.com/jackc/pgx/v4 v4.18.0 // indirect
github.com/jackc/puddle/v2 v2.2.0 // indirect
github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 // indirect
github.com/jedisct1/go-minisign v0.0.0-20211028175153-1c139d1cc84b // indirect
Expand Down

0 comments on commit ccf9ccd

Please sign in to comment.