Remove enumvalue_customname, goproto_enum_prefix and enum_customname

This commit removes gogoproto.enumvalue_customname, gogoproto.goproto_enum_prefix and gogoproto.enum_customname. All of them make proto-generated Go code more idiomatic, but we already don't use these enums in our external-surfacing types and they are anyway not supported by Google's official toolchain (see containerd#6564). Signed-off-by: Kazuyoshi Kato <[email protected]>
kiashok · Jan 18, 2023 · a7ff6f0 · a7ff6f0
1 parent 28f0e2d
commit a7ff6f0
Show file tree

Hide file tree

Showing 22 changed files with 269 additions and 361 deletions.
diff --git a/api/next.pb.txt b/api/next.pb.txt
@@ -1616,27 +1616,14 @@ file {
     value {
       name: "STAT"
       number: 0
-      options {
-        66001: "WriteActionStat"
-      }
     }
     value {
       name: "WRITE"
       number: 1
-      options {
-        66001: "WriteActionWrite"
-      }
     }
     value {
       name: "COMMIT"
       number: 2
-      options {
-        66001: "WriteActionCommit"
-      }
-    }
-    options {
-      62001: 0
-      62023: "WriteAction"
     }
   }
   service {
@@ -3404,34 +3391,18 @@ file {
     value {
       name: "UNKNOWN"
       number: 0
-      options {
-        66001: "KindUnknown"
-      }
     }
     value {
       name: "VIEW"
       number: 1
-      options {
-        66001: "KindView"
-      }
     }
     value {
       name: "ACTIVE"
       number: 2
-      options {
-        66001: "KindActive"
-      }
     }
     value {
       name: "COMMITTED"
       number: 3
-      options {
-        66001: "KindCommitted"
-      }
-    }
-    options {
-      62001: 0
-      62023: "Kind"
     }
   }
   service {
@@ -3642,48 +3613,26 @@ file {
     value {
       name: "UNKNOWN"
       number: 0
-      options {
-        66001: "StatusUnknown"
-      }
     }
     value {
       name: "CREATED"
       number: 1
-      options {
-        66001: "StatusCreated"
-      }
     }
     value {
       name: "RUNNING"
       number: 2
-      options {
-        66001: "StatusRunning"
-      }
     }
     value {
       name: "STOPPED"
       number: 3
-      options {
-        66001: "StatusStopped"
-      }
     }
     value {
       name: "PAUSED"
       number: 4
-      options {
-        66001: "StatusPaused"
-      }
     }
     value {
       name: "PAUSING"
       number: 5
-      options {
-        66001: "StatusPausing"
-      }
-    }
-    options {
-      62001: 0
-      62023: "Status"
     }
   }
   syntax: "proto3"

diff --git a/api/services/content/v1/content.pb.go b/api/services/content/v1/content.pb.go
diff --git a/api/services/content/v1/content.proto b/api/services/content/v1/content.proto
@@ -206,20 +206,17 @@ message ListStatusesResponse {
 
 // WriteAction defines the behavior of a WriteRequest.
 enum WriteAction {
-	option (gogoproto.goproto_enum_prefix) = false;
-	option (gogoproto.enum_customname) = "WriteAction";
-
 	// WriteActionStat instructs the writer to return the current status while
 	// holding the lock on the write.
-	STAT = 0 [(gogoproto.enumvalue_customname) = "WriteActionStat"];
+	STAT = 0;
 
 	// WriteActionWrite sets the action for the write request to write data.
 	//
 	// Any data included will be written at the provided offset. The
 	// transaction will be left open for further writes.
 	//
 	// This is the default.
-	WRITE = 1 [(gogoproto.enumvalue_customname) = "WriteActionWrite"];
+	WRITE = 1;
 
 	// WriteActionCommit will write any outstanding data in the message and
 	// commit the write, storing it under the digest.
@@ -228,7 +225,7 @@ enum WriteAction {
 	// commit it.
 	//
 	// This action will always terminate the write.
-	COMMIT = 2 [(gogoproto.enumvalue_customname) = "WriteActionCommit"];
+	COMMIT = 2;
 }
 
 // WriteContentRequest writes data to the request ref at offset.