From 21028dec69a833e1b84a2d528f4b7b4afb80ff6e Mon Sep 17 00:00:00 2001 From: Stas Dm Date: Wed, 11 Sep 2024 11:44:57 +0200 Subject: [PATCH] feat: more linter --- cmd/vc-rest/startcmd/start_test.go | 7 +--- component/oidc/fosite/mongo/util_test.go | 7 +--- component/oidc/fosite/redis/util_test.go | 7 +--- pkg/kms/arieskms_test.go | 7 +--- pkg/ld/store_provider_test.go | 7 +--- .../healthutil/json_result_writer_test.go | 6 ++-- pkg/observability/health/mongo/check_test.go | 7 +--- .../v1/oidc4ci/controller_e2e_flows_test.go | 34 +++++++------------ .../arieskmsstore/aries_kms_store_test.go | 7 +--- pkg/storage/mongodb/client_test.go | 7 +--- .../clientmanager/clientmanager_store_test.go | 7 +--- .../cslindexstore/csl_index_store_test.go | 7 +--- .../mongodb/cslvcstore/csl_vc_store_test.go | 7 +--- .../mongodb/ldstore/context_store_test.go | 6 +--- .../claim_data_store_test.go | 7 +--- .../oidc4cinoncestore/oidc4vc_store_test.go | 7 +--- .../oidc4vc_state_store_test.go | 7 +--- .../oidc4vp_claims_store_test.go | 9 ++--- .../oidc4vpnoncestore/tx_nonce_store_test.go | 7 +--- .../oidc4vptxstore/oidc4vp_tx_store_test.go | 8 +---- .../request_object_store_test.go | 8 +---- .../vc_issuance_histsory_store_test.go | 8 +---- .../vcstatusstore/vc_status_store_test.go | 8 +---- 23 files changed, 37 insertions(+), 155 deletions(-) diff --git a/cmd/vc-rest/startcmd/start_test.go b/cmd/vc-rest/startcmd/start_test.go index f8bdd9865..186cb3da0 100644 --- a/cmd/vc-rest/startcmd/start_test.go +++ b/cmd/vc-rest/startcmd/start_test.go @@ -13,7 +13,6 @@ import ( "net/http" "net/http/httptest" "os" - "reflect" "testing" "time" @@ -25,8 +24,6 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "github.com/trustbloc/logutil-go/pkg/log" - "go.mongodb.org/mongo-driver/bson" - "go.mongodb.org/mongo-driver/bson/bsontype" "go.mongodb.org/mongo-driver/mongo" "go.mongodb.org/mongo-driver/mongo/options" nooptracer "go.opentelemetry.io/otel/trace/noop" @@ -708,9 +705,7 @@ func waitForMongoDBToBeUp() error { func pingMongoDB() error { var err error - tM := reflect.TypeOf(bson.M{}) - reg := bson.NewRegistryBuilder().RegisterTypeMapEntry(bsontype.EmbeddedDocument, tM).Build() - clientOpts := options.Client().SetRegistry(reg).ApplyURI(mongoDBConnString) + clientOpts := options.Client().ApplyURI(mongoDBConnString) ctx, cancel := context.WithTimeout(context.Background(), 3*time.Second) defer cancel() diff --git a/component/oidc/fosite/mongo/util_test.go b/component/oidc/fosite/mongo/util_test.go index 8bbe6aab7..484b16094 100644 --- a/component/oidc/fosite/mongo/util_test.go +++ b/component/oidc/fosite/mongo/util_test.go @@ -9,7 +9,6 @@ package mongo import ( "context" "fmt" - "reflect" "testing" "time" @@ -17,8 +16,6 @@ import ( dctest "github.com/ory/dockertest/v3" dc "github.com/ory/dockertest/v3/docker" "github.com/stretchr/testify/require" - "go.mongodb.org/mongo-driver/bson" - "go.mongodb.org/mongo-driver/bson/bsontype" "go.mongodb.org/mongo-driver/mongo" "go.mongodb.org/mongo-driver/mongo/options" ) @@ -56,9 +53,7 @@ func waitForMongoDBToBeUp() error { func pingMongoDB() error { var err error - tM := reflect.TypeOf(bson.M{}) - reg := bson.NewRegistryBuilder().RegisterTypeMapEntry(bsontype.EmbeddedDocument, tM).Build() - clientOpts := options.Client().SetRegistry(reg).ApplyURI(mongoDBConnString) + clientOpts := options.Client().ApplyURI(mongoDBConnString) ctx, cancel := context.WithTimeout(context.Background(), 3*time.Second) defer cancel() diff --git a/component/oidc/fosite/redis/util_test.go b/component/oidc/fosite/redis/util_test.go index be75837bf..161417454 100644 --- a/component/oidc/fosite/redis/util_test.go +++ b/component/oidc/fosite/redis/util_test.go @@ -9,7 +9,6 @@ package redis import ( "context" "fmt" - "reflect" "testing" "time" @@ -19,8 +18,6 @@ import ( redisapi "github.com/redis/go-redis/v9" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "go.mongodb.org/mongo-driver/bson" - "go.mongodb.org/mongo-driver/bson/bsontype" "go.mongodb.org/mongo-driver/mongo" "go.mongodb.org/mongo-driver/mongo/options" @@ -114,9 +111,7 @@ func waitForMongoDBToBeUp() error { func pingMongoDB() error { var err error - tM := reflect.TypeOf(bson.M{}) - reg := bson.NewRegistryBuilder().RegisterTypeMapEntry(bsontype.EmbeddedDocument, tM).Build() - clientOpts := options.Client().SetRegistry(reg).ApplyURI(mongoDBConnString) + clientOpts := options.Client().ApplyURI(mongoDBConnString) ctx, cancel := context.WithTimeout(context.Background(), 3*time.Second) defer cancel() diff --git a/pkg/kms/arieskms_test.go b/pkg/kms/arieskms_test.go index d3d4a2d9c..f48d77be7 100644 --- a/pkg/kms/arieskms_test.go +++ b/pkg/kms/arieskms_test.go @@ -13,7 +13,6 @@ import ( "encoding/base64" "net/http" "os" - "reflect" "testing" "time" @@ -22,8 +21,6 @@ import ( dc "github.com/ory/dockertest/v3/docker" "github.com/stretchr/testify/require" arieskms "github.com/trustbloc/kms-go/spi/kms" - "go.mongodb.org/mongo-driver/bson" - "go.mongodb.org/mongo-driver/bson/bsontype" "go.mongodb.org/mongo-driver/mongo" "go.mongodb.org/mongo-driver/mongo/options" @@ -237,9 +234,7 @@ func waitForMongoDBToBeUp() error { func pingMongoDB() error { var err error - tM := reflect.TypeOf(bson.M{}) - reg := bson.NewRegistryBuilder().RegisterTypeMapEntry(bsontype.EmbeddedDocument, tM).Build() - clientOpts := options.Client().SetRegistry(reg).ApplyURI(mongoDBConnString) + clientOpts := options.Client().ApplyURI(mongoDBConnString) ctx, cancel := context.WithTimeout(context.Background(), 3*time.Second) defer cancel() diff --git a/pkg/ld/store_provider_test.go b/pkg/ld/store_provider_test.go index 4d08bedc7..9061960f9 100644 --- a/pkg/ld/store_provider_test.go +++ b/pkg/ld/store_provider_test.go @@ -8,7 +8,6 @@ package ld_test import ( "context" - "reflect" "testing" "time" @@ -17,8 +16,6 @@ import ( dctest "github.com/ory/dockertest/v3" dc "github.com/ory/dockertest/v3/docker" "github.com/stretchr/testify/require" - "go.mongodb.org/mongo-driver/bson" - "go.mongodb.org/mongo-driver/bson/bsontype" "go.mongodb.org/mongo-driver/mongo" "go.mongodb.org/mongo-driver/mongo/options" @@ -86,9 +83,7 @@ func waitForMongoDBToBeUp(connectionString string) error { func pingMongoDB(connectionString string) error { var err error - tM := reflect.TypeOf(bson.M{}) - reg := bson.NewRegistryBuilder().RegisterTypeMapEntry(bsontype.EmbeddedDocument, tM).Build() - clientOpts := options.Client().SetRegistry(reg).ApplyURI(connectionString) + clientOpts := options.Client().ApplyURI(connectionString) ctx, cancel := context.WithTimeout(context.Background(), 3*time.Second) defer cancel() diff --git a/pkg/observability/health/healthutil/json_result_writer_test.go b/pkg/observability/health/healthutil/json_result_writer_test.go index 9aa263ba0..c49adaa45 100644 --- a/pkg/observability/health/healthutil/json_result_writer_test.go +++ b/pkg/observability/health/healthutil/json_result_writer_test.go @@ -31,14 +31,14 @@ func TestResultWriter_Write(t *testing.T) { err := writer.Write(&health.CheckerResult{ Status: health.StatusUp, - Details: &map[string]health.CheckResult{ + Details: map[string]health.CheckResult{ "up": { Status: health.StatusUp, - Timestamp: &now, + Timestamp: now, }, "down": { Status: health.StatusDown, - Timestamp: &now, + Timestamp: now, }, }, }, http.StatusOK, rw, nil) diff --git a/pkg/observability/health/mongo/check_test.go b/pkg/observability/health/mongo/check_test.go index 1e5a687cf..42db44b70 100644 --- a/pkg/observability/health/mongo/check_test.go +++ b/pkg/observability/health/mongo/check_test.go @@ -8,7 +8,6 @@ package mongo_test import ( "context" - "reflect" "testing" "time" @@ -16,8 +15,6 @@ import ( dctest "github.com/ory/dockertest/v3" dc "github.com/ory/dockertest/v3/docker" "github.com/stretchr/testify/require" - "go.mongodb.org/mongo-driver/bson" - "go.mongodb.org/mongo-driver/bson/bsontype" "go.mongodb.org/mongo-driver/mongo" "go.mongodb.org/mongo-driver/mongo/options" @@ -82,9 +79,7 @@ func waitForMongoDBToBeUp() error { func pingMongoDB() error { var err error - tM := reflect.TypeOf(bson.M{}) - reg := bson.NewRegistryBuilder().RegisterTypeMapEntry(bsontype.EmbeddedDocument, tM).Build() - clientOpts := options.Client().SetRegistry(reg).ApplyURI(mongoDBConnString) + clientOpts := options.Client().ApplyURI(mongoDBConnString) ctx, cancel := context.WithTimeout(context.Background(), 3*time.Second) defer cancel() diff --git a/pkg/restapi/v1/oidc4ci/controller_e2e_flows_test.go b/pkg/restapi/v1/oidc4ci/controller_e2e_flows_test.go index 2a468f784..ebae7f6d5 100644 --- a/pkg/restapi/v1/oidc4ci/controller_e2e_flows_test.go +++ b/pkg/restapi/v1/oidc4ci/controller_e2e_flows_test.go @@ -119,18 +119,13 @@ func testAuthorizeCodeGrantFlow(t *testing.T, proofType string) { config := new(fosite.Config) config.EnforcePKCE = true + config.GlobalSecret = []byte("secret-for-signing-and-verifying-signatures") + config.AuthorizeCodeLifespan = time.Minute + config.AccessTokenLifespan = time.Hour - var hmacStrategy = &fositeoauth.HMACSHAStrategy{ - Enigma: &hmac.HMACStrategy{ - Config: &fosite.Config{ - GlobalSecret: []byte("secret-for-signing-and-verifying-signatures"), - }, - }, - Config: &fosite.Config{ - AuthorizeCodeLifespan: time.Minute, - AccessTokenLifespan: time.Hour, - }, - } + var hmacStrategy = fositeoauth.NewHMACSHAStrategy(&hmac.HMACStrategy{ + Config: config, + }, config) oauth2Provider := compose.Compose(config, fositeStore, hmacStrategy, compose.OAuth2AuthorizeExplicitFactory, @@ -343,18 +338,13 @@ func TestPreAuthorizeCodeGrantFlow(t *testing.T) { config := new(fosite.Config) config.EnforcePKCE = true + config.GlobalSecret = []byte("secret-for-signing-and-verifying-signatures") + config.AuthorizeCodeLifespan = time.Minute + config.AccessTokenLifespan = time.Hour - var hmacStrategy = &fositeoauth.HMACSHAStrategy{ - Enigma: &hmac.HMACStrategy{ - Config: &fosite.Config{ - GlobalSecret: []byte("secret-for-signing-and-verifying-signatures"), - }, - }, - Config: &fosite.Config{ - AuthorizeCodeLifespan: time.Minute, - AccessTokenLifespan: time.Hour, - }, - } + var hmacStrategy = fositeoauth.NewHMACSHAStrategy(&hmac.HMACStrategy{ + Config: config, + }, config) oauth2Provider := compose.Compose(config, fositeStore, hmacStrategy, compose.OAuth2AuthorizeExplicitFactory, diff --git a/pkg/storage/mongodb/arieskmsstore/aries_kms_store_test.go b/pkg/storage/mongodb/arieskmsstore/aries_kms_store_test.go index 2456ea2d4..73dcaf461 100644 --- a/pkg/storage/mongodb/arieskmsstore/aries_kms_store_test.go +++ b/pkg/storage/mongodb/arieskmsstore/aries_kms_store_test.go @@ -8,7 +8,6 @@ package arieskmsstore import ( "context" - "reflect" "testing" "time" @@ -17,8 +16,6 @@ import ( dc "github.com/ory/dockertest/v3/docker" "github.com/stretchr/testify/require" arieskms "github.com/trustbloc/kms-go/kms" - "go.mongodb.org/mongo-driver/bson" - "go.mongodb.org/mongo-driver/bson/bsontype" "go.mongodb.org/mongo-driver/mongo" "go.mongodb.org/mongo-driver/mongo/options" @@ -100,9 +97,7 @@ func waitForMongoDBToBeUp() error { func pingMongoDB() error { var err error - tM := reflect.TypeOf(bson.M{}) - reg := bson.NewRegistryBuilder().RegisterTypeMapEntry(bsontype.EmbeddedDocument, tM).Build() - clientOpts := options.Client().SetRegistry(reg).ApplyURI(mongoDBConnString) + clientOpts := options.Client().ApplyURI(mongoDBConnString) ctx, cancel := context.WithTimeout(context.Background(), 3*time.Second) defer cancel() diff --git a/pkg/storage/mongodb/client_test.go b/pkg/storage/mongodb/client_test.go index 142874cad..085372263 100644 --- a/pkg/storage/mongodb/client_test.go +++ b/pkg/storage/mongodb/client_test.go @@ -8,7 +8,6 @@ package mongodb_test import ( "context" - "reflect" "testing" "time" @@ -16,8 +15,6 @@ import ( dctest "github.com/ory/dockertest/v3" dc "github.com/ory/dockertest/v3/docker" "github.com/stretchr/testify/require" - "go.mongodb.org/mongo-driver/bson" - "go.mongodb.org/mongo-driver/bson/bsontype" "go.mongodb.org/mongo-driver/mongo" "go.mongodb.org/mongo-driver/mongo/options" "go.mongodb.org/mongo-driver/mongo/readpref" @@ -79,9 +76,7 @@ func waitForMongoDBToBeUp() error { func pingMongoDB() error { var err error - tM := reflect.TypeOf(bson.M{}) - reg := bson.NewRegistryBuilder().RegisterTypeMapEntry(bsontype.EmbeddedDocument, tM).Build() - clientOpts := options.Client().SetRegistry(reg).ApplyURI(mongoDBConnString) + clientOpts := options.Client().ApplyURI(mongoDBConnString) ctx, cancel := context.WithTimeout(context.Background(), 3*time.Second) defer cancel() diff --git a/pkg/storage/mongodb/clientmanager/clientmanager_store_test.go b/pkg/storage/mongodb/clientmanager/clientmanager_store_test.go index c01f36ead..1a6aad2bc 100644 --- a/pkg/storage/mongodb/clientmanager/clientmanager_store_test.go +++ b/pkg/storage/mongodb/clientmanager/clientmanager_store_test.go @@ -8,7 +8,6 @@ package clientmanager_test import ( "context" - "reflect" "testing" "time" @@ -19,8 +18,6 @@ import ( "github.com/ory/fosite" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "go.mongodb.org/mongo-driver/bson" - "go.mongodb.org/mongo-driver/bson/bsontype" "go.mongodb.org/mongo-driver/mongo" "go.mongodb.org/mongo-driver/mongo/options" @@ -165,9 +162,7 @@ func waitForMongoDBToBeUp() error { func pingMongoDB() error { var err error - tM := reflect.TypeOf(bson.M{}) - reg := bson.NewRegistryBuilder().RegisterTypeMapEntry(bsontype.EmbeddedDocument, tM).Build() - clientOpts := options.Client().SetRegistry(reg).ApplyURI(mongoDBConnString) + clientOpts := options.Client().ApplyURI(mongoDBConnString) ctx, cancel := context.WithTimeout(context.Background(), 3*time.Second) defer cancel() diff --git a/pkg/storage/mongodb/cslindexstore/csl_index_store_test.go b/pkg/storage/mongodb/cslindexstore/csl_index_store_test.go index cd2941d5b..8879b5546 100644 --- a/pkg/storage/mongodb/cslindexstore/csl_index_store_test.go +++ b/pkg/storage/mongodb/cslindexstore/csl_index_store_test.go @@ -9,7 +9,6 @@ package cslindexstore import ( "context" _ "embed" - "reflect" "testing" "time" @@ -19,8 +18,6 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "github.com/trustbloc/vc-go/verifiable" - "go.mongodb.org/mongo-driver/bson" - "go.mongodb.org/mongo-driver/bson/bsontype" "go.mongodb.org/mongo-driver/mongo" "go.mongodb.org/mongo-driver/mongo/options" @@ -233,9 +230,7 @@ func waitForMongoDBToBeUp() error { func pingMongoDB() error { var err error - tM := reflect.TypeOf(bson.M{}) - reg := bson.NewRegistryBuilder().RegisterTypeMapEntry(bsontype.EmbeddedDocument, tM).Build() - clientOpts := options.Client().SetRegistry(reg).ApplyURI(mongoDBConnString) + clientOpts := options.Client().ApplyURI(mongoDBConnString) ctx, cancel := context.WithTimeout(context.Background(), 3*time.Second) defer cancel() diff --git a/pkg/storage/mongodb/cslvcstore/csl_vc_store_test.go b/pkg/storage/mongodb/cslvcstore/csl_vc_store_test.go index b5ecc1d3a..b9115028e 100644 --- a/pkg/storage/mongodb/cslvcstore/csl_vc_store_test.go +++ b/pkg/storage/mongodb/cslvcstore/csl_vc_store_test.go @@ -9,7 +9,6 @@ package cslvcstore import ( "context" _ "embed" - "reflect" "testing" "time" @@ -19,8 +18,6 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "github.com/trustbloc/vc-go/verifiable" - "go.mongodb.org/mongo-driver/bson" - "go.mongodb.org/mongo-driver/bson/bsontype" "go.mongodb.org/mongo-driver/mongo" "go.mongodb.org/mongo-driver/mongo/options" @@ -214,9 +211,7 @@ func waitForMongoDBToBeUp() error { func pingMongoDB() error { var err error - tM := reflect.TypeOf(bson.M{}) - reg := bson.NewRegistryBuilder().RegisterTypeMapEntry(bsontype.EmbeddedDocument, tM).Build() - clientOpts := options.Client().SetRegistry(reg).ApplyURI(mongoDBConnString) + clientOpts := options.Client().ApplyURI(mongoDBConnString) ctx, cancel := context.WithTimeout(context.Background(), 3*time.Second) defer cancel() diff --git a/pkg/storage/mongodb/ldstore/context_store_test.go b/pkg/storage/mongodb/ldstore/context_store_test.go index 04b749a86..7a2b3e5e0 100644 --- a/pkg/storage/mongodb/ldstore/context_store_test.go +++ b/pkg/storage/mongodb/ldstore/context_store_test.go @@ -10,7 +10,6 @@ import ( "bytes" "context" "encoding/json" - "reflect" "testing" "time" @@ -24,7 +23,6 @@ import ( ldcontext "github.com/trustbloc/did-go/doc/ld/context" "github.com/trustbloc/did-go/doc/ld/context/embed" "go.mongodb.org/mongo-driver/bson" - "go.mongodb.org/mongo-driver/bson/bsontype" "go.mongodb.org/mongo-driver/mongo" "go.mongodb.org/mongo-driver/mongo/options" @@ -169,9 +167,7 @@ func waitForMongoDBToBeUp(connectionString string) error { func pingMongoDB(connectionString string) error { var err error - tM := reflect.TypeOf(bson.M{}) - reg := bson.NewRegistryBuilder().RegisterTypeMapEntry(bsontype.EmbeddedDocument, tM).Build() - clientOpts := options.Client().SetRegistry(reg).ApplyURI(connectionString) + clientOpts := options.Client().ApplyURI(connectionString) ctx, cancel := context.WithTimeout(context.Background(), 3*time.Second) defer cancel() diff --git a/pkg/storage/mongodb/oidc4ciclaimdatastore/claim_data_store_test.go b/pkg/storage/mongodb/oidc4ciclaimdatastore/claim_data_store_test.go index fde6449ac..8859ecc47 100644 --- a/pkg/storage/mongodb/oidc4ciclaimdatastore/claim_data_store_test.go +++ b/pkg/storage/mongodb/oidc4ciclaimdatastore/claim_data_store_test.go @@ -8,7 +8,6 @@ package oidc4ciclaimdatastore import ( "context" - "reflect" "testing" "time" @@ -17,8 +16,6 @@ import ( dc "github.com/ory/dockertest/v3/docker" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "go.mongodb.org/mongo-driver/bson" - "go.mongodb.org/mongo-driver/bson/bsontype" "go.mongodb.org/mongo-driver/bson/primitive" "go.mongodb.org/mongo-driver/mongo" "go.mongodb.org/mongo-driver/mongo/options" @@ -168,9 +165,7 @@ func waitForMongoDBToBeUp() error { func pingMongoDB() error { var err error - tM := reflect.TypeOf(bson.M{}) - reg := bson.NewRegistryBuilder().RegisterTypeMapEntry(bsontype.EmbeddedDocument, tM).Build() - clientOpts := options.Client().SetRegistry(reg).ApplyURI(mongoDBConnString) + clientOpts := options.Client().ApplyURI(mongoDBConnString) ctx, cancel := context.WithTimeout(context.Background(), 3*time.Second) defer cancel() diff --git a/pkg/storage/mongodb/oidc4cinoncestore/oidc4vc_store_test.go b/pkg/storage/mongodb/oidc4cinoncestore/oidc4vc_store_test.go index 8c5166207..37c9a274c 100644 --- a/pkg/storage/mongodb/oidc4cinoncestore/oidc4vc_store_test.go +++ b/pkg/storage/mongodb/oidc4cinoncestore/oidc4vc_store_test.go @@ -8,7 +8,6 @@ package oidc4cinoncestore import ( "context" - "reflect" "sync" "testing" "time" @@ -19,8 +18,6 @@ import ( dc "github.com/ory/dockertest/v3/docker" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "go.mongodb.org/mongo-driver/bson" - "go.mongodb.org/mongo-driver/bson/bsontype" "go.mongodb.org/mongo-driver/mongo" "go.mongodb.org/mongo-driver/mongo/options" @@ -352,9 +349,7 @@ func waitForMongoDBToBeUp() error { func pingMongoDB() error { var err error - tM := reflect.TypeOf(bson.M{}) - reg := bson.NewRegistryBuilder().RegisterTypeMapEntry(bsontype.EmbeddedDocument, tM).Build() - clientOpts := options.Client().SetRegistry(reg).ApplyURI(mongoDBConnString) + clientOpts := options.Client().ApplyURI(mongoDBConnString) ctx, cancel := context.WithTimeout(context.Background(), 3*time.Second) defer cancel() diff --git a/pkg/storage/mongodb/oidc4cistatestore/oidc4vc_state_store_test.go b/pkg/storage/mongodb/oidc4cistatestore/oidc4vc_state_store_test.go index bb2ea8620..84bc8a4e0 100644 --- a/pkg/storage/mongodb/oidc4cistatestore/oidc4vc_state_store_test.go +++ b/pkg/storage/mongodb/oidc4cistatestore/oidc4vc_state_store_test.go @@ -8,7 +8,6 @@ package oidc4cistatestore import ( "context" - "reflect" "sync" "testing" "time" @@ -19,8 +18,6 @@ import ( dc "github.com/ory/dockertest/v3/docker" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "go.mongodb.org/mongo-driver/bson" - "go.mongodb.org/mongo-driver/bson/bsontype" "go.mongodb.org/mongo-driver/mongo" "go.mongodb.org/mongo-driver/mongo/options" @@ -199,9 +196,7 @@ func waitForMongoDBToBeUp() error { func pingMongoDB() error { var err error - tM := reflect.TypeOf(bson.M{}) - reg := bson.NewRegistryBuilder().RegisterTypeMapEntry(bsontype.EmbeddedDocument, tM).Build() - clientOpts := options.Client().SetRegistry(reg).ApplyURI(mongoDBConnString) + clientOpts := options.Client().ApplyURI(mongoDBConnString) ctx, cancel := context.WithTimeout(context.Background(), 3*time.Second) defer cancel() diff --git a/pkg/storage/mongodb/oidc4vpclaimsstore/oidc4vp_claims_store_test.go b/pkg/storage/mongodb/oidc4vpclaimsstore/oidc4vp_claims_store_test.go index 64318346f..31ea8f40b 100644 --- a/pkg/storage/mongodb/oidc4vpclaimsstore/oidc4vp_claims_store_test.go +++ b/pkg/storage/mongodb/oidc4vpclaimsstore/oidc4vp_claims_store_test.go @@ -9,7 +9,6 @@ package oidc4vpclaimsstore import ( "context" _ "embed" - "reflect" "testing" "time" @@ -18,8 +17,6 @@ import ( dc "github.com/ory/dockertest/v3/docker" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "go.mongodb.org/mongo-driver/bson" - "go.mongodb.org/mongo-driver/bson/bsontype" "go.mongodb.org/mongo-driver/bson/primitive" "go.mongodb.org/mongo-driver/mongo" "go.mongodb.org/mongo-driver/mongo/options" @@ -185,10 +182,8 @@ func waitForMongoDBToBeUp() error { func pingMongoDB() error { var err error - tM := reflect.TypeOf(bson.M{}) - reg := bson.NewRegistryBuilder().RegisterTypeMapEntry(bsontype.EmbeddedDocument, tM).Build() - clientOpts := options.Client().SetRegistry(reg).ApplyURI(mongoDBConnString) - + clientOpts := options.Client().ApplyURI(mongoDBConnString) + ctx, cancel := context.WithTimeout(context.Background(), 3*time.Second) defer cancel() mongoClient, err := mongo.Connect(ctx, clientOpts) diff --git a/pkg/storage/mongodb/oidc4vpnoncestore/tx_nonce_store_test.go b/pkg/storage/mongodb/oidc4vpnoncestore/tx_nonce_store_test.go index cbd5c7316..fcde7c977 100644 --- a/pkg/storage/mongodb/oidc4vpnoncestore/tx_nonce_store_test.go +++ b/pkg/storage/mongodb/oidc4vpnoncestore/tx_nonce_store_test.go @@ -8,7 +8,6 @@ package oidc4vpnoncestore_test import ( "context" - "reflect" "testing" "time" @@ -17,8 +16,6 @@ import ( dc "github.com/ory/dockertest/v3/docker" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "go.mongodb.org/mongo-driver/bson" - "go.mongodb.org/mongo-driver/bson/bsontype" "go.mongodb.org/mongo-driver/mongo" "go.mongodb.org/mongo-driver/mongo/options" @@ -170,9 +167,7 @@ func waitForMongoDBToBeUp() error { func pingMongoDB() error { var err error - tM := reflect.TypeOf(bson.M{}) - reg := bson.NewRegistryBuilder().RegisterTypeMapEntry(bsontype.EmbeddedDocument, tM).Build() - clientOpts := options.Client().SetRegistry(reg).ApplyURI(mongoDBConnString) + clientOpts := options.Client().ApplyURI(mongoDBConnString) ctx, cancel := context.WithTimeout(context.Background(), 3*time.Second) defer cancel() diff --git a/pkg/storage/mongodb/oidc4vptxstore/oidc4vp_tx_store_test.go b/pkg/storage/mongodb/oidc4vptxstore/oidc4vp_tx_store_test.go index af58d9d6d..e66f5c711 100644 --- a/pkg/storage/mongodb/oidc4vptxstore/oidc4vp_tx_store_test.go +++ b/pkg/storage/mongodb/oidc4vptxstore/oidc4vp_tx_store_test.go @@ -9,7 +9,6 @@ package oidc4vptxstore import ( "context" _ "embed" - "reflect" "testing" "time" @@ -18,8 +17,6 @@ import ( dc "github.com/ory/dockertest/v3/docker" "github.com/stretchr/testify/require" "github.com/trustbloc/vc-go/presexch" - "go.mongodb.org/mongo-driver/bson" - "go.mongodb.org/mongo-driver/bson/bsontype" "go.mongodb.org/mongo-driver/bson/primitive" "go.mongodb.org/mongo-driver/mongo" "go.mongodb.org/mongo-driver/mongo/options" @@ -242,10 +239,7 @@ func waitForMongoDBToBeUp() error { func pingMongoDB() error { var err error - tM := reflect.TypeOf(bson.M{}) - reg := bson.NewRegistryBuilder().RegisterTypeMapEntry(bsontype.EmbeddedDocument, tM).Build() - clientOpts := options.Client().SetRegistry(reg).ApplyURI(mongoDBConnString) - + clientOpts := options.Client().ApplyURI(mongoDBConnString) ctx, cancel := context.WithTimeout(context.Background(), 3*time.Second) defer cancel() mongoClient, err := mongo.Connect(ctx, clientOpts) diff --git a/pkg/storage/mongodb/requestobjectstore/request_object_store_test.go b/pkg/storage/mongodb/requestobjectstore/request_object_store_test.go index f0dfbd2c4..753f72e77 100644 --- a/pkg/storage/mongodb/requestobjectstore/request_object_store_test.go +++ b/pkg/storage/mongodb/requestobjectstore/request_object_store_test.go @@ -8,7 +8,6 @@ package requestobjectstore import ( "context" - "reflect" "testing" "time" @@ -19,8 +18,6 @@ import ( dctest "github.com/ory/dockertest/v3" dc "github.com/ory/dockertest/v3/docker" "github.com/stretchr/testify/require" - "go.mongodb.org/mongo-driver/bson" - "go.mongodb.org/mongo-driver/bson/bsontype" "go.mongodb.org/mongo-driver/mongo" "go.mongodb.org/mongo-driver/mongo/options" @@ -192,10 +189,7 @@ func waitForMongoDBToBeUp() error { func pingMongoDB() error { var err error - tM := reflect.TypeOf(bson.M{}) - reg := bson.NewRegistryBuilder().RegisterTypeMapEntry(bsontype.EmbeddedDocument, tM).Build() - clientOpts := options.Client().SetRegistry(reg).ApplyURI(mongoDBConnString) - + clientOpts := options.Client().ApplyURI(mongoDBConnString) ctx, cancel := context.WithTimeout(context.Background(), 3*time.Second) defer cancel() mongoClient, err := mongo.Connect(ctx, clientOpts) diff --git a/pkg/storage/mongodb/vcissuancehistorystore/vc_issuance_histsory_store_test.go b/pkg/storage/mongodb/vcissuancehistorystore/vc_issuance_histsory_store_test.go index 0190a51a7..cf97a3a99 100644 --- a/pkg/storage/mongodb/vcissuancehistorystore/vc_issuance_histsory_store_test.go +++ b/pkg/storage/mongodb/vcissuancehistorystore/vc_issuance_histsory_store_test.go @@ -8,7 +8,6 @@ package vcissuancehistorystore import ( "context" - "reflect" "testing" "time" @@ -19,8 +18,6 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" timeutil "github.com/trustbloc/did-go/doc/util/time" - "go.mongodb.org/mongo-driver/bson" - "go.mongodb.org/mongo-driver/bson/bsontype" "go.mongodb.org/mongo-driver/mongo" "go.mongodb.org/mongo-driver/mongo/options" @@ -224,10 +221,7 @@ func waitForMongoDBToBeUp() error { func pingMongoDB() error { var err error - tM := reflect.TypeOf(bson.M{}) - reg := bson.NewRegistryBuilder().RegisterTypeMapEntry(bsontype.EmbeddedDocument, tM).Build() - clientOpts := options.Client().SetRegistry(reg).ApplyURI(mongoDBConnString) - + clientOpts := options.Client().ApplyURI(mongoDBConnString) ctx, cancel := context.WithTimeout(context.Background(), 3*time.Second) defer cancel() mongoClient, err := mongo.Connect(ctx, clientOpts) diff --git a/pkg/storage/mongodb/vcstatusstore/vc_status_store_test.go b/pkg/storage/mongodb/vcstatusstore/vc_status_store_test.go index bbe781c5b..6db96d573 100644 --- a/pkg/storage/mongodb/vcstatusstore/vc_status_store_test.go +++ b/pkg/storage/mongodb/vcstatusstore/vc_status_store_test.go @@ -9,7 +9,6 @@ package vcstatusstore import ( "context" _ "embed" - "reflect" "testing" "time" @@ -19,8 +18,6 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "github.com/trustbloc/vc-go/verifiable" - "go.mongodb.org/mongo-driver/bson" - "go.mongodb.org/mongo-driver/bson/bsontype" "go.mongodb.org/mongo-driver/mongo" "go.mongodb.org/mongo-driver/mongo/options" @@ -159,10 +156,7 @@ func waitForMongoDBToBeUp() error { func pingMongoDB() error { var err error - tM := reflect.TypeOf(bson.M{}) - reg := bson.NewRegistryBuilder().RegisterTypeMapEntry(bsontype.EmbeddedDocument, tM).Build() - clientOpts := options.Client().SetRegistry(reg).ApplyURI(mongoDBConnString) - + clientOpts := options.Client().ApplyURI(mongoDBConnString) ctx, cancel := context.WithTimeout(context.Background(), 3*time.Second) defer cancel() mongoClient, err := mongo.Connect(ctx, clientOpts)