This is an automated email from the ASF dual-hosted git repository. juergbi pushed a commit to branch juerg/token-auth in repository https://gitbox.apache.org/repos/asf/buildstream.git
commit f095829fc7981f6ca6618a156734c2d89fc9f5c7 Author: Jürg Billeter <[email protected]> AuthorDate: Fri Jun 7 08:25:57 2024 +0200 _protos: Update local_cas.proto from buildbox --- .../_protos/build/buildgrid/local_cas.proto | 23 +++++++ .../_protos/build/buildgrid/local_cas_pb2.py | 74 +++++++++++----------- 2 files changed, 60 insertions(+), 37 deletions(-) diff --git a/src/buildstream/_protos/build/buildgrid/local_cas.proto b/src/buildstream/_protos/build/buildgrid/local_cas.proto index a26d9f0e0..852bbe2f0 100644 --- a/src/buildstream/_protos/build/buildgrid/local_cas.proto +++ b/src/buildstream/_protos/build/buildgrid/local_cas.proto @@ -287,6 +287,7 @@ message StageTreeRequest { message Credentials { int64 uid = 1; + int64 gid = 2; } // The UNIX credentials of the processes that will access the staged tree. @@ -331,6 +332,16 @@ message CaptureTreeRequest { // If enabled, they MUST NOT be modified after issuing this request in order // to guarantee consistency. bool move_files = 5; + + // The format that the localcas should use to capture the contents of + // output directories. + // + // In case this field is set to a value that is not supported by the + // localcas, the worker SHOULD interpret this field as TREE_ONLY. The + // localcas MAY store output directories in formats that are a superset + // of what was requested (e.g., interpreting DIRECTORY_ONLY as + // TREE_AND_DIRECTORY). + build.bazel.remote.execution.v2.Command.OutputDirectoryFormat output_directory_format = 7; } // A response message for @@ -348,6 +359,11 @@ message CaptureTreeResponse { // The result of attempting to capture and upload the tree. google.rpc.Status status = 3; + + // The digest of the captured directory as an encoded + // [Tree][build.bazel.remote.execution.v2.Directory] proto containing the + // directory's contents, if successful. + build.bazel.remote.execution.v2.Digest root_directory_digest = 4; } // The responses to the requests. @@ -470,6 +486,12 @@ message Remote { // specified as well. bytes client_cert = 5; + // The path to a token for optional HTTP bearer authentication. + string access_token_path = 7; + + // Access token reload interval. + google.protobuf.Duration access_token_reload_interval = 8; + // Remote keepalive time. Unset or empty is treated as disabling keepalive. google.protobuf.Duration keepalive_time = 6; } @@ -487,6 +509,7 @@ message GetInstanceNameForRemotesRequest { Remote content_addressable_storage = 1; Remote remote_asset = 2; Remote action_cache = 4; + Remote execution = 5; } // A response message for diff --git a/src/buildstream/_protos/build/buildgrid/local_cas_pb2.py b/src/buildstream/_protos/build/buildgrid/local_cas_pb2.py index b6f9cebe0..990cfe902 100644 --- a/src/buildstream/_protos/build/buildgrid/local_cas_pb2.py +++ b/src/buildstream/_protos/build/buildgrid/local_cas_pb2.py @@ -17,7 +17,7 @@ from buildstream._protos.google.rpc import status_pb2 as google_dot_rpc_dot_stat from google.protobuf import duration_pb2 as google_dot_protobuf_dot_duration__pb2 -DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x1f\x62uild/buildgrid/local_cas.proto\x12\x0f\x62uild.buildgrid\x1a\x36\x62uild/bazel/remote/execution/v2/remote_execution.proto\x1a\x17google/rpc/status.proto\x1a\x1egoogle/protobuf/duration.proto\"p\n\x18\x46\x65tchMissingBlobsRequest\x12\x15\n\rinstance_name\x18\x01 \x01(\t\x12=\n\x0c\x62lob_digests\x18\x02 \x03(\x0b\x32\'.build.bazel.remote.execution.v2.Digest\"\xcc\x01\n\x19\x46\x65tchMissingBlobsResponse\x12\x46\n\tresp [...] +DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x1f\x62uild/buildgrid/local_cas.proto\x12\x0f\x62uild.buildgrid\x1a\x36\x62uild/bazel/remote/execution/v2/remote_execution.proto\x1a\x17google/rpc/status.proto\x1a\x1egoogle/protobuf/duration.proto\"p\n\x18\x46\x65tchMissingBlobsRequest\x12\x15\n\rinstance_name\x18\x01 \x01(\t\x12=\n\x0c\x62lob_digests\x18\x02 \x03(\x0b\x32\'.build.bazel.remote.execution.v2.Digest\"\xcc\x01\n\x19\x46\x65tchMissingBlobsResponse\x12\x46\n\tresp [...] @@ -275,41 +275,41 @@ if _descriptor._USE_C_DESCRIPTORS == False: _UPLOADTREERESPONSE._serialized_start=1069 _UPLOADTREERESPONSE._serialized_end=1089 _STAGETREEREQUEST._serialized_start=1092 - _STAGETREEREQUEST._serialized_end=1312 + _STAGETREEREQUEST._serialized_end=1325 _STAGETREEREQUEST_CREDENTIALS._serialized_start=1286 - _STAGETREEREQUEST_CREDENTIALS._serialized_end=1312 - _STAGETREERESPONSE._serialized_start=1314 - _STAGETREERESPONSE._serialized_end=1347 - _CAPTURETREEREQUEST._serialized_start=1350 - _CAPTURETREEREQUEST._serialized_end=1494 - _CAPTURETREERESPONSE._serialized_start=1497 - _CAPTURETREERESPONSE._serialized_end=1708 - _CAPTURETREERESPONSE_RESPONSE._serialized_start=1586 - _CAPTURETREERESPONSE_RESPONSE._serialized_end=1708 - _CAPTUREFILESREQUEST._serialized_start=1711 - _CAPTUREFILESREQUEST._serialized_end=1856 - _CAPTUREFILESRESPONSE._serialized_start=1859 - _CAPTUREFILESRESPONSE._serialized_end=2171 - _CAPTUREFILESRESPONSE_RESPONSE._serialized_start=1951 - _CAPTUREFILESRESPONSE_RESPONSE._serialized_end=2171 - _GETINSTANCENAMEFORREMOTEREQUEST._serialized_start=2174 - _GETINSTANCENAMEFORREMOTEREQUEST._serialized_end=2305 - _GETINSTANCENAMEFORREMOTERESPONSE._serialized_start=2307 - _GETINSTANCENAMEFORREMOTERESPONSE._serialized_end=2364 - _REMOTE._serialized_start=2367 - _REMOTE._serialized_end=2524 - _GETINSTANCENAMEFORREMOTESREQUEST._serialized_start=2527 - _GETINSTANCENAMEFORREMOTESREQUEST._serialized_end=2740 - _GETINSTANCENAMEFORREMOTESRESPONSE._serialized_start=2742 - _GETINSTANCENAMEFORREMOTESRESPONSE._serialized_end=2800 - _GETINSTANCENAMEFORNAMESPACEREQUEST._serialized_start=2802 - _GETINSTANCENAMEFORNAMESPACEREQUEST._serialized_end=2875 - _GETINSTANCENAMEFORNAMESPACERESPONSE._serialized_start=2877 - _GETINSTANCENAMEFORNAMESPACERESPONSE._serialized_end=2937 - _GETLOCALDISKUSAGEREQUEST._serialized_start=2939 - _GETLOCALDISKUSAGEREQUEST._serialized_end=2965 - _GETLOCALDISKUSAGERESPONSE._serialized_start=2967 - _GETLOCALDISKUSAGERESPONSE._serialized_end=3035 - _LOCALCONTENTADDRESSABLESTORAGE._serialized_start=3038 - _LOCALCONTENTADDRESSABLESTORAGE._serialized_end=4263 + _STAGETREEREQUEST_CREDENTIALS._serialized_end=1325 + _STAGETREERESPONSE._serialized_start=1327 + _STAGETREERESPONSE._serialized_end=1360 + _CAPTURETREEREQUEST._serialized_start=1363 + _CAPTURETREEREQUEST._serialized_end=1604 + _CAPTURETREERESPONSE._serialized_start=1607 + _CAPTURETREERESPONSE._serialized_end=1891 + _CAPTURETREERESPONSE_RESPONSE._serialized_start=1697 + _CAPTURETREERESPONSE_RESPONSE._serialized_end=1891 + _CAPTUREFILESREQUEST._serialized_start=1894 + _CAPTUREFILESREQUEST._serialized_end=2039 + _CAPTUREFILESRESPONSE._serialized_start=2042 + _CAPTUREFILESRESPONSE._serialized_end=2354 + _CAPTUREFILESRESPONSE_RESPONSE._serialized_start=2134 + _CAPTUREFILESRESPONSE_RESPONSE._serialized_end=2354 + _GETINSTANCENAMEFORREMOTEREQUEST._serialized_start=2357 + _GETINSTANCENAMEFORREMOTEREQUEST._serialized_end=2488 + _GETINSTANCENAMEFORREMOTERESPONSE._serialized_start=2490 + _GETINSTANCENAMEFORREMOTERESPONSE._serialized_end=2547 + _REMOTE._serialized_start=2550 + _REMOTE._serialized_end=2799 + _GETINSTANCENAMEFORREMOTESREQUEST._serialized_start=2802 + _GETINSTANCENAMEFORREMOTESREQUEST._serialized_end=3059 + _GETINSTANCENAMEFORREMOTESRESPONSE._serialized_start=3061 + _GETINSTANCENAMEFORREMOTESRESPONSE._serialized_end=3119 + _GETINSTANCENAMEFORNAMESPACEREQUEST._serialized_start=3121 + _GETINSTANCENAMEFORNAMESPACEREQUEST._serialized_end=3194 + _GETINSTANCENAMEFORNAMESPACERESPONSE._serialized_start=3196 + _GETINSTANCENAMEFORNAMESPACERESPONSE._serialized_end=3256 + _GETLOCALDISKUSAGEREQUEST._serialized_start=3258 + _GETLOCALDISKUSAGEREQUEST._serialized_end=3284 + _GETLOCALDISKUSAGERESPONSE._serialized_start=3286 + _GETLOCALDISKUSAGERESPONSE._serialized_end=3354 + _LOCALCONTENTADDRESSABLESTORAGE._serialized_start=3357 + _LOCALCONTENTADDRESSABLESTORAGE._serialized_end=4582 # @@protoc_insertion_point(module_scope)
