Add int-type Authz ID proto fields alongside any string-type proto fields

core/objects.go

@@ -269,7 +269,7 @@ func (ch Challenge) StringID() string {
 type Authorization struct {
 	// An identifier for this authorization, unique across
 	// authorizations and certificates within this instance.
-	ID string `json:"-"`
+	ID int64 `json:"-"`
 
 	// The identifier for which authorization is being given
 	Identifier identifier.ACMEIdentifier `json:"identifier"`

core/proto/core.proto

@@ -93,9 +93,10 @@ message Registration {
 }
 
 message Authorization {
-  // Next unused field number: 12
+  // Next unused field number: 13
   reserved 5, 7, 8;
-  string id = 1;
+  string id = 1;    // TODO(#8722): reserve
+  int64 idInt = 12; // TODO(#8722): rename
   int64 registrationID = 3;
   // Fields specified by RFC 8555, Section 7.1.4
   reserved 2; // Previously dnsName

grpc/pb-marshalling.go

@@ -8,6 +8,7 @@ package grpc
 import (
 	"fmt"
 	"net/netip"
+	"strconv"
 	"time"
 
 	"github.com/go-jose/go-jose/v4"
@@ -291,7 +292,8 @@ func AuthzToPB(authz core.Authorization) (*corepb.Authorization, error) {
 	}
 
 	return &corepb.Authorization{
-		Id:                     authz.ID,
+		Id:                     fmt.Sprintf("%d", authz.ID),
+		IdInt:                  authz.ID,
 		Identifier:             authz.Identifier.ToProto(),
 		RegistrationID:         authz.RegistrationID,
 		Status:                 string(authz.Status),
@@ -315,8 +317,20 @@ func PBToAuthz(pb *corepb.Authorization) (core.Authorization, error) {
 		c := pb.Expires.AsTime()
 		expires = &c
 	}
+
+	// TODO(#8722): remove this series of checks when pb.Id is int64-only
+	var authzIDInt int64
+	if pb.IdInt != 0 {
+		authzIDInt = pb.IdInt
+	} else if pb.Id != "" {
+		parsed, err := strconv.ParseInt(pb.Id, 10, 64)
+		if err != nil {
+			return core.Authorization{}, ErrInvalidParameters
+		}
+		authzIDInt = parsed
+	}
 	authz := core.Authorization{
-		ID:                     pb.Id,
+		ID:                     authzIDInt,
 		Identifier:             identifier.FromProto(pb.Identifier),
 		RegistrationID:         pb.RegistrationID,
 		Status:                 core.AcmeStatus(pb.Status),

grpc/pb-marshalling_test.go

@@ -216,7 +216,7 @@ func TestAuthz(t *testing.T) {
 		Token:  "asd2",
 	}
 	inAuthz := core.Authorization{
-		ID:             "1",
+		ID:             1,
 		Identifier:     ident,
 		RegistrationID: 5,
 		Status:         core.StatusPending,
@@ -230,7 +230,7 @@ func TestAuthz(t *testing.T) {
 	test.AssertDeepEquals(t, inAuthz, outAuthz)
 
 	inAuthzNilExpires := core.Authorization{
-		ID:             "1",
+		ID:             1,
 		Identifier:     ident,
 		RegistrationID: 5,
 		Status:         core.StatusPending,