Change embedded version naming on proto types (#329)

...V0_0_2 -> ...V002

See naming: https://protobuf.dev/programming-guides/style/#identifier

We were initially using this to avoid collisions, but those are
academic/theoretical and we can work around them. Additionally we
now can identify collisions at the proto spec level rather than
at generation time.

Signed-off-by: Appu Goundan <appu@google.com>

Author: loosebazooka

api/proto/dsse.proto

@@ -23,16 +23,16 @@ import "verifier.proto";
 
 option go_package = "github.com/sigstore/rekor-tiles/pkg/generated/protobuf";
 
-// A request to add a DSSE entry to the log
-message DSSERequestV0_0_2 {
+// A request to add a DSSE v0.0.2 entry to the log
+message DSSERequestV002 {
     // A DSSE envelope
     io.intoto.Envelope envelope = 1 [(google.api.field_behavior) = REQUIRED];
     // All necessary verification material to verify all signatures embedded in the envelope
     repeated Verifier verifiers = 2 [(google.api.field_behavior) = REQUIRED];
 }
 
 
-message DSSELogEntryV0_0_2 {
+message DSSELogEntryV002 {
     // The hash of the DSSE payload
     dev.sigstore.common.v1.HashOutput payloadHash = 1 [(google.api.field_behavior) = REQUIRED];
     // Signatures and their associated verification material used to verify the payload

api/proto/entry.proto

@@ -37,7 +37,7 @@ message Entry {
 // Spec contains one of the Rekor entry types.
 message Spec {
     oneof spec {
-        HashedRekordLogEntryV0_0_2 hashed_rekord_v0_0_2 = 1 [(google.api.field_behavior) = REQUIRED];
-        DSSELogEntryV0_0_2 dsse_v0_0_2  = 2 [(google.api.field_behavior) = REQUIRED];
+        HashedRekordLogEntryV002 hashed_rekord_v002 = 1 [(google.api.field_behavior) = REQUIRED];
+        DSSELogEntryV002 dsse_v002  = 2 [(google.api.field_behavior) = REQUIRED];
     }
 }

api/proto/hashedrekord.proto

@@ -22,17 +22,17 @@ import "verifier.proto";
 
 option go_package = "github.com/sigstore/rekor-tiles/pkg/generated/protobuf";
 
-// A request to add a hashedrekord to the log
-message HashedRekordRequestV0_0_2 {
+// A request to add a hashedrekord v0.0.2 to the log
+message HashedRekordRequestV002 {
     // The hashed data
     bytes digest = 1 [(google.api.field_behavior) = REQUIRED];
     // A single signature over the hashed data with the verifier needed to validate it
     Signature signature = 2 [(google.api.field_behavior) = REQUIRED];
 }
 
-message HashedRekordLogEntryV0_0_2 {
+message HashedRekordLogEntryV002 {
     // The hashed data
     dev.sigstore.common.v1.HashOutput data = 1 [(google.api.field_behavior) = REQUIRED];
     // A single signature over the hashed data with the verifier needed to validate it
     Signature signature = 2 [(google.api.field_behavior) = REQUIRED];
-}
+}

api/proto/rekor_service.proto

@@ -61,8 +61,8 @@ service Rekor {
 // Create a new HashedRekord or DSSE
 message CreateEntryRequest {
     oneof spec {
-        HashedRekordRequestV0_0_2 hashed_rekord_request_v0_0_2 = 1 [(google.api.field_behavior) = REQUIRED];
-        DSSERequestV0_0_2 dsse_request_v0_0_2  = 2 [(google.api.field_behavior) = REQUIRED];
+        HashedRekordRequestV002 hashed_rekord_request_v002 = 1 [(google.api.field_behavior) = REQUIRED];
+        DSSERequestV002 dsse_request_v002 = 2 [(google.api.field_behavior) = REQUIRED];
     }
 }
 

docs/openapi/rekor_service.swagger.json

@@ -119,27 +119,27 @@ func (w *writeClient) Add(ctx context.Context, entry any) (*pbs.TransparencyLogE
 
 func createRequest(entry any) (*pb.CreateEntryRequest, error) {
 	switch e := entry.(type) {
-	case *pb.HashedRekordRequestV0_0_2:
+	case *pb.HashedRekordRequestV002:
 		return createHashedRekordRequest(e), nil
-	case *pb.DSSERequestV0_0_2:
+	case *pb.DSSERequestV002:
 		return createDSSERequest(e), nil
 	default:
 		return nil, fmt.Errorf("unsupported entry type: %T", entry)
 	}
 }
 
-func createHashedRekordRequest(h *pb.HashedRekordRequestV0_0_2) *pb.CreateEntryRequest {
+func createHashedRekordRequest(h *pb.HashedRekordRequestV002) *pb.CreateEntryRequest {
 	return &pb.CreateEntryRequest{
-		Spec: &pb.CreateEntryRequest_HashedRekordRequestV0_0_2{
-			HashedRekordRequestV0_0_2: h,
+		Spec: &pb.CreateEntryRequest_HashedRekordRequestV002{
+			HashedRekordRequestV002: h,
 		},
 	}
 }
 
-func createDSSERequest(d *pb.DSSERequestV0_0_2) *pb.CreateEntryRequest {
+func createDSSERequest(d *pb.DSSERequestV002) *pb.CreateEntryRequest {
 	return &pb.CreateEntryRequest{
-		Spec: &pb.CreateEntryRequest_DsseRequestV0_0_2{
-			DsseRequestV0_0_2: d,
+		Spec: &pb.CreateEntryRequest_DsseRequestV002{
+			DsseRequestV002: d,
 		},
 	}
 }

pkg/client/write/write.go

@@ -123,7 +123,7 @@ func TestAdd(t *testing.T) {
 	}{
 		{
 			name: "valid hashedrekord",
-			entry: &pb.HashedRekordRequestV0_0_2{
+			entry: &pb.HashedRekordRequestV002{
 				Signature: &pb.Signature{
 					Content: []byte("sign"),
 					Verifier: &pb.Verifier{
@@ -157,7 +157,7 @@ func TestAdd(t *testing.T) {
 		},
 		{
 			name: "valid dsse",
-			entry: &pb.DSSERequestV0_0_2{
+			entry: &pb.DSSERequestV002{
 				Envelope: &dsse.Envelope{
 					Payload:     []byte("some payload"),
 					PayloadType: "",
@@ -204,7 +204,7 @@ func TestAdd(t *testing.T) {
 		},
 		{
 			name: "server error",
-			entry: &pb.DSSERequestV0_0_2{
+			entry: &pb.DSSERequestV002{
 				Envelope: &dsse.Envelope{
 					Payload:     []byte("some payload"),
 					PayloadType: "",
@@ -232,7 +232,7 @@ func TestAdd(t *testing.T) {
 		},
 		{
 			name: "unexpected response body from server",
-			entry: &pb.DSSERequestV0_0_2{
+			entry: &pb.DSSERequestV002{
 				Envelope: &dsse.Envelope{
 					Payload:     []byte("some payload"),
 					PayloadType: "",
@@ -260,7 +260,7 @@ func TestAdd(t *testing.T) {
 		},
 		{
 			name: "invalid checkpoint",
-			entry: &pb.DSSERequestV0_0_2{
+			entry: &pb.DSSERequestV002{
 				Envelope: &dsse.Envelope{
 					Payload:     []byte("some payload"),
 					PayloadType: "",
@@ -301,7 +301,7 @@ func TestAdd(t *testing.T) {
 		},
 		{
 			name: "invalid inclusion proof",
-			entry: &pb.DSSERequestV0_0_2{
+			entry: &pb.DSSERequestV002{
 				Envelope: &dsse.Envelope{
 					Payload:     []byte("some payload"),
 					PayloadType: "",