fix(identity): bridge workspace token fields

gen/openapi/identity/v1/tokens.openapi.yaml

@@ -268,6 +268,9 @@ components:
         issuedAt:
           title: issued_at
           $ref: '#/components/schemas/google.protobuf.Timestamp'
+        workspaceId:
+          type: string
+          title: workspace_id
       title: IntrospectResponse
       additionalProperties: false
       description: |-
@@ -346,6 +349,9 @@ components:
           type: integer
           title: ttl_seconds
           format: int32
+        workspaceId:
+          type: string
+          title: workspace_id
       title: IssueServiceTokenRequest
       additionalProperties: false
     identity.v1.IssueServiceTokenResponse:

gen/ts/identity/v1/tokens_pb.ts

@@ -1,4 +1,4 @@
-// @generated by protoc-gen-es v2.12.0 with parameter "target=ts,import_extension=.js"
+// @generated by protoc-gen-es v2.12.1 with parameter "target=ts,import_extension=.js"
 // @generated from file identity/v1/tokens.proto (package identity.v1, syntax proto3)
 /* eslint-disable */
 
@@ -12,7 +12,7 @@ import type { Message } from "@bufbuild/protobuf";
  * Describes the file identity/v1/tokens.proto.
  */
 export const file_identity_v1_tokens: GenFile = /*@__PURE__*/
