diff --git a/go.mod b/go.mod index b6f04513c..a807abedc 100644 --- a/go.mod +++ b/go.mod @@ -50,7 +50,7 @@ require ( github.com/hashicorp/vault/api v1.9.1 github.com/iancoleman/strcase v0.2.0 github.com/jackc/pgconn v1.14.0 - github.com/jackc/pgx/v4 v4.18.1 + github.com/jackc/pgx/v4 v4.18.1 // indirect github.com/jefferai/keyring v1.1.7-0.20220316160357-58a74bb55891 github.com/kr/pretty v0.3.1 github.com/kr/text v0.2.0 diff --git a/internal/cmd/base/internal/docker/supported.go b/internal/cmd/base/internal/docker/supported.go index ba0e4b9d4..ccf599b5c 100644 --- a/internal/cmd/base/internal/docker/supported.go +++ b/internal/cmd/base/internal/docker/supported.go @@ -12,7 +12,7 @@ import ( "strings" "github.com/hashicorp/boundary/internal/db/common" - _ "github.com/jackc/pgx/v4/stdlib" + _ "github.com/jackc/pgx/v5/stdlib" "github.com/ory/dockertest/v3" ) diff --git a/internal/credential/vault/supported.go b/internal/credential/vault/supported.go index 6610fbe95..caeb0735c 100644 --- a/internal/credential/vault/supported.go +++ b/internal/credential/vault/supported.go @@ -21,7 +21,7 @@ import ( "github.com/hashicorp/boundary/internal/db/common" "github.com/hashicorp/go-rootcerts" vault "github.com/hashicorp/vault/api" - _ "github.com/jackc/pgx/v4/stdlib" + _ "github.com/jackc/pgx/v5/stdlib" "github.com/ory/dockertest/v3" "github.com/stretchr/testify/require" ) diff --git a/internal/daemon/controller/handlers/authmethods/authmethod_service_test.go b/internal/daemon/controller/handlers/authmethods/authmethod_service_test.go index 8a92e9358..32fccb9c7 100644 --- a/internal/daemon/controller/handlers/authmethods/authmethod_service_test.go +++ b/internal/daemon/controller/handlers/authmethods/authmethod_service_test.go @@ -1351,7 +1351,6 @@ func TestCreate(t *testing.T) { s, err := authmethods.NewService(testKms, pwRepoFn, oidcRepoFn, iamRepoFn, atRepoFn, ldapRepoFn) require.NoError(err, "Error when getting new auth_method service.") - conn.Debug(true) got, gErr := s.CreateAuthMethod(requestauth.DisabledAuthTestContext(iamRepoFn, tc.req.GetItem().GetScopeId()), tc.req) if tc.err != nil { require.Error(gErr) diff --git a/internal/db/common/db.go b/internal/db/common/db.go index fc4a17eeb..9de957b03 100644 --- a/internal/db/common/db.go +++ b/internal/db/common/db.go @@ -6,7 +6,7 @@ package common import ( "database/sql" - _ "github.com/jackc/pgx/v4" + _ "github.com/jackc/pgx/v5" ) func SqlOpen(driverName, dataSourceName string) (*sql.DB, error) { diff --git a/internal/db/db.go b/internal/db/db.go index bb15a3286..0ceb1a87a 100644 --- a/internal/db/db.go +++ b/internal/db/db.go @@ -13,7 +13,7 @@ import ( "github.com/hashicorp/boundary/internal/errors" "github.com/hashicorp/boundary/internal/observability/event" "github.com/hashicorp/go-dbw" - _ "github.com/jackc/pgx/v4" + _ "github.com/jackc/pgx/v5" "gorm.io/driver/postgres" ) diff --git a/testing/dbtest/template.go b/testing/dbtest/template.go index 9eda320b5..87cd6aa7d 100644 --- a/testing/dbtest/template.go +++ b/testing/dbtest/template.go @@ -16,7 +16,7 @@ import ( "github.com/hashicorp/boundary/internal/db/common" wrapping "github.com/hashicorp/go-kms-wrapping/v2" "github.com/hashicorp/go-kms-wrapping/v2/aead" - _ "github.com/jackc/pgx/v4/stdlib" + _ "github.com/jackc/pgx/v5/stdlib" ) var testDBPort = "5432" diff --git a/testing/internal/e2e/tests/database/migration_test.go b/testing/internal/e2e/tests/database/migration_test.go index 93935d11d..f63c8b7a5 100644 --- a/testing/internal/e2e/tests/database/migration_test.go +++ b/testing/internal/e2e/tests/database/migration_test.go @@ -20,7 +20,7 @@ import ( "github.com/hashicorp/boundary/testing/internal/e2e/boundary" "github.com/hashicorp/boundary/testing/internal/e2e/infra" "github.com/hashicorp/boundary/testing/internal/e2e/vault" - _ "github.com/jackc/pgx/v4/stdlib" + _ "github.com/jackc/pgx/v5/stdlib" "github.com/ory/dockertest/v3" "github.com/ory/dockertest/v3/docker" "github.com/stretchr/testify/require"