Skip to content

Commit

Permalink
chore: update go dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
renovate[bot] authored Dec 18, 2024
1 parent 07186df commit 8381bab
Show file tree
Hide file tree
Showing 40 changed files with 250 additions and 240 deletions.
6 changes: 3 additions & 3 deletions server/cmd/db-migrations/ref_field_schema.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ import (
"fmt"

"github.com/samber/lo"
"go.mongodb.org/mongo-driver/bson"
"go.mongodb.org/mongo-driver/mongo"
"go.mongodb.org/mongo-driver/mongo/options"
"go.mongodb.org/mongo-driver/v2/bson"
"go.mongodb.org/mongo-driver/v2/mongo"
"go.mongodb.org/mongo-driver/v2/mongo/options"
)

type Schema struct {
Expand Down
4 changes: 2 additions & 2 deletions server/cmd/db-migrations/ref_field_schema_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ import (
"github.com/reearth/reearthx/log"
"github.com/reearth/reearthx/mongox/mongotest"
"github.com/stretchr/testify/assert"
"go.mongodb.org/mongo-driver/bson"
"go.mongodb.org/mongo-driver/bson/primitive"
"go.mongodb.org/mongo-driver/v2/bson"
"go.mongodb.org/mongo-driver/v2/bson/primitive"
)

func TestRefFieldSchema(t *testing.T) {
Expand Down
36 changes: 18 additions & 18 deletions server/go.mod
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
module github.com/reearth/reearth-cms/server

go 1.23.2
go 1.23.4

require (
cloud.google.com/go/pubsub v1.45.1
cloud.google.com/go/storage v1.46.0
github.com/99designs/gqlgen v0.17.55
cloud.google.com/go/pubsub v1.45.3
cloud.google.com/go/storage v1.48.0
github.com/99designs/gqlgen v0.17.60
github.com/avast/retry-go/v4 v4.6.0
github.com/aws/aws-sdk-go-v2 v1.32.3
github.com/aws/aws-sdk-go-v2/config v1.28.1
github.com/aws/aws-sdk-go-v2/service/s3 v1.66.2
github.com/aws/aws-sdk-go-v2/service/sns v1.33.3
github.com/aws/aws-sdk-go-v2 v1.32.6
github.com/aws/aws-sdk-go-v2/config v1.28.6
github.com/aws/aws-sdk-go-v2/service/s3 v1.71.0
github.com/aws/aws-sdk-go-v2/service/sns v1.33.7
github.com/chrispappas/golang-generics-set v1.0.1
github.com/gavv/httpexpect/v2 v2.16.0
github.com/getkin/kin-openapi v0.128.0
Expand All @@ -20,9 +20,9 @@ require (
github.com/hallazzang/echo-compose v1.0.1
github.com/jarcoal/httpmock v1.3.1
github.com/joho/godotenv v1.5.1
github.com/k0kubun/pp/v3 v3.3.0
github.com/k0kubun/pp/v3 v3.4.1
github.com/kelseyhightower/envconfig v1.4.0
github.com/labstack/echo/v4 v4.12.0
github.com/labstack/echo/v4 v4.13.2
github.com/oapi-codegen/oapi-codegen/v2 v2.4.1
github.com/oapi-codegen/runtime v1.1.1
github.com/paulmach/go.geojson v1.5.0
Expand All @@ -33,17 +33,17 @@ require (
github.com/sendgrid/sendgrid-go v3.16.0+incompatible
github.com/spf13/afero v1.11.0
github.com/square/mongo-lock v0.0.0-20230808145049-cfcf499f6bf0
github.com/stretchr/testify v1.9.0
github.com/vektah/gqlparser/v2 v2.5.18
github.com/stretchr/testify v1.10.0
github.com/vektah/gqlparser/v2 v2.5.20
github.com/vikstrous/dataloadgen v0.0.6
go.mongodb.org/mongo-driver v1.17.1
go.mongodb.org/mongo-driver/v2 v2.0.0
go.opencensus.io v0.24.0
go.opentelemetry.io/contrib/instrumentation/github.com/labstack/echo/otelecho v0.56.0
go.opentelemetry.io/contrib/instrumentation/go.mongodb.org/mongo-driver/mongo/otelmongo v0.56.0
go.opentelemetry.io/contrib/instrumentation/github.com/labstack/echo/otelecho v0.58.0
go.opentelemetry.io/contrib/instrumentation/go.mongodb.org/mongo-driver/mongo/otelmongo v0.58.0
golang.org/x/exp v0.0.0-20241009180824-f66d83c29e7c
golang.org/x/net v0.30.0
golang.org/x/text v0.19.0
google.golang.org/api v0.204.0
golang.org/x/net v0.32.0
golang.org/x/text v0.21.0
google.golang.org/api v0.213.0
)

require (
Expand Down
2 changes: 1 addition & 1 deletion server/internal/adapter/publicapi/item_export.go
Original file line number Diff line number Diff line change
Expand Up @@ -152,4 +152,4 @@ func generateCSV(pw *io.PipeWriter, l item.VersionedList, s *schema.Schema) erro
}

return w.Error()
}
}
6 changes: 3 additions & 3 deletions server/internal/app/repo.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@ import (
"github.com/reearth/reearthx/log"
"github.com/reearth/reearthx/mongox"
"github.com/spf13/afero"
"go.mongodb.org/mongo-driver/event"
"go.mongodb.org/mongo-driver/mongo"
"go.mongodb.org/mongo-driver/mongo/options"
"go.mongodb.org/mongo-driver/v2/event"
"go.mongodb.org/mongo-driver/v2/mongo"
"go.mongodb.org/mongo-driver/v2/mongo/options"
"go.opentelemetry.io/contrib/instrumentation/go.mongodb.org/mongo-driver/mongo/otelmongo"
)

Expand Down
6 changes: 3 additions & 3 deletions server/internal/infrastructure/mongo/asset.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@ import (
"github.com/reearth/reearthx/mongox"
"github.com/reearth/reearthx/rerror"
"github.com/reearth/reearthx/usecasex"
"go.mongodb.org/mongo-driver/bson"
"go.mongodb.org/mongo-driver/bson/primitive"
"go.mongodb.org/mongo-driver/mongo/options"
"go.mongodb.org/mongo-driver/v2/bson"
"go.mongodb.org/mongo-driver/v2/bson/primitive"
"go.mongodb.org/mongo-driver/v2/mongo/options"
)

var (
Expand Down
6 changes: 3 additions & 3 deletions server/internal/infrastructure/mongo/asset_file.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ import (
"github.com/reearth/reearth-cms/server/pkg/id"
"github.com/reearth/reearthx/mongox"
"github.com/reearth/reearthx/rerror"
"go.mongodb.org/mongo-driver/bson"
"go.mongodb.org/mongo-driver/mongo"
"go.mongodb.org/mongo-driver/mongo/options"
"go.mongodb.org/mongo-driver/v2/bson"
"go.mongodb.org/mongo-driver/v2/mongo"
"go.mongodb.org/mongo-driver/v2/mongo/options"
)

type AssetFile struct {
Expand Down
2 changes: 1 addition & 1 deletion server/internal/infrastructure/mongo/asset_file_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import (
"github.com/reearth/reearthx/mongox/mongotest"
"github.com/reearth/reearthx/rerror"
"github.com/stretchr/testify/assert"
"go.mongodb.org/mongo-driver/bson"
"go.mongodb.org/mongo-driver/v2/bson"
)

func TestAssetFileRepo_FindByID(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion server/internal/infrastructure/mongo/asset_upload.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
"github.com/reearth/reearth-cms/server/internal/usecase/repo"
"github.com/reearth/reearth-cms/server/pkg/asset"
"github.com/reearth/reearthx/mongox"
"go.mongodb.org/mongo-driver/bson"
"go.mongodb.org/mongo-driver/v2/bson"
)

type AssetUpload struct {
Expand Down
4 changes: 2 additions & 2 deletions server/internal/infrastructure/mongo/container.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ import (
"github.com/reearth/reearthx/log"
"github.com/reearth/reearthx/mongox"
"github.com/reearth/reearthx/util"
"go.mongodb.org/mongo-driver/bson"
"go.mongodb.org/mongo-driver/mongo"
"go.mongodb.org/mongo-driver/v2/bson"
"go.mongodb.org/mongo-driver/v2/mongo"
)

func New(ctx context.Context, mc *mongo.Client, databaseName string, useTransaction bool, acRepo *accountrepo.Container) (*repo.Container, error) {
Expand Down
2 changes: 1 addition & 1 deletion server/internal/infrastructure/mongo/event.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (
"github.com/reearth/reearth-cms/server/pkg/id"
"github.com/reearth/reearthx/mongox"
"github.com/samber/lo"
"go.mongodb.org/mongo-driver/bson"
"go.mongodb.org/mongo-driver/v2/bson"
)

var (
Expand Down
2 changes: 1 addition & 1 deletion server/internal/infrastructure/mongo/group.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (
"github.com/reearth/reearth-cms/server/pkg/id"
"github.com/reearth/reearthx/mongox"
"github.com/reearth/reearthx/rerror"
"go.mongodb.org/mongo-driver/bson"
"go.mongodb.org/mongo-driver/v2/bson"
)

var (
Expand Down
2 changes: 1 addition & 1 deletion server/internal/infrastructure/mongo/integration.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import (
"github.com/reearth/reearthx/mongox"
"github.com/reearth/reearthx/util"
"github.com/samber/lo"
"go.mongodb.org/mongo-driver/bson"
"go.mongodb.org/mongo-driver/v2/bson"
)

var (
Expand Down
2 changes: 1 addition & 1 deletion server/internal/infrastructure/mongo/item.go
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import (
"github.com/reearth/reearthx/rerror"
"github.com/reearth/reearthx/usecasex"
"github.com/samber/lo"
"go.mongodb.org/mongo-driver/bson"
"go.mongodb.org/mongo-driver/v2/bson"
)

var (
Expand Down
4 changes: 2 additions & 2 deletions server/internal/infrastructure/mongo/item_search.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ import (
"github.com/reearth/reearthx/usecasex"
"github.com/reearth/reearthx/util"
"github.com/samber/lo"
"go.mongodb.org/mongo-driver/bson"
"go.mongodb.org/mongo-driver/bson/primitive"
"go.mongodb.org/mongo-driver/v2/bson"
"go.mongodb.org/mongo-driver/v2/bson/primitive"
"go.opencensus.io/trace"
)

Expand Down
4 changes: 2 additions & 2 deletions server/internal/infrastructure/mongo/item_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ import (
"github.com/reearth/reearthx/util"
"github.com/samber/lo"
"github.com/stretchr/testify/assert"
"go.mongodb.org/mongo-driver/bson"
"go.mongodb.org/mongo-driver/bson/primitive"
"go.mongodb.org/mongo-driver/v2/bson"
"go.mongodb.org/mongo-driver/v2/bson/primitive"
)

func TestItem_FindByID(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion server/internal/infrastructure/mongo/lock.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
"github.com/avast/retry-go/v4"
"github.com/google/uuid"
lock "github.com/square/mongo-lock"
"go.mongodb.org/mongo-driver/mongo"
"go.mongodb.org/mongo-driver/v2/mongo"

"github.com/reearth/reearth-cms/server/internal/usecase/repo"
"github.com/reearth/reearthx/log"
Expand Down
4 changes: 2 additions & 2 deletions server/internal/infrastructure/mongo/model.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ import (
"github.com/reearth/reearthx/mongox"
"github.com/reearth/reearthx/rerror"
"github.com/reearth/reearthx/usecasex"
"go.mongodb.org/mongo-driver/bson"
"go.mongodb.org/mongo-driver/bson/primitive"
"go.mongodb.org/mongo-driver/v2/bson"
"go.mongodb.org/mongo-driver/v2/bson/primitive"
)

var (
Expand Down
2 changes: 1 addition & 1 deletion server/internal/infrastructure/mongo/mongodoc/asset.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
"github.com/reearth/reearthx/account/accountdomain"
"github.com/reearth/reearthx/mongox"
"github.com/samber/lo"
"go.mongodb.org/mongo-driver/bson"
"go.mongodb.org/mongo-driver/v2/bson"
)

type AssetDocument struct {
Expand Down
2 changes: 1 addition & 1 deletion server/internal/infrastructure/mongo/mongodoc/document.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import (
"github.com/reearth/reearth-cms/server/pkg/version"
"github.com/reearth/reearthx/i18n"
"github.com/reearth/reearthx/rerror"
"go.mongodb.org/mongo-driver/bson"
"go.mongodb.org/mongo-driver/v2/bson"
)

type Type string
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import (
"github.com/reearth/reearthx/account/accountdomain/user"
"github.com/samber/lo"
"github.com/stretchr/testify/assert"
"go.mongodb.org/mongo-driver/bson"
"go.mongodb.org/mongo-driver/v2/bson"
)

func TestNewDocument(t *testing.T) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import (
"github.com/reearth/reearthx/account/accountdomain/user"
"github.com/samber/lo"
"github.com/stretchr/testify/assert"
"go.mongodb.org/mongo-driver/bson"
"go.mongodb.org/mongo-driver/v2/bson"
)

func TestEventDocument_Model(t *testing.T) {
Expand Down
6 changes: 3 additions & 3 deletions server/internal/infrastructure/mongo/mongogit/collection.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@ import (
"github.com/reearth/reearthx/usecasex"
"github.com/reearth/reearthx/util"
"github.com/samber/lo"
"go.mongodb.org/mongo-driver/bson"
"go.mongodb.org/mongo-driver/bson/primitive"
"go.mongodb.org/mongo-driver/mongo/options"
"go.mongodb.org/mongo-driver/v2/bson"
"go.mongodb.org/mongo-driver/v2/bson/primitive"
"go.mongodb.org/mongo-driver/v2/mongo/options"
)

type Collection struct {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@ import (
"github.com/reearth/reearthx/usecasex"
"github.com/samber/lo"
"github.com/stretchr/testify/assert"
"go.mongodb.org/mongo-driver/bson"
"go.mongodb.org/mongo-driver/bson/primitive"
"go.mongodb.org/mongo-driver/mongo"
"go.mongodb.org/mongo-driver/v2/bson"
"go.mongodb.org/mongo-driver/v2/bson/primitive"
"go.mongodb.org/mongo-driver/v2/mongo"
)

func init() {
Expand Down
4 changes: 2 additions & 2 deletions server/internal/infrastructure/mongo/mongogit/document.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ import (
"github.com/reearth/reearth-cms/server/pkg/version"
"github.com/reearth/reearthx/mongox"
"github.com/reearth/reearthx/util"
"go.mongodb.org/mongo-driver/bson"
"go.mongodb.org/mongo-driver/bson/primitive"
"go.mongodb.org/mongo-driver/v2/bson"
"go.mongodb.org/mongo-driver/v2/bson/primitive"
)

const (
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ import (
"github.com/reearth/reearth-cms/server/pkg/version"
"github.com/samber/lo"
"github.com/stretchr/testify/assert"
"go.mongodb.org/mongo-driver/bson"
"go.mongodb.org/mongo-driver/bson/primitive"
"go.mongodb.org/mongo-driver/v2/bson"
"go.mongodb.org/mongo-driver/v2/bson/primitive"
)

func TestDocument_MarshalBSON(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion server/internal/infrastructure/mongo/mongogit/query.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package mongogit
import (
"github.com/reearth/reearth-cms/server/pkg/version"
"github.com/reearth/reearthx/mongox"
"go.mongodb.org/mongo-driver/bson"
"go.mongodb.org/mongo-driver/v2/bson"
)

func apply(q version.Query, f any) (res any) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (

"github.com/reearth/reearth-cms/server/pkg/version"
"github.com/stretchr/testify/assert"
"go.mongodb.org/mongo-driver/bson"
"go.mongodb.org/mongo-driver/v2/bson"
)

func TestQuery_Apply(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion server/internal/infrastructure/mongo/project.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package mongo
import (
"context"

"go.mongodb.org/mongo-driver/bson"
"go.mongodb.org/mongo-driver/v2/bson"

"github.com/reearth/reearth-cms/server/internal/infrastructure/mongo/mongodoc"
"github.com/reearth/reearth-cms/server/internal/usecase/repo"
Expand Down
4 changes: 2 additions & 2 deletions server/internal/infrastructure/mongo/request.go
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ import (
"github.com/reearth/reearthx/rerror"
"github.com/reearth/reearthx/usecasex"
"github.com/samber/lo"
"go.mongodb.org/mongo-driver/bson"
"go.mongodb.org/mongo-driver/bson/primitive"
"go.mongodb.org/mongo-driver/v2/bson"
"go.mongodb.org/mongo-driver/v2/bson/primitive"
)

var (
Expand Down
2 changes: 1 addition & 1 deletion server/internal/infrastructure/mongo/schema.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import (
"github.com/reearth/reearthx/mongox"
"github.com/reearth/reearthx/util"
"github.com/samber/lo"
"go.mongodb.org/mongo-driver/bson"
"go.mongodb.org/mongo-driver/v2/bson"
)

var (
Expand Down
2 changes: 1 addition & 1 deletion server/internal/infrastructure/mongo/thread.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import (
"github.com/reearth/reearthx/mongox"
"github.com/reearth/reearthx/rerror"
"github.com/samber/lo"
"go.mongodb.org/mongo-driver/bson"
"go.mongodb.org/mongo-driver/v2/bson"
)

var (
Expand Down
2 changes: 1 addition & 1 deletion server/internal/infrastructure/mongo/view.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import (
"github.com/reearth/reearthx/mongox"
"github.com/reearth/reearthx/util"
"github.com/samber/lo"
"go.mongodb.org/mongo-driver/bson"
"go.mongodb.org/mongo-driver/v2/bson"
)

var (
Expand Down
Loading

0 comments on commit 8381bab

Please sign in to comment.