Renames SVID Entry field from TTL to X509SvidTtl

Per comment spiffe/spire#3445 (comment) it was decided to
1. Rename the TTL field to X509SvidTtl
2. Add the new JwtSvidTtl field

This change augments commit spiffe@3c5e450

Signed-off-by: Dennis Gove <dgove1@bloomberg.net>

proto/spire/api/types/entry.proto

@@ -24,10 +24,9 @@ message Entry {
     // workload attestation.
     repeated spire.api.types.Selector selectors = 4;
 
-    // The time to live for identities issued for this entry (in seconds).
-    // This field is deprecated in favor of the x509_svid_ttl and jwt_svid_ttl
-    // fields and will be removed in a future release.
-    int32 ttl = 5;
+    // The time to live for X509-SVID identities issued for this entry (in seconds).
+    // Previously called ttl
+    int32 x509_svid_ttl = 5;
 
     // The names of trust domains the identity described by this entry
     // federates with.
@@ -56,11 +55,8 @@ message Entry {
     // Determines if the issued identity is exportable to a store
     bool store_svid = 12;
 
-    // The time to live for X509-SVID identities issued for this entry (in seconds), overrides ttl if set.
-    int32 x509_svid_ttl = 13;
-
     // The time to live for JWT-SVID identities issued for this entry (in seconds), overrides ttl if set.
-    int32 jwt_svid_ttl = 14;
+    int32 jwt_svid_ttl = 13;
 }
 
 // Field mask for Entry fields
@@ -74,8 +70,8 @@ message EntryMask {
     // selectors field mask
     bool selectors = 4;
 
-    // ttl field mask
-    bool ttl = 5;
+    // x509_svid_ttl field mask
+    bool x509_svid_ttl = 5;
 
     // federates_with field mask
     bool federates_with = 6;
@@ -98,9 +94,6 @@ message EntryMask {
     // store_svid field mask
     bool store_svid = 12;
 
-    // x509_svid_ttl field mask
-    bool x509_svid_ttl = 13;
-
     // jwt_svid_ttl field mask
-    bool jwt_svid_ttl = 14;
+    bool jwt_svid_ttl = 13;
 }