PMM-12913 refactor empty proto messages

percona · Feb 15, 2024 · a4e9545 · a4e9545
1 parent 958acbc
commit a4e9545
Show file tree

Hide file tree

Showing 141 changed files with 7,949 additions and 16,763 deletions.
diff --git a/agent/agentlocal/agent_local.go b/agent/agentlocal/agent_local.go
@@ -33,6 +33,7 @@ import (
 	"sync"
 	"time"
 
+	"github.com/golang/protobuf/ptypes/empty"
 	grpc_gateway "github.com/grpc-ecosystem/grpc-gateway/v2/runtime"
 	"github.com/pkg/errors"
 	"github.com/prometheus/client_golang/prometheus"
@@ -184,7 +185,7 @@ func roundFloat(upTime float32, numAfterDot int) float32 {
 }
 
 // Reload reloads pmm-agent and its configuration.
-func (s *Server) Reload(ctx context.Context, req *agentlocal.ReloadRequest) (*agentlocal.ReloadResponse, error) {
+func (s *Server) Reload(_ context.Context, req *empty.Empty) (*empty.Empty, error) {
 	// sync errors with setup command
 
 	if _, err := s.cfg.Reload(s.l); err != nil {
@@ -196,7 +197,7 @@ func (s *Server) Reload(ctx context.Context, req *agentlocal.ReloadRequest) (*ag
 	})
 
 	// client may or may not receive this response due to server shutdown
-	return &agentlocal.ReloadResponse{}, nil
+	return &empty.Empty{}, nil
 }
 
 // runGRPCServer runs gRPC server until context is canceled, then gracefully stops it.

diff --git a/api/actions/v1/actions.pb.go b/api/actions/v1/actions.pb.go
diff --git a/api/actions/v1/actions.pb.validate.go b/api/actions/v1/actions.pb.validate.go
diff --git a/api/actions/v1/actions.proto b/api/actions/v1/actions.proto
@@ -3,6 +3,7 @@ syntax = "proto3";
 package actions.v1;
 
 import "google/api/annotations.proto";
+import "google/protobuf/empty.proto";
 import "protoc-gen-openapiv2/options/annotations.proto";
 import "validate/validate.proto";
 
@@ -275,8 +276,6 @@ message CancelActionRequest {
   string action_id = 1 [(validate.rules).string.min_len = 1];
 }
 
-message CancelActionResponse {}
-
 // Actions service provides public Management API methods for Actions.
 service ActionsService {
   // GetAction gets result of a given Action.
@@ -434,7 +433,7 @@ service ActionsService {
     };
   }
   // CancelAction stops an Action.
-  rpc CancelAction(CancelActionRequest) returns (CancelActionResponse) {
+  rpc CancelAction(CancelActionRequest) returns (google.protobuf.Empty) {
     option (google.api.http) = {
       post: "/v1/actions/Cancel"
       body: "*"

diff --git a/api/actions/v1/actions_grpc.pb.go b/api/actions/v1/actions_grpc.pb.go