-  fileDesc("ChhpZGVudGl0eS92MS90b2tlbnMucHJvdG8SC2lkZW50aXR5LnYxIiIKEUludHJvc3BlY3RSZXF1ZXN0Eg0KBXRva2VuGAEgASgJIuACChJJbnRyb3NwZWN0UmVzcG9uc2USDgoGYWN0aXZlGAEgASgIEg8KB3N1YmplY3QYAiABKAkSEgoKdG9rZW5fdHlwZRgDIAEoCRIPCgdzZXJ2aWNlGAQgASgJEhcKD29yZ2FuaXphdGlvbl9pZBgFIAEoCRIOCgZzY29wZXMYBiADKAkSEgoKYWdlbnRfdHlwZRgHIAEoCRIUCgxjYXBhYmlsaXRpZXMYCCADKAkSDgoGcnVuX2lkGAkgASgJEg8KB3N1cmZhY2UYCiABKAkSFAoMdXNlcl9zdWJqZWN0GAsgASgJEg0KBWVtYWlsGAwgASgJEgwKBG5hbWUYDSABKAkSLgoKZXhwaXJlc19hdBgOIAEoCzIaLmdvb2dsZS5wcm90b2J1Zi5UaW1lc3RhbXASLQoJaXNzdWVkX2F0GA8gASgLMhouZ29vZ2xlLnByb3RvYnVmLlRpbWVzdGFtcCJpChhJc3N1ZVNlcnZpY2VUb2tlblJlcXVlc3QSDwoHc2VydmljZRgBIAEoCRIXCg9vcmdhbml6YXRpb25faWQYAiABKAkSDgoGc2NvcGVzGAMgAygJEhMKC3R0bF9zZWNvbmRzGAQgASgFIloKGUlzc3VlU2VydmljZVRva2VuUmVzcG9uc2USDQoFdG9rZW4YASABKAkSLgoKZXhwaXJlc19hdBgCIAEoCzIaLmdvb2dsZS5wcm90b2J1Zi5UaW1lc3RhbXAikgEKFklzc3VlQWdlbnRUb2tlblJlcXVlc3QSFgoKYWdlbnRfdHlwZRgBIAEoCUICGAESGAoMY2FwYWJpbGl0aWVzGAIgAygJQgIYARIOCgZzY29wZXMYAyADKAkSDwoHc3VyZmFjZRgEIAEoCRITCgt0dGxfc2Vjb25kcxgFIAEoBRIQCghhZ2VudF9pZBgGIAEoCSJYChdJc3N1ZUFnZW50VG9rZW5SZXNwb25zZRINCgV0b2tlbhgBIAEoCRIuCgpleHBpcmVzX2F0GAIgASgLMhouZ29vZ2xlLnByb3RvYnVmLlRpbWVzdGFtcDKfAgoMVG9rZW5TZXJ2aWNlEk0KCkludHJvc3BlY3QSHi5pZGVudGl0eS52MS5JbnRyb3NwZWN0UmVxdWVzdBofLmlkZW50aXR5LnYxLkludHJvc3BlY3RSZXNwb25zZRJiChFJc3N1ZVNlcnZpY2VUb2tlbhIlLmlkZW50aXR5LnYxLklzc3VlU2VydmljZVRva2VuUmVxdWVzdBomLmlkZW50aXR5LnYxLklzc3VlU2VydmljZVRva2VuUmVzcG9uc2USXAoPSXNzdWVBZ2VudFRva2VuEiMuaWRlbnRpdHkudjEuSXNzdWVBZ2VudFRva2VuUmVxdWVzdBokLmlkZW50aXR5LnYxLklzc3VlQWdlbnRUb2tlblJlc3BvbnNlQjhaNmdpdGh1Yi5jb20vZXZhbG9wcy9wcm90by9nZW4vZ28vaWRlbnRpdHkvdjE7aWRlbnRpdHl2MWIGcHJvdG8z", [file_google_protobuf_timestamp]);
+  fileDesc("ChhpZGVudGl0eS92MS90b2tlbnMucHJvdG8SC2lkZW50aXR5LnYxIiIKEUludHJvc3BlY3RSZXF1ZXN0Eg0KBXRva2VuGAEgASgJIvYCChJJbnRyb3NwZWN0UmVzcG9uc2USDgoGYWN0aXZlGAEgASgIEg8KB3N1YmplY3QYAiABKAkSEgoKdG9rZW5fdHlwZRgDIAEoCRIPCgdzZXJ2aWNlGAQgASgJEhcKD29yZ2FuaXphdGlvbl9pZBgFIAEoCRIOCgZzY29wZXMYBiADKAkSEgoKYWdlbnRfdHlwZRgHIAEoCRIUCgxjYXBhYmlsaXRpZXMYCCADKAkSDgoGcnVuX2lkGAkgASgJEg8KB3N1cmZhY2UYCiABKAkSFAoMdXNlcl9zdWJqZWN0GAsgASgJEg0KBWVtYWlsGAwgASgJEgwKBG5hbWUYDSABKAkSLgoKZXhwaXJlc19hdBgOIAEoCzIaLmdvb2dsZS5wcm90b2J1Zi5UaW1lc3RhbXASLQoJaXNzdWVkX2F0GA8gASgLMhouZ29vZ2xlLnByb3RvYnVmLlRpbWVzdGFtcBIUCgx3b3Jrc3BhY2VfaWQYGyABKAkifwoYSXNzdWVTZXJ2aWNlVG9rZW5SZXF1ZXN0Eg8KB3NlcnZpY2UYASABKAkSFwoPb3JnYW5pemF0aW9uX2lkGAIgASgJEg4KBnNjb3BlcxgDIAMoCRITCgt0dGxfc2Vjb25kcxgEIAEoBRIUCgx3b3Jrc3BhY2VfaWQYBSABKAkiWgoZSXNzdWVTZXJ2aWNlVG9rZW5SZXNwb25zZRINCgV0b2tlbhgBIAEoCRIuCgpleHBpcmVzX2F0GAIgASgLMhouZ29vZ2xlLnByb3RvYnVmLlRpbWVzdGFtcCKSAQoWSXNzdWVBZ2VudFRva2VuUmVxdWVzdBIWCgphZ2VudF90eXBlGAEgASgJQgIYARIYCgxjYXBhYmlsaXRpZXMYAiADKAlCAhgBEg4KBnNjb3BlcxgDIAMoCRIPCgdzdXJmYWNlGAQgASgJEhMKC3R0bF9zZWNvbmRzGAUgASgFEhAKCGFnZW50X2lkGAYgASgJIlgKF0lzc3VlQWdlbnRUb2tlblJlc3BvbnNlEg0KBXRva2VuGAEgASgJEi4KCmV4cGlyZXNfYXQYAiABKAsyGi5nb29nbGUucHJvdG9idWYuVGltZXN0YW1wMp8CCgxUb2tlblNlcnZpY2USTQoKSW50cm9zcGVjdBIeLmlkZW50aXR5LnYxLkludHJvc3BlY3RSZXF1ZXN0Gh8uaWRlbnRpdHkudjEuSW50cm9zcGVjdFJlc3BvbnNlEmIKEUlzc3VlU2VydmljZVRva2VuEiUuaWRlbnRpdHkudjEuSXNzdWVTZXJ2aWNlVG9rZW5SZXF1ZXN0GiYuaWRlbnRpdHkudjEuSXNzdWVTZXJ2aWNlVG9rZW5SZXNwb25zZRJcCg9Jc3N1ZUFnZW50VG9rZW4SIy5pZGVudGl0eS52MS5Jc3N1ZUFnZW50VG9rZW5SZXF1ZXN0GiQuaWRlbnRpdHkudjEuSXNzdWVBZ2VudFRva2VuUmVzcG9uc2VCOFo2Z2l0aHViLmNvbS9ldmFsb3BzL3Byb3RvL2dlbi9nby9pZGVudGl0eS92MTtpZGVudGl0eXYxYgZwcm90bzM", [file_google_protobuf_timestamp]);
 
 /**
  * @generated from message identity.v1.IntrospectRequest
@@ -114,6 +114,11 @@ export type IntrospectResponse = Message<"identity.v1.IntrospectResponse"> & {
    * @generated from field: google.protobuf.Timestamp issued_at = 15;
    */
   issuedAt?: Timestamp | undefined;
