From 4c8faeba5d64f3199613f2987fec1736aa881f59 Mon Sep 17 00:00:00 2001
From: torsm <torsm@google.com>
Date: Wed, 30 Aug 2023 12:09:58 +0000
Subject: [PATCH] Format Proto files

---
 .../fleetspeak_daemonservice/config.proto     | 10 +--
 .../client/proto/fleetspeak_client/api.proto  |  4 +-
 .../fleetspeak_stdinservice/messages.pb.go    | 14 ++---
 .../fleetspeak_stdinservice/messages.proto    |  6 +-
 .../src/common/proto/fleetspeak/common.pb.go  |  5 +-
 .../src/common/proto/fleetspeak/common.proto  | 26 ++++----
 .../src/common/proto/fleetspeak/system.pb.go  | 18 +++---
 .../src/common/proto/fleetspeak/system.proto  | 10 +--
 .../fleetspeak_monitoring/resource.proto      |  4 +-
 .../proto/fleetspeak_config/config.pb.go      |  4 +-
 .../proto/fleetspeak_config/config.proto      |  8 +--
 .../frr/proto/fleetspeak_frr/frr.pb.go        | 10 +--
 .../frr/proto/fleetspeak_frr/frr.proto        | 35 +++++------
 .../frr/proto/fleetspeak_frr/frr_grpc.pb.go   |  8 +--
 .../proto/fleetspeak_components/config.pb.go  |  7 ++-
 .../proto/fleetspeak_components/config.proto  |  7 ++-
 .../fleetspeak_grpcservice/grpcservice.pb.go  |  2 +-
 .../fleetspeak_grpcservice/grpcservice.proto  | 15 ++---
 .../proto/fleetspeak_server/admin.pb.go       | 28 ++++-----
 .../proto/fleetspeak_server/admin.proto       | 62 +++++++++----------
 .../proto/fleetspeak_server/broadcasts.pb.go  | 14 ++---
 .../proto/fleetspeak_server/broadcasts.proto  |  5 +-
 .../proto/fleetspeak_server/resource.proto    |  4 +-
 .../proto/fleetspeak_server/server.pb.go      |  6 +-
 .../proto/fleetspeak_server/server.proto      |  6 +-
 .../proto/fleetspeak_server/services.pb.go    |  4 +-
 .../proto/fleetspeak_server/services.proto    |  8 +--
 27 files changed, 164 insertions(+), 166 deletions(-)

diff --git a/fleetspeak/src/client/daemonservice/proto/fleetspeak_daemonservice/config.proto b/fleetspeak/src/client/daemonservice/proto/fleetspeak_daemonservice/config.proto
index ac1ffd77..ec5be4d2 100644
--- a/fleetspeak/src/client/daemonservice/proto/fleetspeak_daemonservice/config.proto
+++ b/fleetspeak/src/client/daemonservice/proto/fleetspeak_daemonservice/config.proto
@@ -2,10 +2,10 @@ syntax = "proto3";
 
 package fleetspeak.daemonservice;
 
-option go_package = "github.com/google/fleetspeak/fleetspeak/src/client/daemonservice/proto/fleetspeak_daemonservice";
-
 import "google/protobuf/duration.proto";
 
