From 7f000362d685dbc818b1da33161cfea3f6fbf12d Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 14 Mar 2024 00:34:11 +0000 Subject: [PATCH 1/2] Update module google.golang.org/protobuf to v1.33.0 [SECURITY] --- go.mod | 2 +- go.sum | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/go.mod b/go.mod index ba14d70..b2b9b42 100644 --- a/go.mod +++ b/go.mod @@ -13,7 +13,7 @@ require ( go.mongodb.org/mongo-driver v1.13.0 golang.org/x/net v0.18.0 golang.org/x/sync v0.5.0 - google.golang.org/protobuf v1.31.0 + google.golang.org/protobuf v1.33.0 gopkg.in/yaml.v3 v3.0.1 k8s.io/api v0.28.4 k8s.io/apimachinery v0.28.4 diff --git a/go.sum b/go.sum index 58af700..afda8c2 100644 --- a/go.sum +++ b/go.sum @@ -180,6 +180,8 @@ google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp0 google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= google.golang.org/protobuf v1.31.0 h1:g0LDEJHgrBl9N9r17Ru3sqWhkIx2NB67okBHPwC7hs8= google.golang.org/protobuf v1.31.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= +google.golang.org/protobuf v1.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI= +google.golang.org/protobuf v1.33.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q= From 79da43416944215fe9854ba0884628453dc18a01 Mon Sep 17 00:00:00 2001 From: github-actions <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 14 Mar 2024 00:35:19 +0000 Subject: [PATCH 2/2] Commit from GitHub Actions (compile PB) --- .../state/v1/statev1connect/state.connect.go | 70 ++++++++++++++----- 1 file changed, 51 insertions(+), 19 deletions(-) diff --git a/backend/spec/state/v1/statev1connect/state.connect.go b/backend/spec/state/v1/statev1connect/state.connect.go index fba2f96..23ec261 100644 --- a/backend/spec/state/v1/statev1connect/state.connect.go +++ b/backend/spec/state/v1/statev1connect/state.connect.go @@ -18,7 +18,7 @@ import ( // generated with a version of connect newer than the one compiled into your binary. You can fix the // problem by either regenerating this code with an older version of connect or updating the connect // version compiled into your binary. -const _ = connect.IsAtLeastVersion0_1_0 +const _ = connect.IsAtLeastVersion1_13_0 const ( // StateManagerServiceName is the fully-qualified name of the StateManagerService service. @@ -62,6 +62,20 @@ const ( StateManagerServiceUpdateTrainProcedure = "/state.v1.StateManagerService/UpdateTrain" ) +// These variables are the protoreflect.Descriptor objects for the RPCs defined in this package. +var ( + stateManagerServiceServiceDescriptor = v1.File_state_v1_state_proto.Services().ByName("StateManagerService") + stateManagerServiceGetBlockStatesMethodDescriptor = stateManagerServiceServiceDescriptor.Methods().ByName("GetBlockStates") + stateManagerServiceUpdateBlockStateMethodDescriptor = stateManagerServiceServiceDescriptor.Methods().ByName("UpdateBlockState") + stateManagerServiceUpdatePointStateMethodDescriptor = stateManagerServiceServiceDescriptor.Methods().ByName("UpdatePointState") + stateManagerServiceGetPointStatesMethodDescriptor = stateManagerServiceServiceDescriptor.Methods().ByName("GetPointStates") + stateManagerServiceUpdateStopStateMethodDescriptor = stateManagerServiceServiceDescriptor.Methods().ByName("UpdateStopState") + stateManagerServiceGetStopStatesMethodDescriptor = stateManagerServiceServiceDescriptor.Methods().ByName("GetStopStates") + stateManagerServiceGetTrainsMethodDescriptor = stateManagerServiceServiceDescriptor.Methods().ByName("GetTrains") + stateManagerServiceAddTrainMethodDescriptor = stateManagerServiceServiceDescriptor.Methods().ByName("AddTrain") + stateManagerServiceUpdateTrainMethodDescriptor = stateManagerServiceServiceDescriptor.Methods().ByName("UpdateTrain") +) + // StateManagerServiceClient is a client for the state.v1.StateManagerService service. type StateManagerServiceClient interface { // Block @@ -92,47 +106,56 @@ func NewStateManagerServiceClient(httpClient connect.HTTPClient, baseURL string, getBlockStates: connect.NewClient[v1.GetBlockStatesRequest, v1.GetBlockStatesResponse]( httpClient, baseURL+StateManagerServiceGetBlockStatesProcedure, - opts..., + connect.WithSchema(stateManagerServiceGetBlockStatesMethodDescriptor), + connect.WithClientOptions(opts...), ), updateBlockState: connect.NewClient[v1.UpdateBlockStateRequest, v1.UpdateBlockStateResponse]( httpClient, baseURL+StateManagerServiceUpdateBlockStateProcedure, - opts..., + connect.WithSchema(stateManagerServiceUpdateBlockStateMethodDescriptor), + connect.WithClientOptions(opts...), ), updatePointState: connect.NewClient[v1.UpdatePointStateRequest, v1.UpdatePointStateResponse]( httpClient, baseURL+StateManagerServiceUpdatePointStateProcedure, - opts..., + connect.WithSchema(stateManagerServiceUpdatePointStateMethodDescriptor), + connect.WithClientOptions(opts...), ), getPointStates: connect.NewClient[v1.GetPointStatesRequest, v1.GetPointStatesResponse]( httpClient, baseURL+StateManagerServiceGetPointStatesProcedure, - opts..., + connect.WithSchema(stateManagerServiceGetPointStatesMethodDescriptor), + connect.WithClientOptions(opts...), ), updateStopState: connect.NewClient[v1.UpdateStopStateRequest, v1.UpdateStopStateResponse]( httpClient, baseURL+StateManagerServiceUpdateStopStateProcedure, - opts..., + connect.WithSchema(stateManagerServiceUpdateStopStateMethodDescriptor), + connect.WithClientOptions(opts...), ), getStopStates: connect.NewClient[v1.GetStopStatesRequest, v1.GetStopStatesResponse]( httpClient, baseURL+StateManagerServiceGetStopStatesProcedure, - opts..., + connect.WithSchema(stateManagerServiceGetStopStatesMethodDescriptor), + connect.WithClientOptions(opts...), ), getTrains: connect.NewClient[v1.GetTrainsRequest, v1.GetTrainsResponse]( httpClient, baseURL+StateManagerServiceGetTrainsProcedure, - opts..., + connect.WithSchema(stateManagerServiceGetTrainsMethodDescriptor), + connect.WithClientOptions(opts...), ), addTrain: connect.NewClient[v1.AddTrainRequest, v1.AddTrainResponse]( httpClient, baseURL+StateManagerServiceAddTrainProcedure, - opts..., + connect.WithSchema(stateManagerServiceAddTrainMethodDescriptor), + connect.WithClientOptions(opts...), ), updateTrain: connect.NewClient[v1.UpdateTrainRequest, v1.UpdateTrainResponse]( httpClient, baseURL+StateManagerServiceUpdateTrainProcedure, - opts..., + connect.WithSchema(stateManagerServiceUpdateTrainMethodDescriptor), + connect.WithClientOptions(opts...), ), } } @@ -221,47 +244,56 @@ func NewStateManagerServiceHandler(svc StateManagerServiceHandler, opts ...conne stateManagerServiceGetBlockStatesHandler := connect.NewUnaryHandler( StateManagerServiceGetBlockStatesProcedure, svc.GetBlockStates, - opts..., + connect.WithSchema(stateManagerServiceGetBlockStatesMethodDescriptor), + connect.WithHandlerOptions(opts...), ) stateManagerServiceUpdateBlockStateHandler := connect.NewUnaryHandler( StateManagerServiceUpdateBlockStateProcedure, svc.UpdateBlockState, - opts..., + connect.WithSchema(stateManagerServiceUpdateBlockStateMethodDescriptor), + connect.WithHandlerOptions(opts...), ) stateManagerServiceUpdatePointStateHandler := connect.NewUnaryHandler( StateManagerServiceUpdatePointStateProcedure, svc.UpdatePointState, - opts..., + connect.WithSchema(stateManagerServiceUpdatePointStateMethodDescriptor), + connect.WithHandlerOptions(opts...), ) stateManagerServiceGetPointStatesHandler := connect.NewUnaryHandler( StateManagerServiceGetPointStatesProcedure, svc.GetPointStates, - opts..., + connect.WithSchema(stateManagerServiceGetPointStatesMethodDescriptor), + connect.WithHandlerOptions(opts...), ) stateManagerServiceUpdateStopStateHandler := connect.NewUnaryHandler( StateManagerServiceUpdateStopStateProcedure, svc.UpdateStopState, - opts..., + connect.WithSchema(stateManagerServiceUpdateStopStateMethodDescriptor), + connect.WithHandlerOptions(opts...), ) stateManagerServiceGetStopStatesHandler := connect.NewUnaryHandler( StateManagerServiceGetStopStatesProcedure, svc.GetStopStates, - opts..., + connect.WithSchema(stateManagerServiceGetStopStatesMethodDescriptor), + connect.WithHandlerOptions(opts...), ) stateManagerServiceGetTrainsHandler := connect.NewUnaryHandler( StateManagerServiceGetTrainsProcedure, svc.GetTrains, - opts..., + connect.WithSchema(stateManagerServiceGetTrainsMethodDescriptor), + connect.WithHandlerOptions(opts...), ) stateManagerServiceAddTrainHandler := connect.NewUnaryHandler( StateManagerServiceAddTrainProcedure, svc.AddTrain, - opts..., + connect.WithSchema(stateManagerServiceAddTrainMethodDescriptor), + connect.WithHandlerOptions(opts...), ) stateManagerServiceUpdateTrainHandler := connect.NewUnaryHandler( StateManagerServiceUpdateTrainProcedure, svc.UpdateTrain, - opts..., + connect.WithSchema(stateManagerServiceUpdateTrainMethodDescriptor), + connect.WithHandlerOptions(opts...), ) return "/state.v1.StateManagerService/", http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { switch r.URL.Path {