fix non-constant format string

crazy-max · crazy-max · commit 28d8cc3174be · 2025-11-06T15:05:38.000+01:00
Signed-off-by: CrazyMax &lt;1951866+crazy-max@users.noreply.github.com&gt;
diff --git a/ca/server.go b/ca/server.go
@@ -147,7 +147,7 @@ func (s *Server) GetUnlockKey(_ context.Context, _ *api.GetUnlockKeyRequest) (*a
 // NodeCertificateStatus returns the current issuance status of an issuance request identified by the nodeID
 func (s *Server) NodeCertificateStatus(ctx context.Context, request *api.NodeCertificateStatusRequest) (*api.NodeCertificateStatusResponse, error) {
 	if request.NodeID == "" {
-		return nil, status.Errorf(codes.InvalidArgument, codes.InvalidArgument.String())
+		return nil, status.Error(codes.InvalidArgument, codes.InvalidArgument.String())
 	}
 
 	serverCtx, err := s.isRunningLocked()
@@ -178,7 +178,7 @@ func (s *Server) NodeCertificateStatus(ctx context.Context, request *api.NodeCer
 
 	// This node ID doesn't exist
 	if node == nil {
-		return nil, status.Errorf(codes.NotFound, codes.NotFound.String())
+		return nil, status.Error(codes.NotFound, codes.NotFound.String())
 	}
 
 	log.G(ctx).WithFields(log.Fields{
@@ -234,7 +234,7 @@ func (s *Server) NodeCertificateStatus(ctx context.Context, request *api.NodeCer
 func (s *Server) IssueNodeCertificate(ctx context.Context, request *api.IssueNodeCertificateRequest) (*api.IssueNodeCertificateResponse, error) {
 	// First, let's see if the remote node is presenting a non-empty CSR
 	if len(request.CSR) == 0 {
-		return nil, status.Errorf(codes.InvalidArgument, codes.InvalidArgument.String())
+		return nil, status.Error(codes.InvalidArgument, codes.InvalidArgument.String())
 	}
 
 	if err := s.isReadyLocked(); err != nil {
diff --git a/manager/controlapi/ca_rotation.go b/manager/controlapi/ca_rotation.go
@@ -241,7 +241,7 @@ func validateCAConfig(ctx context.Context, securityConfig *ca.SecurityConfig, cl
 		if cluster.RootCA.LastForcedRotation != newConfig.ForceRotate {
 			newRootCA, err := ca.CreateRootCA(ca.DefaultRootCN)
 			if err != nil {
-				return nil, status.Errorf(codes.Internal, err.Error())
+				return nil, status.Error(codes.Internal, err.Error())
 			}
 			return newRootRotationObject(ctx, securityConfig, &cluster.RootCA, newRootCA, oldCertExtCAs, newConfig.ForceRotate)
 		}
@@ -265,7 +265,7 @@ func validateCAConfig(ctx context.Context, securityConfig *ca.SecurityConfig, cl
 	}
 	newRootCA, err := ca.NewRootCA(newConfig.SigningCACert, signingCert, newConfig.SigningCAKey, ca.DefaultNodeCertExpiration, nil)
 	if err != nil {
-		return nil, status.Errorf(codes.InvalidArgument, err.Error())
+		return nil, status.Error(codes.InvalidArgument, err.Error())
 	}
 
 	if len(newRootCA.Pool.Subjects()) != 1 {
diff --git a/manager/controlapi/cluster.go b/manager/controlapi/cluster.go
@@ -32,14 +32,14 @@ var (
 
 func validateClusterSpec(spec *api.ClusterSpec) error {
 	if spec == nil {
-		return status.Errorf(codes.InvalidArgument, errInvalidArgument.Error())
+		return status.Error(codes.InvalidArgument, errInvalidArgument.Error())
 	}
 
 	// Validate that expiry time being provided is valid, and over our minimum
 	if spec.CAConfig.NodeCertExpiry != nil {
 		expiry, err := gogotypes.DurationFromProto(spec.CAConfig.NodeCertExpiry)
 		if err != nil {
-			return status.Errorf(codes.InvalidArgument, errInvalidArgument.Error())
+			return status.Error(codes.InvalidArgument, errInvalidArgument.Error())
 		}
 		if expiry < ca.MinNodeCertExpiration {
 			return status.Errorf(codes.InvalidArgument, "minimum certificate expiry time is: %s", ca.MinNodeCertExpiration)
@@ -60,7 +60,7 @@ func validateClusterSpec(spec *api.ClusterSpec) error {
 	if spec.Dispatcher.HeartbeatPeriod != nil {
 		heartbeatPeriod, err := gogotypes.DurationFromProto(spec.Dispatcher.HeartbeatPeriod)
 		if err != nil {
-			return status.Errorf(codes.InvalidArgument, errInvalidArgument.Error())
+			return status.Error(codes.InvalidArgument, errInvalidArgument.Error())
 		}
 		if heartbeatPeriod < 0 {
 			return status.Errorf(codes.InvalidArgument, "heartbeat time period cannot be a negative duration")
@@ -79,7 +79,7 @@ func validateClusterSpec(spec *api.ClusterSpec) error {
 // - Returns `NotFound` if the Cluster is not found.
 func (s *Server) GetCluster(_ context.Context, request *api.GetClusterRequest) (*api.GetClusterResponse, error) {
 	if request.ClusterID == "" {
-		return nil, status.Errorf(codes.InvalidArgument, errInvalidArgument.Error())
+		return nil, status.Error(codes.InvalidArgument, errInvalidArgument.Error())
 	}
 
 	var cluster *api.Cluster
@@ -105,7 +105,7 @@ func (s *Server) GetCluster(_ context.Context, request *api.GetClusterRequest) (
 // - Returns an error if the update fails.
 func (s *Server) UpdateCluster(ctx context.Context, request *api.UpdateClusterRequest) (*api.UpdateClusterResponse, error) {
 	if request.ClusterID == "" || request.ClusterVersion == nil {
-		return nil, status.Errorf(codes.InvalidArgument, errInvalidArgument.Error())
+		return nil, status.Error(codes.InvalidArgument, errInvalidArgument.Error())
 	}
 	if err := validateClusterSpec(request.Spec); err != nil {
 		return nil, err
diff --git a/manager/controlapi/config.go b/manager/controlapi/config.go
@@ -52,7 +52,7 @@ func (s *Server) GetConfig(_ context.Context, request *api.GetConfigRequest) (*a
 // - Returns an error if the update fails.
 func (s *Server) UpdateConfig(ctx context.Context, request *api.UpdateConfigRequest) (*api.UpdateConfigResponse, error) {
 	if request.ConfigID == "" || request.ConfigVersion == nil {
-		return nil, status.Errorf(codes.InvalidArgument, errInvalidArgument.Error())
+		return nil, status.Error(codes.InvalidArgument, errInvalidArgument.Error())
 	}
 
 	var config *api.Config
@@ -234,7 +234,7 @@ func (s *Server) RemoveConfig(ctx context.Context, request *api.RemoveConfigRequ
 
 func validateConfigSpec(spec *api.ConfigSpec) error {
 	if spec == nil {
-		return status.Errorf(codes.InvalidArgument, errInvalidArgument.Error())
+		return status.Error(codes.InvalidArgument, errInvalidArgument.Error())
 	}
 	if err := validateConfigOrSecretAnnotations(spec.Annotations); err != nil {
 		return err
diff --git a/manager/controlapi/network.go b/manager/controlapi/network.go
@@ -70,7 +70,7 @@ func (s *Server) validateIPAM(ipam *api.IPAMOptions) error {
 
 func (s *Server) validateNetworkSpec(spec *api.NetworkSpec) error {
 	if spec == nil {
-		return status.Errorf(codes.InvalidArgument, errInvalidArgument.Error())
+		return status.Error(codes.InvalidArgument, errInvalidArgument.Error())
 	}
 
 	if spec.Attachable && spec.Ingress {
@@ -138,7 +138,7 @@ func (s *Server) CreateNetwork(_ context.Context, request *api.CreateNetworkRequ
 // - Returns `NotFound` if the Network is not found.
 func (s *Server) GetNetwork(ctx context.Context, request *api.GetNetworkRequest) (*api.GetNetworkResponse, error) {
 	if request.NetworkID == "" {
-		return nil, status.Errorf(codes.InvalidArgument, errInvalidArgument.Error())
+		return nil, status.Error(codes.InvalidArgument, errInvalidArgument.Error())
 	}
 
 	var n *api.Network
@@ -162,7 +162,7 @@ func (s *Server) GetNetwork(ctx context.Context, request *api.GetNetworkRequest)
 // - Returns an error if the deletion fails.
 func (s *Server) RemoveNetwork(_ context.Context, request *api.RemoveNetworkRequest) (*api.RemoveNetworkResponse, error) {
 	if request.NetworkID == "" {
-		return nil, status.Errorf(codes.InvalidArgument, errInvalidArgument.Error())
+		return nil, status.Error(codes.InvalidArgument, errInvalidArgument.Error())
 	}
 
 	var (
diff --git a/manager/controlapi/node.go b/manager/controlapi/node.go
@@ -15,7 +15,7 @@ import (
 
 func validateNodeSpec(spec *api.NodeSpec) error {
 	if spec == nil {
-		return status.Errorf(codes.InvalidArgument, errInvalidArgument.Error())
+		return status.Error(codes.InvalidArgument, errInvalidArgument.Error())
 	}
 	return nil
 }
@@ -25,7 +25,7 @@ func validateNodeSpec(spec *api.NodeSpec) error {
 // - Returns `NotFound` if the Node is not found.
 func (s *Server) GetNode(_ context.Context, request *api.GetNodeRequest) (*api.GetNodeResponse, error) {
 	if request.NodeID == "" {
-		return nil, status.Errorf(codes.InvalidArgument, errInvalidArgument.Error())
+		return nil, status.Error(codes.InvalidArgument, errInvalidArgument.Error())
 	}
 
 	var node *api.Node
@@ -202,7 +202,7 @@ func (s *Server) ListNodes(_ context.Context, request *api.ListNodesRequest) (*a
 // - Returns an error if the update fails.
 func (s *Server) UpdateNode(_ context.Context, request *api.UpdateNodeRequest) (*api.UpdateNodeResponse, error) {
 	if request.NodeID == "" || request.NodeVersion == nil {
-		return nil, status.Errorf(codes.InvalidArgument, errInvalidArgument.Error())
+		return nil, status.Error(codes.InvalidArgument, errInvalidArgument.Error())
 	}
 	if err := validateNodeSpec(request.Spec); err != nil {
 		return nil, err
@@ -293,7 +293,7 @@ func orphanNodeTasks(tx store.Tx, nodeID string) error {
 // - Returns an error if the delete fails.
 func (s *Server) RemoveNode(_ context.Context, request *api.RemoveNodeRequest) (*api.RemoveNodeResponse, error) {
 	if request.NodeID == "" {
-		return nil, status.Errorf(codes.InvalidArgument, errInvalidArgument.Error())
+		return nil, status.Error(codes.InvalidArgument, errInvalidArgument.Error())
 	}
 
 	err := s.store.Update(func(tx store.Tx) error {
diff --git a/manager/controlapi/secret.go b/manager/controlapi/secret.go
@@ -51,7 +51,7 @@ func (s *Server) GetSecret(_ context.Context, request *api.GetSecretRequest) (*a
 // - Returns an error if the update fails.
 func (s *Server) UpdateSecret(ctx context.Context, request *api.UpdateSecretRequest) (*api.UpdateSecretResponse, error) {
 	if request.SecretID == "" || request.SecretVersion == nil {
-		return nil, status.Errorf(codes.InvalidArgument, errInvalidArgument.Error())
+		return nil, status.Error(codes.InvalidArgument, errInvalidArgument.Error())
 	}
 	var secret *api.Secret
 	err := s.store.Update(func(tx store.Tx) error {
@@ -242,7 +242,7 @@ func (s *Server) RemoveSecret(ctx context.Context, request *api.RemoveSecretRequ
 
 func validateSecretSpec(spec *api.SecretSpec) error {
 	if spec == nil {
-		return status.Errorf(codes.InvalidArgument, errInvalidArgument.Error())
+		return status.Error(codes.InvalidArgument, errInvalidArgument.Error())
 	}
 	if err := validateConfigOrSecretAnnotations(spec.Annotations); err != nil {
 		return err
@@ -256,7 +256,7 @@ func validateSecretSpec(spec *api.SecretSpec) error {
 		return nil
 	}
 	if err := validation.ValidateSecretPayload(spec.Data); err != nil {
-		return status.Errorf(codes.InvalidArgument, "%s", err.Error())
+		return status.Error(codes.InvalidArgument, err.Error())
 	}
 	return nil
 }
diff --git a/manager/controlapi/service.go b/manager/controlapi/service.go
@@ -147,7 +147,7 @@ func validateContainerSpec(taskSpec api.TaskSpec) error {
 		LogDriver: taskSpec.LogDriver,
 	})
 	if err != nil {
-		return status.Errorf(codes.InvalidArgument, err.Error())
+		return status.Error(codes.InvalidArgument, err.Error())
 	}
 
 	if err := validateImage(container.Image); err != nil {
@@ -526,7 +526,7 @@ func validateJob(spec *api.ServiceSpec) error {
 
 func validateServiceSpec(spec *api.ServiceSpec) error {
 	if spec == nil {
-		return status.Errorf(codes.InvalidArgument, errInvalidArgument.Error())
+		return status.Error(codes.InvalidArgument, errInvalidArgument.Error())
 	}
 	if err := validateAnnotations(spec.Annotations); err != nil {
 		return err
@@ -789,7 +789,7 @@ func (s *Server) CreateService(_ context.Context, request *api.CreateServiceRequ
 // - Returns `NotFound` if the Service is not found.
 func (s *Server) GetService(_ context.Context, request *api.GetServiceRequest) (*api.GetServiceResponse, error) {
 	if request.ServiceID == "" {
-		return nil, status.Errorf(codes.InvalidArgument, errInvalidArgument.Error())
+		return nil, status.Error(codes.InvalidArgument, errInvalidArgument.Error())
 	}
 
 	var service *api.Service
@@ -816,7 +816,7 @@ func (s *Server) GetService(_ context.Context, request *api.GetServiceRequest) (
 // - Returns an error if the update fails.
 func (s *Server) UpdateService(_ context.Context, request *api.UpdateServiceRequest) (*api.UpdateServiceResponse, error) {
 	if request.ServiceID == "" || request.ServiceVersion == nil {
-		return nil, status.Errorf(codes.InvalidArgument, errInvalidArgument.Error())
+		return nil, status.Error(codes.InvalidArgument, errInvalidArgument.Error())
 	}
 	if err := validateServiceSpec(request.Spec); err != nil {
 		return nil, err
@@ -853,7 +853,7 @@ func (s *Server) UpdateService(_ context.Context, request *api.UpdateServiceRequ
 		if (len(request.Spec.Networks) != 0 || len(service.Spec.Networks) != 0) &&
 			!reflect.DeepEqual(request.Spec.Networks, service.Spec.Networks) &&
 			reflect.DeepEqual(request.Spec.Task.Networks, service.Spec.Task.Networks) {
-			return status.Errorf(codes.Unimplemented, errNetworkUpdateNotSupported.Error())
+			return status.Error(codes.Unimplemented, errNetworkUpdateNotSupported.Error())
 		}
 
 		// Check to see if all the secrets being added exist as objects
@@ -872,11 +872,11 @@ func (s *Server) UpdateService(_ context.Context, request *api.UpdateServiceRequ
 		// with service mode change (comparing current config with previous config).
 		// proper way to change service mode is to delete and re-add.
 		if reflect.TypeOf(service.Spec.Mode) != reflect.TypeOf(request.Spec.Mode) {
-			return status.Errorf(codes.Unimplemented, errModeChangeNotAllowed.Error())
+			return status.Error(codes.Unimplemented, errModeChangeNotAllowed.Error())
 		}
 
 		if service.Spec.Annotations.Name != request.Spec.Annotations.Name {
-			return status.Errorf(codes.Unimplemented, errRenameNotSupported.Error())
+			return status.Error(codes.Unimplemented, errRenameNotSupported.Error())
 		}
 
 		service.Meta.Version = *request.ServiceVersion
@@ -942,7 +942,7 @@ func (s *Server) UpdateService(_ context.Context, request *api.UpdateServiceRequ
 // - Returns an error if the deletion fails.
 func (s *Server) RemoveService(_ context.Context, request *api.RemoveServiceRequest) (*api.RemoveServiceResponse, error) {
 	if request.ServiceID == "" {
-		return nil, status.Errorf(codes.InvalidArgument, errInvalidArgument.Error())
+		return nil, status.Error(codes.InvalidArgument, errInvalidArgument.Error())
 	}
 
 	err := s.store.Update(func(tx store.Tx) error {
@@ -1000,7 +1000,7 @@ func (s *Server) ListServices(_ context.Context, request *api.ListServicesReques
 	if err != nil {
 		switch err {
 		case store.ErrInvalidFindBy:
-			return nil, status.Errorf(codes.InvalidArgument, err.Error())
+			return nil, status.Error(codes.InvalidArgument, err.Error())
 		default:
 			return nil, err
 		}
diff --git a/manager/controlapi/task.go b/manager/controlapi/task.go
@@ -16,7 +16,7 @@ import (
 // - Returns `NotFound` if the Task is not found.
 func (s *Server) GetTask(_ context.Context, request *api.GetTaskRequest) (*api.GetTaskResponse, error) {
 	if request.TaskID == "" {
-		return nil, status.Errorf(codes.InvalidArgument, errInvalidArgument.Error())
+		return nil, status.Error(codes.InvalidArgument, errInvalidArgument.Error())
 	}
 
 	var task *api.Task
@@ -37,7 +37,7 @@ func (s *Server) GetTask(_ context.Context, request *api.GetTaskRequest) (*api.G
 // - Returns an error if the deletion fails.
 func (s *Server) RemoveTask(_ context.Context, request *api.RemoveTaskRequest) (*api.RemoveTaskResponse, error) {
 	if request.TaskID == "" {
-		return nil, status.Errorf(codes.InvalidArgument, errInvalidArgument.Error())
+		return nil, status.Error(codes.InvalidArgument, errInvalidArgument.Error())
 	}
 
 	err := s.store.Update(func(tx store.Tx) error {
diff --git a/manager/dispatcher/nodes.go b/manager/dispatcher/nodes.go
@@ -35,7 +35,7 @@ func (rn *registeredNode) checkSessionID(sessionID string) error {
 	// changed. If it has, we will the stream and make the node
 	// re-register.
 	if sessionID == "" || rn.SessionID != sessionID {
-		return status.Errorf(codes.InvalidArgument, ErrSessionInvalid.Error())
+		return status.Error(codes.InvalidArgument, ErrSessionInvalid.Error())
 	}
 
 	return nil
@@ -135,7 +135,7 @@ func (s *nodeStore) Get(id string) (*registeredNode, error) {
 	rn, ok := s.nodes[id]
 	s.mu.RUnlock()
 	if !ok {
-		return nil, status.Errorf(codes.NotFound, ErrNodeNotRegistered.Error())
+		return nil, status.Error(codes.NotFound, ErrNodeNotRegistered.Error())
 	}
 	return rn, nil
 }
@@ -145,7 +145,7 @@ func (s *nodeStore) GetWithSession(id, sid string) (*registeredNode, error) {
 	rn, ok := s.nodes[id]
 	s.mu.RUnlock()
 	if !ok {
-		return nil, status.Errorf(codes.NotFound, ErrNodeNotRegistered.Error())
+		return nil, status.Error(codes.NotFound, ErrNodeNotRegistered.Error())
 	}
 	return rn, rn.checkSessionID(sid)
 }
diff --git a/manager/drivers/secrets.go b/manager/drivers/secrets.go
@@ -1,6 +1,7 @@
 package drivers
 
 import (
+	"errors"
 	"fmt"
 
 	"github.com/moby/swarmkit/v2/api"
@@ -80,7 +81,7 @@ func (d *SecretDriver) Get(spec *api.SecretSpec, task *api.Task) ([]byte, bool,
 		return nil, false, err
 	}
 	if secretResp.Err != "" {
-		return nil, secretResp.DoNotReuse, fmt.Errorf(secretResp.Err)
+		return nil, secretResp.DoNotReuse, errors.New(secretResp.Err)
 	}
 	// Assign the secret value
 	return secretResp.Value, secretResp.DoNotReuse, nil
diff --git a/manager/resourceapi/allocator.go b/manager/resourceapi/allocator.go
@@ -98,7 +98,7 @@ func (ra *ResourceAllocator) AttachNetwork(ctx context.Context, request *api.Att
 // - Returns an error if the deletion fails.
 func (ra *ResourceAllocator) DetachNetwork(ctx context.Context, request *api.DetachNetworkRequest) (*api.DetachNetworkResponse, error) {
 	if request.AttachmentID == "" {
-		return nil, status.Errorf(codes.InvalidArgument, errInvalidArgument.Error())
+		return nil, status.Error(codes.InvalidArgument, errInvalidArgument.Error())
 	}
 
 	nodeInfo, err := ca.RemoteNode(ctx)
diff --git a/manager/state/raft/raft.go b/manager/state/raft/raft.go
@@ -948,11 +948,11 @@ func (n *Node) Join(ctx context.Context, req *api.JoinRequest) (*api.JoinRespons
 	defer n.membershipLock.Unlock()
 
 	if !n.IsMember() {
-		return nil, status.Errorf(codes.FailedPrecondition, "%s", ErrNoRaftMember.Error())
+		return nil, status.Error(codes.FailedPrecondition, ErrNoRaftMember.Error())
 	}
 
 	if !n.isLeader() {
-		return nil, status.Errorf(codes.FailedPrecondition, "%s", ErrLostLeadership.Error())
+		return nil, status.Error(codes.FailedPrecondition, ErrLostLeadership.Error())
 	}
 
 	remoteAddr := req.Addr
@@ -1365,17 +1365,17 @@ func (n *Node) StreamRaftMessage(stream api.Raft_StreamRaftMessageServer) error
 		if recvdMsg.Message.Index != raftMsgIndex {
 			errMsg := fmt.Sprintf("Raft message chunk with index %d is different from the previously received raft message index %d",
 				recvdMsg.Message.Index, raftMsgIndex)
-			log.G(stream.Context()).Errorf(errMsg)
-			return status.Errorf(codes.InvalidArgument, "%s", errMsg)
+			log.G(stream.Context()).Error(errMsg)
+			return status.Error(codes.InvalidArgument, errMsg)
 		}
 
 		// Verify that multiple message received on a stream
 		// can only be of type raftpb.MsgSnap.
 		if recvdMsg.Message.Type != raftpb.MsgSnap {
 			errMsg := fmt.Sprintf("Raft message chunk is not of type %d",
 				raftpb.MsgSnap)
-			log.G(stream.Context()).Errorf(errMsg)
-			return status.Errorf(codes.InvalidArgument, "%s", errMsg)
+			log.G(stream.Context()).Error(errMsg)
+			return status.Error(codes.InvalidArgument, errMsg)
 		}
 
 		// Append the received snapshot data.
@@ -1408,7 +1408,7 @@ func (n *Node) ProcessRaftMessage(ctx context.Context, msg *api.ProcessRaftMessa
 	// a node in the remove set
 	if n.cluster.IsIDRemoved(msg.Message.From) {
 		n.processRaftMessageLogger(ctx, msg).Debug("received message from removed member")
-		return nil, status.Errorf(codes.NotFound, "%s", membership.ErrMemberRemoved.Error())
+		return nil, status.Error(codes.NotFound, membership.ErrMemberRemoved.Error())
 	}
 
 	ctx, cancel := n.WithContext(ctx)
diff --git a/manager/state/raft/transport/mock_raft_test.go b/manager/state/raft/transport/mock_raft_test.go
diff --git a/manager/watchapi/watch.go b/manager/watchapi/watch.go

Original file line number	Diff line number	Diff line change
`@@ -241,7 +241,7 @@ func validateCAConfig(ctx context.Context, securityConfig *ca.SecurityConfig, cl`
`241`	`241`	`if cluster.RootCA.LastForcedRotation != newConfig.ForceRotate {`
`242`	`242`	`newRootCA, err := ca.CreateRootCA(ca.DefaultRootCN)`
`243`	`243`	`if err != nil {`
`244`		`- return nil, status.Errorf(codes.Internal, err.Error())`
	`244`	`+ return nil, status.Error(codes.Internal, err.Error())`
`245`	`245`	`}`
`246`	`246`	`return newRootRotationObject(ctx, securityConfig, &cluster.RootCA, newRootCA, oldCertExtCAs, newConfig.ForceRotate)`
`247`	`247`	`}`
`@@ -265,7 +265,7 @@ func validateCAConfig(ctx context.Context, securityConfig *ca.SecurityConfig, cl`
`265`	`265`	`}`
`266`	`266`	`newRootCA, err := ca.NewRootCA(newConfig.SigningCACert, signingCert, newConfig.SigningCAKey, ca.DefaultNodeCertExpiration, nil)`
`267`	`267`	`if err != nil {`
`268`		`- return nil, status.Errorf(codes.InvalidArgument, err.Error())`
	`268`	`+ return nil, status.Error(codes.InvalidArgument, err.Error())`
`269`	`269`	`}`
`270`	`270`
`271`	`271`	`if len(newRootCA.Pool.Subjects()) != 1 {`
Original file line number	Diff line number	Diff line change
`@@ -51,7 +51,7 @@ func (s Server) GetSecret(_ context.Context, request api.GetSecretRequest) (*a`
`51`	`51`	`// - Returns an error if the update fails.`
`52`	`52`	`func (s Server) UpdateSecret(ctx context.Context, request api.UpdateSecretRequest) (*api.UpdateSecretResponse, error) {`
`53`	`53`	`if request.SecretID == "" \|\| request.SecretVersion == nil {`
`54`		`- return nil, status.Errorf(codes.InvalidArgument, errInvalidArgument.Error())`
	`54`	`+ return nil, status.Error(codes.InvalidArgument, errInvalidArgument.Error())`
`55`	`55`	`}`
`56`	`56`	`var secret *api.Secret`
`57`	`57`	`err := s.store.Update(func(tx store.Tx) error {`
`@@ -242,7 +242,7 @@ func (s Server) RemoveSecret(ctx context.Context, request api.RemoveSecretRequ`
`242`	`242`
`243`	`243`	`func validateSecretSpec(spec *api.SecretSpec) error {`
`244`	`244`	`if spec == nil {`
`245`		`- return status.Errorf(codes.InvalidArgument, errInvalidArgument.Error())`
	`245`	`+ return status.Error(codes.InvalidArgument, errInvalidArgument.Error())`
`246`	`246`	`}`
`247`	`247`	`if err := validateConfigOrSecretAnnotations(spec.Annotations); err != nil {`
`248`	`248`	`return err`
`@@ -256,7 +256,7 @@ func validateSecretSpec(spec *api.SecretSpec) error {`
`256`	`256`	`return nil`
`257`	`257`	`}`
`258`	`258`	`if err := validation.ValidateSecretPayload(spec.Data); err != nil {`
`259`		`- return status.Errorf(codes.InvalidArgument, "%s", err.Error())`
	`259`	`+ return status.Error(codes.InvalidArgument, err.Error())`
`260`	`260`	`}`
`261`	`261`	`return nil`
`262`	`262`	`}`
Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ func (rn *registeredNode) checkSessionID(sessionID string) error {`
`35`	`35`	`// changed. If it has, we will the stream and make the node`
`36`	`36`	`// re-register.`
`37`	`37`	`if sessionID == "" \|\| rn.SessionID != sessionID {`
`38`		`- return status.Errorf(codes.InvalidArgument, ErrSessionInvalid.Error())`
	`38`	`+ return status.Error(codes.InvalidArgument, ErrSessionInvalid.Error())`
`39`	`39`	`}`
`40`	`40`
`41`	`41`	`return nil`
`@@ -135,7 +135,7 @@ func (s nodeStore) Get(id string) (registeredNode, error) {`
`135`	`135`	`rn, ok := s.nodes[id]`
`136`	`136`	`s.mu.RUnlock()`
`137`	`137`	`if !ok {`
`138`		`- return nil, status.Errorf(codes.NotFound, ErrNodeNotRegistered.Error())`
	`138`	`+ return nil, status.Error(codes.NotFound, ErrNodeNotRegistered.Error())`
`139`	`139`	`}`
`140`	`140`	`return rn, nil`
`141`	`141`	`}`
`@@ -145,7 +145,7 @@ func (s nodeStore) GetWithSession(id, sid string) (registeredNode, error) {`
`145`	`145`	`rn, ok := s.nodes[id]`
`146`	`146`	`s.mu.RUnlock()`
`147`	`147`	`if !ok {`
`148`		`- return nil, status.Errorf(codes.NotFound, ErrNodeNotRegistered.Error())`
	`148`	`+ return nil, status.Error(codes.NotFound, ErrNodeNotRegistered.Error())`
`149`	`149`	`}`
`150`	`150`	`return rn, rn.checkSessionID(sid)`
`151`	`151`	`}`