Skip to content

chore(deps): update module github.com/grpc-ecosystem/grpc-gateway to v2 (main) #16214

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
renovate wants to merge 1 commit into from
Closed

chore(deps): update module github.com/grpc-ecosystem/grpc-gateway to v2 (main) #16214

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ require (
github.com/gorilla/handlers v1.5.2
github.com/grpc-ecosystem/go-grpc-middleware v1.4.0
github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0
github.com/grpc-ecosystem/grpc-gateway v1.16.0
github.com/grpc-ecosystem/grpc-gateway/v2 v2.29.0
github.com/itchyny/gojq v0.12.19
github.com/jcmturner/gokrb5/v8 v8.4.4
github.com/klauspost/pgzip v1.2.6
Expand Down Expand Up @@ -118,6 +118,7 @@ require (
github.com/gaganhr94/docker-credential-acr v1.0.2 // indirect
github.com/go-openapi/swag/jsonname v0.26.0 // indirect
github.com/google/cel-go v0.26.0 // indirect
github.com/grpc-ecosystem/grpc-gateway v1.16.0 // indirect
github.com/klauspost/crc32 v1.3.0 // indirect
github.com/moby/moby/client v0.4.1 // indirect
github.com/olekukonko/cat v0.0.0-20250911104152-50322a0618f6 // indirect
Expand Down Expand Up @@ -172,7 +173,6 @@ require (
github.com/google/gnostic-models v0.7.0 // indirect
github.com/google/s2a-go v0.1.9 // indirect
github.com/gorilla/websocket v1.5.4-0.20250319132907-e064f32e3674 // indirect
github.com/grpc-ecosystem/grpc-gateway/v2 v2.29.0 // indirect
github.com/jackc/pgio v1.0.0 // indirect
github.com/jackc/pgpassfile v1.0.0 // indirect
github.com/jackc/pgservicefile v0.0.0-20240606120523-5a60cdf6a761 // indirect
Expand Down
4 changes: 2 additions & 2 deletions pkg/apiclient/artifact/artifact.pb.gw.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions pkg/apiclient/clusterworkflowtemplate/cluster-workflow-template.pb.gw.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions pkg/apiclient/cronworkflow/cron-workflow.pb.gw.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions pkg/apiclient/event/event.pb.gw.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions pkg/apiclient/eventsource/eventsource.pb.gw.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions pkg/apiclient/info/info.pb.gw.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions pkg/apiclient/sensor/sensor.pb.gw.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions pkg/apiclient/sync/sync.pb.gw.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions pkg/apiclient/workflow/workflow.pb.gw.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions pkg/apiclient/workflowarchive/workflow-archive.pb.gw.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions pkg/apiclient/workflowtemplate/workflow-template.pb.gw.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion server/apiserver/argoserver.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
"github.com/gorilla/handlers"
grpc_middleware "github.com/grpc-ecosystem/go-grpc-middleware"
grpc_prometheus "github.com/grpc-ecosystem/go-grpc-prometheus"
"github.com/grpc-ecosystem/grpc-gateway/runtime"
"github.com/grpc-ecosystem/grpc-gateway/v2/runtime"
"github.com/prometheus/client_golang/prometheus/promhttp"
"github.com/sethvargo/go-limiter"
"github.com/sethvargo/go-limiter/httplimit"
Expand Down Expand Up @@ -427,18 +427,18 @@
// golang/protobuf. Which does not support types such as time.Time. gogo/protobuf does support
// time.Time, but does not support custom UnmarshalJSON() and MarshalJSON() methods. Therefore
// we use our own Marshaler
gwMuxOpts := runtime.WithMarshalerOption(runtime.MIMEWildcard, new(json.Marshaler))

Check failure on line 430 in server/apiserver/argoserver.go

View workflow job for this annotation

GitHub Actions / Codegen 

cannot use new(json.Marshaler) (value of type *"github.com/argoproj/argo-workflows/v4/util/json".Marshaler) as "github.com/grpc-ecosystem/grpc-gateway/v2/runtime".Marshaler value in argument to runtime.WithMarshalerOption: *"github.com/argoproj/argo-workflows/v4/util/json".Marshaler does not implement "github.com/grpc-ecosystem/grpc-gateway/v2/runtime".Marshaler (wrong type for method ContentType)
gwmux := runtime.NewServeMux(gwMuxOpts,
runtime.WithIncomingHeaderMatcher(grpcutil.IncomingHeaderMatcher),
runtime.WithProtoErrorHandler(runtime.DefaultHTTPProtoErrorHandler),

Check failure on line 433 in server/apiserver/argoserver.go

View workflow job for this annotation

GitHub Actions / Codegen 

undefined: runtime.DefaultHTTPProtoErrorHandler

Check failure on line 433 in server/apiserver/argoserver.go

View workflow job for this annotation

GitHub Actions / Codegen 

undefined: runtime.WithProtoErrorHandler
)
mustRegisterGWHandler(ctx, infopkg.RegisterInfoServiceHandlerFromEndpoint, gwmux, endpoint, dialOpts)

Check failure on line 435 in server/apiserver/argoserver.go

View workflow job for this annotation

GitHub Actions / Codegen 

cannot use infopkg.RegisterInfoServiceHandlerFromEndpoint (value of type func(ctx "context".Context, mux *"github.com/grpc-ecosystem/grpc-gateway/runtime".ServeMux, endpoint string, opts []"google.golang.org/grpc".DialOption) (err error)) as registerFunc value in argument to mustRegisterGWHandler
mustRegisterGWHandler(ctx, eventpkg.RegisterEventServiceHandlerFromEndpoint, gwmux, endpoint, dialOpts)

Check failure on line 436 in server/apiserver/argoserver.go

View workflow job for this annotation

GitHub Actions / Codegen 

cannot use eventpkg.RegisterEventServiceHandlerFromEndpoint (value of type func(ctx "context".Context, mux *"github.com/grpc-ecosystem/grpc-gateway/runtime".ServeMux, endpoint string, opts []"google.golang.org/grpc".DialOption) (err error)) as registerFunc value in argument to mustRegisterGWHandler
mustRegisterGWHandler(ctx, eventsourcepkg.RegisterEventSourceServiceHandlerFromEndpoint, gwmux, endpoint, dialOpts)

Check failure on line 437 in server/apiserver/argoserver.go

View workflow job for this annotation

GitHub Actions / Codegen 

cannot use eventsourcepkg.RegisterEventSourceServiceHandlerFromEndpoint (value of type func(ctx "context".Context, mux *"github.com/grpc-ecosystem/grpc-gateway/runtime".ServeMux, endpoint string, opts []"google.golang.org/grpc".DialOption) (err error)) as registerFunc value in argument to mustRegisterGWHandler
mustRegisterGWHandler(ctx, sensorpkg.RegisterSensorServiceHandlerFromEndpoint, gwmux, endpoint, dialOpts)

Check failure on line 438 in server/apiserver/argoserver.go

View workflow job for this annotation

GitHub Actions / Codegen 

cannot use sensorpkg.RegisterSensorServiceHandlerFromEndpoint (value of type func(ctx "context".Context, mux *"github.com/grpc-ecosystem/grpc-gateway/runtime".ServeMux, endpoint string, opts []"google.golang.org/grpc".DialOption) (err error)) as registerFunc value in argument to mustRegisterGWHandler
mustRegisterGWHandler(ctx, workflowpkg.RegisterWorkflowServiceHandlerFromEndpoint, gwmux, endpoint, dialOpts)

Check failure on line 439 in server/apiserver/argoserver.go

View workflow job for this annotation

GitHub Actions / Codegen 

cannot use workflowpkg.RegisterWorkflowServiceHandlerFromEndpoint (value of type func(ctx "context".Context, mux *"github.com/grpc-ecosystem/grpc-gateway/runtime".ServeMux, endpoint string, opts []"google.golang.org/grpc".DialOption) (err error)) as registerFunc value in argument to mustRegisterGWHandler
mustRegisterGWHandler(ctx, workflowtemplatepkg.RegisterWorkflowTemplateServiceHandlerFromEndpoint, gwmux, endpoint, dialOpts)

Check failure on line 440 in server/apiserver/argoserver.go

View workflow job for this annotation

GitHub Actions / Codegen 

cannot use workflowtemplatepkg.RegisterWorkflowTemplateServiceHandlerFromEndpoint (value of type func(ctx "context".Context, mux *"github.com/grpc-ecosystem/grpc-gateway/runtime".ServeMux, endpoint string, opts []"google.golang.org/grpc".DialOption) (err error)) as registerFunc value in argument to mustRegisterGWHandler
mustRegisterGWHandler(ctx, cronworkflowpkg.RegisterCronWorkflowServiceHandlerFromEndpoint, gwmux, endpoint, dialOpts)

Check failure on line 441 in server/apiserver/argoserver.go

View workflow job for this annotation

GitHub Actions / Codegen 

cannot use cronworkflowpkg.RegisterCronWorkflowServiceHandlerFromEndpoint (value of type func(ctx "context".Context, mux *"github.com/grpc-ecosystem/grpc-gateway/runtime".ServeMux, endpoint string, opts []"google.golang.org/grpc".DialOption) (err error)) as registerFunc value in argument to mustRegisterGWHandler
mustRegisterGWHandler(ctx, workflowarchivepkg.RegisterArchivedWorkflowServiceHandlerFromEndpoint, gwmux, endpoint, dialOpts)
mustRegisterGWHandler(ctx, clusterwftemplatepkg.RegisterClusterWorkflowTemplateServiceHandlerFromEndpoint, gwmux, endpoint, dialOpts)
mustRegisterGWHandler(ctx, syncpkg.RegisterSyncServiceHandlerFromEndpoint, gwmux, endpoint, dialOpts)
Expand Down
2 changes: 1 addition & 1 deletion util/json/json.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"encoding/json"
"io"

gwruntime "github.com/grpc-ecosystem/grpc-gateway/runtime"
gwruntime "github.com/grpc-ecosystem/grpc-gateway/v2/runtime"
)

// Marshaler is a type which satisfies the grpc-gateway Marshaler interface
Expand Down
Loading