diff --git a/go.mod b/go.mod index 3c9f9cfcb634..d75716c32122 100644 --- a/go.mod +++ b/go.mod @@ -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 @@ -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 @@ -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 diff --git a/pkg/apiclient/artifact/artifact.pb.gw.go b/pkg/apiclient/artifact/artifact.pb.gw.go index fe85f7877bd5..ec52d783c2f7 100644 --- a/pkg/apiclient/artifact/artifact.pb.gw.go +++ b/pkg/apiclient/artifact/artifact.pb.gw.go @@ -15,8 +15,8 @@ import ( "github.com/golang/protobuf/descriptor" "github.com/golang/protobuf/proto" - "github.com/grpc-ecosystem/grpc-gateway/runtime" - "github.com/grpc-ecosystem/grpc-gateway/utilities" + "github.com/grpc-ecosystem/grpc-gateway/v2/runtime" + "github.com/grpc-ecosystem/grpc-gateway/v2/utilities" "google.golang.org/grpc" "google.golang.org/grpc/codes" "google.golang.org/grpc/grpclog" diff --git a/pkg/apiclient/clusterworkflowtemplate/cluster-workflow-template.pb.gw.go b/pkg/apiclient/clusterworkflowtemplate/cluster-workflow-template.pb.gw.go index a05e32239e85..46f1bbfd5289 100644 --- a/pkg/apiclient/clusterworkflowtemplate/cluster-workflow-template.pb.gw.go +++ b/pkg/apiclient/clusterworkflowtemplate/cluster-workflow-template.pb.gw.go @@ -15,8 +15,8 @@ import ( "github.com/golang/protobuf/descriptor" "github.com/golang/protobuf/proto" - "github.com/grpc-ecosystem/grpc-gateway/runtime" - "github.com/grpc-ecosystem/grpc-gateway/utilities" + "github.com/grpc-ecosystem/grpc-gateway/v2/runtime" + "github.com/grpc-ecosystem/grpc-gateway/v2/utilities" "google.golang.org/grpc" "google.golang.org/grpc/codes" "google.golang.org/grpc/grpclog" diff --git a/pkg/apiclient/cronworkflow/cron-workflow.pb.gw.go b/pkg/apiclient/cronworkflow/cron-workflow.pb.gw.go index 5725c63f2137..8d5f140ced9a 100644 --- a/pkg/apiclient/cronworkflow/cron-workflow.pb.gw.go +++ b/pkg/apiclient/cronworkflow/cron-workflow.pb.gw.go @@ -15,8 +15,8 @@ import ( "github.com/golang/protobuf/descriptor" "github.com/golang/protobuf/proto" - "github.com/grpc-ecosystem/grpc-gateway/runtime" - "github.com/grpc-ecosystem/grpc-gateway/utilities" + "github.com/grpc-ecosystem/grpc-gateway/v2/runtime" + "github.com/grpc-ecosystem/grpc-gateway/v2/utilities" "google.golang.org/grpc" "google.golang.org/grpc/codes" "google.golang.org/grpc/grpclog" diff --git a/pkg/apiclient/event/event.pb.gw.go b/pkg/apiclient/event/event.pb.gw.go index 4e9a322f379e..a584d8fafab7 100644 --- a/pkg/apiclient/event/event.pb.gw.go +++ b/pkg/apiclient/event/event.pb.gw.go @@ -15,8 +15,8 @@ import ( "github.com/golang/protobuf/descriptor" "github.com/golang/protobuf/proto" - "github.com/grpc-ecosystem/grpc-gateway/runtime" - "github.com/grpc-ecosystem/grpc-gateway/utilities" + "github.com/grpc-ecosystem/grpc-gateway/v2/runtime" + "github.com/grpc-ecosystem/grpc-gateway/v2/utilities" "google.golang.org/grpc" "google.golang.org/grpc/codes" "google.golang.org/grpc/grpclog" diff --git a/pkg/apiclient/eventsource/eventsource.pb.gw.go b/pkg/apiclient/eventsource/eventsource.pb.gw.go index eedec46cbf26..4cc758a42c0f 100644 --- a/pkg/apiclient/eventsource/eventsource.pb.gw.go +++ b/pkg/apiclient/eventsource/eventsource.pb.gw.go @@ -15,8 +15,8 @@ import ( "github.com/golang/protobuf/descriptor" "github.com/golang/protobuf/proto" - "github.com/grpc-ecosystem/grpc-gateway/runtime" - "github.com/grpc-ecosystem/grpc-gateway/utilities" + "github.com/grpc-ecosystem/grpc-gateway/v2/runtime" + "github.com/grpc-ecosystem/grpc-gateway/v2/utilities" "google.golang.org/grpc" "google.golang.org/grpc/codes" "google.golang.org/grpc/grpclog" diff --git a/pkg/apiclient/info/info.pb.gw.go b/pkg/apiclient/info/info.pb.gw.go index 245ce70c58b9..940fc62674ec 100644 --- a/pkg/apiclient/info/info.pb.gw.go +++ b/pkg/apiclient/info/info.pb.gw.go @@ -15,8 +15,8 @@ import ( "github.com/golang/protobuf/descriptor" "github.com/golang/protobuf/proto" - "github.com/grpc-ecosystem/grpc-gateway/runtime" - "github.com/grpc-ecosystem/grpc-gateway/utilities" + "github.com/grpc-ecosystem/grpc-gateway/v2/runtime" + "github.com/grpc-ecosystem/grpc-gateway/v2/utilities" "google.golang.org/grpc" "google.golang.org/grpc/codes" "google.golang.org/grpc/grpclog" diff --git a/pkg/apiclient/sensor/sensor.pb.gw.go b/pkg/apiclient/sensor/sensor.pb.gw.go index a2b2ab4ab1f9..b63c361c3075 100644 --- a/pkg/apiclient/sensor/sensor.pb.gw.go +++ b/pkg/apiclient/sensor/sensor.pb.gw.go @@ -15,8 +15,8 @@ import ( "github.com/golang/protobuf/descriptor" "github.com/golang/protobuf/proto" - "github.com/grpc-ecosystem/grpc-gateway/runtime" - "github.com/grpc-ecosystem/grpc-gateway/utilities" + "github.com/grpc-ecosystem/grpc-gateway/v2/runtime" + "github.com/grpc-ecosystem/grpc-gateway/v2/utilities" "google.golang.org/grpc" "google.golang.org/grpc/codes" "google.golang.org/grpc/grpclog" diff --git a/pkg/apiclient/sync/sync.pb.gw.go b/pkg/apiclient/sync/sync.pb.gw.go index f5efce5e87fd..776f0b5c5945 100644 --- a/pkg/apiclient/sync/sync.pb.gw.go +++ b/pkg/apiclient/sync/sync.pb.gw.go @@ -15,8 +15,8 @@ import ( "github.com/golang/protobuf/descriptor" "github.com/golang/protobuf/proto" - "github.com/grpc-ecosystem/grpc-gateway/runtime" - "github.com/grpc-ecosystem/grpc-gateway/utilities" + "github.com/grpc-ecosystem/grpc-gateway/v2/runtime" + "github.com/grpc-ecosystem/grpc-gateway/v2/utilities" "google.golang.org/grpc" "google.golang.org/grpc/codes" "google.golang.org/grpc/grpclog" diff --git a/pkg/apiclient/workflow/workflow.pb.gw.go b/pkg/apiclient/workflow/workflow.pb.gw.go index 5f53f0a359ee..e0dd553c5c41 100644 --- a/pkg/apiclient/workflow/workflow.pb.gw.go +++ b/pkg/apiclient/workflow/workflow.pb.gw.go @@ -15,8 +15,8 @@ import ( "github.com/golang/protobuf/descriptor" "github.com/golang/protobuf/proto" - "github.com/grpc-ecosystem/grpc-gateway/runtime" - "github.com/grpc-ecosystem/grpc-gateway/utilities" + "github.com/grpc-ecosystem/grpc-gateway/v2/runtime" + "github.com/grpc-ecosystem/grpc-gateway/v2/utilities" "google.golang.org/grpc" "google.golang.org/grpc/codes" "google.golang.org/grpc/grpclog" diff --git a/pkg/apiclient/workflowarchive/workflow-archive.pb.gw.go b/pkg/apiclient/workflowarchive/workflow-archive.pb.gw.go index b64e0c6af943..307f6c169e0a 100644 --- a/pkg/apiclient/workflowarchive/workflow-archive.pb.gw.go +++ b/pkg/apiclient/workflowarchive/workflow-archive.pb.gw.go @@ -15,8 +15,8 @@ import ( "github.com/golang/protobuf/descriptor" "github.com/golang/protobuf/proto" - "github.com/grpc-ecosystem/grpc-gateway/runtime" - "github.com/grpc-ecosystem/grpc-gateway/utilities" + "github.com/grpc-ecosystem/grpc-gateway/v2/runtime" + "github.com/grpc-ecosystem/grpc-gateway/v2/utilities" "google.golang.org/grpc" "google.golang.org/grpc/codes" "google.golang.org/grpc/grpclog" diff --git a/pkg/apiclient/workflowtemplate/workflow-template.pb.gw.go b/pkg/apiclient/workflowtemplate/workflow-template.pb.gw.go index 703520f36026..7f3cb9713ad0 100644 --- a/pkg/apiclient/workflowtemplate/workflow-template.pb.gw.go +++ b/pkg/apiclient/workflowtemplate/workflow-template.pb.gw.go @@ -15,8 +15,8 @@ import ( "github.com/golang/protobuf/descriptor" "github.com/golang/protobuf/proto" - "github.com/grpc-ecosystem/grpc-gateway/runtime" - "github.com/grpc-ecosystem/grpc-gateway/utilities" + "github.com/grpc-ecosystem/grpc-gateway/v2/runtime" + "github.com/grpc-ecosystem/grpc-gateway/v2/utilities" "google.golang.org/grpc" "google.golang.org/grpc/codes" "google.golang.org/grpc/grpclog" diff --git a/server/apiserver/argoserver.go b/server/apiserver/argoserver.go index 3496acff5aed..02d54d6acad5 100644 --- a/server/apiserver/argoserver.go +++ b/server/apiserver/argoserver.go @@ -16,7 +16,7 @@ import ( "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" diff --git a/util/json/json.go b/util/json/json.go index e43edb979f1d..b58cca66173b 100644 --- a/util/json/json.go +++ b/util/json/json.go @@ -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