Skip to content

Commit c125189

Browse files
authored
fix!: update mongo driver to v2 (Resolves #61) (#103)
1 parent 21f0486 commit c125189

File tree

7 files changed

+22
-24
lines changed

7 files changed

+22
-24
lines changed

README.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -351,8 +351,8 @@ import (
351351
"context"
352352
"github.com/elasticpath/epcc-search-ast-helper"
353353
"github.com/elasticpath/epcc-search-ast-helper/mongo"
354-
"go.mongodb.org/mongo-driver/bson"
355-
"go.mongodb.org/mongo-driver/mongo"
354+
"go.mongodb.org/mongo-driver/v2/bson"
355+
"go.mongodb.org/mongo-driver/v2/mongo"
356356
)
357357

358358
func Example(ast *epsearchast.AstNode, collection *mongo.Collection, tenantBoundaryQuery bson.M) (*mongo.Cursor, error) {
@@ -401,8 +401,8 @@ import (
401401
"context"
402402
"github.com/elasticpath/epcc-search-ast-helper"
403403
"github.com/elasticpath/epcc-search-ast-helper/mongo"
404-
"go.mongodb.org/mongo-driver/bson"
405-
"go.mongodb.org/mongo-driver/mongo"
404+
"go.mongodb.org/mongo-driver/v2/bson"
405+
"go.mongodb.org/mongo-driver/v2/mongo"
406406
"strings"
407407
)
408408

@@ -445,8 +445,8 @@ import (
445445
"context"
446446
"github.com/elasticpath/epcc-search-ast-helper"
447447
"github.com/elasticpath/epcc-search-ast-helper/mongo"
448-
"go.mongodb.org/mongo-driver/bson"
449-
"go.mongodb.org/mongo-driver/mongo"
448+
"go.mongodb.org/mongo-driver/v2/bson"
449+
"go.mongodb.org/mongo-driver/v2/mongo"
450450
"strings"
451451
)
452452

docker-compose.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ services:
22
postgres:
33
image: postgres:15.0-bullseye
44
ports:
5-
- '20001:5432'
5+
- '127.0.0.1:20001:5432'
66
environment:
77
POSTGRES_PASSWORD: admin
88
POSTGRES_USER: admin
@@ -15,7 +15,7 @@ services:
1515
mongo:
1616
image: mongo:7.0
1717
ports:
18-
- '20002:27017'
18+
- '127.0.0.1:20002:27017'
1919
environment:
2020
MONGO_INITDB_ROOT_USERNAME: admin
2121
MONGO_INITDB_ROOT_PASSWORD: admin
@@ -28,7 +28,7 @@ services:
2828
elasticsearch:
2929
image: elasticsearch:7.17.25
3030
ports:
31-
- '20003:9200'
31+
- '127.0.0.1:20003:9200'
3232
environment:
3333
discovery.type: single-node
3434
ES_JAVA_OPTS: "-Xms1024m -Xmx1024m"

go.mod

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ require (
66
github.com/go-playground/validator/v10 v10.28.0
77
github.com/lib/pq v1.10.9
88
github.com/stretchr/testify v1.11.1
9-
go.mongodb.org/mongo-driver v1.17.6
9+
go.mongodb.org/mongo-driver/v2 v2.4.0
1010
gorm.io/driver/postgres v1.6.0
1111
gorm.io/gorm v1.31.1
1212
)
@@ -16,7 +16,7 @@ require (
1616
github.com/gabriel-vasile/mimetype v1.4.10 // indirect
1717
github.com/go-playground/locales v0.14.1 // indirect
1818
github.com/go-playground/universal-translator v0.18.1 // indirect
19-
github.com/golang/snappy v0.0.4 // indirect
19+
github.com/golang/snappy v1.0.0 // indirect
2020
github.com/jackc/pgpassfile v1.0.0 // indirect
2121
github.com/jackc/pgservicefile v0.0.0-20240606120523-5a60cdf6a761 // indirect
2222
github.com/jackc/pgx/v5 v5.7.2 // indirect
@@ -26,7 +26,6 @@ require (
2626
github.com/klauspost/compress v1.16.7 // indirect
2727
github.com/kr/text v0.2.0 // indirect
2828
github.com/leodido/go-urn v1.4.0 // indirect
29-
github.com/montanaflynn/stats v0.7.1 // indirect
3029
github.com/pmezard/go-difflib v1.0.0 // indirect
3130
github.com/rogpeppe/go-internal v1.13.1 // indirect
3231
github.com/stretchr/objx v0.5.2 // indirect

go.sum

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ github.com/go-playground/universal-translator v0.18.1 h1:Bcnm0ZwsGyWbCzImXv+pAJn
1212
github.com/go-playground/universal-translator v0.18.1/go.mod h1:xekY+UJKNuX9WP91TpwSH2VMlDf28Uj24BCp08ZFTUY=
1313
github.com/go-playground/validator/v10 v10.28.0 h1:Q7ibns33JjyW48gHkuFT91qX48KG0ktULL6FgHdG688=
1414
github.com/go-playground/validator/v10 v10.28.0/go.mod h1:GoI6I1SjPBh9p7ykNE/yj3fFYbyDOpwMn5KXd+m2hUU=
15-
github.com/golang/snappy v0.0.4 h1:yAGX7huGHXlcLOEtBnF4w7FQwA26wojNCwOYAEhLjQM=
16-
github.com/golang/snappy v0.0.4/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
15+
github.com/golang/snappy v1.0.0 h1:Oy607GVXHs7RtbggtPBnr2RmDArIsAefDwvrdWvRhGs=
16+
github.com/golang/snappy v1.0.0/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
1717
github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
1818
github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
1919
github.com/jackc/pgpassfile v1.0.0 h1:/6Hmqy13Ss2zCq62VdNG8tM1wchn8zjSGOBJ6icpsIM=
@@ -38,8 +38,6 @@ github.com/leodido/go-urn v1.4.0 h1:WT9HwE9SGECu3lg4d/dIA+jxlljEa1/ffXKmRjqdmIQ=
3838
github.com/leodido/go-urn v1.4.0/go.mod h1:bvxc+MVxLKB4z00jd1z+Dvzr47oO32F/QSNjSBOlFxI=
3939
github.com/lib/pq v1.10.9 h1:YXG7RB+JIjhP29X+OtkiDnYaXQwpS4JEWq7dtCCRUEw=
4040
github.com/lib/pq v1.10.9/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o=
41-
github.com/montanaflynn/stats v0.7.1 h1:etflOAAHORrCC44V+aR6Ftzort912ZU+YLiSTuV8eaE=
42-
github.com/montanaflynn/stats v0.7.1/go.mod h1:etXPPgVO6n31NxCd9KQUMvCM+ve0ruNzt6R8Bnaayow=
4341
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
4442
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
4543
github.com/rogpeppe/go-internal v1.13.1 h1:KvO1DLK/DRN07sQ1LQKScxyZJuNnedQ5/wKSR38lUII=
@@ -60,8 +58,8 @@ github.com/xdg-go/stringprep v1.0.4/go.mod h1:mPGuuIYwz7CmR2bT9j4GbQqutWS1zV24gi
6058
github.com/youmark/pkcs8 v0.0.0-20240726163527-a2c0da244d78 h1:ilQV1hzziu+LLM3zUTJ0trRztfwgjqKnBWNtSRkbmwM=
6159
github.com/youmark/pkcs8 v0.0.0-20240726163527-a2c0da244d78/go.mod h1:aL8wCCfTfSfmXjznFBSZNN13rSJjlIOI1fUNAtF7rmI=
6260
github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
63-
go.mongodb.org/mongo-driver v1.17.6 h1:87JUG1wZfWsr6rIz3ZmpH90rL5tea7O3IHuSwHUpsss=
64-
go.mongodb.org/mongo-driver v1.17.6/go.mod h1:Hy04i7O2kC4RS06ZrhPRqj/u4DTYkFDAAccj+rVKqgQ=
61+
go.mongodb.org/mongo-driver/v2 v2.4.0 h1:Oq6BmUAAFTzMeh6AonuDlgZMuAuEiUxoAD1koK5MuFo=
62+
go.mongodb.org/mongo-driver/v2 v2.4.0/go.mod h1:jHeEDJHJq7tm6ZF45Issun9dbogjfnPySb1vXA7EeAI=
6563
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
6664
golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
6765
golang.org/x/crypto v0.42.0 h1:chiH31gIWm57EkTXpwnqf8qeuMUi0yekh6mT2AvFlqI=

mongo/mongo_query_builder.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import (
77

88
"github.com/elasticpath/epcc-search-ast-helper"
99
)
10-
import "go.mongodb.org/mongo-driver/bson"
10+
import "go.mongodb.org/mongo-driver/v2/bson"
1111

1212
type DefaultMongoQueryBuilder struct {
1313
FieldTypes map[string]epsearchast.FieldType

mongo/mongo_query_builder_int_test.go

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,16 @@ package astmongo
33
import (
44
"context"
55
"fmt"
6+
67
"log"
78
"os"
89
"testing"
910
"time"
1011

1112
"github.com/elasticpath/epcc-search-ast-helper"
12-
"go.mongodb.org/mongo-driver/bson"
13-
"go.mongodb.org/mongo-driver/mongo"
14-
"go.mongodb.org/mongo-driver/mongo/options"
13+
"go.mongodb.org/mongo-driver/v2/bson"
14+
"go.mongodb.org/mongo-driver/v2/mongo"
15+
"go.mongodb.org/mongo-driver/v2/mongo/options"
1516
)
1617

1718
var client *mongo.Client
@@ -21,7 +22,7 @@ func TestMain(m *testing.M) {
2122
defer cancel()
2223

2324
var err error
24-
client, err = mongo.Connect(ctx, options.Client().ApplyURI("mongodb://admin:admin@localhost:20002"))
25+
client, err = mongo.Connect(options.Client().ApplyURI("mongodb://admin:admin@localhost:20002"))
2526
if err != nil {
2627
log.Fatalf("Failed to connect to MongoDB: %v", err)
2728
}

mongo/mongo_query_builder_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import (
55
"fmt"
66
"github.com/elasticpath/epcc-search-ast-helper"
77
"github.com/stretchr/testify/require"
8-
"go.mongodb.org/mongo-driver/bson"
8+
"go.mongodb.org/mongo-driver/v2/bson"
99
"strings"
1010
"testing"
1111
)

0 commit comments

Comments
 (0)