lint: add protolint config

And tidy up the proto definitions to follow the new linting rules.

Signed-off-by: Justin Chadwell <[email protected]>

Author: jedevc

.protolint.yaml

@@ -0,0 +1,27 @@
+lint:
+  directories:
+    exclude:
+      - vendor
+
+  rules:
+    no_default: true
+
+    add:
+      # syntax
+      - INDENT
+      - SYNTAX_CONSISTENT
+      - QUOTE_CONSISTENT
+
+      # ordering
+      - IMPORTS_SORTED
+
+      # naming
+      - PACKAGE_NAME_LOWER_CASE
+      - RPC_NAMES_UPPER_CAMEL_CASE
+      - RPC_NAMES_CASE
+      - SERVICE_NAMES_UPPER_CAMEL_CASE
+
+  rules_option:
+    indent:
+      style: tab
+      not_insert_newline: true

api/services/control/control.pb.go

@@ -2,13 +2,13 @@ syntax = "proto3";
 
 package moby.buildkit.v1;
 
-import "github.com/gogo/protobuf/gogoproto/gogo.proto";
-import "google/protobuf/timestamp.proto";
-import "github.com/moby/buildkit/solver/pb/ops.proto";
-import "github.com/moby/buildkit/api/types/worker.proto";
 // import "github.com/containerd/containerd/api/types/descriptor.proto";
 import "github.com/gogo/googleapis/google/rpc/status.proto";
+import "github.com/gogo/protobuf/gogoproto/gogo.proto";
+import "github.com/moby/buildkit/api/types/worker.proto";
+import "github.com/moby/buildkit/solver/pb/ops.proto";
 import "github.com/moby/buildkit/sourcepolicy/pb/policy.proto";
+import "google/protobuf/timestamp.proto";
 
 option (gogoproto.sizer_all) = true;
 option (gogoproto.marshaler_all) = true;

api/services/control/control.proto

@@ -2,15 +2,13 @@ syntax = "proto3";
 
 package moby.buildkit.v1.frontend;
 
-import "github.com/gogo/protobuf/gogoproto/gogo.proto";
 import "github.com/gogo/googleapis/google/rpc/status.proto";
-import "github.com/moby/buildkit/solver/pb/ops.proto";
+import "github.com/gogo/protobuf/gogoproto/gogo.proto";
 import "github.com/moby/buildkit/api/types/worker.proto";
+import "github.com/moby/buildkit/solver/pb/ops.proto";
+import "github.com/moby/buildkit/sourcepolicy/pb/policy.proto";
 import "github.com/moby/buildkit/util/apicaps/pb/caps.proto";
 import "github.com/tonistiigi/fsutil/types/stat.proto";
-import "github.com/moby/buildkit/sourcepolicy/pb/policy.proto";
-
-
 
 option (gogoproto.sizer_all) = true;
 option (gogoproto.marshaler_all) = true;
@@ -70,7 +68,7 @@ message RefMap {
 }
 
 message Attestations {
-    repeated Attestation attestation = 1;
+	repeated Attestation attestation = 1;
 }
 
 message Attestation {
@@ -167,7 +165,7 @@ message SolveResponse {
 	// deprecated
 	string ref = 1; // can be used by readfile request
 	// deprecated
-/*	bytes ExporterAttr = 2;*/
+	// bytes ExporterAttr = 2;
 
 	// these fields are returned when allowMapReturn was set
 	Result result = 3;

frontend/gateway/pb/gateway.pb.go

@@ -5,10 +5,10 @@ package moby.filesync.v1;
 option go_package = "auth";
 
 service Auth{
-  rpc Credentials(CredentialsRequest) returns (CredentialsResponse);
-  rpc FetchToken(FetchTokenRequest) returns (FetchTokenResponse);
-  rpc GetTokenAuthority(GetTokenAuthorityRequest) returns (GetTokenAuthorityResponse);
-  rpc VerifyTokenAuthority(VerifyTokenAuthorityRequest) returns (VerifyTokenAuthorityResponse);
+	rpc Credentials(CredentialsRequest) returns (CredentialsResponse);
+	rpc FetchToken(FetchTokenRequest) returns (FetchTokenResponse);
+	rpc GetTokenAuthority(GetTokenAuthorityRequest) returns (GetTokenAuthorityResponse);
+	rpc VerifyTokenAuthority(VerifyTokenAuthorityRequest) returns (VerifyTokenAuthorityResponse);
 }
 
 message CredentialsRequest {

frontend/gateway/pb/gateway.proto

@@ -7,15 +7,14 @@ option go_package = "filesync";
 import "github.com/tonistiigi/fsutil/types/wire.proto";
 
 service FileSync{
-  rpc DiffCopy(stream fsutil.types.Packet) returns (stream fsutil.types.Packet);
-  rpc TarStream(stream fsutil.types.Packet) returns (stream fsutil.types.Packet);
+	rpc DiffCopy(stream fsutil.types.Packet) returns (stream fsutil.types.Packet);
+	rpc TarStream(stream fsutil.types.Packet) returns (stream fsutil.types.Packet);
 }
 
 service FileSend{
-  rpc DiffCopy(stream BytesMessage) returns (stream BytesMessage);
+	rpc DiffCopy(stream BytesMessage) returns (stream BytesMessage);
 }
 
-
 // BytesMessage contains a chunk of byte data
 message BytesMessage{
 	bytes data = 1;

session/auth/auth.proto

@@ -5,7 +5,7 @@ package moby.buildkit.secrets.v1;
 option go_package = "secrets";
 
 service Secrets{
-  rpc GetSecret(GetSecretRequest) returns (GetSecretResponse);
+	rpc GetSecret(GetSecretRequest) returns (GetSecretResponse);
 }
 
 

session/filesync/filesync.proto

@@ -393,14 +393,14 @@ message MergeOp {
 }
 
 message LowerDiffInput {
-  int64 input = 1 [(gogoproto.customtype) = "InputIndex", (gogoproto.nullable) = false];
+	int64 input = 1 [(gogoproto.customtype) = "InputIndex", (gogoproto.nullable) = false];
 }
 
 message UpperDiffInput {
-  int64 input = 1 [(gogoproto.customtype) = "InputIndex", (gogoproto.nullable) = false];
+	int64 input = 1 [(gogoproto.customtype) = "InputIndex", (gogoproto.nullable) = false];
 }
 
 message DiffOp {
-  LowerDiffInput lower = 1;
-  UpperDiffInput upper = 2;
+	LowerDiffInput lower = 1;
+	UpperDiffInput upper = 2;
 }

session/secrets/secrets.proto

@@ -3,15 +3,15 @@ syntax = "proto3";
 package stack;
 
 message Stack {
-    repeated Frame frames = 1;
-    repeated string cmdline = 2;
-    int32 pid = 3;
-    string version = 4;
-    string revision = 5;
+	repeated Frame frames = 1;
+	repeated string cmdline = 2;
+	int32 pid = 3;
+	string version = 4;
+	string revision = 5;
 }
 
 message Frame {
-    string Name = 1;
-    string File = 2;
-    int32 Line = 3;
+	string Name = 1;
+	string File = 2;
+	int32 Line = 3;
 }