+option go_package = "github.com/google/fleetspeak/fleetspeak/src/client/daemonservice/proto/fleetspeak_daemonservice";
+
 // The configuration information expected by daemonservice.Factory in
 // ClientServiceConfig.config.
 message Config {
@@ -51,12 +51,12 @@ message Config {
   // message_type="StdOutput"
   // data=<fleetspeak.daemonservice.StdOutputData>
   message StdParams {
-    string service_name = 1; // Service on the server to forward to. Required.
+    string service_name = 1;  // Service on the server to forward to. Required.
 
     // A message will be sent when we have flush_bytes queued, or when we
     // have bytes flush_time_seconds old.
-    int32 flush_bytes = 2; // Default and maximum value is 1MB.
-    int32 flush_time_seconds = 3; // Default is 60.
+    int32 flush_bytes = 2;         // Default and maximum value is 1MB.
+    int32 flush_time_seconds = 3;  // Default is 60.
   }
   StdParams std_params = 11;
 }
diff --git a/fleetspeak/src/client/proto/fleetspeak_client/api.proto b/fleetspeak/src/client/proto/fleetspeak_client/api.proto
index 7c8eb17f..39a42cb8 100644
--- a/fleetspeak/src/client/proto/fleetspeak_client/api.proto
+++ b/fleetspeak/src/client/proto/fleetspeak_client/api.proto
@@ -2,10 +2,10 @@ syntax = "proto3";
 
 package fleetspeak.client;
 
-option go_package = "github.com/google/fleetspeak/fleetspeak/src/client/proto/fleetspeak_client";
-
 import "google/protobuf/any.proto";
 
+option go_package = "github.com/google/fleetspeak/fleetspeak/src/client/proto/fleetspeak_client";
+
 message ByteBlob {
   bytes data = 1;
 }
diff --git a/fleetspeak/src/client/stdinservice/proto/fleetspeak_stdinservice/messages.pb.go b/fleetspeak/src/client/stdinservice/proto/fleetspeak_stdinservice/messages.pb.go
index d8553638..4705d85e 100644
--- a/fleetspeak/src/client/stdinservice/proto/fleetspeak_stdinservice/messages.pb.go
+++ b/fleetspeak/src/client/stdinservice/proto/fleetspeak_stdinservice/messages.pb.go
@@ -160,13 +160,13 @@ var file_fleetspeak_src_client_stdinservice_proto_fleetspeak_stdinservice_messag
 	0x73, 0x70, 0x65, 0x61, 0x6b, 0x5f, 0x73, 0x74, 0x64, 0x69, 0x6e, 0x73, 0x65, 0x72, 0x76, 0x69,
 	0x63, 0x65, 0x2f, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74,
 	0x6f, 0x12, 0x17, 0x66, 0x6c, 0x65, 0x65, 0x74, 0x73, 0x70, 0x65, 0x61, 0x6b, 0x2e, 0x73, 0x74,
-	0x64, 0x69, 0x6e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x1a, 0x1f, 0x67, 0x6f, 0x6f, 0x67,
-	0x6c, 0x65, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2f, 0x74, 0x69, 0x6d, 0x65,
-	0x73, 0x74, 0x61, 0x6d, 0x70, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x40, 0x66, 0x6c, 0x65,
-	0x65, 0x74, 0x73, 0x70, 0x65, 0x61, 0x6b, 0x2f, 0x73, 0x72, 0x63, 0x2f, 0x63, 0x6f, 0x6d, 0x6d,
-	0x6f, 0x6e, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x66, 0x6c, 0x65, 0x65, 0x74, 0x73, 0x70,
-	0x65, 0x61, 0x6b, 0x5f, 0x6d, 0x6f, 0x6e, 0x69, 0x74, 0x6f, 0x72, 0x69, 0x6e, 0x67, 0x2f, 0x72,
-	0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x38, 0x0a,
+	0x64, 0x69, 0x6e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x1a, 0x40, 0x66, 0x6c, 0x65, 0x65,
+	0x74, 0x73, 0x70, 0x65, 0x61, 0x6b, 0x2f, 0x73, 0x72, 0x63, 0x2f, 0x63, 0x6f, 0x6d, 0x6d, 0x6f,
+	0x6e, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x66, 0x6c, 0x65, 0x65, 0x74, 0x73, 0x70, 0x65,
+	0x61, 0x6b, 0x5f, 0x6d, 0x6f, 0x6e, 0x69, 0x74, 0x6f, 0x72, 0x69, 0x6e, 0x67, 0x2f, 0x72, 0x65,
+	0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x1f, 0x67, 0x6f,
+	0x6f, 0x67, 0x6c, 0x65, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2f, 0x74, 0x69,
+	0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x38, 0x0a,
 	0x0c, 0x49, 0x6e, 0x70, 0x75, 0x74, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x12, 0x14, 0x0a,
 	0x05, 0x69, 0x6e, 0x70, 0x75, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x05, 0x69, 0x6e,
 	0x70, 0x75, 0x74, 0x12, 0x12, 0x0a, 0x04, 0x61, 0x72, 0x67, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28,
diff --git a/fleetspeak/src/client/stdinservice/proto/fleetspeak_stdinservice/messages.proto b/fleetspeak/src/client/stdinservice/proto/fleetspeak_stdinservice/messages.proto
index 4265678c..ebeae5b8 100644
--- a/fleetspeak/src/client/stdinservice/proto/fleetspeak_stdinservice/messages.proto
+++ b/fleetspeak/src/client/stdinservice/proto/fleetspeak_stdinservice/messages.proto
@@ -2,10 +2,10 @@ syntax = "proto3";
 
 package fleetspeak.stdinservice;
 
-option go_package = "github.com/google/fleetspeak/fleetspeak/src/client/stdinservice/proto/fleetspeak_stdinservice";
-
-import "google/protobuf/timestamp.proto";
 import "fleetspeak/src/common/proto/fleetspeak_monitoring/resource.proto";
+import "google/protobuf/timestamp.proto";
+
+option go_package = "github.com/google/fleetspeak/fleetspeak/src/client/stdinservice/proto/fleetspeak_stdinservice";
 
 message InputMessage {
   // The data to be forwarded to the service.
diff --git a/fleetspeak/src/common/proto/fleetspeak/common.pb.go b/fleetspeak/src/common/proto/fleetspeak/common.pb.go
index f06ca288..8e5ce741 100644
--- a/fleetspeak/src/common/proto/fleetspeak/common.pb.go
+++ b/fleetspeak/src/common/proto/fleetspeak/common.pb.go
@@ -679,8 +679,9 @@ type ContactData struct {
 	// will be sent.
 	DoneSending bool `protobuf:"varint,5,opt,name=done_sending,json=doneSending,proto3" json:"done_sending,omitempty"`
 	// Set by the client to indicate how many messages it is willing to accept for
-	// each installed service. After the first exchange of an streaming connection, it
-	// represents the number of additional messages that will be accepted.
+	// each installed service. After the first exchange of an streaming
+	// connection, it represents the number of additional messages that will be
+	// accepted.
 	AllowedMessages map[string]uint64 `protobuf:"bytes,6,rep,name=AllowedMessages,proto3" json:"AllowedMessages,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"`
 }
 
diff --git a/fleetspeak/src/common/proto/fleetspeak/common.proto b/fleetspeak/src/common/proto/fleetspeak/common.proto
index d2f0d80d..03df11a7 100644
--- a/fleetspeak/src/common/proto/fleetspeak/common.proto
+++ b/fleetspeak/src/common/proto/fleetspeak/common.proto
@@ -2,11 +2,11 @@ syntax = "proto3";
 
 package fleetspeak;
 
-option go_package = "github.com/google/fleetspeak/fleetspeak/src/common/proto/fleetspeak";
-
 import "google/protobuf/any.proto";
 import "google/protobuf/timestamp.proto";
 
+option go_package = "github.com/google/fleetspeak/fleetspeak/src/common/proto/fleetspeak";
+
 // An Address identifies the source or destination of a message.
 message Address {
   // The client_id, if the address refers to a service on a client. If unset,
@@ -69,7 +69,7 @@ message Message {
   // The message priority. The primary effect is on the ordering of messages
   // sent from the client to the server.
   enum Priority {
-    MEDIUM = 0; // Out of order, but results in a sensible default.
+    MEDIUM = 0;  // Out of order, but results in a sensible default.
     LOW = 1;
     HIGH = 2;
   }
@@ -131,11 +131,11 @@ message Signature {
 // A WrappedContactData is provided by the client to the server with every
 // contact.
 message WrappedContactData {
-  bytes contact_data = 1;  // A serialized ContactData.
-  repeated Signature signatures = 2; // Optional extra signatures validating
-                                     // contact_data.
-  repeated string client_labels = 3; // The labels that the client claims to
-                                     // have.
+  bytes contact_data = 1;             // A serialized ContactData.
+  repeated Signature signatures = 2;  // Optional extra signatures validating
+                                      // contact_data.
+  repeated string client_labels = 3;  // The labels that the client claims to
+                                      // have.
 }
 
 // On every contact, the client and server exchange ContactData messages.
@@ -148,7 +148,7 @@ message ContactData {
 
   // Records the client's current time setting, as of the creation of this
   // ContactData. Only set by the client.
-   google.protobuf.Timestamp client_clock = 3;
+  google.protobuf.Timestamp client_clock = 3;
 
   // If set, acknowledges receipt of a streamed WrappedContactData. This is used
   // for control purposes during streaming connections.
@@ -159,11 +159,11 @@ message ContactData {
   bool done_sending = 5;
 
   // Set by the client to indicate how many messages it is willing to accept for
-  // each installed service. After the first exchange of an streaming connection, it
-  // represents the number of additional messages that will be accepted.
+  // each installed service. After the first exchange of an streaming
+  // connection, it represents the number of additional messages that will be
+  // accepted.
   map<string, uint64> AllowedMessages = 6;
 }
 
 // An empty message, typically used as a trivial RPC response.
-message EmptyMessage {
-}
+message EmptyMessage {}
diff --git a/fleetspeak/src/common/proto/fleetspeak/system.pb.go b/fleetspeak/src/common/proto/fleetspeak/system.pb.go
index bf5a1ca8..e39ff466 100644
--- a/fleetspeak/src/common/proto/fleetspeak/system.pb.go
+++ b/fleetspeak/src/common/proto/fleetspeak/system.pb.go
@@ -317,8 +317,8 @@ type ClientServiceConfig struct {
 	// labels. Note that labels for the special 'client' service are checked on
 	// the client. All other labels are only checked on the server.
 	RequiredLabels []*Label `protobuf:"bytes,6,rep,name=required_labels,json=requiredLabels,proto3" json:"required_labels,omitempty"`
-	// The time at which the service configuration was signed. Should be populated by
-	// the signing tool when creating a SignedClientServiceConfig.
+	// The time at which the service configuration was signed. Should be populated
+	// by the signing tool when creating a SignedClientServiceConfig.
 	SignedTime *timestamppb.Timestamp `protobuf:"bytes,7,opt,name=signed_time,json=signedTime,proto3" json:"signed_time,omitempty"`
 }
 
@@ -643,13 +643,13 @@ var file_fleetspeak_src_common_proto_fleetspeak_system_proto_rawDesc = []byte{
 	0x2f, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x66, 0x6c,
 	0x65, 0x65, 0x74, 0x73, 0x70, 0x65, 0x61, 0x6b, 0x2f, 0x73, 0x79, 0x73, 0x74, 0x65, 0x6d, 0x2e,
 	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x0a, 0x66, 0x6c, 0x65, 0x65, 0x74, 0x73, 0x70, 0x65, 0x61,
-	0x6b, 0x1a, 0x19, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62,
-	0x75, 0x66, 0x2f, 0x61, 0x6e, 0x79, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x1f, 0x67, 0x6f,
-	0x6f, 0x67, 0x6c, 0x65, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2f, 0x74, 0x69,
-	0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x33, 0x66,
-	0x6c, 0x65, 0x65, 0x74, 0x73, 0x70, 0x65, 0x61, 0x6b, 0x2f, 0x73, 0x72, 0x63, 0x2f, 0x63, 0x6f,
-	0x6d, 0x6d, 0x6f, 0x6e, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x66, 0x6c, 0x65, 0x65, 0x74,
-	0x73, 0x70, 0x65, 0x61, 0x6b, 0x2f, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x70, 0x72, 0x6f,
+	0x6b, 0x1a, 0x33, 0x66, 0x6c, 0x65, 0x65, 0x74, 0x73, 0x70, 0x65, 0x61, 0x6b, 0x2f, 0x73, 0x72,
+	0x63, 0x2f, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x66,
+	0x6c, 0x65, 0x65, 0x74, 0x73, 0x70, 0x65, 0x61, 0x6b, 0x2f, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e,
+	0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x19, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2f, 0x70,
+	0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2f, 0x61, 0x6e, 0x79, 0x2e, 0x70, 0x72, 0x6f, 0x74,
+	0x6f, 0x1a, 0x1f, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62,
+	0x75, 0x66, 0x2f, 0x74, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x2e, 0x70, 0x72, 0x6f,
 	0x74, 0x6f, 0x22, 0x31, 0x0a, 0x0e, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x41, 0x63, 0x6b,
 	0x44, 0x61, 0x74, 0x61, 0x12, 0x1f, 0x0a, 0x0b, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x5f,
 	0x69, 0x64, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0c, 0x52, 0x0a, 0x6d, 0x65, 0x73, 0x73, 0x61,
diff --git a/fleetspeak/src/common/proto/fleetspeak/system.proto b/fleetspeak/src/common/proto/fleetspeak/system.proto
index c202af25..cc19e7d3 100644
--- a/fleetspeak/src/common/proto/fleetspeak/system.proto
+++ b/fleetspeak/src/common/proto/fleetspeak/system.proto
@@ -5,11 +5,11 @@ syntax = "proto3";
 
 package fleetspeak;
 
-option go_package = "github.com/google/fleetspeak/fleetspeak/src/common/proto/fleetspeak";
-
+import "fleetspeak/src/common/proto/fleetspeak/common.proto";
 import "google/protobuf/any.proto";
 import "google/protobuf/timestamp.proto";
-import "fleetspeak/src/common/proto/fleetspeak/common.proto";
+
+option go_package = "github.com/google/fleetspeak/fleetspeak/src/common/proto/fleetspeak";
 
 // A MessageAck message is sent from the client to the server to acknowledge the
 // successful receipt of one or more messages. Messages from the server to the
@@ -77,8 +77,8 @@ message ClientServiceConfig {
   // the client. All other labels are only checked on the server.
   repeated Label required_labels = 6;
 
-  // The time at which the service configuration was signed. Should be populated by
-  // the signing tool when creating a SignedClientServiceConfig.
+  // The time at which the service configuration was signed. Should be populated
+  // by the signing tool when creating a SignedClientServiceConfig.
   google.protobuf.Timestamp signed_time = 7;
 }
 
diff --git a/fleetspeak/src/common/proto/fleetspeak_monitoring/resource.proto b/fleetspeak/src/common/proto/fleetspeak_monitoring/resource.proto
index 358f28ec..bbaadacd 100644
--- a/fleetspeak/src/common/proto/fleetspeak_monitoring/resource.proto
+++ b/fleetspeak/src/common/proto/fleetspeak_monitoring/resource.proto
@@ -2,10 +2,10 @@ syntax = "proto3";
 
 package fleetspeak.monitoring;
 
-option go_package = "github.com/google/fleetspeak/fleetspeak/src/common/proto/fleetspeak_monitoring";
-
 import "google/protobuf/timestamp.proto";
 
+option go_package = "github.com/google/fleetspeak/fleetspeak/src/common/proto/fleetspeak_monitoring";
+
 // Contains resource-usage metrics for Fleetspeak clients. The stats are
 // arrived at by aggregating raw data retrieved from the OS.
 // CPU-usage is in milliseconds per second, and memory usage is in bytes.
diff --git a/fleetspeak/src/config/proto/fleetspeak_config/config.pb.go b/fleetspeak/src/config/proto/fleetspeak_config/config.pb.go
index ef59b0ae..f65d4440 100644
--- a/fleetspeak/src/config/proto/fleetspeak_config/config.pb.go
+++ b/fleetspeak/src/config/proto/fleetspeak_config/config.pb.go
@@ -43,8 +43,8 @@ type Config struct {
 	// A file containing the private key associated with trusted_cert_file, only
 	// required if it is necessary to create server certificates.
 	//
-	// NOTE: Contains private key material. Only needs to be online when creating new
-	// server certificates.
+	// NOTE: Contains private key material. Only needs to be online when creating
+	// new server certificates.
 	TrustedCertKeyFile string `protobuf:"bytes,4,opt,name=trusted_cert_key_file,json=trustedCertKeyFile,proto3" json:"trusted_cert_key_file,omitempty"`
 	// A file containing a PEM encoded certificate that the Fleetspeak server
 	// should use to identify itself. If this file is not already present, a 1
diff --git a/fleetspeak/src/config/proto/fleetspeak_config/config.proto b/fleetspeak/src/config/proto/fleetspeak_config/config.proto
index 3916a83b..9f87602d 100644
--- a/fleetspeak/src/config/proto/fleetspeak_config/config.proto
+++ b/fleetspeak/src/config/proto/fleetspeak_config/config.proto
@@ -2,10 +2,10 @@ syntax = "proto3";
 
 package fleetspeak.config;
 
-option go_package = "github.com/google/fleetspeak/fleetspeak/src/config/proto/fleetspeak_config";
-
 import "fleetspeak/src/server/components/proto/fleetspeak_components/config.proto";
 
+option go_package = "github.com/google/fleetspeak/fleetspeak/src/config/proto/fleetspeak_config";
+
 // The configuration parameters needed by the configuration tool in order to
 // create the artifacts needed to run a fleetspeak installation.
 message Config {
@@ -27,8 +27,8 @@ message Config {
   // A file containing the private key associated with trusted_cert_file, only
   // required if it is necessary to create server certificates.
   //
-  // NOTE: Contains private key material. Only needs to be online when creating new
-  // server certificates.
+  // NOTE: Contains private key material. Only needs to be online when creating
+  // new server certificates.
   string trusted_cert_key_file = 4;
 
   // A file containing a PEM encoded certificate that the Fleetspeak server
diff --git a/fleetspeak/src/inttesting/frr/proto/fleetspeak_frr/frr.pb.go b/fleetspeak/src/inttesting/frr/proto/fleetspeak_frr/frr.pb.go
index bd44a37d..8e9d245c 100644
--- a/fleetspeak/src/inttesting/frr/proto/fleetspeak_frr/frr.pb.go
+++ b/fleetspeak/src/inttesting/frr/proto/fleetspeak_frr/frr.pb.go
@@ -70,14 +70,15 @@ func (x *Config) GetMasterServer() string {
 	return ""
 }
 
-// A TrafficRequest message is sent from the server to the client which tells the
-// client to send random data back.
+// A TrafficRequest message is sent from the server to the client which tells
+// the client to send random data back.
 type TrafficRequestData struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	// An identifier used to identify the frr master instance responsible for this.
+	// An identifier used to identify the frr master instance responsible for
+	// this.
 	MasterId int64 `protobuf:"varint,1,opt,name=master_id,json=masterId,proto3" json:"master_id,omitempty"`
 	// An identifier used to link responses to requests.
 	RequestId int64 `protobuf:"varint,2,opt,name=request_id,json=requestId,proto3" json:"request_id,omitempty"`
@@ -588,7 +589,8 @@ type CreateHuntRequest struct {
 	Data  *TrafficRequestData `protobuf:"bytes,1,opt,name=data,proto3" json:"data,omitempty"`
 	Limit uint64              `protobuf:"varint,2,opt,name=limit,proto3" json:"limit,omitempty"`
 	// If client_ids is empty, the request is considered a broadcast request with
-	// specified limit, otherwise unicast requests are sent to the provided clients.
+	// specified limit, otherwise unicast requests are sent to the provided
+	// clients.
 	ClientIds []string `protobuf:"bytes,3,rep,name=client_ids,json=clientIds,proto3" json:"client_ids,omitempty"`
 }
 
diff --git a/fleetspeak/src/inttesting/frr/proto/fleetspeak_frr/frr.proto b/fleetspeak/src/inttesting/frr/proto/fleetspeak_frr/frr.proto
index b3f46d9a..90463375 100755
--- a/fleetspeak/src/inttesting/frr/proto/fleetspeak_frr/frr.proto
+++ b/fleetspeak/src/inttesting/frr/proto/fleetspeak_frr/frr.proto
@@ -2,20 +2,21 @@ syntax = "proto3";
 
 package fleetspeak.frr;
 
-option go_package = "github.com/google/fleetspeak/fleetspeak/src/inttesting/frr/proto/fleetspeak_frr";
-
 import "fleetspeak/src/common/proto/fleetspeak/common.proto";
 
+option go_package = "github.com/google/fleetspeak/fleetspeak/src/inttesting/frr/proto/fleetspeak_frr";
+
 // Contains the information needed to configure a frr server component.
 message Config {
   // The address to reach the master frr server over grpc.
   string master_server = 1;
 }
 
-// A TrafficRequest message is sent from the server to the client which tells the
-// client to send random data back.
+// A TrafficRequest message is sent from the server to the client which tells
+// the client to send random data back.
 message TrafficRequestData {
-  // An identifier used to identify the frr master instance responsible for this.
+  // An identifier used to identify the frr master instance responsible for
+  // this.
   int64 master_id = 1;
 
   // An identifier used to link responses to requests.
@@ -56,7 +57,6 @@ message FileRequestData {
   string name = 2;
 }
 
-
 // A FileResponse is sent from the client to the server and
 // reports that the client successfully downloaded a file from the
 // server.
@@ -94,33 +94,30 @@ message CreateHuntRequest {
   TrafficRequestData data = 1;
   uint64 limit = 2;
   // If client_ids is empty, the request is considered a broadcast request with
-  // specified limit, otherwise unicast requests are sent to the provided clients.
+  // specified limit, otherwise unicast requests are sent to the provided
+  // clients.
   repeated string client_ids = 3;
 }
 
-message CreateHuntResponse {
-}
+message CreateHuntResponse {}
 
 // The service implemented by the FRR master server to collect data from the FRR
 // Fleetspeak server services.
 service Master {
   // RecordMessage records that a TrafficResponse message was received by
   // the FS server.
-  rpc RecordTrafficResponse(MessageInfo) returns (fleetspeak.EmptyMessage) {
-  }
+  rpc RecordTrafficResponse(MessageInfo) returns (fleetspeak.EmptyMessage) {}
 
   // RecordFileResponse records that a FileResponse message was received
   // by the FS server.
-  rpc RecordFileResponse(FileResponseInfo) returns (fleetspeak.EmptyMessage) {
-  }
+  rpc RecordFileResponse(FileResponseInfo) returns (fleetspeak.EmptyMessage) {}
 
-  // CompletedRequests returns a list of requests made to a client which have been
-  // completed.
-  rpc CompletedRequests(CompletedRequestsRequest) returns (CompletedRequestsResponse) {
-  }
+  // CompletedRequests returns a list of requests made to a client which have
+  // been completed.
+  rpc CompletedRequests(CompletedRequestsRequest)
+      returns (CompletedRequestsResponse) {}
 
   // CreateHunt initiates a hunt which sends the provided TrafficRequestData to
   // every client, up to limit.
-  rpc CreateHunt(CreateHuntRequest) returns (CreateHuntResponse) {
-  }
+  rpc CreateHunt(CreateHuntRequest) returns (CreateHuntResponse) {}
 }
diff --git a/fleetspeak/src/inttesting/frr/proto/fleetspeak_frr/frr_grpc.pb.go b/fleetspeak/src/inttesting/frr/proto/fleetspeak_frr/frr_grpc.pb.go
index 417777f9..9e7b18de 100644
--- a/fleetspeak/src/inttesting/frr/proto/fleetspeak_frr/frr_grpc.pb.go
+++ b/fleetspeak/src/inttesting/frr/proto/fleetspeak_frr/frr_grpc.pb.go
@@ -29,8 +29,8 @@ type MasterClient interface {
 	// RecordFileResponse records that a FileResponse message was received
 	// by the FS server.
 	RecordFileResponse(ctx context.Context, in *FileResponseInfo, opts ...grpc.CallOption) (*fleetspeak.EmptyMessage, error)
-	// CompletedRequests returns a list of requests made to a client which have been
-	// completed.
+	// CompletedRequests returns a list of requests made to a client which have
+	// been completed.
 	CompletedRequests(ctx context.Context, in *CompletedRequestsRequest, opts ...grpc.CallOption) (*CompletedRequestsResponse, error)
 	// CreateHunt initiates a hunt which sends the provided TrafficRequestData to
 	// every client, up to limit.
@@ -91,8 +91,8 @@ type MasterServer interface {
 	// RecordFileResponse records that a FileResponse message was received
 	// by the FS server.
 	RecordFileResponse(context.Context, *FileResponseInfo) (*fleetspeak.EmptyMessage, error)
-	// CompletedRequests returns a list of requests made to a client which have been
-	// completed.
+	// CompletedRequests returns a list of requests made to a client which have
+	// been completed.
 	CompletedRequests(context.Context, *CompletedRequestsRequest) (*CompletedRequestsResponse, error)
 	// CreateHunt initiates a hunt which sends the provided TrafficRequestData to
 	// every client, up to limit.
diff --git a/fleetspeak/src/server/components/proto/fleetspeak_components/config.pb.go b/fleetspeak/src/server/components/proto/fleetspeak_components/config.pb.go
index 14b11293..f1983397 100644
--- a/fleetspeak/src/server/components/proto/fleetspeak_components/config.pb.go
+++ b/fleetspeak/src/server/components/proto/fleetspeak_components/config.pb.go
@@ -195,9 +195,10 @@ type HttpsConfig struct {
 	// connection causes more active connections but can reduce database load and
 	// server->client communications latency.
 	DisableStreaming bool `protobuf:"varint,4,opt,name=disable_streaming,json=disableStreaming,proto3" json:"disable_streaming,omitempty"`
-	// If set, the server will validate the client certificate from the request header.
-	// This should be used if TLS is terminated at the load balancer and client certificates
-	// can be passed upstream to the fleetspeak server as an http header.
+	// If set, the server will validate the client certificate from the request
+	// header. This should be used if TLS is terminated at the load balancer and
+	// client certificates can be passed upstream to the fleetspeak server as an
+	// http header.
 	ClientCertificateHeader string `protobuf:"bytes,5,opt,name=client_certificate_header,json=clientCertificateHeader,proto3" json:"client_certificate_header,omitempty"`
 }
 
diff --git a/fleetspeak/src/server/components/proto/fleetspeak_components/config.proto b/fleetspeak/src/server/components/proto/fleetspeak_components/config.proto
index 23811939..9ed08e94 100644
--- a/fleetspeak/src/server/components/proto/fleetspeak_components/config.proto
+++ b/fleetspeak/src/server/components/proto/fleetspeak_components/config.proto
@@ -82,9 +82,10 @@ message HttpsConfig {
   // server->client communications latency.
   bool disable_streaming = 4;
 
-  // If set, the server will validate the client certificate from the request header.
-  // This should be used if TLS is terminated at the load balancer and client certificates
-  // can be passed upstream to the fleetspeak server as an http header.
+  // If set, the server will validate the client certificate from the request
+  // header. This should be used if TLS is terminated at the load balancer and
+  // client certificates can be passed upstream to the fleetspeak server as an
+  // http header.
   string client_certificate_header = 5;
 }
 
diff --git a/fleetspeak/src/server/grpcservice/proto/fleetspeak_grpcservice/grpcservice.pb.go b/fleetspeak/src/server/grpcservice/proto/fleetspeak_grpcservice/grpcservice.pb.go
index 7fa31687..c357789e 100644
--- a/fleetspeak/src/server/grpcservice/proto/fleetspeak_grpcservice/grpcservice.pb.go
+++ b/fleetspeak/src/server/grpcservice/proto/fleetspeak_grpcservice/grpcservice.pb.go
@@ -28,7 +28,7 @@ type Config struct {
 
 	Target   string `protobuf:"bytes,1,opt,name=target,proto3" json:"target,omitempty"`                     // The address to dial.
 	Insecure bool   `protobuf:"varint,2,opt,name=insecure,proto3" json:"insecure,omitempty"`                // If set, will not secure connection to the target.
-	CertFile string `protobuf:"bytes,3,opt,name=cert_file,json=certFile,proto3" json:"cert_file,omitempty"` // If set, a pool of trusted certificates will be read from this file and used to authenticate the connection to target.
+	CertFile string `protobuf:"bytes,3,opt,name=cert_file,json=certFile,proto3" json:"cert_file,omitempty"` // If set, a pool of trusted certificates will be read from this file
 }
 
 func (x *Config) Reset() {
diff --git a/fleetspeak/src/server/grpcservice/proto/fleetspeak_grpcservice/grpcservice.proto b/fleetspeak/src/server/grpcservice/proto/fleetspeak_grpcservice/grpcservice.proto
index 3d3612c6..f4eade56 100644
--- a/fleetspeak/src/server/grpcservice/proto/fleetspeak_grpcservice/grpcservice.proto
+++ b/fleetspeak/src/server/grpcservice/proto/fleetspeak_grpcservice/grpcservice.proto
@@ -2,20 +2,21 @@ syntax = "proto3";
 
 package fleetspeak.grpcservice;
 
-option go_package = "github.com/google/fleetspeak/fleetspeak/src/server/grpcservice/proto/fleetspeak_grpcservice";
-
 import "fleetspeak/src/common/proto/fleetspeak/common.proto";
 
+option go_package = "github.com/google/fleetspeak/fleetspeak/src/server/grpcservice/proto/fleetspeak_grpcservice";
+
 message Config {
-  string target = 1; // The address to dial.
-  bool insecure = 2; // If set, will not secure connection to the target.
-  string cert_file = 3; // If set, a pool of trusted certificates will be read from this file and used to authenticate the connection to target.
+  string target = 1;  // The address to dial.
+  bool insecure = 2;  // If set, will not secure connection to the target.
+  string cert_file =
+      3;  // If set, a pool of trusted certificates will be read from this file
+          // and used to authenticate the connection to target.
 }
 
 // Processor is the service that a target system must implement to
 // receive messages through a GRPCService based service.
 service Processor {
   // Process accepts message and processes it.
-  rpc Process(fleetspeak.Message) returns (fleetspeak.EmptyMessage) {
-  }
+  rpc Process(fleetspeak.Message) returns (fleetspeak.EmptyMessage) {}
 }
diff --git a/fleetspeak/src/server/proto/fleetspeak_server/admin.pb.go b/fleetspeak/src/server/proto/fleetspeak_server/admin.pb.go
index a2696f7a..1d9ce8c2 100644
--- a/fleetspeak/src/server/proto/fleetspeak_server/admin.pb.go
+++ b/fleetspeak/src/server/proto/fleetspeak_server/admin.pb.go
@@ -1312,20 +1312,20 @@ var file_fleetspeak_src_server_proto_fleetspeak_server_admin_proto_rawDesc = []b
 	0x2f, 0x73, 0x65, 0x72, 0x76, 0x65, 0x72, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x66, 0x6c,
 	0x65, 0x65, 0x74, 0x73, 0x70, 0x65, 0x61, 0x6b, 0x5f, 0x73, 0x65, 0x72, 0x76, 0x65, 0x72, 0x2f,
 	0x61, 0x64, 0x6d, 0x69, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x11, 0x66, 0x6c, 0x65,
-	0x65, 0x74, 0x73, 0x70, 0x65, 0x61, 0x6b, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x65, 0x72, 0x1a, 0x1f,
-	0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2f,
-	0x74, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a,
-	0x33, 0x66, 0x6c, 0x65, 0x65, 0x74, 0x73, 0x70, 0x65, 0x61, 0x6b, 0x2f, 0x73, 0x72, 0x63, 0x2f,
-	0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x66, 0x6c, 0x65,
-	0x65, 0x74, 0x73, 0x70, 0x65, 0x61, 0x6b, 0x2f, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x70,
-	0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x3e, 0x66, 0x6c, 0x65, 0x65, 0x74, 0x73, 0x70, 0x65, 0x61, 0x6b,
-	0x2f, 0x73, 0x72, 0x63, 0x2f, 0x73, 0x65, 0x72, 0x76, 0x65, 0x72, 0x2f, 0x70, 0x72, 0x6f, 0x74,
-	0x6f, 0x2f, 0x66, 0x6c, 0x65, 0x65, 0x74, 0x73, 0x70, 0x65, 0x61, 0x6b, 0x5f, 0x73, 0x65, 0x72,
-	0x76, 0x65, 0x72, 0x2f, 0x62, 0x72, 0x6f, 0x61, 0x64, 0x63, 0x61, 0x73, 0x74, 0x73, 0x2e, 0x70,
-	0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x3c, 0x66, 0x6c, 0x65, 0x65, 0x74, 0x73, 0x70, 0x65, 0x61, 0x6b,
-	0x2f, 0x73, 0x72, 0x63, 0x2f, 0x73, 0x65, 0x72, 0x76, 0x65, 0x72, 0x2f, 0x70, 0x72, 0x6f, 0x74,
-	0x6f, 0x2f, 0x66, 0x6c, 0x65, 0x65, 0x74, 0x73, 0x70, 0x65, 0x61, 0x6b, 0x5f, 0x73, 0x65, 0x72,
-	0x76, 0x65, 0x72, 0x2f, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x2e, 0x70, 0x72, 0x6f,
+	0x65, 0x74, 0x73, 0x70, 0x65, 0x61, 0x6b, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x65, 0x72, 0x1a, 0x33,
+	0x66, 0x6c, 0x65, 0x65, 0x74, 0x73, 0x70, 0x65, 0x61, 0x6b, 0x2f, 0x73, 0x72, 0x63, 0x2f, 0x63,
+	0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x66, 0x6c, 0x65, 0x65,
+	0x74, 0x73, 0x70, 0x65, 0x61, 0x6b, 0x2f, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x70, 0x72,
+	0x6f, 0x74, 0x6f, 0x1a, 0x3e, 0x66, 0x6c, 0x65, 0x65, 0x74, 0x73, 0x70, 0x65, 0x61, 0x6b, 0x2f,
+	0x73, 0x72, 0x63, 0x2f, 0x73, 0x65, 0x72, 0x76, 0x65, 0x72, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f,
+	0x2f, 0x66, 0x6c, 0x65, 0x65, 0x74, 0x73, 0x70, 0x65, 0x61, 0x6b, 0x5f, 0x73, 0x65, 0x72, 0x76,
+	0x65, 0x72, 0x2f, 0x62, 0x72, 0x6f, 0x61, 0x64, 0x63, 0x61, 0x73, 0x74, 0x73, 0x2e, 0x70, 0x72,
+	0x6f, 0x74, 0x6f, 0x1a, 0x3c, 0x66, 0x6c, 0x65, 0x65, 0x74, 0x73, 0x70, 0x65, 0x61, 0x6b, 0x2f,
+	0x73, 0x72, 0x63, 0x2f, 0x73, 0x65, 0x72, 0x76, 0x65, 0x72, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f,
+	0x2f, 0x66, 0x6c, 0x65, 0x65, 0x74, 0x73, 0x70, 0x65, 0x61, 0x6b, 0x5f, 0x73, 0x65, 0x72, 0x76,
+	0x65, 0x72, 0x2f, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74,
+	0x6f, 0x1a, 0x1f, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62,
+	0x75, 0x66, 0x2f, 0x74, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x2e, 0x70, 0x72, 0x6f,
 	0x74, 0x6f, 0x22, 0x6a, 0x0a, 0x16, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x42, 0x72, 0x6f, 0x61,
 	0x64, 0x63, 0x61, 0x73, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x3a, 0x0a, 0x09,
 	0x62, 0x72, 0x6f, 0x61, 0x64, 0x63, 0x61, 0x73, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32,
diff --git a/fleetspeak/src/server/proto/fleetspeak_server/admin.proto b/fleetspeak/src/server/proto/fleetspeak_server/admin.proto
index 6268be68..2a8cbdbe 100644
--- a/fleetspeak/src/server/proto/fleetspeak_server/admin.proto
+++ b/fleetspeak/src/server/proto/fleetspeak_server/admin.proto
@@ -2,12 +2,12 @@ syntax = "proto3";
 
 package fleetspeak.server;
 
-option go_package = "github.com/google/fleetspeak/fleetspeak/src/server/proto/fleetspeak_server";
-
-import "google/protobuf/timestamp.proto";
 import "fleetspeak/src/common/proto/fleetspeak/common.proto";
 import "fleetspeak/src/server/proto/fleetspeak_server/broadcasts.proto";
 import "fleetspeak/src/server/proto/fleetspeak_server/resource.proto";
+import "google/protobuf/timestamp.proto";
+
+option go_package = "github.com/google/fleetspeak/fleetspeak/src/server/proto/fleetspeak_server";
 
 message CreateBroadcastRequest {
   Broadcast broadcast = 1;
@@ -132,67 +132,63 @@ message FetchClientResourceUsageRecordsResponse {
 service Admin {
   // CreateBroadcast creates a FS broadcast, potentially sending a message to
   // many machines in the fleet.
-  rpc CreateBroadcast (CreateBroadcastRequest) returns (fleetspeak.EmptyMessage) {
-  }
+  rpc CreateBroadcast(CreateBroadcastRequest)
+      returns (fleetspeak.EmptyMessage) {}
 
   // ListActiveBroadcasts lists the currently active FS broadcasts.
-  rpc ListActiveBroadcasts (ListActiveBroadcastsRequest) returns (ListActiveBroadcastsResponse) {
-  }
+  rpc ListActiveBroadcasts(ListActiveBroadcastsRequest)
+      returns (ListActiveBroadcastsResponse) {}
 
   // ListClients lists the currently active FS clients.
-  rpc ListClients (ListClientsRequest) returns (ListClientsResponse) {
-  }
+  rpc ListClients(ListClientsRequest) returns (ListClientsResponse) {}
 
   // StreamClientIds lists the currently active FS clients as a stream.
-  rpc StreamClientIds (StreamClientIdsRequest) returns (stream StreamClientIdsResponse) {
-  }
+  rpc StreamClientIds(StreamClientIdsRequest)
+      returns (stream StreamClientIdsResponse) {}
 
   // ListClientContacts lists the contact history for a client.
-  rpc ListClientContacts (ListClientContactsRequest) returns (ListClientContactsResponse) {
-  }
+  rpc ListClientContacts(ListClientContactsRequest)
+      returns (ListClientContactsResponse) {}
 
   // StreamClientContacts lists the contact history for a client as a stream.
-  rpc StreamClientContacts (StreamClientContactsRequest) returns (stream StreamClientContactsResponse) {
-  }
+  rpc StreamClientContacts(StreamClientContactsRequest)
+      returns (stream StreamClientContactsResponse) {}
 
   // GetMessageStatus retrieves the current status of a message.
-  rpc GetMessageStatus (GetMessageStatusRequest) returns (GetMessageStatusResponse) {
-  }
+  rpc GetMessageStatus(GetMessageStatusRequest)
+      returns (GetMessageStatusResponse) {}
 
   // InsertMessage inserts a message into the Fleetspeak system to be processed
   // by the server or delivered to a client.
   // TODO: Have this method return the message that is written to the
   // datastore (or at least the id).
-  rpc InsertMessage (fleetspeak.Message) returns (fleetspeak.EmptyMessage) {
-  }
+  rpc InsertMessage(fleetspeak.Message) returns (fleetspeak.EmptyMessage) {}
 
   // DeletePendingMessages clears message queues for given clients.
-  rpc DeletePendingMessages (DeletePendingMessagesRequest) returns (fleetspeak.EmptyMessage) {
-  }
+  rpc DeletePendingMessages(DeletePendingMessagesRequest)
+      returns (fleetspeak.EmptyMessage) {}
 
   // Returns the pending messages for given clients.
-  rpc GetPendingMessages (GetPendingMessagesRequest) returns (GetPendingMessagesResponse) {
-  }
+  rpc GetPendingMessages(GetPendingMessagesRequest)
+      returns (GetPendingMessagesResponse) {}
 
   // Returns the number of pending messages for the given clients.
-  rpc GetPendingMessageCount (GetPendingMessageCountRequest) returns (GetPendingMessageCountResponse) {
-  }
+  rpc GetPendingMessageCount(GetPendingMessageCountRequest)
+      returns (GetPendingMessageCountResponse) {}
 
   // StoreFile inserts a file into the Fleetspeak system.
-  rpc StoreFile (StoreFileRequest) returns (fleetspeak.EmptyMessage) {
-  }
+  rpc StoreFile(StoreFileRequest) returns (fleetspeak.EmptyMessage) {}
 
   // KeepAlive does as little as possible.
-  rpc KeepAlive (fleetspeak.EmptyMessage) returns (fleetspeak.EmptyMessage) {
-  }
+  rpc KeepAlive(fleetspeak.EmptyMessage) returns (fleetspeak.EmptyMessage) {}
 
   // BlacklistClient marks a client_id as invalid, forcing all Fleetspeak
   // clients using it to rekey.
-  rpc BlacklistClient (BlacklistClientRequest) returns (fleetspeak.EmptyMessage) {
-  }
+  rpc BlacklistClient(BlacklistClientRequest)
+      returns (fleetspeak.EmptyMessage) {}
 
   // FetchClientResourceUsageRecords returns all resource usage records for a
   // single client with a given limit on the number of records.
-  rpc FetchClientResourceUsageRecords (FetchClientResourceUsageRecordsRequest) returns (FetchClientResourceUsageRecordsResponse) {
-  }
+  rpc FetchClientResourceUsageRecords(FetchClientResourceUsageRecordsRequest)
+      returns (FetchClientResourceUsageRecordsResponse) {}
 }
diff --git a/fleetspeak/src/server/proto/fleetspeak_server/broadcasts.pb.go b/fleetspeak/src/server/proto/fleetspeak_server/broadcasts.pb.go
index 0f95357c..6d2bd6ef 100644
--- a/fleetspeak/src/server/proto/fleetspeak_server/broadcasts.pb.go
+++ b/fleetspeak/src/server/proto/fleetspeak_server/broadcasts.pb.go
@@ -125,13 +125,13 @@ var file_fleetspeak_src_server_proto_fleetspeak_server_broadcasts_proto_rawDesc
 	0x65, 0x65, 0x74, 0x73, 0x70, 0x65, 0x61, 0x6b, 0x5f, 0x73, 0x65, 0x72, 0x76, 0x65, 0x72, 0x2f,
 	0x62, 0x72, 0x6f, 0x61, 0x64, 0x63, 0x61, 0x73, 0x74, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f,
 	0x12, 0x11, 0x66, 0x6c, 0x65, 0x65, 0x74, 0x73, 0x70, 0x65, 0x61, 0x6b, 0x2e, 0x73, 0x65, 0x72,
-	0x76, 0x65, 0x72, 0x1a, 0x19, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2f, 0x70, 0x72, 0x6f, 0x74,
-	0x6f, 0x62, 0x75, 0x66, 0x2f, 0x61, 0x6e, 0x79, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x1f,
-	0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2f,
-	0x74, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a,
-	0x33, 0x66, 0x6c, 0x65, 0x65, 0x74, 0x73, 0x70, 0x65, 0x61, 0x6b, 0x2f, 0x73, 0x72, 0x63, 0x2f,
-	0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x66, 0x6c, 0x65,
-	0x65, 0x74, 0x73, 0x70, 0x65, 0x61, 0x6b, 0x2f, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x70,
+	0x76, 0x65, 0x72, 0x1a, 0x33, 0x66, 0x6c, 0x65, 0x65, 0x74, 0x73, 0x70, 0x65, 0x61, 0x6b, 0x2f,
+	0x73, 0x72, 0x63, 0x2f, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f,
+	0x2f, 0x66, 0x6c, 0x65, 0x65, 0x74, 0x73, 0x70, 0x65, 0x61, 0x6b, 0x2f, 0x63, 0x6f, 0x6d, 0x6d,
+	0x6f, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x19, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65,
+	0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2f, 0x61, 0x6e, 0x79, 0x2e, 0x70, 0x72,
+	0x6f, 0x74, 0x6f, 0x1a, 0x1f, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2f, 0x70, 0x72, 0x6f, 0x74,
+	0x6f, 0x62, 0x75, 0x66, 0x2f, 0x74, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x2e, 0x70,
 	0x72, 0x6f, 0x74, 0x6f, 0x22, 0xa9, 0x02, 0x0a, 0x09, 0x42, 0x72, 0x6f, 0x61, 0x64, 0x63, 0x61,
 	0x73, 0x74, 0x12, 0x21, 0x0a, 0x0c, 0x62, 0x72, 0x6f, 0x61, 0x64, 0x63, 0x61, 0x73, 0x74, 0x5f,
 	0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x0b, 0x62, 0x72, 0x6f, 0x61, 0x64, 0x63,
diff --git a/fleetspeak/src/server/proto/fleetspeak_server/broadcasts.proto b/fleetspeak/src/server/proto/fleetspeak_server/broadcasts.proto
index c495b70c..4d446967 100644
--- a/fleetspeak/src/server/proto/fleetspeak_server/broadcasts.proto
+++ b/fleetspeak/src/server/proto/fleetspeak_server/broadcasts.proto
@@ -2,12 +2,11 @@ syntax = "proto3";
 
 package fleetspeak.server;
 
-option go_package = "github.com/google/fleetspeak/fleetspeak/src/server/proto/fleetspeak_server";
-
+import "fleetspeak/src/common/proto/fleetspeak/common.proto";
 import "google/protobuf/any.proto";
 import "google/protobuf/timestamp.proto";
 
-import "fleetspeak/src/common/proto/fleetspeak/common.proto";
+option go_package = "github.com/google/fleetspeak/fleetspeak/src/server/proto/fleetspeak_server";
 
 // A Broadcast is a template to build messages to send to a number of machines.
 message Broadcast {
diff --git a/fleetspeak/src/server/proto/fleetspeak_server/resource.proto b/fleetspeak/src/server/proto/fleetspeak_server/resource.proto
index fac9944d..c6292bc1 100644
--- a/fleetspeak/src/server/proto/fleetspeak_server/resource.proto
+++ b/fleetspeak/src/server/proto/fleetspeak_server/resource.proto
@@ -2,10 +2,10 @@ syntax = "proto3";
 
 package fleetspeak.server;
 
-option go_package = "github.com/google/fleetspeak/fleetspeak/src/server/proto/fleetspeak_server";
-
 import "google/protobuf/timestamp.proto";
 
+option go_package = "github.com/google/fleetspeak/fleetspeak/src/server/proto/fleetspeak_server";
+
 // Represents client resource-usage data in the data-store.
 // Next id: 15
 message ClientResourceUsageRecord {
diff --git a/fleetspeak/src/server/proto/fleetspeak_server/server.pb.go b/fleetspeak/src/server/proto/fleetspeak_server/server.pb.go
index 63637da1..85c6a054 100644
--- a/fleetspeak/src/server/proto/fleetspeak_server/server.pb.go
+++ b/fleetspeak/src/server/proto/fleetspeak_server/server.pb.go
@@ -90,12 +90,12 @@ var file_fleetspeak_src_server_proto_fleetspeak_server_server_proto_rawDesc = []
 	0x65, 0x65, 0x74, 0x73, 0x70, 0x65, 0x61, 0x6b, 0x5f, 0x73, 0x65, 0x72, 0x76, 0x65, 0x72, 0x2f,
 	0x73, 0x65, 0x72, 0x76, 0x65, 0x72, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x11, 0x66, 0x6c,
 	0x65, 0x65, 0x74, 0x73, 0x70, 0x65, 0x61, 0x6b, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x65, 0x72, 0x1a,
-	0x1e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66,
-	0x2f, 0x64, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a,
 	0x3c, 0x66, 0x6c, 0x65, 0x65, 0x74, 0x73, 0x70, 0x65, 0x61, 0x6b, 0x2f, 0x73, 0x72, 0x63, 0x2f,
 	0x73, 0x65, 0x72, 0x76, 0x65, 0x72, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x66, 0x6c, 0x65,
 	0x65, 0x74, 0x73, 0x70, 0x65, 0x61, 0x6b, 0x5f, 0x73, 0x65, 0x72, 0x76, 0x65, 0x72, 0x2f, 0x73,
-	0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x97, 0x01,
+	0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x1e, 0x67,
+	0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2f, 0x64,
+	0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x97, 0x01,
 	0x0a, 0x0c, 0x53, 0x65, 0x72, 0x76, 0x65, 0x72, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x12, 0x3c,
 	0x0a, 0x08, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b,
 	0x32, 0x20, 0x2e, 0x66, 0x6c, 0x65, 0x65, 0x74, 0x73, 0x70, 0x65, 0x61, 0x6b, 0x2e, 0x73, 0x65,
diff --git a/fleetspeak/src/server/proto/fleetspeak_server/server.proto b/fleetspeak/src/server/proto/fleetspeak_server/server.proto
index c80db557..f6c21e47 100644
--- a/fleetspeak/src/server/proto/fleetspeak_server/server.proto
+++ b/fleetspeak/src/server/proto/fleetspeak_server/server.proto
@@ -2,10 +2,10 @@ syntax = "proto3";
 
 package fleetspeak.server;
 
-option go_package = "github.com/google/fleetspeak/fleetspeak/src/server/proto/fleetspeak_server";
-
-import "google/protobuf/duration.proto";
 import "fleetspeak/src/server/proto/fleetspeak_server/services.proto";
+import "google/protobuf/duration.proto";
+
+option go_package = "github.com/google/fleetspeak/fleetspeak/src/server/proto/fleetspeak_server";
 
 // Describes a server's configuration. If unset, all values default to values
 // reasonable for a unit test or small installation. Larger installations may
diff --git a/fleetspeak/src/server/proto/fleetspeak_server/services.pb.go b/fleetspeak/src/server/proto/fleetspeak_server/services.pb.go
index b043f45a..01f701e6 100644
--- a/fleetspeak/src/server/proto/fleetspeak_server/services.pb.go
+++ b/fleetspeak/src/server/proto/fleetspeak_server/services.pb.go
@@ -21,8 +21,8 @@ const (
 	_ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20)
 )
 
-// A ServiceConfig describes how the server should configure a 'service', which is
-// a module that sends and processes messages.
+// A ServiceConfig describes how the server should configure a 'service', which
+// is a module that sends and processes messages.
 type ServiceConfig struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
diff --git a/fleetspeak/src/server/proto/fleetspeak_server/services.proto b/fleetspeak/src/server/proto/fleetspeak_server/services.proto
index 60ab7430..19d92abe 100644
--- a/fleetspeak/src/server/proto/fleetspeak_server/services.proto
+++ b/fleetspeak/src/server/proto/fleetspeak_server/services.proto
@@ -2,12 +2,12 @@ syntax = "proto3";
 
 package fleetspeak.server;
 
-option go_package = "github.com/google/fleetspeak/fleetspeak/src/server/proto/fleetspeak_server";
-
 import "google/protobuf/any.proto";
 
-// A ServiceConfig describes how the server should configure a 'service', which is
-// a module that sends and processes messages.
+option go_package = "github.com/google/fleetspeak/fleetspeak/src/server/proto/fleetspeak_server";
+
+// A ServiceConfig describes how the server should configure a 'service', which
+// is a module that sends and processes messages.
 message ServiceConfig {
   // The name that the service will be known as. Primary use is to address
   // messages to the service. The service names 'server' and 'client' are