+
+  /**
+   * @generated from field: string workspace_id = 27;
+   */
+  workspaceId: string;
 };
 
 /**
@@ -146,6 +151,11 @@ export type IssueServiceTokenRequest = Message<"identity.v1.IssueServiceTokenReq
    * @generated from field: int32 ttl_seconds = 4;
    */
   ttlSeconds: number;
+
+  /**
+   * @generated from field: string workspace_id = 5;
+   */
+  workspaceId: string;
 };
 
 /**

proto/identity/v1/tokens.proto

@@ -42,13 +42,15 @@ message IntrospectResponse {
   string name = 13;
   google.protobuf.Timestamp expires_at = 14;
   google.protobuf.Timestamp issued_at = 15;
+  string workspace_id = 27;
 }
 
 message IssueServiceTokenRequest {
   string service = 1;
   string organization_id = 2;
   repeated string scopes = 3;
   int32 ttl_seconds = 4;
+  string workspace_id = 5;
 }
 
 message IssueServiceTokenResponse {

scripts/test_identity_workspace_compat.py

@@ -0,0 +1,29 @@
+#!/usr/bin/env python3
+
+import re
+import unittest
+from pathlib import Path
+
+
+SOURCE = (
+    Path(__file__).resolve().parents[1] / "proto" / "identity" / "v1" / "tokens.proto"
+)
+
+
+class IdentityWorkspaceCompatibilityTests(unittest.TestCase):
+    def test_workspace_fields_match_platform_numbers(self) -> None:
+        source = SOURCE.read_text(encoding="utf-8")
+        issue = re.search(
+            r"message IssueServiceTokenRequest \{(?P<body>.*?)\n\}", source, re.DOTALL
+        )
+        introspect = re.search(
+            r"message IntrospectResponse \{(?P<body>.*?)\n\}", source, re.DOTALL
+        )
+        self.assertIsNotNone(issue)
+        self.assertIsNotNone(introspect)
+        self.assertRegex(issue.group("body"), r"\bstring workspace_id = 5;")
+        self.assertRegex(introspect.group("body"), r"\bstring workspace_id = 27;")
+
+
+if __name__ == "__main__":
+    unittest.main()