[Notes] [Git][BuildGrid/buildgrid][mablanch/92-architecture-documentatio

finn pushed to branch mablanch/92-architecture-documentation at BuildGrid / buildgrid

Commits:

45e1d8b9

by Martin Blanchard at 2018-10-25T10:25:51Z

 Udapte .proto files to their latest version

Noteworthy changes include:
* From remote_execution.proto:
  - Support for symlinks in build output [1].
  - Operation cancellation clarification [2].
  - Documentation updates.
* From http.proto:
  - Documentation updates.

[1] https://github.com/bazelbuild/remote-apis/pull/28
[2] https://github.com/bazelbuild/remote-apis/pull/30

6e9857e2
by Finn at 2018-10-25T12:26:31Z
```
Adding an FAQ to the docs.
```
296cf1ed
by Martin Blanchard at 2018-10-26T18:21:16Z
```
docs: Load the graphviz extension for diagrams
```

de223c8f

by Finn at 2018-10-26T18:21:16Z

Add an Architecture section with diagrams.

23 changed files:

README.rst
buildgrid/_protos/build/bazel/remote/execution/v2/remote_execution.proto
buildgrid/_protos/build/bazel/remote/execution/v2/remote_execution_pb2.py
buildgrid/_protos/build/bazel/remote/execution/v2/remote_execution_pb2_grpc.py
buildgrid/_protos/build/bazel/semver/semver.proto
buildgrid/_protos/build/bazel/semver/semver_pb2.py
buildgrid/_protos/buildstream/v2/buildstream_pb2.py
buildgrid/_protos/google/api/annotations_pb2.py
buildgrid/_protos/google/api/http.proto
buildgrid/_protos/google/api/http_pb2.py
buildgrid/_protos/google/bytestream/bytestream_pb2.py
buildgrid/_protos/google/devtools/remoteworkers/v1test2/bots_pb2.py
buildgrid/_protos/google/devtools/remoteworkers/v1test2/command_pb2.py
buildgrid/_protos/google/devtools/remoteworkers/v1test2/tasks_pb2.py
buildgrid/_protos/google/devtools/remoteworkers/v1test2/worker_pb2.py
buildgrid/_protos/google/longrunning/operations_pb2.py
buildgrid/_protos/google/rpc/code_pb2.py
buildgrid/_protos/google/rpc/status_pb2.py
+ docs/source/architecture.rst
+ docs/source/architecture_overview.rst
docs/source/conf.py
+ docs/source/faq.rst
docs/source/index.rst

Changes:

README.rst

@@ -13,7 +13,7 @@ BuildGrid is a Python remote execution service which implements Google's
  `Remote Execution API`_ and the `Remote Workers API`_. The project's goal is to
  be able to execute build jobs remotely on a grid of computers in order to
  massively speed up build times. Workers on the grid should be able to run with
 -different environments. It works with clients such as `Bazel`_,
 +different environments. It works with clients such as `Bazel`_,
  `BuildStream`_ and `RECC`_, and is designed to be able to work with any client
  that conforms to the above API protocols.
@@ -47,6 +47,7 @@ Resources
  - `Bug tracking`_
  - `Mailing list`_
  - `Slack channel`_ [`invite link`_]
 +- `FAQ`_
  .. _Homepage: https://buildgrid.build
  .. _GitLab repository: https://gitlab.com/BuildGrid/buildgrid
@@ -54,3 +55,4 @@ Resources
  .. _Mailing list: https://lists.buildgrid.build/cgi-bin/mailman/listinfo/buildgrid
  .. _Slack channel: https://buildteamworld.slack.com/messages/CC9MKC203
  .. _invite link: https://join.slack.com/t/buildteamworld/shared_invite/enQtMzkxNzE0MDMyMDY1LTRmZmM1OWE0OTFkMGE1YjU5Njc4ODEzYjc0MGMyOTM5ZTQ5MmE2YTQ1MzQwZDc5MWNhODY1ZmRkZTE4YjFhNjU
 +.. _FAQ: https://buildgrid.gitlab.io/buildgrid/faq.html

buildgrid/_protos/build/bazel/remote/execution/v2/remote_execution.proto

@@ -93,6 +93,9 @@ service Execution {
    // * `INTERNAL`: An internal error occurred in the execution engine or the
    //   worker.
    // * `DEADLINE_EXCEEDED`: The execution timed out.
 +  // * `CANCELLED`: The operation was cancelled by the client. This status is
 +  //   only possible if the server implements the Operations API CancelOperation
 +  //   method, and it was called for the current execution.
    //
    // In the case of a missing input or command, the server SHOULD additionally
    // send a [PreconditionFailure][google.rpc.PreconditionFailure] error detail
@@ -157,7 +160,7 @@ service ActionCache {
    // `ContentAddressableStorage`.
    //
    // Errors:
 -  // * `NOT_IMPLEMENTED`: This method is not supported by the server.
 +  // * `UNIMPLEMENTED`: This method is not supported by the server.
    // * `RESOURCE_EXHAUSTED`: There is insufficient storage space to add the
    //   entry to the cache.
    rpc UpdateActionResult(UpdateActionResultRequest) returns (ActionResult) {
@@ -181,8 +184,8 @@ service ActionCache {
  // hierarchy, which must also each be uploaded on their own.
  //
  // For small file uploads the client should group them together and call
 -// [BatchUpdateBlobs][build.bazel.remote.execution.v2.ContentAddressableStorage.BatchUpdateBlobs]
 -// on chunks of no more than 10 MiB. For large uploads, the client must use the
 +// [BatchUpdateBlobs][build.bazel.remote.execution.v2.ContentAddressableStorage.BatchUpdateBlobs].
 +// For large uploads, the client must use the
  // [Write method][google.bytestream.ByteStream.Write] of the ByteStream API. The
  // `resource_name` is `{instance_name}/uploads/{uuid}/blobs/{hash}/{size}`,
  // where `instance_name` is as described in the next paragraph, `uuid` is a
@@ -426,7 +429,8 @@ message Command {
    // A list of the output files that the client expects to retrieve from the
    // action. Only the listed files, as well as directories listed in
    // `output_directories`, will be returned to the client as output.
 -  // Other files that may be created during command execution are discarded.
 +  // Other files or directories that may be created during command execution
 +  // are discarded.
    //
    // The paths are relative to the working directory of the action execution.
    // The paths are specified using a single forward slash (`/`) as a path
@@ -438,16 +442,17 @@ message Command {
    // MUST be sorted lexicographically by code point (or, equivalently, by UTF-8
    // bytes).
    //
 -  // An output file cannot be duplicated, be a parent of another output file, be
 -  // a child of a listed output directory, or have the same path as any of the
 -  // listed output directories.
 +  // An output file cannot be duplicated, be a parent of another output file, or
 +  // have the same path as any of the listed output directories.
    repeated string output_files = 3;
    // A list of the output directories that the client expects to retrieve from
 -  // the action. Only the contents of the indicated directories (recursively
 -  // including the contents of their subdirectories) will be
 -  // returned, as well as files listed in `output_files`. Other files that may
 -  // be created during command execution are discarded.
 +  // the action. Only the listed directories will be returned (an entire
 +  // directory structure will be returned as a
 +  // [Tree][build.bazel.remote.execution.v2.Tree] message digest, see
 +  // [OutputDirectory][build.bazel.remote.execution.v2.OutputDirectory]), as
 +  // well as files listed in `output_files`. Other files or directories that
 +  // may be created during command execution are discarded.
    //
    // The paths are relative to the working directory of the action execution.
    // The paths are specified using a single forward slash (`/`) as a path
@@ -461,9 +466,8 @@ message Command {
    // MUST be sorted lexicographically by code point (or, equivalently, by UTF-8
    // bytes).
    //
 -  // An output directory cannot be duplicated, be a parent of another output
 -  // directory, be a parent of a listed output file, or have the same path as
 -  // any of the listed output files.
 +  // An output directory cannot be duplicated or have the same path as any of
 +  // the listed output files.
    repeated string output_directories = 4;
    // The platform requirements for the execution environment. The server MAY
@@ -710,7 +714,9 @@ message ActionResult {
    // The output files of the action. For each output file requested in the
    // `output_files` field of the Action, if the corresponding file existed after
 -  // the action completed, a single entry will be present in the output list.
 +  // the action completed, a single entry will be present either in this field,
 +  // or in the output_file_symlinks field, if the file was a symbolic link to
 +  // another file.
    //
    // If the action does not produce the requested output, or produces a
    // directory where a regular file is expected or vice versa, then that output
@@ -718,6 +724,21 @@ message ActionResult {
    // list as desired; clients MUST NOT assume that the output list is sorted.
    repeated OutputFile output_files = 2;
 +  // The output files of the action that are symbolic links to other files. Those
 +  // may be links to other output files, or input files, or even absolute paths
 +  // outside of the working directory, if the server supports
 +  // [SymlinkAbsolutePathStrategy.ALLOWED][build.bazel.remote.execution.v2.SymlinkAbsolutePathStrategy].
 +  // For each output file requested in the `output_files` field of the Action,
 +  // if the corresponding file existed after
 +  // the action completed, a single entry will be present either in this field,
 +  // or in the `output_files` field, if the file was not a symbolic link.
 +  //
 +  // If the action does not produce the requested output, or produces a
 +  // directory where a regular file is expected or vice versa, then that output
 +  // will be omitted from the list. The server is free to arrange the output
 +  // list as desired; clients MUST NOT assume that the output list is sorted.
 +  repeated OutputSymlink output_file_symlinks = 10;
++
    // The output directories of the action. For each output directory requested
    // in the `output_directories` field of the Action, if the corresponding
    // directory existed after the action completed, a single entry will be
@@ -779,6 +800,22 @@ message ActionResult {
    // ```
    repeated OutputDirectory output_directories = 3;
 +  // The output directories of the action that are symbolic links to other
 +  // directories. Those may be links to other output directories, or input
 +  // directories, or even absolute paths outside of the working directory,
 +  // if the server supports
 +  // [SymlinkAbsolutePathStrategy.ALLOWED][build.bazel.remote.execution.v2.SymlinkAbsolutePathStrategy].
 +  // For each output directory requested in the `output_directories` field of
 +  // the Action, if the directory file existed after
 +  // the action completed, a single entry will be present either in this field,
 +  // or in the `output_directories` field, if the directory was not a symbolic link.
 +  //
 +  // If the action does not produce the requested output, or produces a
 +  // file where a directory is expected or vice versa, then that output
 +  // will be omitted from the list. The server is free to arrange the output
 +  // list as desired; clients MUST NOT assume that the output list is sorted.
 +  repeated OutputSymlink output_directory_symlinks = 11;
++
    // The exit code of the command.
    int32 exit_code = 4;
@@ -821,7 +858,7 @@ message ActionResult {
  //
  // `OutputFile` is binary-compatible with `FileNode`.
  message OutputFile {
 -  // The full path of the file relative to the input root, including the
 +  // The full path of the file relative to the working directory, including the
    // filename. The path separator is a forward slash `/`. Since this is a
    // relative path, it MUST NOT begin with a leading forward slash.
    string path = 1;
@@ -866,6 +903,26 @@ message OutputDirectory {
    Digest tree_digest = 3;
+ }
 +// An `OutputSymlink` is similar to a
 +// [Symlink][build.bazel.remote.execution.v2.SymlinkNode], but it is used as an
 +// output in an `ActionResult`.
 +//
 +// `OutputSymlink` is binary-compatible with `SymlinkNode`.
 +message OutputSymlink {
 +  // The full path of the symlink relative to the working directory, including the
 +  // filename. The path separator is a forward slash `/`. Since this is a
 +  // relative path, it MUST NOT begin with a leading forward slash.
 +  string path = 1;
++
 +  // The target path of the symlink. The path separator is a forward slash `/`.
 +  // The target path can be relative to the parent directory of the symlink or
 +  // it can be an absolute path starting with `/`. Support for absolute paths
 +  // can be checked using the [Capabilities][build.bazel.remote.execution.v2.Capabilities]
 +  // API. The canonical form forbids the substrings `/./` and `//` in the target
 +  // path. `..` components are allowed anywhere in the target path.
 +  string target = 2;
 +}
++
  // An `ExecutionPolicy` can be used to control the scheduling of the action.
  message ExecutionPolicy {
    // The priority (relative importance) of this action. Generally, a lower value

buildgrid/_protos/build/bazel/remote/execution/v2/remote_execution_pb2.py The diff for this file was not included because it is too large.

buildgrid/_protos/build/bazel/remote/execution/v2/remote_execution_pb2_grpc.py

@@ -99,6 +99,9 @@ class ExecutionServicer(object):
      * `INTERNAL`: An internal error occurred in the execution engine or the
      worker.
      * `DEADLINE_EXCEEDED`: The execution timed out.
 +    * `CANCELLED`: The operation was cancelled by the client. This status is
 +    only possible if the server implements the Operations API CancelOperation
 +    method, and it was called for the current execution.
      In the case of a missing input or command, the server SHOULD additionally
      send a [PreconditionFailure][google.rpc.PreconditionFailure] error detail
@@ -229,7 +232,7 @@ class ActionCacheServicer(object):
      `ContentAddressableStorage`.
      Errors:
 -    * `NOT_IMPLEMENTED`: This method is not supported by the server.
 +    * `UNIMPLEMENTED`: This method is not supported by the server.
      * `RESOURCE_EXHAUSTED`: There is insufficient storage space to add the
      entry to the cache.
      """
@@ -273,8 +276,8 @@ class ContentAddressableStorageStub(object):
    hierarchy, which must also each be uploaded on their own.
    For small file uploads the client should group them together and call
 -  [BatchUpdateBlobs][build.bazel.remote.execution.v2.ContentAddressableStorage.BatchUpdateBlobs]
 -  on chunks of no more than 10 MiB. For large uploads, the client must use the
 +  [BatchUpdateBlobs][build.bazel.remote.execution.v2.ContentAddressableStorage.BatchUpdateBlobs].
 +  For large uploads, the client must use the
    [Write method][google.bytestream.ByteStream.Write] of the ByteStream API. The
    `resource_name` is `{instance_name}/uploads/{uuid}/blobs/{hash}/{size}`,
    where `instance_name` is as described in the next paragraph, `uuid` is a
@@ -369,8 +372,8 @@ class ContentAddressableStorageServicer(object):
    hierarchy, which must also each be uploaded on their own.
    For small file uploads the client should group them together and call
 -  [BatchUpdateBlobs][build.bazel.remote.execution.v2.ContentAddressableStorage.BatchUpdateBlobs]
 -  on chunks of no more than 10 MiB. For large uploads, the client must use the
 +  [BatchUpdateBlobs][build.bazel.remote.execution.v2.ContentAddressableStorage.BatchUpdateBlobs].
 +  For large uploads, the client must use the
    [Write method][google.bytestream.ByteStream.Write] of the ByteStream API. The
    `resource_name` is `{instance_name}/uploads/{uuid}/blobs/{hash}/{size}`,
    where `instance_name` is as described in the next paragraph, `uuid` is a

buildgrid/_protos/build/bazel/semver/semver.proto

@@ -16,6 +16,13 @@ syntax = "proto3";
  package build.bazel.semver;
 +option csharp_namespace = "Build.Bazel.Semver";
 +option go_package = "semver";
 +option java_multiple_files = true;
 +option java_outer_classname = "SemverProto";
 +option java_package = "build.bazel.semver";
 +option objc_class_prefix = "SMV";
++
  message SemVer {
    int32 major = 1;
    int32 minor = 2;

buildgrid/_protos/build/bazel/semver/semver_pb2.py

@@ -7,7 +7,6 @@ from google.protobuf import descriptor as _descriptor
  from google.protobuf import message as _message
  from google.protobuf import reflection as _reflection
  from google.protobuf import symbol_database as _symbol_database
 -from google.protobuf import descriptor_pb2
  # @@protoc_insertion_point(imports)
  _sym_db = _symbol_database.Default()
@@ -19,7 +18,8 @@ DESCRIPTOR = _descriptor.FileDescriptor(
    name='build/bazel/semver/semver.proto',
    package='build.bazel.semver',
    syntax='proto3',
 -  serialized_pb=_b('\n\x1f\x62uild/bazel/semver/semver.proto\x12\x12\x62uild.bazel.semver\"I\n\x06SemVer\x12\r\n\x05major\x18\x01 \x01(\x05\x12\r\n\x05minor\x18\x02 \x01(\x05\x12\r\n\x05patch\x18\x03 \x01(\x05\x12\x12\n\nprerelease\x18\x04 \x01(\tb\x06proto3')
 +  serialized_options=_b('\n\022build.bazel.semverB\013SemverProtoP\001Z\006semver\242\002\003SMV\252\002\022Build.Bazel.Semver'),
 +  serialized_pb=_b('\n\x1f\x62uild/bazel/semver/semver.proto\x12\x12\x62uild.bazel.semver\"I\n\x06SemVer\x12\r\n\x05major\x18\x01 \x01(\x05\x12\r\n\x05minor\x18\x02 \x01(\x05\x12\r\n\x05patch\x18\x03 \x01(\x05\x12\x12\n\nprerelease\x18\x04 \x01(\tBF\n\x12\x62uild.bazel.semverB\x0bSemverProtoP\x01Z\x06semver\xa2\x02\x03SMV\xaa\x02\x12\x42uild.Bazel.Semverb\x06proto3')
+ )
@@ -38,35 +38,35 @@ _SEMVER = _descriptor.Descriptor(
        has_default_value=False, default_value=0,
        message_type=None, enum_type=None, containing_type=None,
        is_extension=False, extension_scope=None,
 -      options=None, file=DESCRIPTOR),
 +      serialized_options=None, file=DESCRIPTOR),
      _descriptor.FieldDescriptor(
        name='minor', full_name='build.bazel.semver.SemVer.minor', index=1,
        number=2, type=5, cpp_type=1, label=1,
        has_default_value=False, default_value=0,
        message_type=None, enum_type=None, containing_type=None,
        is_extension=False, extension_scope=None,
 -      options=None, file=DESCRIPTOR),
 +      serialized_options=None, file=DESCRIPTOR),
      _descriptor.FieldDescriptor(
        name='patch', full_name='build.bazel.semver.SemVer.patch', index=2,
        number=3, type=5, cpp_type=1, label=1,
        has_default_value=False, default_value=0,
        message_type=None, enum_type=None, containing_type=None,
        is_extension=False, extension_scope=None,
 -      options=None, file=DESCRIPTOR),
 +      serialized_options=None, file=DESCRIPTOR),
      _descriptor.FieldDescriptor(
        name='prerelease', full_name='build.bazel.semver.SemVer.prerelease', index=3,
        number=4, type=9, cpp_type=9, label=1,
        has_default_value=False, default_value=_b("").decode('utf-8'),
        message_type=None, enum_type=None, containing_type=None,
        is_extension=False, extension_scope=None,
 -      options=None, file=DESCRIPTOR),
 +      serialized_options=None, file=DESCRIPTOR),
    ],
    extensions=[
    ],
    nested_types=[],
    enum_types=[
    ],
 -  options=None,
 +  serialized_options=None,
    is_extendable=False,
    syntax='proto3',
    extension_ranges=[],
@@ -87,4 +87,5 @@ SemVer = _reflection.GeneratedProtocolMessageType('SemVer', (_message.Message,),
  _sym_db.RegisterMessage(SemVer)
 +DESCRIPTOR._options = None
  # @@protoc_insertion_point(module_scope)

buildgrid/_protos/buildstream/v2/buildstream_pb2.py

@@ -7,7 +7,6 @@ from google.protobuf import descriptor as _descriptor
  from google.protobuf import message as _message
  from google.protobuf import reflection as _reflection
  from google.protobuf import symbol_database as _symbol_database
 -from google.protobuf import descriptor_pb2
  # @@protoc_insertion_point(imports)
  _sym_db = _symbol_database.Default()
@@ -21,6 +20,7 @@ DESCRIPTOR = _descriptor.FileDescriptor(
    name='buildstream/v2/buildstream.proto',
    package='buildstream.v2',
    syntax='proto3',
 +  serialized_options=None,
    serialized_pb=_b('\n buildstream/v2/buildstream.proto\x12\x0e\x62uildstream.v2\x1a\x36\x62uild/bazel/remote/execution/v2/remote_execution.proto\x1a\x1cgoogle/api/annotations.proto\"9\n\x13GetReferenceRequest\x12\x15\n\rinstance_name\x18\x01 \x01(\t\x12\x0b\n\x03key\x18\x02 \x01(\t\"O\n\x14GetReferenceResponse\x12\x37\n\x06\x64igest\x18\x01 \x01(\x0b\x32\'.build.bazel.remote.execution.v2.Digest\"v\n\x16UpdateReferenceRequest\x12\x15\n\rinstance_name\x18\x01 \x01(\t\x12\x0c\n\x04keys\x18\x02 \x03(\t\x12\x37\n\x06\x64igest\x18\x03 \x01(\x0b\x32\'.build.bazel.remote.execution.v2.Digest\"\x19\n\x17UpdateReferenceResponse\"&\n\rStatusRequest\x12\x15\n\rinstance_name\x18\x01 \x01(\t\"\'\n\x0eStatusResponse\x12\x15\n\rallow_updates\x18\x01 \x01(\x08\x32\xca\x03\n\x10ReferenceStorage\x12\x90\x01\n\x0cGetReference\x12#.buildstream.v2.GetReferenceRequest\x1a$.buildstream.v2.GetReferenceResponse\"5\x82\xd3\xe4\x93\x02/\x12-/v2/{instance_name=**}/buildstream/refs/{key}\x12\xa1\x01\n\x0fUpdateReference\x12&.buildstream.v2.UpdateReferenceRequest\x1a\'.buildstream.v2.UpdateReferenceResponse\"=\x82\xd3\xe4\x93\x02\x37\x1a-/v2/{instance_name=**}/buildstream/refs/{key}:\x06\x64igest\x12\x7f\n\x06Status\x12\x1d.buildstream.v2.StatusRequest\x1a\x1e.buildstream.v2.StatusResponse\"6\x82\xd3\xe4\x93\x02\x30\x1a./v2/{instance_name=**}/buildstream/refs:statusb\x06proto3')
+   ,
    dependencies=[build_dot_bazel_dot_remote_dot_execution_dot_v2_dot_remote__execution__pb2.DESCRIPTOR,google_dot_api_dot_annotations__pb2.DESCRIPTOR,])
@@ -41,21 +41,21 @@ _GETREFERENCEREQUEST = _descriptor.Descriptor(
        has_default_value=False, default_value=_b("").decode('utf-8'),
        message_type=None, enum_type=None, containing_type=None,
        is_extension=False, extension_scope=None,
 -      options=None, file=DESCRIPTOR),
 +      serialized_options=None, file=DESCRIPTOR),
      _descriptor.FieldDescriptor(
        name='key', full_name='buildstream.v2.GetReferenceRequest.key', index=1,
        number=2, type=9, cpp_type=9, label=1,
        has_default_value=False, default_value=_b("").decode('utf-8'),
        message_type=None, enum_type=None, containing_type=None,
        is_extension=False, extension_scope=None,
 -      options=None, file=DESCRIPTOR),
 +      serialized_options=None, file=DESCRIPTOR),
    ],
    extensions=[
    ],
    nested_types=[],
    enum_types=[
    ],
 -  options=None,
 +  serialized_options=None,
    is_extendable=False,
    syntax='proto3',
    extension_ranges=[],
@@ -79,14 +79,14 @@ _GETREFERENCERESPONSE = _descriptor.Descriptor(
        has_default_value=False, default_value=None,
        message_type=None, enum_type=None, containing_type=None,
        is_extension=False, extension_scope=None,
 -      options=None, file=DESCRIPTOR),
 +      serialized_options=None, file=DESCRIPTOR),
    ],
    extensions=[
    ],
    nested_types=[],
    enum_types=[
    ],
 -  options=None,
 +  serialized_options=None,
    is_extendable=False,
    syntax='proto3',
    extension_ranges=[],
@@ -110,28 +110,28 @@ _UPDATEREFERENCEREQUEST = _descriptor.Descriptor(
        has_default_value=False, default_value=_b("").decode('utf-8'),
        message_type=None, enum_type=None, containing_type=None,
        is_extension=False, extension_scope=None,
 -      options=None, file=DESCRIPTOR),
 +      serialized_options=None, file=DESCRIPTOR),
      _descriptor.FieldDescriptor(
        name='keys', full_name='buildstream.v2.UpdateReferenceRequest.keys', index=1,
        number=2, type=9, cpp_type=9, label=3,
        has_default_value=False, default_value=[],
        message_type=None, enum_type=None, containing_type=None,
        is_extension=False, extension_scope=None,
 -      options=None, file=DESCRIPTOR),
 +      serialized_options=None, file=DESCRIPTOR),
      _descriptor.FieldDescriptor(
        name='digest', full_name='buildstream.v2.UpdateReferenceRequest.digest', index=2,
        number=3, type=11, cpp_type=10, label=1,
        has_default_value=False, default_value=None,
        message_type=None, enum_type=None, containing_type=None,
        is_extension=False, extension_scope=None,
 -      options=None, file=DESCRIPTOR),
 +      serialized_options=None, file=DESCRIPTOR),
    ],
    extensions=[
    ],
    nested_types=[],
    enum_types=[
    ],
 -  options=None,
 +  serialized_options=None,
    is_extendable=False,
    syntax='proto3',
    extension_ranges=[],
@@ -155,7 +155,7 @@ _UPDATEREFERENCERESPONSE = _descriptor.Descriptor(
    nested_types=[],
    enum_types=[
    ],
 -  options=None,
 +  serialized_options=None,
    is_extendable=False,
    syntax='proto3',
    extension_ranges=[],
@@ -179,14 +179,14 @@ _STATUSREQUEST = _descriptor.Descriptor(
        has_default_value=False, default_value=_b("").decode('utf-8'),
        message_type=None, enum_type=None, containing_type=None,
        is_extension=False, extension_scope=None,
 -      options=None, file=DESCRIPTOR),
 +      serialized_options=None, file=DESCRIPTOR),
    ],
    extensions=[
    ],
    nested_types=[],
    enum_types=[
    ],
 -  options=None,
 +  serialized_options=None,
    is_extendable=False,
    syntax='proto3',
    extension_ranges=[],
@@ -210,14 +210,14 @@ _STATUSRESPONSE = _descriptor.Descriptor(
        has_default_value=False, default_value=False,
        message_type=None, enum_type=None, containing_type=None,
        is_extension=False, extension_scope=None,
 -      options=None, file=DESCRIPTOR),
 +      serialized_options=None, file=DESCRIPTOR),
    ],
    extensions=[
    ],
    nested_types=[],
    enum_types=[
    ],
 -  options=None,
 +  serialized_options=None,
    is_extendable=False,
    syntax='proto3',
    extension_ranges=[],
@@ -286,7 +286,7 @@ _REFERENCESTORAGE = _descriptor.ServiceDescriptor(
    full_name='buildstream.v2.ReferenceStorage',
    file=DESCRIPTOR,
    index=0,
 -  options=None,
 +  serialized_options=None,
    serialized_start=507,
    serialized_end=965,
    methods=[
@@ -297,7 +297,7 @@ _REFERENCESTORAGE = _descriptor.ServiceDescriptor(
      containing_service=None,
      input_type=_GETREFERENCEREQUEST,
      output_type=_GETREFERENCERESPONSE,
 -    options=_descriptor._ParseOptions(descriptor_pb2.MethodOptions(), _b('\202\323\344\223\002/\022-/v2/{instance_name=**}/buildstream/refs/{key}')),
 +    serialized_options=_b('\202\323\344\223\002/\022-/v2/{instance_name=**}/buildstream/refs/{key}'),
    ),
    _descriptor.MethodDescriptor(
      name='UpdateReference',
@@ -306,7 +306,7 @@ _REFERENCESTORAGE = _descriptor.ServiceDescriptor(
      containing_service=None,
      input_type=_UPDATEREFERENCEREQUEST,
      output_type=_UPDATEREFERENCERESPONSE,
 -    options=_descriptor._ParseOptions(descriptor_pb2.MethodOptions(), _b('\202\323\344\223\0027\032-/v2/{instance_name=**}/buildstream/refs/{key}:\006digest')),
 +    serialized_options=_b('\202\323\344\223\0027\032-/v2/{instance_name=**}/buildstream/refs/{key}:\006digest'),
    ),
    _descriptor.MethodDescriptor(
      name='Status',
@@ -315,7 +315,7 @@ _REFERENCESTORAGE = _descriptor.ServiceDescriptor(
      containing_service=None,
      input_type=_STATUSREQUEST,
      output_type=_STATUSRESPONSE,
 -    options=_descriptor._ParseOptions(descriptor_pb2.MethodOptions(), _b('\202\323\344\223\0020\032./v2/{instance_name=**}/buildstream/refs:status')),
 +    serialized_options=_b('\202\323\344\223\0020\032./v2/{instance_name=**}/buildstream/refs:status'),
    ),
  ])
  _sym_db.RegisterServiceDescriptor(_REFERENCESTORAGE)

buildgrid/_protos/google/api/annotations_pb2.py

@@ -7,7 +7,6 @@ from google.protobuf import descriptor as _descriptor
  from google.protobuf import message as _message
  from google.protobuf import reflection as _reflection
  from google.protobuf import symbol_database as _symbol_database
 -from google.protobuf import descriptor_pb2
  # @@protoc_insertion_point(imports)
  _sym_db = _symbol_database.Default()
@@ -21,6 +20,7 @@ DESCRIPTOR = _descriptor.FileDescriptor(
    name='google/api/annotations.proto',
    package='google.api',
    syntax='proto3',
 +  serialized_options=_b('\n\016com.google.apiB\020AnnotationsProtoP\001ZAgoogle.golang.org/genproto/googleapis/api/annotations;annotations\242\002\004GAPI'),
    serialized_pb=_b('\n\x1cgoogle/api/annotations.proto\x12\ngoogle.api\x1a\x15google/api/http.proto\x1a google/protobuf/descriptor.proto:E\n\x04http\x12\x1e.google.protobuf.MethodOptions\x18\xb0\xca\xbc\" \x01(\x0b\x32\x14.google.api.HttpRuleBn\n\x0e\x63om.google.apiB\x10\x41nnotationsProtoP\x01ZAgoogle.golang.org/genproto/googleapis/api/annotations;annotations\xa2\x02\x04GAPIb\x06proto3')
+   ,
    dependencies=[google_dot_api_dot_http__pb2.DESCRIPTOR,google_dot_protobuf_dot_descriptor__pb2.DESCRIPTOR,])
@@ -33,7 +33,7 @@ http = _descriptor.FieldDescriptor(
    has_default_value=False, default_value=None,
    message_type=None, enum_type=None, containing_type=None,
    is_extension=True, extension_scope=None,
 -  options=None, file=DESCRIPTOR)
 +  serialized_options=None, file=DESCRIPTOR)
  DESCRIPTOR.extensions_by_name['http'] = http
  _sym_db.RegisterFileDescriptor(DESCRIPTOR)
@@ -41,6 +41,5 @@ _sym_db.RegisterFileDescriptor(DESCRIPTOR)
  http.message_type = google_dot_api_dot_http__pb2._HTTPRULE
  google_dot_protobuf_dot_descriptor__pb2.MethodOptions.RegisterExtension(http)
 -DESCRIPTOR.has_options = True
 -DESCRIPTOR._options = _descriptor._ParseOptions(descriptor_pb2.FileOptions(), _b('\n\016com.google.apiB\020AnnotationsProtoP\001ZAgoogle.golang.org/genproto/googleapis/api/annotations;annotations\242\002\004GAPI'))
 +DESCRIPTOR._options = None
  # @@protoc_insertion_point(module_scope)

buildgrid/_protos/google/api/http.proto

 -// Copyright 2018 Google LLC
 +// Copyright 2018 Google LLC.
  //
  // Licensed under the Apache License, Version 2.0 (the "License");
  // you may not use this file except in compliance with the License.
@@ -11,6 +11,7 @@
  // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  // See the License for the specific language governing permissions and
  // limitations under the License.
 +//
  syntax = "proto3";
@@ -42,94 +43,92 @@ message Http {
    bool fully_decode_reserved_expansion = 2;
+ }
 -// `HttpRule` defines the mapping of an RPC method to one or more HTTP
 -// REST API methods. The mapping specifies how different portions of the RPC
 -// request message are mapped to URL path, URL query parameters, and
 -// HTTP request body. The mapping is typically specified as an
 -// `google.api.http` annotation on the RPC method,
 -// see "google/api/annotations.proto" for details.
 -//
 -// The mapping consists of a field specifying the path template and
 -// method kind.  The path template can refer to fields in the request
 -// message, as in the example below which describes a REST GET
 -// operation on a resource collection of messages:
 -//
 +// # gRPC Transcoding
 +//
 +// gRPC Transcoding is a feature for mapping between a gRPC method and one or
 +// more HTTP REST endpoints. It allows developers to build a single API service
 +// that supports both gRPC APIs and REST APIs. Many systems, including [Google
 +// APIs](https://github.com/googleapis/googleapis),
 +// [Cloud Endpoints](https://cloud.google.com/endpoints), [gRPC
 +// Gateway](https://github.com/grpc-ecosystem/grpc-gateway),
 +// and [Envoy](https://github.com/envoyproxy/envoy) proxy support this feature
 +// and use it for large scale production services.
 +//
 +// `HttpRule` defines the schema of the gRPC/REST mapping. The mapping specifies
 +// how different portions of the gRPC request message are mapped to the URL
 +// path, URL query parameters, and HTTP request body. It also controls how the
 +// gRPC response message is mapped to the HTTP response body. `HttpRule` is
 +// typically specified as an `google.api.http` annotation on the gRPC method.
 +//
 +// Each mapping specifies a URL path template and an HTTP method. The path
 +// template may refer to one or more fields in the gRPC request message, as long
 +// as each field is a non-repeated field with a primitive (non-message) type.
 +// The path template controls how fields of the request message are mapped to
 +// the URL path.
 +//
 +// Example:
  //
  //     service Messaging {
  //       rpc GetMessage(GetMessageRequest) returns (Message) {
 -//         option (google.api.http).get = "/v1/messages/{message_id}/{sub.subfield}";
 +//         option (google.api.http) = {
 +//             get: "/v1/{name=messages/*}"
 +//         };
  //       }
  //     }
  //     message GetMessageRequest {
 -//       message SubMessage {
 -//         string subfield = 1;
 -//       }
 -//       string message_id = 1; // mapped to the URL
 -//       SubMessage sub = 2;    // `sub.subfield` is url-mapped
 +//       string name = 1; // Mapped to URL path.
  //     }
  //     message Message {
 -//       string text = 1; // content of the resource
 +//       string text = 1; // The resource content.
  //     }
  //
 -// The same http annotation can alternatively be expressed inside the
 -// `GRPC API Configuration` YAML file.
 +// This enables an HTTP REST to gRPC mapping as below:
  //
 -//     http:
 -//       rules:
 -//         - selector: <proto_package_name>.Messaging.GetMessage
 -//           get: /v1/messages/{message_id}/{sub.subfield}
 -//
 -// This definition enables an automatic, bidrectional mapping of HTTP
 -// JSON to RPC. Example:
 -//
 -// HTTP | RPC
 +// HTTP | gRPC
  // -----|-----
 -// `GET /v1/messages/123456/foo`  | `GetMessage(message_id: "123456" sub: SubMessage(subfield: "foo"))`
 -//
 -// In general, not only fields but also field paths can be referenced
 -// from a path pattern. Fields mapped to the path pattern cannot be
 -// repeated and must have a primitive (non-message) type.
 -//
 -// Any fields in the request message which are not bound by the path
 -// pattern automatically become (optional) HTTP query
 -// parameters. Assume the following definition of the request message:
 +// `GET /v1/messages/123456`  | `GetMessage(name: "messages/123456")`
  //
 +// Any fields in the request message which are not bound by the path template
 +// automatically become HTTP query parameters if there is no HTTP request body.
 +// For example:
  //
  //     service Messaging {
  //       rpc GetMessage(GetMessageRequest) returns (Message) {
 -//         option (google.api.http).get = "/v1/messages/{message_id}";
 +//         option (google.api.http) = {
 +//             get:"/v1/messages/{message_id}"
 +//         };
  //       }
  //     }
  //     message GetMessageRequest {
  //       message SubMessage {
  //         string subfield = 1;
  //       }
 -//       string message_id = 1; // mapped to the URL
 -//       int64 revision = 2;    // becomes a parameter
 -//       SubMessage sub = 3;    // `sub.subfield` becomes a parameter
 +//       string message_id = 1; // Mapped to URL path.
 +//       int64 revision = 2;    // Mapped to URL query parameter `revision`.
 +//       SubMessage sub = 3;    // Mapped to URL query parameter `sub.subfield`.
  //     }
  //
 -//
  // This enables a HTTP JSON to RPC mapping as below:
  //
 -// HTTP | RPC
 +// HTTP | gRPC
  // -----|-----
  // `GET /v1/messages/123456?revision=2&sub.subfield=foo` | `GetMessage(message_id: "123456" revision: 2 sub: SubMessage(subfield: "foo"))`
  //
 -// Note that fields which are mapped to HTTP parameters must have a
 -// primitive type or a repeated primitive type. Message types are not
 -// allowed. In the case of a repeated type, the parameter can be
 -// repeated in the URL, as in `...?param=A&param=B`.
 +// Note that fields which are mapped to URL query parameters must have a
 +// primitive type or a repeated primitive type or a non-repeated message type.
 +// In the case of a repeated type, the parameter can be repeated in the URL
 +// as `...?param=A&param=B`. In the case of a message type, each field of the
 +// message is mapped to a separate parameter, such as
 +// `...?foo.a=A&foo.b=B&foo.c=C`.
  //
 -// For HTTP method kinds which allow a request body, the `body` field
 +// For HTTP methods that allow a request body, the `body` field
  // specifies the mapping. Consider a REST update method on the
  // message resource collection:
  //
 -//
  //     service Messaging {
  //       rpc UpdateMessage(UpdateMessageRequest) returns (Message) {
  //         option (google.api.http) = {
 -//           put: "/v1/messages/{message_id}"
 +//           patch: "/v1/messages/{message_id}"
  //           body: "message"
  //         };
  //       }
@@ -139,14 +138,13 @@ message Http {
  //       Message message = 2;   // mapped to the body
  //     }
  //
 -//
  // The following HTTP JSON to RPC mapping is enabled, where the
  // representation of the JSON in the request body is determined by
  // protos JSON encoding:
  //
 -// HTTP | RPC
 +// HTTP | gRPC
  // -----|-----
 -// `PUT /v1/messages/123456 { "text": "Hi!" }` | `UpdateMessage(message_id: "123456" message { text: "Hi!" })`
 +// `PATCH /v1/messages/123456 { "text": "Hi!" }` | `UpdateMessage(message_id: "123456" message { text: "Hi!" })`
  //
  // The special name `*` can be used in the body mapping to define that
  // every field not bound by the path template should be mapped to the
@@ -156,7 +154,7 @@ message Http {
  //     service Messaging {
  //       rpc UpdateMessage(Message) returns (Message) {
  //         option (google.api.http) = {
 -//           put: "/v1/messages/{message_id}"
 +//           patch: "/v1/messages/{message_id}"
  //           body: "*"
  //         };
  //       }
@@ -169,13 +167,13 @@ message Http {
  //
  // The following HTTP JSON to RPC mapping is enabled:
  //
 -// HTTP | RPC
 +// HTTP | gRPC
  // -----|-----
 -// `PUT /v1/messages/123456 { "text": "Hi!" }` | `UpdateMessage(message_id: "123456" text: "Hi!")`
 +// `PATCH /v1/messages/123456 { "text": "Hi!" }` | `UpdateMessage(message_id: "123456" text: "Hi!")`
  //
  // Note that when using `*` in the body mapping, it is not possible to
  // have HTTP parameters, as all fields not bound by the path end in
 -// the body. This makes this option more rarely used in practice of
 +// the body. This makes this option more rarely used in practice when
  // defining REST APIs. The common usage of `*` is in custom methods
  // which don't use the URL at all for transferring data.
  //
@@ -197,32 +195,30 @@ message Http {
  //       string user_id = 2;
  //     }
  //
 +// This enables the following two alternative HTTP JSON to RPC mappings:
  //
 -// This enables the following two alternative HTTP JSON to RPC
 -// mappings:
 -//
 -// HTTP | RPC
 +// HTTP | gRPC
  // -----|-----
  // `GET /v1/messages/123456` | `GetMessage(message_id: "123456")`
  // `GET /v1/users/me/messages/123456` | `GetMessage(user_id: "me" message_id: "123456")`
  //
 -// # Rules for HTTP mapping
 -//
 -// The rules for mapping HTTP path, query parameters, and body fields
 -// to the request message are as follows:
 +// ## Rules for HTTP mapping
  //
 -// 1. The `body` field specifies either `*` or a field path, or is
 -//    omitted. If omitted, it indicates there is no HTTP request body.
 -// 2. Leaf fields (recursive expansion of nested messages in the
 -//    request) can be classified into three types:
 -//     (a) Matched in the URL template.
 -//     (b) Covered by body (if body is `*`, everything except (a) fields;
 -//         else everything under the body field)
 -//     (c) All other fields.
 -// 3. URL query parameters found in the HTTP request are mapped to (c) fields.
 -// 4. Any body sent with an HTTP request can contain only (b) fields.
 +// 1. Leaf request fields (recursive expansion nested messages in the request
 +//    message) are classified into three categories:
 +//    - Fields referred by the path template. They are passed via the URL path.
 +//    - Fields referred by the [HttpRule.body][google.api.HttpRule.body]. They are passed via the HTTP
 +//      request body.
 +//    - All other fields are passed via the URL query parameters, and the
 +//      parameter name is the field path in the request message. A repeated
 +//      field can be represented as multiple query parameters under the same
 +//      name.
 +//  2. If [HttpRule.body][google.api.HttpRule.body] is "*", there is no URL query parameter, all fields
 +//     are passed via URL path and HTTP request body.
 +//  3. If [HttpRule.body][google.api.HttpRule.body] is omitted, there is no HTTP request body, all
 +//     fields are passed via URL path and URL query parameters.
  //
 -// The syntax of the path template is as follows:
 +// ### Path template syntax
  //
  //     Template = "/" Segments [ Verb ] ;
  //     Segments = Segment { "/" Segment } ;
@@ -231,36 +227,86 @@ message Http {
  //     FieldPath = IDENT { "." IDENT } ;
  //     Verb     = ":" LITERAL ;
  //
 -// The syntax `*` matches a single path segment. The syntax `**` matches zero
 -// or more path segments, which must be the last part of the path except the
 -// `Verb`. The syntax `LITERAL` matches literal text in the path.
 +// The syntax `*` matches a single URL path segment. The syntax `**` matches
 +// zero or more URL path segments, which must be the last part of the URL path
 +// except the `Verb`.
  //
  // The syntax `Variable` matches part of the URL path as specified by its
  // template. A variable template must not contain other variables. If a variable
  // matches a single path segment, its template may be omitted, e.g. `{var}`
  // is equivalent to `{var=*}`.
  //
 +// The syntax `LITERAL` matches literal text in the URL path. If the `LITERAL`
 +// contains any reserved character, such characters should be percent-encoded
 +// before the matching.
 +//
  // If a variable contains exactly one path segment, such as `"{var}"` or
 -// `"{var=*}"`, when such a variable is expanded into a URL path, all characters
 -// except `[-_.~0-9a-zA-Z]` are percent-encoded. Such variables show up in the
 -// Discovery Document as `{var}`.
 -//
 -// If a variable contains one or more path segments, such as `"{var=foo/*}"`
 -// or `"{var=**}"`, when such a variable is expanded into a URL path, all
 -// characters except `[-_.~/0-9a-zA-Z]` are percent-encoded. Such variables
 -// show up in the Discovery Document as `{+var}`.
 -//
 -// NOTE: While the single segment variable matches the semantics of
 -// [RFC 6570](https://tools.ietf.org/html/rfc6570) Section 3.2.2
 -// Simple String Expansion, the multi segment variable **does not** match
 -// RFC 6570 Reserved Expansion. The reason is that the Reserved Expansion
 +// `"{var=*}"`, when such a variable is expanded into a URL path on the client
 +// side, all characters except `[-_.~0-9a-zA-Z]` are percent-encoded. The
 +// server side does the reverse decoding. Such variables show up in the
 +// [Discovery Document](https://developers.google.com/discovery/v1/reference/apis)
 +// as `{var}`.
 +//
 +// If a variable contains multiple path segments, such as `"{var=foo/*}"`
 +// or `"{var=**}"`, when such a variable is expanded into a URL path on the
 +// client side, all characters except `[-_.~/0-9a-zA-Z]` are percent-encoded.
 +// The server side does the reverse decoding, except "%2F" and "%2f" are left
 +// unchanged. Such variables show up in the
 +// [Discovery Document](https://developers.google.com/discovery/v1/reference/apis)
 +// as `{+var}`.
 +//
 +// ## Using gRPC API Service Configuration
 +//
 +// gRPC API Service Configuration (service config) is a configuration language
 +// for configuring a gRPC service to become a user-facing product. The
 +// service config is simply the YAML representation of the `google.api.Service`
 +// proto message.
 +//
 +// As an alternative to annotating your proto file, you can configure gRPC
 +// transcoding in your service config YAML files. You do this by specifying a
 +// `HttpRule` that maps the gRPC method to a REST endpoint, achieving the same
 +// effect as the proto annotation. This can be particularly useful if you
 +// have a proto that is reused in multiple services. Note that any transcoding
 +// specified in the service config will override any matching transcoding
 +// configuration in the proto.
 +//
 +// Example:
 +//
 +//     http:
 +//       rules:
 +//         # Selects a gRPC method and applies HttpRule to it.
 +//         - selector: example.v1.Messaging.GetMessage
 +//           get: /v1/messages/{message_id}/{sub.subfield}
 +//
 +// ## Special notes
 +//
 +// When gRPC Transcoding is used to map a gRPC to JSON REST endpoints, the
 +// proto to JSON conversion must follow the [proto3
 +// specification](https://developers.google.com/protocol-buffers/docs/proto3#json).
 +//
 +// While the single segment variable follows the semantics of
 +// [RFC 6570](https://tools.ietf.org/html/rfc6570) Section 3.2.2 Simple String
 +// Expansion, the multi segment variable **does not** follow RFC 6570 Section
 +// 3.2.3 Reserved Expansion. The reason is that the Reserved Expansion
  // does not expand special characters like `?` and `#`, which would lead
 -// to invalid URLs.
 +// to invalid URLs. As the result, gRPC Transcoding uses a custom encoding
 +// for multi segment variables.
 +//
 +// The path variables **must not** refer to any repeated or mapped field,
 +// because client libraries are not capable of handling such variable expansion.
 +//
 +// The path variables **must not** capture the leading "/" character. The reason
 +// is that the most common use case "{var}" does not capture the leading "/"
 +// character. For consistency, all path variables must share the same behavior.
  //
 -// NOTE: the field paths in variables and in the `body` must not refer to
 -// repeated fields or map fields.
 +// Repeated message fields must not be mapped to URL query parameters, because
 +// no client library can support such complicated mapping.
 +//
 +// If an API needs to use a JSON array for request or response body, it can map
 +// the request or response body to a repeated field. However, some gRPC
 +// Transcoding implementations may not support this feature.
  message HttpRule {
 -  // Selects methods to which this rule applies.
 +  // Selects a method to which this rule applies.
    //
    // Refer to [selector][google.api.DocumentationRule.selector] for syntax details.
    string selector = 1;
@@ -269,19 +315,20 @@ message HttpRule {
    // used with any of the {get|put|post|delete|patch} methods. A custom method
    // can be defined using the 'custom' field.
    oneof pattern {
 -    // Used for listing and getting information about resources.
 +    // Maps to HTTP GET. Used for listing and getting information about
 +    // resources.
      string get = 2;
 -    // Used for updating a resource.
 +    // Maps to HTTP PUT. Used for replacing a resource.
      string put = 3;
 -    // Used for creating a resource.
 +    // Maps to HTTP POST. Used for creating a resource or performing an action.
      string post = 4;
 -    // Used for deleting a resource.
 +    // Maps to HTTP DELETE. Used for deleting a resource.
      string delete = 5;
 -    // Used for updating a resource.
 +    // Maps to HTTP PATCH. Used for updating a resource.
      string patch = 6;
      // The custom pattern is used for specifying an HTTP method that is not
@@ -291,12 +338,22 @@ message HttpRule {
      CustomHttpPattern custom = 8;
+   }
 -  // The name of the request field whose value is mapped to the HTTP body, or
 -  // `*` for mapping all fields not captured by the path pattern to the HTTP
 -  // body. NOTE: the referred field must not be a repeated field and must be
 -  // present at the top-level of request message type.
 +  // The name of the request field whose value is mapped to the HTTP request
 +  // body, or `*` for mapping all request fields not captured by the path
 +  // pattern to the HTTP body, or omitted for not having any HTTP request body.
 +  //
 +  // NOTE: the referred field must be present at the top-level of the request
 +  // message type.
    string body = 7;
 +  // Optional. The name of the response field whose value is mapped to the HTTP
 +  // response body. When omitted, the entire response message will be used
 +  // as the HTTP response body.
 +  //
 +  // NOTE: The referred field must be present at the top-level of the response
 +  // message type.
 +  string response_body = 12;
++
    // Additional HTTP bindings for the selector. Nested bindings must
    // not contain an `additional_bindings` field themselves (that is,
    // the nesting may only be one level deep).

buildgrid/_protos/google/api/http_pb2.py

@@ -7,7 +7,6 @@ from google.protobuf import descriptor as _descriptor
  from google.protobuf import message as _message
  from google.protobuf import reflection as _reflection
  from google.protobuf import symbol_database as _symbol_database
 -from google.protobuf import descriptor_pb2
  # @@protoc_insertion_point(imports)
  _sym_db = _symbol_database.Default()
@@ -19,7 +18,8 @@ DESCRIPTOR = _descriptor.FileDescriptor(
    name='google/api/http.proto',
    package='google.api',
    syntax='proto3',
 -  serialized_pb=_b('\n\x15google/api/http.proto\x12\ngoogle.api\"T\n\x04Http\x12#\n\x05rules\x18\x01 \x03(\x0b\x32\x14.google.api.HttpRule\x12\'\n\x1f\x66ully_decode_reserved_expansion\x18\x02 \x01(\x08\"\xea\x01\n\x08HttpRule\x12\x10\n\x08selector\x18\x01 \x01(\t\x12\r\n\x03get\x18\x02 \x01(\tH\x00\x12\r\n\x03put\x18\x03 \x01(\tH\x00\x12\x0e\n\x04post\x18\x04 \x01(\tH\x00\x12\x10\n\x06\x64\x65lete\x18\x05 \x01(\tH\x00\x12\x0f\n\x05patch\x18\x06 \x01(\tH\x00\x12/\n\x06\x63ustom\x18\x08 \x01(\x0b\x32\x1d.google.api.CustomHttpPatternH\x00\x12\x0c\n\x04\x62ody\x18\x07 \x01(\t\x12\x31\n\x13\x61\x64\x64itional_bindings\x18\x0b \x03(\x0b\x32\x14.google.api.HttpRuleB\t\n\x07pattern\"/\n\x11\x43ustomHttpPattern\x12\x0c\n\x04kind\x18\x01 \x01(\t\x12\x0c\n\x04path\x18\x02 \x01(\tBj\n\x0e\x63om.google.apiB\tHttpProtoP\x01ZAgoogle.golang.org/genproto/googleapis/api/annotations;annotations\xf8\x01\x01\xa2\x02\x04GAPIb\x06proto3')
 +  serialized_options=_b('\n\016com.google.apiB\tHttpProtoP\001ZAgoogle.golang.org/genproto/googleapis/api/annotations;annotations\370\001\001\242\002\004GAPI'),
 +  serialized_pb=_b('\n\x15google/api/http.proto\x12\ngoogle.api\"T\n\x04Http\x12#\n\x05rules\x18\x01 \x03(\x0b\x32\x14.google.api.HttpRule\x12\'\n\x1f\x66ully_decode_reserved_expansion\x18\x02 \x01(\x08\"\x81\x02\n\x08HttpRule\x12\x10\n\x08selector\x18\x01 \x01(\t\x12\r\n\x03get\x18\x02 \x01(\tH\x00\x12\r\n\x03put\x18\x03 \x01(\tH\x00\x12\x0e\n\x04post\x18\x04 \x01(\tH\x00\x12\x10\n\x06\x64\x65lete\x18\x05 \x01(\tH\x00\x12\x0f\n\x05patch\x18\x06 \x01(\tH\x00\x12/\n\x06\x63ustom\x18\x08 \x01(\x0b\x32\x1d.google.api.CustomHttpPatternH\x00\x12\x0c\n\x04\x62ody\x18\x07 \x01(\t\x12\x15\n\rresponse_body\x18\x0c \x01(\t\x12\x31\n\x13\x61\x64\x64itional_bindings\x18\x0b \x03(\x0b\x32\x14.google.api.HttpRuleB\t\n\x07pattern\"/\n\x11\x43ustomHttpPattern\x12\x0c\n\x04kind\x18\x01 \x01(\t\x12\x0c\n\x04path\x18\x02 \x01(\tBj\n\x0e\x63om.google.apiB\tHttpProtoP\x01ZAgoogle.golang.org/genproto/googleapis/api/annotations;annotations\xf8\x01\x01\xa2\x02\x04GAPIb\x06proto3')
+ )
@@ -38,21 +38,21 @@ _HTTP = _descriptor.Descriptor(
        has_default_value=False, default_value=[],
        message_type=None, enum_type=None, containing_type=None,
        is_extension=False, extension_scope=None,
 -      options=None, file=DESCRIPTOR),
 +      serialized_options=None, file=DESCRIPTOR),
      _descriptor.FieldDescriptor(
        name='fully_decode_reserved_expansion', full_name='google.api.Http.fully_decode_reserved_expansion', index=1,
        number=2, type=8, cpp_type=7, label=1,
        has_default_value=False, default_value=False,
        message_type=None, enum_type=None, containing_type=None,
        is_extension=False, extension_scope=None,
 -      options=None, file=DESCRIPTOR),
 +      serialized_options=None, file=DESCRIPTOR),
    ],
    extensions=[
    ],
    nested_types=[],
    enum_types=[
    ],
 -  options=None,
 +  serialized_options=None,
    is_extendable=False,
    syntax='proto3',
    extension_ranges=[],
@@ -76,70 +76,77 @@ _HTTPRULE = _descriptor.Descriptor(
        has_default_value=False, default_value=_b("").decode('utf-8'),
        message_type=None, enum_type=None, containing_type=None,
        is_extension=False, extension_scope=None,
 -      options=None, file=DESCRIPTOR),
 +      serialized_options=None, file=DESCRIPTOR),
      _descriptor.FieldDescriptor(
        name='get', full_name='google.api.HttpRule.get', index=1,
        number=2, type=9, cpp_type=9, label=1,
        has_default_value=False, default_value=_b("").decode('utf-8'),
        message_type=None, enum_type=None, containing_type=None,
        is_extension=False, extension_scope=None,
 -      options=None, file=DESCRIPTOR),
 +      serialized_options=None, file=DESCRIPTOR),
      _descriptor.FieldDescriptor(
        name='put', full_name='google.api.HttpRule.put', index=2,
        number=3, type=9, cpp_type=9, label=1,
        has_default_value=False, default_value=_b("").decode('utf-8'),
        message_type=None, enum_type=None, containing_type=None,
        is_extension=False, extension_scope=None,
 -      options=None, file=DESCRIPTOR),
 +      serialized_options=None, file=DESCRIPTOR),
      _descriptor.FieldDescriptor(
        name='post', full_name='google.api.HttpRule.post', index=3,
        number=4, type=9, cpp_type=9, label=1,
        has_default_value=False, default_value=_b("").decode('utf-8'),
        message_type=None, enum_type=None, containing_type=None,
        is_extension=False, extension_scope=None,
 -      options=None, file=DESCRIPTOR),
 +      serialized_options=None, file=DESCRIPTOR),
      _descriptor.FieldDescriptor(
        name='delete', full_name='google.api.HttpRule.delete', index=4,
        number=5, type=9, cpp_type=9, label=1,
        has_default_value=False, default_value=_b("").decode('utf-8'),
        message_type=None, enum_type=None, containing_type=None,
        is_extension=False, extension_scope=None,
 -      options=None, file=DESCRIPTOR),
 +      serialized_options=None, file=DESCRIPTOR),
      _descriptor.FieldDescriptor(
        name='patch', full_name='google.api.HttpRule.patch', index=5,
        number=6, type=9, cpp_type=9, label=1,
        has_default_value=False, default_value=_b("").decode('utf-8'),
        message_type=None, enum_type=None, containing_type=None,
        is_extension=False, extension_scope=None,
 -      options=None, file=DESCRIPTOR),
 +      serialized_options=None, file=DESCRIPTOR),
      _descriptor.FieldDescriptor(
        name='custom', full_name='google.api.HttpRule.custom', index=6,
        number=8, type=11, cpp_type=10, label=1,
        has_default_value=False, default_value=None,
        message_type=None, enum_type=None, containing_type=None,
        is_extension=False, extension_scope=None,
 -      options=None, file=DESCRIPTOR),
 +      serialized_options=None, file=DESCRIPTOR),
      _descriptor.FieldDescriptor(
        name='body', full_name='google.api.HttpRule.body', index=7,
        number=7, type=9, cpp_type=9, label=1,
        has_default_value=False, default_value=_b("").decode('utf-8'),
        message_type=None, enum_type=None, containing_type=None,
        is_extension=False, extension_scope=None,
 -      options=None, file=DESCRIPTOR),
 +      serialized_options=None, file=DESCRIPTOR),
      _descriptor.FieldDescriptor(
 -      name='additional_bindings', full_name='google.api.HttpRule.additional_bindings', index=8,
 +      name='response_body', full_name='google.api.HttpRule.response_body', index=8,
 +      number=12, type=9, cpp_type=9, label=1,
 +      has_default_value=False, default_value=_b("").decode('utf-8'),
 +      message_type=None, enum_type=None, containing_type=None,
 +      is_extension=False, extension_scope=None,
 +      serialized_options=None, file=DESCRIPTOR),
 +    _descriptor.FieldDescriptor(
 +      name='additional_bindings', full_name='google.api.HttpRule.additional_bindings', index=9,
        number=11, type=11, cpp_type=10, label=3,
        has_default_value=False, default_value=[],
        message_type=None, enum_type=None, containing_type=None,
        is_extension=False, extension_scope=None,
 -      options=None, file=DESCRIPTOR),
 +      serialized_options=None, file=DESCRIPTOR),
    ],
    extensions=[
    ],
    nested_types=[],
    enum_types=[
    ],
 -  options=None,
 +  serialized_options=None,
    is_extendable=False,
    syntax='proto3',
    extension_ranges=[],
@@ -149,7 +156,7 @@ _HTTPRULE = _descriptor.Descriptor(
        index=0, containing_type=None, fields=[]),
    ],
    serialized_start=124,
 -  serialized_end=358,
 +  serialized_end=381,
+ )
@@ -166,28 +173,28 @@ _CUSTOMHTTPPATTERN = _descriptor.Descriptor(
        has_default_value=False, default_value=_b("").decode('utf-8'),
        message_type=None, enum_type=None, containing_type=None,
        is_extension=False, extension_scope=None,
 -      options=None, file=DESCRIPTOR),
 +      serialized_options=None, file=DESCRIPTOR),
      _descriptor.FieldDescriptor(
        name='path', full_name='google.api.CustomHttpPattern.path', index=1,
        number=2, type=9, cpp_type=9, label=1,
        has_default_value=False, default_value=_b("").decode('utf-8'),
        message_type=None, enum_type=None, containing_type=None,
        is_extension=False, extension_scope=None,
 -      options=None, file=DESCRIPTOR),
 +      serialized_options=None, file=DESCRIPTOR),
    ],
    extensions=[
    ],
    nested_types=[],
    enum_types=[
    ],
 -  options=None,
 +  serialized_options=None,
    is_extendable=False,
    syntax='proto3',
    extension_ranges=[],
    oneofs=[
    ],
 -  serialized_start=360,
 -  serialized_end=407,
 +  serialized_start=383,
 +  serialized_end=430,
+ )
  _HTTP.fields_by_name['rules'].message_type = _HTTPRULE
@@ -238,6 +245,5 @@ CustomHttpPattern = _reflection.GeneratedProtocolMessageType('CustomHttpPattern'
  _sym_db.RegisterMessage(CustomHttpPattern)
 -DESCRIPTOR.has_options = True
 -DESCRIPTOR._options = _descriptor._ParseOptions(descriptor_pb2.FileOptions(), _b('\n\016com.google.apiB\tHttpProtoP\001ZAgoogle.golang.org/genproto/googleapis/api/annotations;annotations\370\001\001\242\002\004GAPI'))
 +DESCRIPTOR._options = None
  # @@protoc_insertion_point(module_scope)

buildgrid/_protos/google/bytestream/bytestream_pb2.py

@@ -7,7 +7,6 @@ from google.protobuf import descriptor as _descriptor
  from google.protobuf import message as _message
  from google.protobuf import reflection as _reflection
  from google.protobuf import symbol_database as _symbol_database
 -from google.protobuf import descriptor_pb2
  # @@protoc_insertion_point(imports)
  _sym_db = _symbol_database.Default()
@@ -21,6 +20,7 @@ DESCRIPTOR = _descriptor.FileDescriptor(
    name='google/bytestream/bytestream.proto',
    package='google.bytestream',
    syntax='proto3',
 +  serialized_options=_b('\n\025com.google.bytestreamB\017ByteStreamProtoZ;google.golang.org/genproto/googleapis/bytestream;bytestream'),
    serialized_pb=_b('\n\"google/bytestream/bytestream.proto\x12\x11google.bytestream\x1a\x1cgoogle/api/annotations.proto\x1a\x1egoogle/protobuf/wrappers.proto\"M\n\x0bReadRequest\x12\x15\n\rresource_name\x18\x01 \x01(\t\x12\x13\n\x0bread_offset\x18\x02 \x01(\x03\x12\x12\n\nread_limit\x18\x03 \x01(\x03\"\x1c\n\x0cReadResponse\x12\x0c\n\x04\x64\x61ta\x18\n \x01(\x0c\"_\n\x0cWriteRequest\x12\x15\n\rresource_name\x18\x01 \x01(\t\x12\x14\n\x0cwrite_offset\x18\x02 \x01(\x03\x12\x14\n\x0c\x66inish_write\x18\x03 \x01(\x08\x12\x0c\n\x04\x64\x61ta\x18\n \x01(\x0c\"\'\n\rWriteResponse\x12\x16\n\x0e\x63ommitted_size\x18\x01 \x01(\x03\"0\n\x17QueryWriteStatusRequest\x12\x15\n\rresource_name\x18\x01 \x01(\t\"D\n\x18QueryWriteStatusResponse\x12\x16\n\x0e\x63ommitted_size\x18\x01 \x01(\x03\x12\x10\n\x08\x63omplete\x18\x02 \x01(\x08\x32\x92\x02\n\nByteStream\x12I\n\x04Read\x12\x1e.google.bytestream.ReadRequest\x1a\x1f.google.bytestream.ReadResponse0\x01\x12L\n\x05Write\x12\x1f.google.bytestream.WriteRequest\x1a .google.bytestream.WriteResponse(\x01\x12k\n\x10QueryWriteStatus\x12*.google.bytestream.QueryWriteStatusRequest\x1a+.google.bytestream.QueryWriteStatusResponseBe\n\x15\x63om.google.bytestreamB\x0f\x42yteStreamProtoZ;google.golang.org/genproto/googleapis/bytestream;bytestreamb\x06proto3')
+   ,
    dependencies=[google_dot_api_dot_annotations__pb2.DESCRIPTOR,google_dot_protobuf_dot_wrappers__pb2.DESCRIPTOR,])
@@ -41,28 +41,28 @@ _READREQUEST = _descriptor.Descriptor(
        has_default_value=False, default_value=_b("").decode('utf-8'),
        message_type=None, enum_type=None, containing_type=None,
        is_extension=False, extension_scope=None,
 -      options=None, file=DESCRIPTOR),
 +      serialized_options=None, file=DESCRIPTOR),
      _descriptor.FieldDescriptor(
        name='read_offset', full_name='google.bytestream.ReadRequest.read_offset', index=1,
        number=2, type=3, cpp_type=2, label=1,
        has_default_value=False, default_value=0,
        message_type=None, enum_type=None, containing_type=None,
        is_extension=False, extension_scope=None,
 -      options=None, file=DESCRIPTOR),
 +      serialized_options=None, file=DESCRIPTOR),
      _descriptor.FieldDescriptor(
        name='read_limit', full_name='google.bytestream.ReadRequest.read_limit', index=2,
        number=3, type=3, cpp_type=2, label=1,
        has_default_value=False, default_value=0,
        message_type=None, enum_type=None, containing_type=None,
        is_extension=False, extension_scope=None,
 -      options=None, file=DESCRIPTOR),
 +      serialized_options=None, file=DESCRIPTOR),
    ],
    extensions=[
    ],
    nested_types=[],
    enum_types=[
    ],
 -  options=None,
 +  serialized_options=None,
    is_extendable=False,
    syntax='proto3',
    extension_ranges=[],
@@ -86,14 +86,14 @@ _READRESPONSE = _descriptor.Descriptor(
        has_default_value=False, default_value=_b(""),
        message_type=None, enum_type=None, containing_type=None,
        is_extension=False, extension_scope=None,
 -      options=None, file=DESCRIPTOR),
 +      serialized_options=None, file=DESCRIPTOR),
    ],
    extensions=[
    ],
    nested_types=[],
    enum_types=[
    ],
 -  options=None,
 +  serialized_options=None,
    is_extendable=False,
    syntax='proto3',
    extension_ranges=[],
@@ -117,35 +117,35 @@ _WRITEREQUEST = _descriptor.Descriptor(
        has_default_value=False, default_value=_b("").decode('utf-8'),
        message_type=None, enum_type=None, containing_type=None,
        is_extension=False, extension_scope=None,
 -      options=None, file=DESCRIPTOR),
 +      serialized_options=None, file=DESCRIPTOR),
      _descriptor.FieldDescriptor(
        name='write_offset', full_name='google.bytestream.WriteRequest.write_offset', index=1,
        number=2, type=3, cpp_type=2, label=1,
        has_default_value=False, default_value=0,
        message_type=None, enum_type=None, containing_type=None,
        is_extension=False, extension_scope=None,
 -      options=None, file=DESCRIPTOR),
 +      serialized_options=None, file=DESCRIPTOR),
      _descriptor.FieldDescriptor(
        name='finish_write', full_name='google.bytestream.WriteRequest.finish_write', index=2,
        number=3, type=8, cpp_type=7, label=1,
        has_default_value=False, default_value=False,
        message_type=None, enum_type=None, containing_type=None,
        is_extension=False, extension_scope=None,
 -      options=None, file=DESCRIPTOR),
 +      serialized_options=None, file=DESCRIPTOR),
      _descriptor.FieldDescriptor(
        name='data', full_name='google.bytestream.WriteRequest.data', index=3,
        number=10, type=12, cpp_type=9, label=1,
        has_default_value=False, default_value=_b(""),
        message_type=None, enum_type=None, containing_type=None,
        is_extension=False, extension_scope=None,
 -      options=None, file=DESCRIPTOR),
 +      serialized_options=None, file=DESCRIPTOR),
    ],
    extensions=[
    ],
    nested_types=[],
    enum_types=[
    ],
 -  options=None,
 +  serialized_options=None,
    is_extendable=False,
    syntax='proto3',
    extension_ranges=[],
@@ -169,14 +169,14 @@ _WRITERESPONSE = _descriptor.Descriptor(
        has_default_value=False, default_value=0,
        message_type=None, enum_type=None, containing_type=None,
        is_extension=False, extension_scope=None,
 -      options=None, file=DESCRIPTOR),
 +      serialized_options=None, file=DESCRIPTOR),
    ],
    extensions=[
    ],
    nested_types=[],
    enum_types=[
    ],
 -  options=None,
 +  serialized_options=None,
    is_extendable=False,
    syntax='proto3',
    extension_ranges=[],
@@ -200,14 +200,14 @@ _QUERYWRITESTATUSREQUEST = _descriptor.Descriptor(
        has_default_value=False, default_value=_b("").decode('utf-8'),
        message_type=None, enum_type=None, containing_type=None,
        is_extension=False, extension_scope=None,
 -      options=None, file=DESCRIPTOR),
 +      serialized_options=None, file=DESCRIPTOR),
    ],
    extensions=[
    ],
    nested_types=[],
    enum_types=[
    ],
 -  options=None,
 +  serialized_options=None,
    is_extendable=False,
    syntax='proto3',
    extension_ranges=[],
@@ -231,21 +231,21 @@ _QUERYWRITESTATUSRESPONSE = _descriptor.Descriptor(
        has_default_value=False, default_value=0,
        message_type=None, enum_type=None, containing_type=None,
        is_extension=False, extension_scope=None,
 -      options=None, file=DESCRIPTOR),
 +      serialized_options=None, file=DESCRIPTOR),
      _descriptor.FieldDescriptor(
        name='complete', full_name='google.bytestream.QueryWriteStatusResponse.complete', index=1,
        number=2, type=8, cpp_type=7, label=1,
        has_default_value=False, default_value=False,
        message_type=None, enum_type=None, containing_type=None,
        is_extension=False, extension_scope=None,
 -      options=None, file=DESCRIPTOR),
 +      serialized_options=None, file=DESCRIPTOR),
    ],
    extensions=[
    ],
    nested_types=[],
    enum_types=[
    ],
 -  options=None,
 +  serialized_options=None,
    is_extendable=False,
    syntax='proto3',
    extension_ranges=[],
@@ -306,15 +306,14 @@ QueryWriteStatusResponse = _reflection.GeneratedProtocolMessageType('QueryWriteS
  _sym_db.RegisterMessage(QueryWriteStatusResponse)
 -DESCRIPTOR.has_options = True
 -DESCRIPTOR._options = _descriptor._ParseOptions(descriptor_pb2.FileOptions(), _b('\n\025com.google.bytestreamB\017ByteStreamProtoZ;google.golang.org/genproto/googleapis/bytestream;bytestream'))
 +DESCRIPTOR._options = None
  _BYTESTREAM = _descriptor.ServiceDescriptor(
    name='ByteStream',
    full_name='google.bytestream.ByteStream',
    file=DESCRIPTOR,
    index=0,
 -  options=None,
 +  serialized_options=None,
    serialized_start=487,
    serialized_end=761,
    methods=[
@@ -325,7 +324,7 @@ _BYTESTREAM = _descriptor.ServiceDescriptor(
      containing_service=None,
      input_type=_READREQUEST,
      output_type=_READRESPONSE,
 -    options=None,
 +    serialized_options=None,
    ),
    _descriptor.MethodDescriptor(
      name='Write',
@@ -334,7 +333,7 @@ _BYTESTREAM = _descriptor.ServiceDescriptor(
      containing_service=None,
      input_type=_WRITEREQUEST,
      output_type=_WRITERESPONSE,
 -    options=None,
 +    serialized_options=None,
    ),
    _descriptor.MethodDescriptor(
      name='QueryWriteStatus',
@@ -343,7 +342,7 @@ _BYTESTREAM = _descriptor.ServiceDescriptor(
      containing_service=None,
      input_type=_QUERYWRITESTATUSREQUEST,
      output_type=_QUERYWRITESTATUSRESPONSE,
 -    options=None,
 +    serialized_options=None,
    ),
  ])
  _sym_db.RegisterServiceDescriptor(_BYTESTREAM)

buildgrid/_protos/google/devtools/remoteworkers/v1test2/bots_pb2.py

@@ -8,7 +8,6 @@ from google.protobuf import descriptor as _descriptor
  from google.protobuf import message as _message
  from google.protobuf import reflection as _reflection
  from google.protobuf import symbol_database as _symbol_database
 -from google.protobuf import descriptor_pb2
  # @@protoc_insertion_point(imports)
  _sym_db = _symbol_database.Default()
@@ -27,6 +26,7 @@ DESCRIPTOR = _descriptor.FileDescriptor(
    name='google/devtools/remoteworkers/v1test2/bots.proto',
    package='google.devtools.remoteworkers.v1test2',
    syntax='proto3',
 +  serialized_options=_b('\n)com.google.devtools.remoteworkers.v1test2B\021RemoteWorkersBotsP\001ZRgoogle.golang.org/genproto/googleapis/devtools/remoteworkers/v1test2;remoteworkers\242\002\002RW\252\002%Google.DevTools.RemoteWorkers.V1Test2'),
    serialized_pb=_b('\n0google/devtools/remoteworkers/v1test2/bots.proto\x12%google.devtools.remoteworkers.v1test2\x1a\x1cgoogle/api/annotations.proto\x1a\x32google/devtools/remoteworkers/v1test2/worker.proto\x1a\x19google/protobuf/any.proto\x1a\x1bgoogle/protobuf/empty.proto\x1a google/protobuf/field_mask.proto\x1a\x1fgoogle/protobuf/timestamp.proto\x1a\x17google/rpc/status.proto\"\xab\x02\n\nBotSession\x12\x0c\n\x04name\x18\x01 \x01(\t\x12\x0e\n\x06\x62ot_id\x18\x02 \x01(\t\x12@\n\x06status\x18\x03 \x01(\x0e\x32\x30.google.devtools.remoteworkers.v1test2.BotStatus\x12=\n\x06worker\x18\x04 \x01(\x0b\x32-.google.devtools.remoteworkers.v1test2.Worker\x12<\n\x06leases\x18\x05 \x03(\x0b\x32,.google.devtools.remoteworkers.v1test2.Lease\x12/\n\x0b\x65xpire_time\x18\x06 \x01(\x0b\x32\x1a.google.protobuf.Timestamp\x12\x0f\n\x07version\x18\x07 \x01(\t\"\x89\x03\n\x05Lease\x12\n\n\x02id\x18\x07 \x01(\t\x12%\n\x07payload\x18\x08 \x01(\x0b\x32\x14.google.protobuf.Any\x12$\n\x06result\x18\t \x01(\x0b\x32\x14.google.protobuf.Any\x12@\n\x05state\x18\x02 \x01(\x0e\x32\x31.google.devtools.remoteworkers.v1test2.LeaseState\x12\"\n\x06status\x18\x03 \x01(\x0b\x32\x12.google.rpc.Status\x12\x43\n\x0crequirements\x18\x04 \x01(\x0b\x32-.google.devtools.remoteworkers.v1test2.Worker\x12/\n\x0b\x65xpire_time\x18\x05 \x01(\x0b\x32\x1a.google.protobuf.Timestamp\x12\x16\n\nassignment\x18\x01 \x01(\tB\x02\x18\x01\x12\x33\n\x11inline_assignment\x18\x06 \x01(\x0b\x32\x14.google.protobuf.AnyB\x02\x18\x01\"\xc5\x01\n\tAdminTemp\x12I\n\x07\x63ommand\x18\x01 \x01(\x0e\x32\x38.google.devtools.remoteworkers.v1test2.AdminTemp.Command\x12\x0b\n\x03\x61rg\x18\x02 \x01(\t\"`\n\x07\x43ommand\x12\x0f\n\x0bUNSPECIFIED\x10\x00\x12\x0e\n\nBOT_UPDATE\x10\x01\x12\x0f\n\x0b\x42OT_RESTART\x10\x02\x12\x11\n\rBOT_TERMINATE\x10\x03\x12\x10\n\x0cHOST_RESTART\x10\x04\"q\n\x17\x43reateBotSessionRequest\x12\x0e\n\x06parent\x18\x01 \x01(\t\x12\x46\n\x0b\x62ot_session\x18\x02 \x01(\x0b\x32\x31.google.devtools.remoteworkers.v1test2.BotSession\"\xa0\x01\n\x17UpdateBotSessionRequest\x12\x0c\n\x04name\x18\x01 \x01(\t\x12\x46\n\x0b\x62ot_session\x18\x02 \x01(\x0b\x32\x31.google.devtools.remoteworkers.v1test2.BotSession\x12/\n\x0bupdate_mask\x18\x03 \x01(\x0b\x32\x1a.google.protobuf.FieldMask\"\xb5\x01\n\x17PostBotEventTempRequest\x12\x0c\n\x04name\x18\x01 \x01(\t\x12Q\n\x04type\x18\x02 \x01(\x0e\x32\x43.google.devtools.remoteworkers.v1test2.PostBotEventTempRequest.Type\x12\x0b\n\x03msg\x18\x03 \x01(\t\",\n\x04Type\x12\x0f\n\x0bUNSPECIFIED\x10\x00\x12\x08\n\x04INFO\x10\x01\x12\t\n\x05\x45RROR\x10\x02*g\n\tBotStatus\x12\x1a\n\x16\x42OT_STATUS_UNSPECIFIED\x10\x00\x12\x06\n\x02OK\x10\x01\x12\r\n\tUNHEALTHY\x10\x02\x12\x12\n\x0eHOST_REBOOTING\x10\x03\x12\x13\n\x0f\x42OT_TERMINATING\x10\x04*`\n\nLeaseState\x12\x1b\n\x17LEASE_STATE_UNSPECIFIED\x10\x00\x12\x0b\n\x07PENDING\x10\x01\x12\n\n\x06\x41\x43TIVE\x10\x02\x12\r\n\tCOMPLETED\x10\x04\x12\r\n\tCANCELLED\x10\x05\x32\xa8\x04\n\x04\x42ots\x12\xbc\x01\n\x10\x43reateBotSession\x12>.google.devtools.remoteworkers.v1test2.CreateBotSessionRequest\x1a\x31.google.devtools.remoteworkers.v1test2.BotSession\"5\x82\xd3\xe4\x93\x02/\" /v1test2/{parent=**}/botSessions:\x0b\x62ot_session\x12\xbc\x01\n\x10UpdateBotSession\x12>.google.devtools.remoteworkers.v1test2.UpdateBotSessionRequest\x1a\x31.google.devtools.remoteworkers.v1test2.BotSession\"5\x82\xd3\xe4\x93\x02/2 /v1test2/{name=**/botSessions/*}:\x0b\x62ot_session\x12\xa1\x01\n\x10PostBotEventTemp\x12>.google.devtools.remoteworkers.v1test2.PostBotEventTempRequest\x1a\x16.google.protobuf.Empty\"5\x82\xd3\xe4\x93\x02/\"*/v1test2/{name=**/botSessions/*}:postEvent:\x01*B\xc1\x01\n)com.google.devtools.remoteworkers.v1test2B\x11RemoteWorkersBotsP\x01ZRgoogle.golang.org/genproto/googleapis/devtools/remoteworkers/v1test2;remoteworkers\xa2\x02\x02RW\xaa\x02%Google.DevTools.RemoteWorkers.V1Test2b\x06proto3')
+   ,
    dependencies=[google_dot_api_dot_annotations__pb2.DESCRIPTOR,google_dot_devtools_dot_remoteworkers_dot_v1test2_dot_worker__pb2.DESCRIPTOR,google_dot_protobuf_dot_any__pb2.DESCRIPTOR,google_dot_protobuf_dot_empty__pb2.DESCRIPTOR,google_dot_protobuf_dot_field__mask__pb2.DESCRIPTOR,google_dot_protobuf_dot_timestamp__pb2.DESCRIPTOR,google_dot_rpc_dot_status__pb2.DESCRIPTOR,])
@@ -39,27 +39,27 @@ _BOTSTATUS = _descriptor.EnumDescriptor(
    values=[
      _descriptor.EnumValueDescriptor(
        name='BOT_STATUS_UNSPECIFIED', index=0, number=0,
 -      options=None,
 +      serialized_options=None,
        type=None),
      _descriptor.EnumValueDescriptor(
        name='OK', index=1, number=1,
 -      options=None,
 +      serialized_options=None,
        type=None),
      _descriptor.EnumValueDescriptor(
        name='UNHEALTHY', index=2, number=2,
 -      options=None,
 +      serialized_options=None,
        type=None),
      _descriptor.EnumValueDescriptor(
        name='HOST_REBOOTING', index=3, number=3,
 -      options=None,
 +      serialized_options=None,
        type=None),
      _descriptor.EnumValueDescriptor(
        name='BOT_TERMINATING', index=4, number=4,
 -      options=None,
 +      serialized_options=None,
        type=None),
    ],
    containing_type=None,
 -  options=None,
 +  serialized_options=None,
    serialized_start=1681,
    serialized_end=1784,
+ )
@@ -74,27 +74,27 @@ _LEASESTATE = _descriptor.EnumDescriptor(
    values=[
      _descriptor.EnumValueDescriptor(
        name='LEASE_STATE_UNSPECIFIED', index=0, number=0,
 -      options=None,
 +      serialized_options=None,
        type=None),
      _descriptor.EnumValueDescriptor(
        name='PENDING', index=1, number=1,
 -      options=None,
 +      serialized_options=None,
        type=None),
      _descriptor.EnumValueDescriptor(
        name='ACTIVE', index=2, number=2,
 -      options=None,
 +      serialized_options=None,
        type=None),
      _descriptor.EnumValueDescriptor(
        name='COMPLETED', index=3, number=4,
 -      options=None,
 +      serialized_options=None,
        type=None),
      _descriptor.EnumValueDescriptor(
        name='CANCELLED', index=4, number=5,
 -      options=None,
 +      serialized_options=None,
        type=None),
    ],
    containing_type=None,
 -  options=None,
 +  serialized_options=None,
    serialized_start=1786,
    serialized_end=1882,
+ )
@@ -121,27 +121,27 @@ _ADMINTEMP_COMMAND = _descriptor.EnumDescriptor(
    values=[
      _descriptor.EnumValueDescriptor(
        name='UNSPECIFIED', index=0, number=0,
 -      options=None,
 +      serialized_options=None,
        type=None),
      _descriptor.EnumValueDescriptor(
        name='BOT_UPDATE', index=1, number=1,
 -      options=None,
 +      serialized_options=None,
        type=None),
      _descriptor.EnumValueDescriptor(
        name='BOT_RESTART', index=2, number=2,
 -      options=None,
 +      serialized_options=None,
        type=None),
      _descriptor.EnumValueDescriptor(
        name='BOT_TERMINATE', index=3, number=3,
 -      options=None,
 +      serialized_options=None,
        type=None),
      _descriptor.EnumValueDescriptor(
        name='HOST_RESTART', index=4, number=4,
 -      options=None,
 +      serialized_options=None,
        type=None),
    ],
    containing_type=None,
 -  options=None,
 +  serialized_options=None,
    serialized_start=1121,
    serialized_end=1217,
+ )
@@ -155,19 +155,19 @@ _POSTBOTEVENTTEMPREQUEST_TYPE = _descriptor.EnumDescriptor(
    values=[
      _descriptor.EnumValueDescriptor(
        name='UNSPECIFIED', index=0, number=0,
 -      options=None,
 +      serialized_options=None,
        type=None),
      _descriptor.EnumValueDescriptor(
        name='INFO', index=1, number=1,
 -      options=None,
 +      serialized_options=None,
        type=None),
      _descriptor.EnumValueDescriptor(
        name='ERROR', index=2, number=2,
 -      options=None,
 +      serialized_options=None,
        type=None),
    ],
    containing_type=None,
 -  options=None,
 +  serialized_options=None,
    serialized_start=1635,
    serialized_end=1679,
+ )
@@ -187,56 +187,56 @@ _BOTSESSION = _descriptor.Descriptor(
        has_default_value=False, default_value=_b("").decode('utf-8'),
        message_type=None, enum_type=None, containing_type=None,
        is_extension=False, extension_scope=None,
 -      options=None, file=DESCRIPTOR),
 +      serialized_options=None, file=DESCRIPTOR),
      _descriptor.FieldDescriptor(
        name='bot_id', full_name='google.devtools.remoteworkers.v1test2.BotSession.bot_id', index=1,
        number=2, type=9, cpp_type=9, label=1,
        has_default_value=False, default_value=_b("").decode('utf-8'),
        message_type=None, enum_type=None, containing_type=None,
        is_extension=False, extension_scope=None,
 -      options=None, file=DESCRIPTOR),
 +      serialized_options=None, file=DESCRIPTOR),
      _descriptor.FieldDescriptor(
        name='status', full_name='google.devtools.remoteworkers.v1test2.BotSession.status', index=2,
        number=3, type=14, cpp_type=8, label=1,
        has_default_value=False, default_value=0,
        message_type=None, enum_type=None, containing_type=None,
        is_extension=False, extension_scope=None,
 -      options=None, file=DESCRIPTOR),
 +      serialized_options=None, file=DESCRIPTOR),
      _descriptor.FieldDescriptor(
        name='worker', full_name='google.devtools.remoteworkers.v1test2.BotSession.worker', index=3,
        number=4, type=11, cpp_type=10, label=1,
        has_default_value=False, default_value=None,
        message_type=None, enum_type=None, containing_type=None,
        is_extension=False, extension_scope=None,
 -      options=None, file=DESCRIPTOR),
 +      serialized_options=None, file=DESCRIPTOR),
      _descriptor.FieldDescriptor(
        name='leases', full_name='google.devtools.remoteworkers.v1test2.BotSession.leases', index=4,
        number=5, type=11, cpp_type=10, label=3,
        has_default_value=False, default_value=[],
        message_type=None, enum_type=None, containing_type=None,
        is_extension=False, extension_scope=None,
 -      options=None, file=DESCRIPTOR),
 +      serialized_options=None, file=DESCRIPTOR),
      _descriptor.FieldDescriptor(
        name='expire_time', full_name='google.devtools.remoteworkers.v1test2.BotSession.expire_time', index=5,
        number=6, type=11, cpp_type=10, label=1,
        has_default_value=False, default_value=None,
        message_type=None, enum_type=None, containing_type=None,
        is_extension=False, extension_scope=None,
 -      options=None, file=DESCRIPTOR),
 +      serialized_options=None, file=DESCRIPTOR),
      _descriptor.FieldDescriptor(
        name='version', full_name='google.devtools.remoteworkers.v1test2.BotSession.version', index=6,
        number=7, type=9, cpp_type=9, label=1,
        has_default_value=False, default_value=_b("").decode('utf-8'),
        message_type=None, enum_type=None, containing_type=None,
        is_extension=False, extension_scope=None,
 -      options=None, file=DESCRIPTOR),
 +      serialized_options=None, file=DESCRIPTOR),
    ],
    extensions=[
    ],
    nested_types=[],
    enum_types=[
    ],
 -  options=None,
 +  serialized_options=None,
    is_extendable=False,
    syntax='proto3',
    extension_ranges=[],
@@ -260,70 +260,70 @@ _LEASE = _descriptor.Descriptor(
        has_default_value=False, default_value=_b("").decode('utf-8'),
        message_type=None, enum_type=None, containing_type=None,
        is_extension=False, extension_scope=None,
 -      options=None, file=DESCRIPTOR),
 +      serialized_options=None, file=DESCRIPTOR),
      _descriptor.FieldDescriptor(
        name='payload', full_name='google.devtools.remoteworkers.v1test2.Lease.payload', index=1,
        number=8, type=11, cpp_type=10, label=1,
        has_default_value=False, default_value=None,
        message_type=None, enum_type=None, containing_type=None,
        is_extension=False, extension_scope=None,
 -      options=None, file=DESCRIPTOR),
 +      serialized_options=None, file=DESCRIPTOR),
      _descriptor.FieldDescriptor(
        name='result', full_name='google.devtools.remoteworkers.v1test2.Lease.result', index=2,
        number=9, type=11, cpp_type=10, label=1,
        has_default_value=False, default_value=None,
        message_type=None, enum_type=None, containing_type=None,
        is_extension=False, extension_scope=None,
 -      options=None, file=DESCRIPTOR),
 +      serialized_options=None, file=DESCRIPTOR),
      _descriptor.FieldDescriptor(
        name='state', full_name='google.devtools.remoteworkers.v1test2.Lease.state', index=3,
        number=2, type=14, cpp_type=8, label=1,
        has_default_value=False, default_value=0,
        message_type=None, enum_type=None, containing_type=None,
        is_extension=False, extension_scope=None,
 -      options=None, file=DESCRIPTOR),
 +      serialized_options=None, file=DESCRIPTOR),
      _descriptor.FieldDescriptor(
        name='status', full_name='google.devtools.remoteworkers.v1test2.Lease.status', index=4,
        number=3, type=11, cpp_type=10, label=1,
        has_default_value=False, default_value=None,
        message_type=None, enum_type=None, containing_type=None,
        is_extension=False, extension_scope=None,
 -      options=None, file=DESCRIPTOR),
 +      serialized_options=None, file=DESCRIPTOR),
      _descriptor.FieldDescriptor(
        name='requirements', full_name='google.devtools.remoteworkers.v1test2.Lease.requirements', index=5,
        number=4, type=11, cpp_type=10, label=1,
        has_default_value=False, default_value=None,
        message_type=None, enum_type=None, containing_type=None,
        is_extension=False, extension_scope=None,
 -      options=None, file=DESCRIPTOR),
 +      serialized_options=None, file=DESCRIPTOR),
      _descriptor.FieldDescriptor(
        name='expire_time', full_name='google.devtools.remoteworkers.v1test2.Lease.expire_time', index=6,
        number=5, type=11, cpp_type=10, label=1,
        has_default_value=False, default_value=None,
        message_type=None, enum_type=None, containing_type=None,
        is_extension=False, extension_scope=None,
 -      options=None, file=DESCRIPTOR),
 +      serialized_options=None, file=DESCRIPTOR),
      _descriptor.FieldDescriptor(
        name='assignment', full_name='google.devtools.remoteworkers.v1test2.Lease.assignment', index=7,
        number=1, type=9, cpp_type=9, label=1,
        has_default_value=False, default_value=_b("").decode('utf-8'),
        message_type=None, enum_type=None, containing_type=None,
        is_extension=False, extension_scope=None,
 -      options=_descriptor._ParseOptions(descriptor_pb2.FieldOptions(), _b('\030\001')), file=DESCRIPTOR),
 +      serialized_options=_b('\030\001'), file=DESCRIPTOR),
      _descriptor.FieldDescriptor(
        name='inline_assignment', full_name='google.devtools.remoteworkers.v1test2.Lease.inline_assignment', index=8,
        number=6, type=11, cpp_type=10, label=1,
        has_default_value=False, default_value=None,
        message_type=None, enum_type=None, containing_type=None,
        is_extension=False, extension_scope=None,
 -      options=_descriptor._ParseOptions(descriptor_pb2.FieldOptions(), _b('\030\001')), file=DESCRIPTOR),
 +      serialized_options=_b('\030\001'), file=DESCRIPTOR),
    ],
    extensions=[
    ],
    nested_types=[],
    enum_types=[
    ],
 -  options=None,
 +  serialized_options=None,
    is_extendable=False,
    syntax='proto3',
    extension_ranges=[],
@@ -347,14 +347,14 @@ _ADMINTEMP = _descriptor.Descriptor(
        has_default_value=False, default_value=0,
        message_type=None, enum_type=None, containing_type=None,
        is_extension=False, extension_scope=None,
 -      options=None, file=DESCRIPTOR),
 +      serialized_options=None, file=DESCRIPTOR),
      _descriptor.FieldDescriptor(
        name='arg', full_name='google.devtools.remoteworkers.v1test2.AdminTemp.arg', index=1,
        number=2, type=9, cpp_type=9, label=1,
        has_default_value=False, default_value=_b("").decode('utf-8'),
        message_type=None, enum_type=None, containing_type=None,
        is_extension=False, extension_scope=None,
 -      options=None, file=DESCRIPTOR),
 +      serialized_options=None, file=DESCRIPTOR),
    ],
    extensions=[
    ],
@@ -362,7 +362,7 @@ _ADMINTEMP = _descriptor.Descriptor(
    enum_types=[
      _ADMINTEMP_COMMAND,
    ],
 -  options=None,
 +  serialized_options=None,
    is_extendable=False,
    syntax='proto3',
    extension_ranges=[],
@@ -386,21 +386,21 @@ _CREATEBOTSESSIONREQUEST = _descriptor.Descriptor(
        has_default_value=False, default_value=_b("").decode('utf-8'),
        message_type=None, enum_type=None, containing_type=None,
        is_extension=False, extension_scope=None,
 -      options=None, file=DESCRIPTOR),
 +      serialized_options=None, file=DESCRIPTOR),
      _descriptor.FieldDescriptor(
        name='bot_session', full_name='google.devtools.remoteworkers.v1test2.CreateBotSessionRequest.bot_session', index=1,
        number=2, type=11, cpp_type=10, label=1,
        has_default_value=False, default_value=None,
        message_type=None, enum_type=None, containing_type=None,
        is_extension=False, extension_scope=None,
 -      options=None, file=DESCRIPTOR),
 +      serialized_options=None, file=DESCRIPTOR),
    ],
    extensions=[
    ],
    nested_types=[],
    enum_types=[
    ],
 -  options=None,
 +  serialized_options=None,
    is_extendable=False,
    syntax='proto3',
    extension_ranges=[],
@@ -424,28 +424,28 @@ _UPDATEBOTSESSIONREQUEST = _descriptor.Descriptor(
        has_default_value=False, default_value=_b("").decode('utf-8'),
        message_type=None, enum_type=None, containing_type=None,
        is_extension=False, extension_scope=None,
 -      options=None, file=DESCRIPTOR),
 +      serialized_options=None, file=DESCRIPTOR),
      _descriptor.FieldDescriptor(
        name='bot_session', full_name='google.devtools.remoteworkers.v1test2.UpdateBotSessionRequest.bot_session', index=1,
        number=2, type=11, cpp_type=10, label=1,
        has_default_value=False, default_value=None,
        message_type=None, enum_type=None, containing_type=None,
        is_extension=False, extension_scope=None,
 -      options=None, file=DESCRIPTOR),
 +      serialized_options=None, file=DESCRIPTOR),
      _descriptor.FieldDescriptor(
        name='update_mask', full_name='google.devtools.remoteworkers.v1test2.UpdateBotSessionRequest.update_mask', index=2,
        number=3, type=11, cpp_type=10, label=1,
        has_default_value=False, default_value=None,
        message_type=None, enum_type=None, containing_type=None,
        is_extension=False, extension_scope=None,
 -      options=None, file=DESCRIPTOR),
 +      serialized_options=None, file=DESCRIPTOR),
    ],
    extensions=[
    ],
    nested_types=[],
    enum_types=[
    ],
 -  options=None,
 +  serialized_options=None,
    is_extendable=False,
    syntax='proto3',
    extension_ranges=[],
@@ -469,21 +469,21 @@ _POSTBOTEVENTTEMPREQUEST = _descriptor.Descriptor(
        has_default_value=False, default_value=_b("").decode('utf-8'),
        message_type=None, enum_type=None, containing_type=None,
        is_extension=False, extension_scope=None,
 -      options=None, file=DESCRIPTOR),
 +      serialized_options=None, file=DESCRIPTOR),
      _descriptor.FieldDescriptor(
        name='type', full_name='google.devtools.remoteworkers.v1test2.PostBotEventTempRequest.type', index=1,
        number=2, type=14, cpp_type=8, label=1,
        has_default_value=False, default_value=0,
        message_type=None, enum_type=None, containing_type=None,
        is_extension=False, extension_scope=None,
 -      options=None, file=DESCRIPTOR),
 +      serialized_options=None, file=DESCRIPTOR),
      _descriptor.FieldDescriptor(
        name='msg', full_name='google.devtools.remoteworkers.v1test2.PostBotEventTempRequest.msg', index=2,
        number=3, type=9, cpp_type=9, label=1,
        has_default_value=False, default_value=_b("").decode('utf-8'),
        message_type=None, enum_type=None, containing_type=None,
        is_extension=False, extension_scope=None,
 -      options=None, file=DESCRIPTOR),
 +      serialized_options=None, file=DESCRIPTOR),
    ],
    extensions=[
    ],
@@ -491,7 +491,7 @@ _POSTBOTEVENTTEMPREQUEST = _descriptor.Descriptor(
    enum_types=[
      _POSTBOTEVENTTEMPREQUEST_TYPE,
    ],
 -  options=None,
 +  serialized_options=None,
    is_extendable=False,
    syntax='proto3',
    extension_ranges=[],
@@ -572,19 +572,16 @@ PostBotEventTempRequest = _reflection.GeneratedProtocolMessageType('PostBotEvent
  _sym_db.RegisterMessage(PostBotEventTempRequest)
 -DESCRIPTOR.has_options = True
 -DESCRIPTOR._options = _descriptor._ParseOptions(descriptor_pb2.FileOptions(), _b('\n)com.google.devtools.remoteworkers.v1test2B\021RemoteWorkersBotsP\001ZRgoogle.golang.org/genproto/googleapis/devtools/remoteworkers/v1test2;remoteworkers\242\002\002RW\252\002%Google.DevTools.RemoteWorkers.V1Test2'))
 -_LEASE.fields_by_name['assignment'].has_options = True
 -_LEASE.fields_by_name['assignment']._options = _descriptor._ParseOptions(descriptor_pb2.FieldOptions(), _b('\030\001'))
 -_LEASE.fields_by_name['inline_assignment'].has_options = True
 -_LEASE.fields_by_name['inline_assignment']._options = _descriptor._ParseOptions(descriptor_pb2.FieldOptions(), _b('\030\001'))
 +DESCRIPTOR._options = None
 +_LEASE.fields_by_name['assignment']._options = None
 +_LEASE.fields_by_name['inline_assignment']._options = None
  _BOTS = _descriptor.ServiceDescriptor(
    name='Bots',
    full_name='google.devtools.remoteworkers.v1test2.Bots',
    file=DESCRIPTOR,
    index=0,
 -  options=None,
 +  serialized_options=None,
    serialized_start=1885,
    serialized_end=2437,
    methods=[
@@ -595,7 +592,7 @@ _BOTS = _descriptor.ServiceDescriptor(
      containing_service=None,
      input_type=_CREATEBOTSESSIONREQUEST,
      output_type=_BOTSESSION,
 -    options=_descriptor._ParseOptions(descriptor_pb2.MethodOptions(), _b('\202\323\344\223\002/\" /v1test2/{parent=**}/botSessions:\013bot_session')),
 +    serialized_options=_b('\202\323\344\223\002/\" /v1test2/{parent=**}/botSessions:\013bot_session'),
    ),
    _descriptor.MethodDescriptor(
      name='UpdateBotSession',
@@ -604,7 +601,7 @@ _BOTS = _descriptor.ServiceDescriptor(
      containing_service=None,
      input_type=_UPDATEBOTSESSIONREQUEST,
      output_type=_BOTSESSION,
 -    options=_descriptor._ParseOptions(descriptor_pb2.MethodOptions(), _b('\202\323\344\223\002/2 /v1test2/{name=**/botSessions/*}:\013bot_session')),
 +    serialized_options=_b('\202\323\344\223\002/2 /v1test2/{name=**/botSessions/*}:\013bot_session'),
    ),
    _descriptor.MethodDescriptor(
      name='PostBotEventTemp',
@@ -613,7 +610,7 @@ _BOTS = _descriptor.ServiceDescriptor(
      containing_service=None,
      input_type=_POSTBOTEVENTTEMPREQUEST,
      output_type=google_dot_protobuf_dot_empty__pb2._EMPTY,
 -    options=_descriptor._ParseOptions(descriptor_pb2.MethodOptions(), _b('\202\323\344\223\002/\"*/v1test2/{name=**/botSessions/*}:postEvent:\001*')),
 +    serialized_options=_b('\202\323\344\223\002/\"*/v1test2/{name=**/botSessions/*}:postEvent:\001*'),
    ),
  ])
  _sym_db.RegisterServiceDescriptor(_BOTS)

buildgrid/_protos/google/devtools/remoteworkers/v1test2/command_pb2.py

@@ -7,7 +7,6 @@ from google.protobuf import descriptor as _descriptor
  from google.protobuf import message as _message
  from google.protobuf import reflection as _reflection
  from google.protobuf import symbol_database as _symbol_database
 -from google.protobuf import descriptor_pb2
  # @@protoc_insertion_point(imports)
  _sym_db = _symbol_database.Default()
@@ -22,6 +21,7 @@ DESCRIPTOR = _descriptor.FileDescriptor(
    name='google/devtools/remoteworkers/v1test2/command.proto',
    package='google.devtools.remoteworkers.v1test2',
    syntax='proto3',
 +  serialized_options=_b('\n)com.google.devtools.remoteworkers.v1test2B\025RemoteWorkersCommandsP\001ZRgoogle.golang.org/genproto/googleapis/devtools/remoteworkers/v1test2;remoteworkers\242\002\002RW\252\002%Google.DevTools.RemoteWorkers.V1Test2'),
    serialized_pb=_b('\n3google/devtools/remoteworkers/v1test2/command.proto\x12%google.devtools.remoteworkers.v1test2\x1a\x19google/protobuf/any.proto\x1a\x1egoogle/protobuf/duration.proto\x1a\x17google/rpc/status.proto\"\xf3\x05\n\x0b\x43ommandTask\x12I\n\x06inputs\x18\x01 \x01(\x0b\x32\x39.google.devtools.remoteworkers.v1test2.CommandTask.Inputs\x12T\n\x10\x65xpected_outputs\x18\x04 \x01(\x0b\x32:.google.devtools.remoteworkers.v1test2.CommandTask.Outputs\x12M\n\x08timeouts\x18\x05 \x01(\x0b\x32;.google.devtools.remoteworkers.v1test2.CommandTask.Timeouts\x1a\xfb\x01\n\x06Inputs\x12\x11\n\targuments\x18\x01 \x03(\t\x12<\n\x05\x66iles\x18\x02 \x03(\x0b\x32-.google.devtools.remoteworkers.v1test2.Digest\x12l\n\x15\x65nvironment_variables\x18\x03 \x03(\x0b\x32M.google.devtools.remoteworkers.v1test2.CommandTask.Inputs.EnvironmentVariable\x1a\x32\n\x13\x45nvironmentVariable\x12\x0c\n\x04name\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\t\x1a\x65\n\x07Outputs\x12\r\n\x05\x66iles\x18\x01 \x03(\t\x12\x13\n\x0b\x64irectories\x18\x02 \x03(\t\x12\x1a\n\x12stdout_destination\x18\x03 \x01(\t\x12\x1a\n\x12stderr_destination\x18\x04 \x01(\t\x1a\x8e\x01\n\x08Timeouts\x12,\n\texecution\x18\x01 \x01(\x0b\x32\x19.google.protobuf.Duration\x12\'\n\x04idle\x18\x02 \x01(\x0b\x32\x19.google.protobuf.Duration\x12+\n\x08shutdown\x18\x03 \x01(\x0b\x32\x19.google.protobuf.Duration\"c\n\x0e\x43ommandOutputs\x12\x11\n\texit_code\x18\x01 \x01(\x05\x12>\n\x07outputs\x18\x02 \x01(\x0b\x32-.google.devtools.remoteworkers.v1test2.Digest\"k\n\x0f\x43ommandOverhead\x12+\n\x08\x64uration\x18\x01 \x01(\x0b\x32\x19.google.protobuf.Duration\x12+\n\x08overhead\x18\x02 \x01(\x0b\x32\x19.google.protobuf.Duration\"\x92\x02\n\rCommandResult\x12\"\n\x06status\x18\x01 \x01(\x0b\x32\x12.google.rpc.Status\x12\x11\n\texit_code\x18\x02 \x01(\x05\x12>\n\x07outputs\x18\x03 \x01(\x0b\x32-.google.devtools.remoteworkers.v1test2.Digest\x12/\n\x08\x64uration\x18\x04 \x01(\x0b\x32\x19.google.protobuf.DurationB\x02\x18\x01\x12/\n\x08overhead\x18\x05 \x01(\x0b\x32\x19.google.protobuf.DurationB\x02\x18\x01\x12(\n\nstatistics\x18\x06 \x03(\x0b\x32\x14.google.protobuf.Any\"\x84\x01\n\x0c\x46ileMetadata\x12\x0c\n\x04path\x18\x01 \x01(\t\x12=\n\x06\x64igest\x18\x02 \x01(\x0b\x32-.google.devtools.remoteworkers.v1test2.Digest\x12\x10\n\x08\x63ontents\x18\x03 \x01(\x0c\x12\x15\n\ris_executable\x18\x04 \x01(\x08\"`\n\x11\x44irectoryMetadata\x12\x0c\n\x04path\x18\x01 \x01(\t\x12=\n\x06\x64igest\x18\x02 \x01(\x0b\x32-.google.devtools.remoteworkers.v1test2.Digest\"*\n\x06\x44igest\x12\x0c\n\x04hash\x18\x01 \x01(\t\x12\x12\n\nsize_bytes\x18\x02 \x01(\x03\"\x9e\x01\n\tDirectory\x12\x42\n\x05\x66iles\x18\x01 \x03(\x0b\x32\x33.google.devtools.remoteworkers.v1test2.FileMetadata\x12M\n\x0b\x64irectories\x18\x02 \x03(\x0b\x32\x38.google.devtools.remoteworkers.v1test2.DirectoryMetadataB\xc5\x01\n)com.google.devtools.remoteworkers.v1test2B\x15RemoteWorkersCommandsP\x01ZRgoogle.golang.org/genproto/googleapis/devtools/remoteworkers/v1test2;remoteworkers\xa2\x02\x02RW\xaa\x02%Google.DevTools.RemoteWorkers.V1Test2b\x06proto3')
+   ,
    dependencies=[google_dot_protobuf_dot_any__pb2.DESCRIPTOR,google_dot_protobuf_dot_duration__pb2.DESCRIPTOR,google_dot_rpc_dot_status__pb2.DESCRIPTOR,])
@@ -42,21 +42,21 @@ _COMMANDTASK_INPUTS_ENVIRONMENTVARIABLE = _descriptor.Descriptor(
        has_default_value=False, default_value=_b("").decode('utf-8'),
        message_type=None, enum_type=None, containing_type=None,
        is_extension=False, extension_scope=None,
 -      options=None, file=DESCRIPTOR),
 +      serialized_options=None, file=DESCRIPTOR),
      _descriptor.FieldDescriptor(
        name='value', full_name='google.devtools.remoteworkers.v1test2.CommandTask.Inputs.EnvironmentVariable.value', index=1,
        number=2, type=9, cpp_type=9, label=1,
        has_default_value=False, default_value=_b("").decode('utf-8'),
        message_type=None, enum_type=None, containing_type=None,
        is_extension=False, extension_scope=None,
 -      options=None, file=DESCRIPTOR),
 +      serialized_options=None, file=DESCRIPTOR),
    ],
    extensions=[
    ],
    nested_types=[],
    enum_types=[
    ],
 -  options=None,
 +  serialized_options=None,
    is_extendable=False,
    syntax='proto3',
    extension_ranges=[],
@@ -79,28 +79,28 @@ _COMMANDTASK_INPUTS = _descriptor.Descriptor(
        has_default_value=False, default_value=[],
        message_type=None, enum_type=None, containing_type=None,
        is_extension=False, extension_scope=None,
 -      options=None, file=DESCRIPTOR),
 +      serialized_options=None, file=DESCRIPTOR),
      _descriptor.FieldDescriptor(
        name='files', full_name='google.devtools.remoteworkers.v1test2.CommandTask.Inputs.files', index=1,
        number=2, type=11, cpp_type=10, label=3,
        has_default_value=False, default_value=[],
        message_type=None, enum_type=None, containing_type=None,
        is_extension=False, extension_scope=None,
 -      options=None, file=DESCRIPTOR),
 +      serialized_options=None, file=DESCRIPTOR),
      _descriptor.FieldDescriptor(
        name='environment_variables', full_name='google.devtools.remoteworkers.v1test2.CommandTask.Inputs.environment_variables', index=2,
        number=3, type=11, cpp_type=10, label=3,
        has_default_value=False, default_value=[],
        message_type=None, enum_type=None, containing_type=None,
        is_extension=False, extension_scope=None,
 -      options=None, file=DESCRIPTOR),
 +      serialized_options=None, file=DESCRIPTOR),
    ],
    extensions=[
    ],
    nested_types=[_COMMANDTASK_INPUTS_ENVIRONMENTVARIABLE, ],
    enum_types=[
    ],
 -  options=None,
 +  serialized_options=None,
    is_extendable=False,
    syntax='proto3',
    extension_ranges=[],
@@ -123,35 +123,35 @@ _COMMANDTASK_OUTPUTS = _descriptor.Descriptor(
        has_default_value=False, default_value=[],
        message_type=None, enum_type=None, containing_type=None,
        is_extension=False, extension_scope=None,
 -      options=None, file=DESCRIPTOR),
 +      serialized_options=None, file=DESCRIPTOR),
      _descriptor.FieldDescriptor(
        name='directories', full_name='google.devtools.remoteworkers.v1test2.CommandTask.Outputs.directories', index=1,
        number=2, type=9, cpp_type=9, label=3,
        has_default_value=False, default_value=[],
        message_type=None, enum_type=None, containing_type=None,
        is_extension=False, extension_scope=None,
 -      options=None, file=DESCRIPTOR),
 +      serialized_options=None, file=DESCRIPTOR),
      _descriptor.FieldDescriptor(
        name='stdout_destination', full_name='google.devtools.remoteworkers.v1test2.CommandTask.Outputs.stdout_destination', index=2,
        number=3, type=9, cpp_type=9, label=1,
        has_default_value=False, default_value=_b("").decode('utf-8'),
        message_type=None, enum_type=None, containing_type=None,
        is_extension=False, extension_scope=None,
 -      options=None, file=DESCRIPTOR),
 +      serialized_options=None, file=DESCRIPTOR),
      _descriptor.FieldDescriptor(
        name='stderr_destination', full_name='google.devtools.remoteworkers.v1test2.CommandTask.Outputs.stderr_destination', index=3,
        number=4, type=9, cpp_type=9, label=1,
        has_default_value=False, default_value=_b("").decode('utf-8'),
        message_type=None, enum_type=None, containing_type=None,
        is_extension=False, extension_scope=None,
 -      options=None, file=DESCRIPTOR),
 +      serialized_options=None, file=DESCRIPTOR),
    ],
    extensions=[
    ],
    nested_types=[],
    enum_types=[
    ],
 -  options=None,
 +  serialized_options=None,
    is_extendable=False,
    syntax='proto3',
    extension_ranges=[],
@@ -174,28 +174,28 @@ _COMMANDTASK_TIMEOUTS = _descriptor.Descriptor(
        has_default_value=False, default_value=None,
        message_type=None, enum_type=None, containing_type=None,
        is_extension=False, extension_scope=None,
 -      options=None, file=DESCRIPTOR),
 +      serialized_options=None, file=DESCRIPTOR),
      _descriptor.FieldDescriptor(
        name='idle', full_name='google.devtools.remoteworkers.v1test2.CommandTask.Timeouts.idle', index=1,
        number=2, type=11, cpp_type=10, label=1,
        has_default_value=False, default_value=None,
        message_type=None, enum_type=None, containing_type=None,
        is_extension=False, extension_scope=None,
 -      options=None, file=DESCRIPTOR),
 +      serialized_options=None, file=DESCRIPTOR),
      _descriptor.FieldDescriptor(
        name='shutdown', full_name='google.devtools.remoteworkers.v1test2.CommandTask.Timeouts.shutdown', index=2,
        number=3, type=11, cpp_type=10, label=1,
        has_default_value=False, default_value=None,
        message_type=None, enum_type=None, containing_type=None,
        is_extension=False, extension_scope=None,
 -      options=None, file=DESCRIPTOR),
 +      serialized_options=None, file=DESCRIPTOR),
    ],
    extensions=[
    ],
    nested_types=[],
    enum_types=[
    ],
 -  options=None,
 +  serialized_options=None,
    is_extendable=False,
    syntax='proto3',
    extension_ranges=[],
@@ -218,28 +218,28 @@ _COMMANDTASK = _descriptor.Descriptor(
        has_default_value=False, default_value=None,
        message_type=None, enum_type=None, containing_type=None,
        is_extension=False, extension_scope=None,
 -      options=None, file=DESCRIPTOR),
 +      serialized_options=None, file=DESCRIPTOR),
      _descriptor.FieldDescriptor(
        name='expected_outputs', full_name='google.devtools.remoteworkers.v1test2.CommandTask.expected_outputs', index=1,
        number=4, type=11, cpp_type=10, label=1,
        has_default_value=False, default_value=None,
        message_type=None, enum_type=None, containing_type=None,
        is_extension=False, extension_scope=None,
 -      options=None, file=DESCRIPTOR),
 +      serialized_options=None, file=DESCRIPTOR),
      _descriptor.FieldDescriptor(
        name='timeouts', full_name='google.devtools.remoteworkers.v1test2.CommandTask.timeouts', index=2,
        number=5, type=11, cpp_type=10, label=1,
        has_default_value=False, default_value=None,
        message_type=None, enum_type=None, containing_type=None,
        is_extension=False, extension_scope=None,
 -      options=None, file=DESCRIPTOR),
 +      serialized_options=None, file=DESCRIPTOR),
    ],
    extensions=[
    ],
    nested_types=[_COMMANDTASK_INPUTS, _COMMANDTASK_OUTPUTS, _COMMANDTASK_TIMEOUTS, ],
    enum_types=[
    ],
 -  options=None,
 +  serialized_options=None,
    is_extendable=False,
    syntax='proto3',
    extension_ranges=[],
@@ -263,21 +263,21 @@ _COMMANDOUTPUTS = _descriptor.Descriptor(
        has_default_value=False, default_value=0,
        message_type=None, enum_type=None, containing_type=None,
        is_extension=False, extension_scope=None,
 -      options=None, file=DESCRIPTOR),
 +      serialized_options=None, file=DESCRIPTOR),
      _descriptor.FieldDescriptor(
        name='outputs', full_name='google.devtools.remoteworkers.v1test2.CommandOutputs.outputs', index=1,
        number=2, type=11, cpp_type=10, label=1,
        has_default_value=False, default_value=None,
        message_type=None, enum_type=None, containing_type=None,
        is_extension=False, extension_scope=None,
 -      options=None, file=DESCRIPTOR),
 +      serialized_options=None, file=DESCRIPTOR),
    ],
    extensions=[
    ],
    nested_types=[],
    enum_types=[
    ],
 -  options=None,
 +  serialized_options=None,
    is_extendable=False,
    syntax='proto3',
    extension_ranges=[],
@@ -301,21 +301,21 @@ _COMMANDOVERHEAD = _descriptor.Descriptor(
        has_default_value=False, default_value=None,
        message_type=None, enum_type=None, containing_type=None,
        is_extension=False, extension_scope=None,
 -      options=None, file=DESCRIPTOR),
 +      serialized_options=None, file=DESCRIPTOR),
      _descriptor.FieldDescriptor(
        name='overhead', full_name='google.devtools.remoteworkers.v1test2.CommandOverhead.overhead', index=1,
        number=2, type=11, cpp_type=10, label=1,
        has_default_value=False, default_value=None,
        message_type=None, enum_type=None, containing_type=None,
        is_extension=False, extension_scope=None,
 -      options=None, file=DESCRIPTOR),
 +      serialized_options=None, file=DESCRIPTOR),
    ],
    extensions=[
    ],
    nested_types=[],
    enum_types=[
    ],
 -  options=None,
 +  serialized_options=None,
    is_extendable=False,
    syntax='proto3',
    extension_ranges=[],
@@ -339,49 +339,49 @@ _COMMANDRESULT = _descriptor.Descriptor(
        has_default_value=False, default_value=None,
        message_type=None, enum_type=None, containing_type=None,
        is_extension=False, extension_scope=None,
 -      options=None, file=DESCRIPTOR),
 +      serialized_options=None, file=DESCRIPTOR),
      _descriptor.FieldDescriptor(
        name='exit_code', full_name='google.devtools.remoteworkers.v1test2.CommandResult.exit_code', index=1,
        number=2, type=5, cpp_type=1, label=1,
        has_default_value=False, default_value=0,
        message_type=None, enum_type=None, containing_type=None,
        is_extension=False, extension_scope=None,
 -      options=None, file=DESCRIPTOR),
 +      serialized_options=None, file=DESCRIPTOR),
      _descriptor.FieldDescriptor(
        name='outputs', full_name='google.devtools.remoteworkers.v1test2.CommandResult.outputs', index=2,
        number=3, type=11, cpp_type=10, label=1,
        has_default_value=False, default_value=None,
        message_type=None, enum_type=None, containing_type=None,
        is_extension=False, extension_scope=None,
 -      options=None, file=DESCRIPTOR),
 +      serialized_options=None, file=DESCRIPTOR),
      _descriptor.FieldDescriptor(
        name='duration', full_name='google.devtools.remoteworkers.v1test2.CommandResult.duration', index=3,
        number=4, type=11, cpp_type=10, label=1,
        has_default_value=False, default_value=None,
        message_type=None, enum_type=None, containing_type=None,
        is_extension=False, extension_scope=None,
 -      options=_descriptor._ParseOptions(descriptor_pb2.FieldOptions(), _b('\030\001')), file=DESCRIPTOR),
 +      serialized_options=_b('\030\001'), file=DESCRIPTOR),
      _descriptor.FieldDescriptor(
        name='overhead', full_name='google.devtools.remoteworkers.v1test2.CommandResult.overhead', index=4,
        number=5, type=11, cpp_type=10, label=1,
        has_default_value=False, default_value=None,
        message_type=None, enum_type=None, containing_type=None,
        is_extension=False, extension_scope=None,
 -      options=_descriptor._ParseOptions(descriptor_pb2.FieldOptions(), _b('\030\001')), file=DESCRIPTOR),
 +      serialized_options=_b('\030\001'), file=DESCRIPTOR),
      _descriptor.FieldDescriptor(
        name='statistics', full_name='google.devtools.remoteworkers.v1test2.CommandResult.statistics', index=5,
        number=6, type=11, cpp_type=10, label=3,
        has_default_value=False, default_value=[],
        message_type=None, enum_type=None, containing_type=None,
        is_extension=False, extension_scope=None,
 -      options=None, file=DESCRIPTOR),
 +      serialized_options=None, file=DESCRIPTOR),
    ],
    extensions=[
    ],
    nested_types=[],
    enum_types=[
    ],
 -  options=None,
 +  serialized_options=None,
    is_extendable=False,
    syntax='proto3',
    extension_ranges=[],
@@ -405,35 +405,35 @@ _FILEMETADATA = _descriptor.Descriptor(
        has_default_value=False, default_value=_b("").decode('utf-8'),
        message_type=None, enum_type=None, containing_type=None,
        is_extension=False, extension_scope=None,
 -      options=None, file=DESCRIPTOR),
 +      serialized_options=None, file=DESCRIPTOR),
      _descriptor.FieldDescriptor(
        name='digest', full_name='google.devtools.remoteworkers.v1test2.FileMetadata.digest', index=1,
        number=2, type=11, cpp_type=10, label=1,
        has_default_value=False, default_value=None,
        message_type=None, enum_type=None, containing_type=None,
        is_extension=False, extension_scope=None,
 -      options=None, file=DESCRIPTOR),
 +      serialized_options=None, file=DESCRIPTOR),
      _descriptor.FieldDescriptor(
        name='contents', full_name='google.devtools.remoteworkers.v1test2.FileMetadata.contents', index=2,
        number=3, type=12, cpp_type=9, label=1,
        has_default_value=False, default_value=_b(""),
        message_type=None, enum_type=None, containing_type=None,
        is_extension=False, extension_scope=None,
 -      options=None, file=DESCRIPTOR),
 +      serialized_options=None, file=DESCRIPTOR),
      _descriptor.FieldDescriptor(
        name='is_executable', full_name='google.devtools.remoteworkers.v1test2.FileMetadata.is_executable', index=3,
        number=4, type=8, cpp_type=7, label=1,
        has_default_value=False, default_value=False,
        message_type=None, enum_type=None, containing_type=None,
        is_extension=False, extension_scope=None,
 -      options=None, file=DESCRIPTOR),
 +      serialized_options=None, file=DESCRIPTOR),
    ],
    extensions=[
    ],
    nested_types=[],
    enum_types=[
    ],
 -  options=None,
 +  serialized_options=None,
    is_extendable=False,
    syntax='proto3',
    extension_ranges=[],
@@ -457,21 +457,21 @@ _DIRECTORYMETADATA = _descriptor.Descriptor(
        has_default_value=False, default_value=_b("").decode('utf-8'),
        message_type=None, enum_type=None, containing_type=None,
        is_extension=False, extension_scope=None,
 -      options=None, file=DESCRIPTOR),
 +      serialized_options=None, file=DESCRIPTOR),
      _descriptor.FieldDescriptor(
        name='digest', full_name='google.devtools.remoteworkers.v1test2.DirectoryMetadata.digest', index=1,
        number=2, type=11, cpp_type=10, label=1,
        has_default_value=False, default_value=None,
        message_type=None, enum_type=None, containing_type=None,
        is_extension=False, extension_scope=None,
 -      options=None, file=DESCRIPTOR),
 +      serialized_options=None, file=DESCRIPTOR),
    ],
    extensions=[
    ],
    nested_types=[],
    enum_types=[
    ],
 -  options=None,
 +  serialized_options=None,
    is_extendable=False,
    syntax='proto3',
    extension_ranges=[],
@@ -495,21 +495,21 @@ _DIGEST = _descriptor.Descriptor(
        has_default_value=False, default_value=_b("").decode('utf-8'),
        message_type=None, enum_type=None, containing_type=None,
        is_extension=False, extension_scope=None,
 -      options=None, file=DESCRIPTOR),
 +      serialized_options=None, file=DESCRIPTOR),
      _descriptor.FieldDescriptor(
        name='size_bytes', full_name='google.devtools.remoteworkers.v1test2.Digest.size_bytes', index=1,
        number=2, type=3, cpp_type=2, label=1,
        has_default_value=False, default_value=0,
        message_type=None, enum_type=None, containing_type=None,
        is_extension=False, extension_scope=None,
 -      options=None, file=DESCRIPTOR),
 +      serialized_options=None, file=DESCRIPTOR),
    ],
    extensions=[
    ],
    nested_types=[],
    enum_types=[
    ],
 -  options=None,
 +  serialized_options=None,
    is_extendable=False,
    syntax='proto3',
    extension_ranges=[],
@@ -533,21 +533,21 @@ _DIRECTORY = _descriptor.Descriptor(
        has_default_value=False, default_value=[],
        message_type=None, enum_type=None, containing_type=None,
        is_extension=False, extension_scope=None,
 -      options=None, file=DESCRIPTOR),
 +      serialized_options=None, file=DESCRIPTOR),
      _descriptor.FieldDescriptor(
        name='directories', full_name='google.devtools.remoteworkers.v1test2.Directory.directories', index=1,
        number=2, type=11, cpp_type=10, label=3,
        has_default_value=False, default_value=[],
        message_type=None, enum_type=None, containing_type=None,
        is_extension=False, extension_scope=None,
 -      options=None, file=DESCRIPTOR),
 +      serialized_options=None, file=DESCRIPTOR),
    ],
    extensions=[
    ],
    nested_types=[],
    enum_types=[
    ],
 -  options=None,
 +  serialized_options=None,
    is_extendable=False,
    syntax='proto3',
    extension_ranges=[],
@@ -680,10 +680,7 @@ Directory = _reflection.GeneratedProtocolMessageType('Directory', (_message.Mess
  _sym_db.RegisterMessage(Directory)
 -DESCRIPTOR.has_options = True
 -DESCRIPTOR._options = _descriptor._ParseOptions(descriptor_pb2.FileOptions(), _b('\n)com.google.devtools.remoteworkers.v1test2B\025RemoteWorkersCommandsP\001ZRgoogle.golang.org/genproto/googleapis/devtools/remoteworkers/v1test2;remoteworkers\242\002\002RW\252\002%Google.DevTools.RemoteWorkers.V1Test2'))
 -_COMMANDRESULT.fields_by_name['duration'].has_options = True
 -_COMMANDRESULT.fields_by_name['duration']._options = _descriptor._ParseOptions(descriptor_pb2.FieldOptions(), _b('\030\001'))
 -_COMMANDRESULT.fields_by_name['overhead'].has_options = True
 -_COMMANDRESULT.fields_by_name['overhead']._options = _descriptor._ParseOptions(descriptor_pb2.FieldOptions(), _b('\030\001'))
 +DESCRIPTOR._options = None
 +_COMMANDRESULT.fields_by_name['duration']._options = None
 +_COMMANDRESULT.fields_by_name['overhead']._options = None
  # @@protoc_insertion_point(module_scope)

buildgrid/_protos/google/devtools/remoteworkers/v1test2/tasks_pb2.py

@@ -7,7 +7,6 @@ from google.protobuf import descriptor as _descriptor
  from google.protobuf import message as _message
  from google.protobuf import reflection as _reflection
  from google.protobuf import symbol_database as _symbol_database
 -from google.protobuf import descriptor_pb2
  # @@protoc_insertion_point(imports)
  _sym_db = _symbol_database.Default()
@@ -23,6 +22,7 @@ DESCRIPTOR = _descriptor.FileDescriptor(
    name='google/devtools/remoteworkers/v1test2/tasks.proto',
    package='google.devtools.remoteworkers.v1test2',
    syntax='proto3',
 +  serialized_options=_b('\n)com.google.devtools.remoteworkers.v1test2B\022RemoteWorkersTasksP\001ZRgoogle.golang.org/genproto/googleapis/devtools/remoteworkers/v1test2;remoteworkers\242\002\002RW\252\002%Google.DevTools.RemoteWorkers.V1Test2'),
    serialized_pb=_b('\n1google/devtools/remoteworkers/v1test2/tasks.proto\x12%google.devtools.remoteworkers.v1test2\x1a\x1cgoogle/api/annotations.proto\x1a\x19google/protobuf/any.proto\x1a google/protobuf/field_mask.proto\x1a\x17google/rpc/status.proto\"\xb1\x01\n\x04Task\x12\x0c\n\x04name\x18\x01 \x01(\t\x12)\n\x0b\x64\x65scription\x18\x02 \x01(\x0b\x32\x14.google.protobuf.Any\x12\x43\n\x04logs\x18\x03 \x03(\x0b\x32\x35.google.devtools.remoteworkers.v1test2.Task.LogsEntry\x1a+\n\tLogsEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\t:\x02\x38\x01\"\x9a\x01\n\nTaskResult\x12\x0c\n\x04name\x18\x01 \x01(\t\x12\x10\n\x08\x63omplete\x18\x02 \x01(\x08\x12\"\n\x06status\x18\x03 \x01(\x0b\x32\x12.google.rpc.Status\x12$\n\x06output\x18\x04 \x01(\x0b\x32\x14.google.protobuf.Any\x12\"\n\x04meta\x18\x05 \x01(\x0b\x32\x14.google.protobuf.Any\"\x1e\n\x0eGetTaskRequest\x12\x0c\n\x04name\x18\x01 \x01(\t\"\xab\x01\n\x17UpdateTaskResultRequest\x12\x0c\n\x04name\x18\x01 \x01(\t\x12\x41\n\x06result\x18\x02 \x01(\x0b\x32\x31.google.devtools.remoteworkers.v1test2.TaskResult\x12/\n\x0bupdate_mask\x18\x03 \x01(\x0b\x32\x1a.google.protobuf.FieldMask\x12\x0e\n\x06source\x18\x04 \x01(\t\"1\n\x11\x41\x64\x64TaskLogRequest\x12\x0c\n\x04name\x18\x01 \x01(\t\x12\x0e\n\x06log_id\x18\x02 \x01(\t\"$\n\x12\x41\x64\x64TaskLogResponse\x12\x0e\n\x06handle\x18\x01 \x01(\t2\x88\x04\n\x05Tasks\x12\x91\x01\n\x07GetTask\x12\x35.google.devtools.remoteworkers.v1test2.GetTaskRequest\x1a+.google.devtools.remoteworkers.v1test2.Task\"\"\x82\xd3\xe4\x93\x02\x1c\x12\x1a/v1test2/{name=**/tasks/*}\x12\xb8\x01\n\x10UpdateTaskResult\x12>.google.devtools.remoteworkers.v1test2.UpdateTaskResultRequest\x1a\x31.google.devtools.remoteworkers.v1test2.TaskResult\"1\x82\xd3\xe4\x93\x02+2!/v1test2/{name=**/tasks/*/result}:\x06result\x12\xaf\x01\n\nAddTaskLog\x12\x38.google.devtools.remoteworkers.v1test2.AddTaskLogRequest\x1a\x39.google.devtools.remoteworkers.v1test2.AddTaskLogResponse\",\x82\xd3\xe4\x93\x02&\"!/v1test2/{name=**/tasks/*}:addLog:\x01*B\xc2\x01\n)com.google.devtools.remoteworkers.v1test2B\x12RemoteWorkersTasksP\x01ZRgoogle.golang.org/genproto/googleapis/devtools/remoteworkers/v1test2;remoteworkers\xa2\x02\x02RW\xaa\x02%Google.DevTools.RemoteWorkers.V1Test2b\x06proto3')
+   ,
    dependencies=[google_dot_api_dot_annotations__pb2.DESCRIPTOR,google_dot_protobuf_dot_any__pb2.DESCRIPTOR,google_dot_protobuf_dot_field__mask__pb2.DESCRIPTOR,google_dot_rpc_dot_status__pb2.DESCRIPTOR,])
@@ -43,21 +43,21 @@ _TASK_LOGSENTRY = _descriptor.Descriptor(
        has_default_value=False, default_value=_b("").decode('utf-8'),
        message_type=None, enum_type=None, containing_type=None,
        is_extension=False, extension_scope=None,
 -      options=None, file=DESCRIPTOR),
 +      serialized_options=None, file=DESCRIPTOR),
      _descriptor.FieldDescriptor(
        name='value', full_name='google.devtools.remoteworkers.v1test2.Task.LogsEntry.value', index=1,
        number=2, type=9, cpp_type=9, label=1,
        has_default_value=False, default_value=_b("").decode('utf-8'),
        message_type=None, enum_type=None, containing_type=None,
        is_extension=False, extension_scope=None,
 -      options=None, file=DESCRIPTOR),
 +      serialized_options=None, file=DESCRIPTOR),
    ],
    extensions=[
    ],
    nested_types=[],
    enum_types=[
    ],
 -  options=_descriptor._ParseOptions(descriptor_pb2.MessageOptions(), _b('8\001')),
 +  serialized_options=_b('8\001'),
    is_extendable=False,
    syntax='proto3',
    extension_ranges=[],
@@ -80,28 +80,28 @@ _TASK = _descriptor.Descriptor(
        has_default_value=False, default_value=_b("").decode('utf-8'),
        message_type=None, enum_type=None, containing_type=None,
        is_extension=False, extension_scope=None,
 -      options=None, file=DESCRIPTOR),
 +      serialized_options=None, file=DESCRIPTOR),
      _descriptor.FieldDescriptor(
        name='description', full_name='google.devtools.remoteworkers.v1test2.Task.description', index=1,
        number=2, type=11, cpp_type=10, label=1,
        has_default_value=False, default_value=None,
        message_type=None, enum_type=None, containing_type=None,
        is_extension=False, extension_scope=None,
 -      options=None, file=DESCRIPTOR),
 +      serialized_options=None, file=DESCRIPTOR),
      _descriptor.FieldDescriptor(
        name='logs', full_name='google.devtools.remoteworkers.v1test2.Task.logs', index=2,
        number=3, type=11, cpp_type=10, label=3,
        has_default_value=False, default_value=[],
        message_type=None, enum_type=None, containing_type=None,
        is_extension=False, extension_scope=None,
 -      options=None, file=DESCRIPTOR),
 +      serialized_options=None, file=DESCRIPTOR),
    ],
    extensions=[
    ],
    nested_types=[_TASK_LOGSENTRY, ],
    enum_types=[
    ],
 -  options=None,
 +  serialized_options=None,
    is_extendable=False,
    syntax='proto3',
    extension_ranges=[],
@@ -125,42 +125,42 @@ _TASKRESULT = _descriptor.Descriptor(
        has_default_value=False, default_value=_b("").decode('utf-8'),
        message_type=None, enum_type=None, containing_type=None,
        is_extension=False, extension_scope=None,
 -      options=None, file=DESCRIPTOR),
 +      serialized_options=None, file=DESCRIPTOR),
      _descriptor.FieldDescriptor(
        name='complete', full_name='google.devtools.remoteworkers.v1test2.TaskResult.complete', index=1,
        number=2, type=8, cpp_type=7, label=1,
        has_default_value=False, default_value=False,
        message_type=None, enum_type=None, containing_type=None,
        is_extension=False, extension_scope=None,
 -      options=None, file=DESCRIPTOR),
 +      serialized_options=None, file=DESCRIPTOR),
      _descriptor.FieldDescriptor(
        name='status', full_name='google.devtools.remoteworkers.v1test2.TaskResult.status', index=2,
        number=3, type=11, cpp_type=10, label=1,
        has_default_value=False, default_value=None,
        message_type=None, enum_type=None, containing_type=None,
        is_extension=False, extension_scope=None,
 -      options=None, file=DESCRIPTOR),
 +      serialized_options=None, file=DESCRIPTOR),
      _descriptor.FieldDescriptor(
        name='output', full_name='google.devtools.remoteworkers.v1test2.TaskResult.output', index=3,
        number=4, type=11, cpp_type=10, label=1,
        has_default_value=False, default_value=None,
        message_type=None, enum_type=None, containing_type=None,
        is_extension=False, extension_scope=None,
 -      options=None, file=DESCRIPTOR),
 +      serialized_options=None, file=DESCRIPTOR),
      _descriptor.FieldDescriptor(
        name='meta', full_name='google.devtools.remoteworkers.v1test2.TaskResult.meta', index=4,
        number=5, type=11, cpp_type=10, label=1,
        has_default_value=False, default_value=None,
        message_type=None, enum_type=None, containing_type=None,
        is_extension=False, extension_scope=None,
 -      options=None, file=DESCRIPTOR),
 +      serialized_options=None, file=DESCRIPTOR),
    ],
    extensions=[
    ],
    nested_types=[],
    enum_types=[
    ],
 -  options=None,
 +  serialized_options=None,
    is_extendable=False,
    syntax='proto3',
    extension_ranges=[],
@@ -184,14 +184,14 @@ _GETTASKREQUEST = _descriptor.Descriptor(
        has_default_value=False, default_value=_b("").decode('utf-8'),
        message_type=None, enum_type=None, containing_type=None,
        is_extension=False, extension_scope=None,
 -      options=None, file=DESCRIPTOR),
 +      serialized_options=None, file=DESCRIPTOR),
    ],
    extensions=[
    ],
    nested_types=[],
    enum_types=[
    ],
 -  options=None,
 +  serialized_options=None,
    is_extendable=False,
    syntax='proto3',
    extension_ranges=[],
@@ -215,35 +215,35 @@ _UPDATETASKRESULTREQUEST = _descriptor.Descriptor(
        has_default_value=False, default_value=_b("").decode('utf-8'),
        message_type=None, enum_type=None, containing_type=None,
        is_extension=False, extension_scope=None,
 -      options=None, file=DESCRIPTOR),
 +      serialized_options=None, file=DESCRIPTOR),
      _descriptor.FieldDescriptor(
        name='result', full_name='google.devtools.remoteworkers.v1test2.UpdateTaskResultRequest.result', index=1,
        number=2, type=11, cpp_type=10, label=1,
        has_default_value=False, default_value=None,
        message_type=None, enum_type=None, containing_type=None,
        is_extension=False, extension_scope=None,
 -      options=None, file=DESCRIPTOR),
 +      serialized_options=None, file=DESCRIPTOR),
      _descriptor.FieldDescriptor(
        name='update_mask', full_name='google.devtools.remoteworkers.v1test2.UpdateTaskResultRequest.update_mask', index=2,
        number=3, type=11, cpp_type=10, label=1,
        has_default_value=False, default_value=None,
        message_type=None, enum_type=None, containing_type=None,
        is_extension=False, extension_scope=None,
 -      options=None, file=DESCRIPTOR),
 +      serialized_options=None, file=DESCRIPTOR),
      _descriptor.FieldDescriptor(
        name='source', full_name='google.devtools.remoteworkers.v1test2.UpdateTaskResultRequest.source', index=3,
        number=4, type=9, cpp_type=9, label=1,
        has_default_value=False, default_value=_b("").decode('utf-8'),
        message_type=None, enum_type=None, containing_type=None,
        is_extension=False, extension_scope=None,
 -      options=None, file=DESCRIPTOR),
 +      serialized_options=None, file=DESCRIPTOR),
    ],
    extensions=[
    ],
    nested_types=[],
    enum_types=[
    ],
 -  options=None,
 +  serialized_options=None,
    is_extendable=False,
    syntax='proto3',
    extension_ranges=[],
@@ -267,21 +267,21 @@ _ADDTASKLOGREQUEST = _descriptor.Descriptor(
        has_default_value=False, default_value=_b("").decode('utf-8'),
        message_type=None, enum_type=None, containing_type=None,
        is_extension=False, extension_scope=None,
 -      options=None, file=DESCRIPTOR),
 +      serialized_options=None, file=DESCRIPTOR),
      _descriptor.FieldDescriptor(
        name='log_id', full_name='google.devtools.remoteworkers.v1test2.AddTaskLogRequest.log_id', index=1,
        number=2, type=9, cpp_type=9, label=1,
        has_default_value=False, default_value=_b("").decode('utf-8'),
        message_type=None, enum_type=None, containing_type=None,
        is_extension=False, extension_scope=None,
 -      options=None, file=DESCRIPTOR),
 +      serialized_options=None, file=DESCRIPTOR),
    ],
    extensions=[
    ],
    nested_types=[],
    enum_types=[
    ],
 -  options=None,
 +  serialized_options=None,
    is_extendable=False,
    syntax='proto3',
    extension_ranges=[],
@@ -305,14 +305,14 @@ _ADDTASKLOGRESPONSE = _descriptor.Descriptor(
        has_default_value=False, default_value=_b("").decode('utf-8'),
        message_type=None, enum_type=None, containing_type=None,
        is_extension=False, extension_scope=None,
 -      options=None, file=DESCRIPTOR),
 +      serialized_options=None, file=DESCRIPTOR),
    ],
    extensions=[
    ],
    nested_types=[],
    enum_types=[
    ],
 -  options=None,
 +  serialized_options=None,
    is_extendable=False,
    syntax='proto3',
    extension_ranges=[],
@@ -389,17 +389,15 @@ AddTaskLogResponse = _reflection.GeneratedProtocolMessageType('AddTaskLogRespons
  _sym_db.RegisterMessage(AddTaskLogResponse)
 -DESCRIPTOR.has_options = True
 -DESCRIPTOR._options = _descriptor._ParseOptions(descriptor_pb2.FileOptions(), _b('\n)com.google.devtools.remoteworkers.v1test2B\022RemoteWorkersTasksP\001ZRgoogle.golang.org/genproto/googleapis/devtools/remoteworkers/v1test2;remoteworkers\242\002\002RW\252\002%Google.DevTools.RemoteWorkers.V1Test2'))
 -_TASK_LOGSENTRY.has_options = True
 -_TASK_LOGSENTRY._options = _descriptor._ParseOptions(descriptor_pb2.MessageOptions(), _b('8\001'))
 +DESCRIPTOR._options = None
 +_TASK_LOGSENTRY._options = None
  _TASKS = _descriptor.ServiceDescriptor(
    name='Tasks',
    full_name='google.devtools.remoteworkers.v1test2.Tasks',
    file=DESCRIPTOR,
    index=0,
 -  options=None,
 +  serialized_options=None,
    serialized_start=841,
    serialized_end=1361,
    methods=[
@@ -410,7 +408,7 @@ _TASKS = _descriptor.ServiceDescriptor(
      containing_service=None,
      input_type=_GETTASKREQUEST,
      output_type=_TASK,
 -    options=_descriptor._ParseOptions(descriptor_pb2.MethodOptions(), _b('\202\323\344\223\002\034\022\032/v1test2/{name=**/tasks/*}')),
 +    serialized_options=_b('\202\323\344\223\002\034\022\032/v1test2/{name=**/tasks/*}'),
    ),
    _descriptor.MethodDescriptor(
      name='UpdateTaskResult',
@@ -419,7 +417,7 @@ _TASKS = _descriptor.ServiceDescriptor(
      containing_service=None,
      input_type=_UPDATETASKRESULTREQUEST,
      output_type=_TASKRESULT,
 -    options=_descriptor._ParseOptions(descriptor_pb2.MethodOptions(), _b('\202\323\344\223\002+2!/v1test2/{name=**/tasks/*/result}:\006result')),
 +    serialized_options=_b('\202\323\344\223\002+2!/v1test2/{name=**/tasks/*/result}:\006result'),
    ),
    _descriptor.MethodDescriptor(
      name='AddTaskLog',
@@ -428,7 +426,7 @@ _TASKS = _descriptor.ServiceDescriptor(
      containing_service=None,
      input_type=_ADDTASKLOGREQUEST,
      output_type=_ADDTASKLOGRESPONSE,
 -    options=_descriptor._ParseOptions(descriptor_pb2.MethodOptions(), _b('\202\323\344\223\002&\"!/v1test2/{name=**/tasks/*}:addLog:\001*')),
 +    serialized_options=_b('\202\323\344\223\002&\"!/v1test2/{name=**/tasks/*}:addLog:\001*'),
    ),
  ])
  _sym_db.RegisterServiceDescriptor(_TASKS)

buildgrid/_protos/google/devtools/remoteworkers/v1test2/worker_pb2.py

@@ -7,7 +7,6 @@ from google.protobuf import descriptor as _descriptor
  from google.protobuf import message as _message
  from google.protobuf import reflection as _reflection
  from google.protobuf import symbol_database as _symbol_database
 -from google.protobuf import descriptor_pb2
  # @@protoc_insertion_point(imports)
  _sym_db = _symbol_database.Default()
@@ -19,6 +18,7 @@ DESCRIPTOR = _descriptor.FileDescriptor(
    name='google/devtools/remoteworkers/v1test2/worker.proto',
    package='google.devtools.remoteworkers.v1test2',
    syntax='proto3',
 +  serialized_options=_b('\n)com.google.devtools.remoteworkers.v1test2B\023RemoteWorkersWorkerP\001ZRgoogle.golang.org/genproto/googleapis/devtools/remoteworkers/v1test2;remoteworkers\242\002\002RW\252\002%Google.DevTools.RemoteWorkers.V1Test2'),
    serialized_pb=_b('\n2google/devtools/remoteworkers/v1test2/worker.proto\x12%google.devtools.remoteworkers.v1test2\"\xa9\x02\n\x06Worker\x12>\n\x07\x64\x65vices\x18\x01 \x03(\x0b\x32-.google.devtools.remoteworkers.v1test2.Device\x12J\n\nproperties\x18\x02 \x03(\x0b\x32\x36.google.devtools.remoteworkers.v1test2.Worker.Property\x12\x45\n\x07\x63onfigs\x18\x03 \x03(\x0b\x32\x34.google.devtools.remoteworkers.v1test2.Worker.Config\x1a&\n\x08Property\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\t\x1a$\n\x06\x43onfig\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\t\"\x8c\x01\n\x06\x44\x65vice\x12\x0e\n\x06handle\x18\x01 \x01(\t\x12J\n\nproperties\x18\x02 \x03(\x0b\x32\x36.google.devtools.remoteworkers.v1test2.Device.Property\x1a&\n\x08Property\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\tB\xc3\x01\n)com.google.devtools.remoteworkers.v1test2B\x13RemoteWorkersWorkerP\x01ZRgoogle.golang.org/genproto/googleapis/devtools/remoteworkers/v1test2;remoteworkers\xa2\x02\x02RW\xaa\x02%Google.DevTools.RemoteWorkers.V1Test2b\x06proto3')
+ )
@@ -38,21 +38,21 @@ _WORKER_PROPERTY = _descriptor.Descriptor(
        has_default_value=False, default_value=_b("").decode('utf-8'),
        message_type=None, enum_type=None, containing_type=None,
        is_extension=False, extension_scope=None,
 -      options=None, file=DESCRIPTOR),
 +      serialized_options=None, file=DESCRIPTOR),
      _descriptor.FieldDescriptor(
        name='value', full_name='google.devtools.remoteworkers.v1test2.Worker.Property.value', index=1,
        number=2, type=9, cpp_type=9, label=1,
        has_default_value=False, default_value=_b("").decode('utf-8'),
        message_type=None, enum_type=None, containing_type=None,
        is_extension=False, extension_scope=None,
 -      options=None, file=DESCRIPTOR),
 +      serialized_options=None, file=DESCRIPTOR),
    ],
    extensions=[
    ],
    nested_types=[],
    enum_types=[
    ],
 -  options=None,
 +  serialized_options=None,
    is_extendable=False,
    syntax='proto3',
    extension_ranges=[],
@@ -75,21 +75,21 @@ _WORKER_CONFIG = _descriptor.Descriptor(
        has_default_value=False, default_value=_b("").decode('utf-8'),
        message_type=None, enum_type=None, containing_type=None,
        is_extension=False, extension_scope=None,
 -      options=None, file=DESCRIPTOR),
 +      serialized_options=None, file=DESCRIPTOR),
      _descriptor.FieldDescriptor(
        name='value', full_name='google.devtools.remoteworkers.v1test2.Worker.Config.value', index=1,
        number=2, type=9, cpp_type=9, label=1,
        has_default_value=False, default_value=_b("").decode('utf-8'),
        message_type=None, enum_type=None, containing_type=None,
        is_extension=False, extension_scope=None,
 -      options=None, file=DESCRIPTOR),
 +      serialized_options=None, file=DESCRIPTOR),
    ],
    extensions=[
    ],
    nested_types=[],
    enum_types=[
    ],
 -  options=None,
 +  serialized_options=None,
    is_extendable=False,
    syntax='proto3',
    extension_ranges=[],
@@ -112,28 +112,28 @@ _WORKER = _descriptor.Descriptor(
        has_default_value=False, default_value=[],
        message_type=None, enum_type=None, containing_type=None,
        is_extension=False, extension_scope=None,
 -      options=None, file=DESCRIPTOR),
 +      serialized_options=None, file=DESCRIPTOR),
      _descriptor.FieldDescriptor(
        name='properties', full_name='google.devtools.remoteworkers.v1test2.Worker.properties', index=1,
        number=2, type=11, cpp_type=10, label=3,
        has_default_value=False, default_value=[],
        message_type=None, enum_type=None, containing_type=None,
        is_extension=False, extension_scope=None,
 -      options=None, file=DESCRIPTOR),
 +      serialized_options=None, file=DESCRIPTOR),
      _descriptor.FieldDescriptor(
        name='configs', full_name='google.devtools.remoteworkers.v1test2.Worker.configs', index=2,
        number=3, type=11, cpp_type=10, label=3,
        has_default_value=False, default_value=[],
        message_type=None, enum_type=None, containing_type=None,
        is_extension=False, extension_scope=None,
 -      options=None, file=DESCRIPTOR),
 +      serialized_options=None, file=DESCRIPTOR),
    ],
    extensions=[
    ],
    nested_types=[_WORKER_PROPERTY, _WORKER_CONFIG, ],
    enum_types=[
    ],
 -  options=None,
 +  serialized_options=None,
    is_extendable=False,
    syntax='proto3',
    extension_ranges=[],
@@ -157,21 +157,21 @@ _DEVICE_PROPERTY = _descriptor.Descriptor(
        has_default_value=False, default_value=_b("").decode('utf-8'),
        message_type=None, enum_type=None, containing_type=None,
        is_extension=False, extension_scope=None,
 -      options=None, file=DESCRIPTOR),
 +      serialized_options=None, file=DESCRIPTOR),
      _descriptor.FieldDescriptor(
        name='value', full_name='google.devtools.remoteworkers.v1test2.Device.Property.value', index=1,
        number=2, type=9, cpp_type=9, label=1,
        has_default_value=False, default_value=_b("").decode('utf-8'),
        message_type=None, enum_type=None, containing_type=None,
        is_extension=False, extension_scope=None,
 -      options=None, file=DESCRIPTOR),
 +      serialized_options=None, file=DESCRIPTOR),
    ],
    extensions=[
    ],
    nested_types=[],
    enum_types=[
    ],
 -  options=None,
 +  serialized_options=None,
    is_extendable=False,
    syntax='proto3',
    extension_ranges=[],
@@ -194,21 +194,21 @@ _DEVICE = _descriptor.Descriptor(
        has_default_value=False, default_value=_b("").decode('utf-8'),
        message_type=None, enum_type=None, containing_type=None,
        is_extension=False, extension_scope=None,
 -      options=None, file=DESCRIPTOR),
 +      serialized_options=None, file=DESCRIPTOR),
      _descriptor.FieldDescriptor(
        name='properties', full_name='google.devtools.remoteworkers.v1test2.Device.properties', index=1,
        number=2, type=11, cpp_type=10, label=3,
        has_default_value=False, default_value=[],
        message_type=None, enum_type=None, containing_type=None,
        is_extension=False, extension_scope=None,
 -      options=None, file=DESCRIPTOR),
 +      serialized_options=None, file=DESCRIPTOR),
    ],
    extensions=[
    ],
    nested_types=[_DEVICE_PROPERTY, ],
    enum_types=[
    ],
 -  options=None,
 +  serialized_options=None,
    is_extendable=False,
    syntax='proto3',
    extension_ranges=[],
@@ -268,6 +268,5 @@ _sym_db.RegisterMessage(Device)
  _sym_db.RegisterMessage(Device.Property)
 -DESCRIPTOR.has_options = True
 -DESCRIPTOR._options = _descriptor._ParseOptions(descriptor_pb2.FileOptions(), _b('\n)com.google.devtools.remoteworkers.v1test2B\023RemoteWorkersWorkerP\001ZRgoogle.golang.org/genproto/googleapis/devtools/remoteworkers/v1test2;remoteworkers\242\002\002RW\252\002%Google.DevTools.RemoteWorkers.V1Test2'))
 +DESCRIPTOR._options = None
  # @@protoc_insertion_point(module_scope)

buildgrid/_protos/google/longrunning/operations_pb2.py

@@ -7,7 +7,6 @@ from google.protobuf import descriptor as _descriptor
  from google.protobuf import message as _message
  from google.protobuf import reflection as _reflection
  from google.protobuf import symbol_database as _symbol_database
 -from google.protobuf import descriptor_pb2
  # @@protoc_insertion_point(imports)
  _sym_db = _symbol_database.Default()
@@ -23,6 +22,7 @@ DESCRIPTOR = _descriptor.FileDescriptor(
    name='google/longrunning/operations.proto',
    package='google.longrunning',
    syntax='proto3',
 +  serialized_options=_b('\n\026com.google.longrunningB\017OperationsProtoP\001Z=google.golang.org/genproto/googleapis/longrunning;longrunning\252\002\022Google.LongRunning\312\002\022Google\\LongRunning'),
    serialized_pb=_b('\n#google/longrunning/operations.proto\x12\x12google.longrunning\x1a\x1cgoogle/api/annotations.proto\x1a\x19google/protobuf/any.proto\x1a\x1bgoogle/protobuf/empty.proto\x1a\x17google/rpc/status.proto\"\xa8\x01\n\tOperation\x12\x0c\n\x04name\x18\x01 \x01(\t\x12&\n\x08metadata\x18\x02 \x01(\x0b\x32\x14.google.protobuf.Any\x12\x0c\n\x04\x64one\x18\x03 \x01(\x08\x12#\n\x05\x65rror\x18\x04 \x01(\x0b\x32\x12.google.rpc.StatusH\x00\x12(\n\x08response\x18\x05 \x01(\x0b\x32\x14.google.protobuf.AnyH\x00\x42\x08\n\x06result\"#\n\x13GetOperationRequest\x12\x0c\n\x04name\x18\x01 \x01(\t\"\\\n\x15ListOperationsRequest\x12\x0c\n\x04name\x18\x04 \x01(\t\x12\x0e\n\x06\x66ilter\x18\x01 \x01(\t\x12\x11\n\tpage_size\x18\x02 \x01(\x05\x12\x12\n\npage_token\x18\x03 \x01(\t\"d\n\x16ListOperationsResponse\x12\x31\n\noperations\x18\x01 \x03(\x0b\x32\x1d.google.longrunning.Operation\x12\x17\n\x0fnext_page_token\x18\x02 \x01(\t\"&\n\x16\x43\x61ncelOperationRequest\x12\x0c\n\x04name\x18\x01 \x01(\t\"&\n\x16\x44\x65leteOperationRequest\x12\x0c\n\x04name\x18\x01 \x01(\t2\x8c\x04\n\nOperations\x12\x86\x01\n\x0eListOperations\x12).google.longrunning.ListOperationsRequest\x1a*.google.longrunning.ListOperationsResponse\"\x1d\x82\xd3\xe4\x93\x02\x17\x12\x15/v1/{name=operations}\x12x\n\x0cGetOperation\x12\'.google.longrunning.GetOperationRequest\x1a\x1d.google.longrunning.Operation\" \x82\xd3\xe4\x93\x02\x1a\x12\x18/v1/{name=operations/**}\x12w\n\x0f\x44\x65leteOperation\x12*.google.longrunning.DeleteOperationRequest\x1a\x16.google.protobuf.Empty\" \x82\xd3\xe4\x93\x02\x1a*\x18/v1/{name=operations/**}\x12\x81\x01\n\x0f\x43\x61ncelOperation\x12*.google.longrunning.CancelOperationRequest\x1a\x16.google.protobuf.Empty\"*\x82\xd3\xe4\x93\x02$\"\x1f/v1/{name=operations/**}:cancel:\x01*B\x94\x01\n\x16\x63om.google.longrunningB\x0fOperationsProtoP\x01Z=google.golang.org/genproto/googleapis/longrunning;longrunning\xaa\x02\x12Google.LongRunning\xca\x02\x12Google\\LongRunningb\x06proto3')
+   ,
    dependencies=[google_dot_api_dot_annotations__pb2.DESCRIPTOR,google_dot_protobuf_dot_any__pb2.DESCRIPTOR,google_dot_protobuf_dot_empty__pb2.DESCRIPTOR,google_dot_rpc_dot_status__pb2.DESCRIPTOR,])
@@ -43,42 +43,42 @@ _OPERATION = _descriptor.Descriptor(
        has_default_value=False, default_value=_b("").decode('utf-8'),
        message_type=None, enum_type=None, containing_type=None,
        is_extension=False, extension_scope=None,
 -      options=None, file=DESCRIPTOR),
 +      serialized_options=None, file=DESCRIPTOR),
      _descriptor.FieldDescriptor(
        name='metadata', full_name='google.longrunning.Operation.metadata', index=1,
        number=2, type=11, cpp_type=10, label=1,
        has_default_value=False, default_value=None,
        message_type=None, enum_type=None, containing_type=None,
        is_extension=False, extension_scope=None,
 -      options=None, file=DESCRIPTOR),
 +      serialized_options=None, file=DESCRIPTOR),
      _descriptor.FieldDescriptor(
        name='done', full_name='google.longrunning.Operation.done', index=2,
        number=3, type=8, cpp_type=7, label=1,
        has_default_value=False, default_value=False,
        message_type=None, enum_type=None, containing_type=None,
        is_extension=False, extension_scope=None,
 -      options=None, file=DESCRIPTOR),
 +      serialized_options=None, file=DESCRIPTOR),
      _descriptor.FieldDescriptor(
        name='error', full_name='google.longrunning.Operation.error', index=3,
        number=4, type=11, cpp_type=10, label=1,
        has_default_value=False, default_value=None,
        message_type=None, enum_type=None, containing_type=None,
        is_extension=False, extension_scope=None,
 -      options=None, file=DESCRIPTOR),
 +      serialized_options=None, file=DESCRIPTOR),
      _descriptor.FieldDescriptor(
        name='response', full_name='google.longrunning.Operation.response', index=4,
        number=5, type=11, cpp_type=10, label=1,
        has_default_value=False, default_value=None,
        message_type=None, enum_type=None, containing_type=None,
        is_extension=False, extension_scope=None,
 -      options=None, file=DESCRIPTOR),
 +      serialized_options=None, file=DESCRIPTOR),
    ],
    extensions=[
    ],
    nested_types=[],
    enum_types=[
    ],
 -  options=None,
 +  serialized_options=None,
    is_extendable=False,
    syntax='proto3',
    extension_ranges=[],
@@ -105,14 +105,14 @@ _GETOPERATIONREQUEST = _descriptor.Descriptor(
        has_default_value=False, default_value=_b("").decode('utf-8'),
        message_type=None, enum_type=None, containing_type=None,
        is_extension=False, extension_scope=None,
 -      options=None, file=DESCRIPTOR),
 +      serialized_options=None, file=DESCRIPTOR),
    ],
    extensions=[
    ],
    nested_types=[],
    enum_types=[
    ],
 -  options=None,
 +  serialized_options=None,
    is_extendable=False,
    syntax='proto3',
    extension_ranges=[],
@@ -136,35 +136,35 @@ _LISTOPERATIONSREQUEST = _descriptor.Descriptor(
        has_default_value=False, default_value=_b("").decode('utf-8'),
        message_type=None, enum_type=None, containing_type=None,
        is_extension=False, extension_scope=None,
 -      options=None, file=DESCRIPTOR),
 +      serialized_options=None, file=DESCRIPTOR),
      _descriptor.FieldDescriptor(
        name='filter', full_name='google.longrunning.ListOperationsRequest.filter', index=1,
        number=1, type=9, cpp_type=9, label=1,
        has_default_value=False, default_value=_b("").decode('utf-8'),
        message_type=None, enum_type=None, containing_type=None,
        is_extension=False, extension_scope=None,
 -      options=None, file=DESCRIPTOR),
 +      serialized_options=None, file=DESCRIPTOR),
      _descriptor.FieldDescriptor(
        name='page_size', full_name='google.longrunning.ListOperationsRequest.page_size', index=2,
        number=2, type=5, cpp_type=1, label=1,
        has_default_value=False, default_value=0,
        message_type=None, enum_type=None, containing_type=None,
        is_extension=False, extension_scope=None,
 -      options=None, file=DESCRIPTOR),
 +      serialized_options=None, file=DESCRIPTOR),
      _descriptor.FieldDescriptor(
        name='page_token', full_name='google.longrunning.ListOperationsRequest.page_token', index=3,
        number=3, type=9, cpp_type=9, label=1,
        has_default_value=False, default_value=_b("").decode('utf-8'),
        message_type=None, enum_type=None, containing_type=None,
        is_extension=False, extension_scope=None,
 -      options=None, file=DESCRIPTOR),
 +      serialized_options=None, file=DESCRIPTOR),
    ],
    extensions=[
    ],
    nested_types=[],
    enum_types=[
    ],
 -  options=None,
 +  serialized_options=None,
    is_extendable=False,
    syntax='proto3',
    extension_ranges=[],
@@ -188,21 +188,21 @@ _LISTOPERATIONSRESPONSE = _descriptor.Descriptor(
        has_default_value=False, default_value=[],
        message_type=None, enum_type=None, containing_type=None,
        is_extension=False, extension_scope=None,
 -      options=None, file=DESCRIPTOR),
 +      serialized_options=None, file=DESCRIPTOR),
      _descriptor.FieldDescriptor(
        name='next_page_token', full_name='google.longrunning.ListOperationsResponse.next_page_token', index=1,
        number=2, type=9, cpp_type=9, label=1,
        has_default_value=False, default_value=_b("").decode('utf-8'),
        message_type=None, enum_type=None, containing_type=None,
        is_extension=False, extension_scope=None,
 -      options=None, file=DESCRIPTOR),
 +      serialized_options=None, file=DESCRIPTOR),
    ],
    extensions=[
    ],
    nested_types=[],
    enum_types=[
    ],
 -  options=None,
 +  serialized_options=None,
    is_extendable=False,
    syntax='proto3',
    extension_ranges=[],
@@ -226,14 +226,14 @@ _CANCELOPERATIONREQUEST = _descriptor.Descriptor(
        has_default_value=False, default_value=_b("").decode('utf-8'),
        message_type=None, enum_type=None, containing_type=None,
        is_extension=False, extension_scope=None,
 -      options=None, file=DESCRIPTOR),
 +      serialized_options=None, file=DESCRIPTOR),
    ],
    extensions=[
    ],
    nested_types=[],
    enum_types=[
    ],
 -  options=None,
 +  serialized_options=None,
    is_extendable=False,
    syntax='proto3',
    extension_ranges=[],
@@ -257,14 +257,14 @@ _DELETEOPERATIONREQUEST = _descriptor.Descriptor(
        has_default_value=False, default_value=_b("").decode('utf-8'),
        message_type=None, enum_type=None, containing_type=None,
        is_extension=False, extension_scope=None,
 -      options=None, file=DESCRIPTOR),
 +      serialized_options=None, file=DESCRIPTOR),
    ],
    extensions=[
    ],
    nested_types=[],
    enum_types=[
    ],
 -  options=None,
 +  serialized_options=None,
    is_extendable=False,
    syntax='proto3',
    extension_ranges=[],
@@ -335,15 +335,14 @@ DeleteOperationRequest = _reflection.GeneratedProtocolMessageType('DeleteOperati
  _sym_db.RegisterMessage(DeleteOperationRequest)
 -DESCRIPTOR.has_options = True
 -DESCRIPTOR._options = _descriptor._ParseOptions(descriptor_pb2.FileOptions(), _b('\n\026com.google.longrunningB\017OperationsProtoP\001Z=google.golang.org/genproto/googleapis/longrunning;longrunning\252\002\022Google.LongRunning\312\002\022Google\\LongRunning'))
 +DESCRIPTOR._options = None
  _OPERATIONS = _descriptor.ServiceDescriptor(
    name='Operations',
    full_name='google.longrunning.Operations',
    file=DESCRIPTOR,
    index=0,
 -  options=None,
 +  serialized_options=None,
    serialized_start=655,
    serialized_end=1179,
    methods=[
@@ -354,7 +353,7 @@ _OPERATIONS = _descriptor.ServiceDescriptor(
      containing_service=None,
      input_type=_LISTOPERATIONSREQUEST,
      output_type=_LISTOPERATIONSRESPONSE,
 -    options=_descriptor._ParseOptions(descriptor_pb2.MethodOptions(), _b('\202\323\344\223\002\027\022\025/v1/{name=operations}')),
 +    serialized_options=_b('\202\323\344\223\002\027\022\025/v1/{name=operations}'),
    ),
    _descriptor.MethodDescriptor(
      name='GetOperation',
@@ -363,7 +362,7 @@ _OPERATIONS = _descriptor.ServiceDescriptor(
      containing_service=None,
      input_type=_GETOPERATIONREQUEST,
      output_type=_OPERATION,
 -    options=_descriptor._ParseOptions(descriptor_pb2.MethodOptions(), _b('\202\323\344\223\002\032\022\030/v1/{name=operations/**}')),
 +    serialized_options=_b('\202\323\344\223\002\032\022\030/v1/{name=operations/**}'),
    ),
    _descriptor.MethodDescriptor(
      name='DeleteOperation',
@@ -372,7 +371,7 @@ _OPERATIONS = _descriptor.ServiceDescriptor(
      containing_service=None,
      input_type=_DELETEOPERATIONREQUEST,
      output_type=google_dot_protobuf_dot_empty__pb2._EMPTY,
 -    options=_descriptor._ParseOptions(descriptor_pb2.MethodOptions(), _b('\202\323\344\223\002\032*\030/v1/{name=operations/**}')),
 +    serialized_options=_b('\202\323\344\223\002\032*\030/v1/{name=operations/**}'),
    ),
    _descriptor.MethodDescriptor(
      name='CancelOperation',
@@ -381,7 +380,7 @@ _OPERATIONS = _descriptor.ServiceDescriptor(
      containing_service=None,
      input_type=_CANCELOPERATIONREQUEST,
      output_type=google_dot_protobuf_dot_empty__pb2._EMPTY,
 -    options=_descriptor._ParseOptions(descriptor_pb2.MethodOptions(), _b('\202\323\344\223\002$\"\037/v1/{name=operations/**}:cancel:\001*')),
 +    serialized_options=_b('\202\323\344\223\002$\"\037/v1/{name=operations/**}:cancel:\001*'),
    ),
  ])
  _sym_db.RegisterServiceDescriptor(_OPERATIONS)

buildgrid/_protos/google/rpc/code_pb2.py

@@ -8,7 +8,6 @@ from google.protobuf import descriptor as _descriptor
  from google.protobuf import message as _message
  from google.protobuf import reflection as _reflection
  from google.protobuf import symbol_database as _symbol_database
 -from google.protobuf import descriptor_pb2
  # @@protoc_insertion_point(imports)
  _sym_db = _symbol_database.Default()
@@ -20,6 +19,7 @@ DESCRIPTOR = _descriptor.FileDescriptor(
    name='google/rpc/code.proto',
    package='google.rpc',
    syntax='proto3',
 +  serialized_options=_b('\n\016com.google.rpcB\tCodeProtoP\001Z3google.golang.org/genproto/googleapis/rpc/code;code\242\002\003RPC'),
    serialized_pb=_b('\n\x15google/rpc/code.proto\x12\ngoogle.rpc*\xb7\x02\n\x04\x43ode\x12\x06\n\x02OK\x10\x00\x12\r\n\tCANCELLED\x10\x01\x12\x0b\n\x07UNKNOWN\x10\x02\x12\x14\n\x10INVALID_ARGUMENT\x10\x03\x12\x15\n\x11\x44\x45\x41\x44LINE_EXCEEDED\x10\x04\x12\r\n\tNOT_FOUND\x10\x05\x12\x12\n\x0e\x41LREADY_EXISTS\x10\x06\x12\x15\n\x11PERMISSION_DENIED\x10\x07\x12\x13\n\x0fUNAUTHENTICATED\x10\x10\x12\x16\n\x12RESOURCE_EXHAUSTED\x10\x08\x12\x17\n\x13\x46\x41ILED_PRECONDITION\x10\t\x12\x0b\n\x07\x41\x42ORTED\x10\n\x12\x10\n\x0cOUT_OF_RANGE\x10\x0b\x12\x11\n\rUNIMPLEMENTED\x10\x0c\x12\x0c\n\x08INTERNAL\x10\r\x12\x0f\n\x0bUNAVAILABLE\x10\x0e\x12\r\n\tDATA_LOSS\x10\x0f\x42X\n\x0e\x63om.google.rpcB\tCodeProtoP\x01Z3google.golang.org/genproto/googleapis/rpc/code;code\xa2\x02\x03RPCb\x06proto3')
+ )
@@ -31,75 +31,75 @@ _CODE = _descriptor.EnumDescriptor(
    values=[
      _descriptor.EnumValueDescriptor(
        name='OK', index=0, number=0,
 -      options=None,
 +      serialized_options=None,
        type=None),
      _descriptor.EnumValueDescriptor(
        name='CANCELLED', index=1, number=1,
 -      options=None,
 +      serialized_options=None,
        type=None),
      _descriptor.EnumValueDescriptor(
        name='UNKNOWN', index=2, number=2,
 -      options=None,
 +      serialized_options=None,
        type=None),
      _descriptor.EnumValueDescriptor(
        name='INVALID_ARGUMENT', index=3, number=3,
 -      options=None,
 +      serialized_options=None,
        type=None),
      _descriptor.EnumValueDescriptor(
        name='DEADLINE_EXCEEDED', index=4, number=4,
 -      options=None,
 +      serialized_options=None,
        type=None),
      _descriptor.EnumValueDescriptor(
        name='NOT_FOUND', index=5, number=5,
 -      options=None,
 +      serialized_options=None,
        type=None),
      _descriptor.EnumValueDescriptor(
        name='ALREADY_EXISTS', index=6, number=6,
 -      options=None,
 +      serialized_options=None,
        type=None),
      _descriptor.EnumValueDescriptor(
        name='PERMISSION_DENIED', index=7, number=7,
 -      options=None,
 +      serialized_options=None,
        type=None),
      _descriptor.EnumValueDescriptor(
        name='UNAUTHENTICATED', index=8, number=16,
 -      options=None,
 +      serialized_options=None,
        type=None),
      _descriptor.EnumValueDescriptor(
        name='RESOURCE_EXHAUSTED', index=9, number=8,
 -      options=None,
 +      serialized_options=None,
        type=None),
      _descriptor.EnumValueDescriptor(
        name='FAILED_PRECONDITION', index=10, number=9,
 -      options=None,
 +      serialized_options=None,
        type=None),
      _descriptor.EnumValueDescriptor(
        name='ABORTED', index=11, number=10,
 -      options=None,
 +      serialized_options=None,
        type=None),
      _descriptor.EnumValueDescriptor(
        name='OUT_OF_RANGE', index=12, number=11,
 -      options=None,
 +      serialized_options=None,
        type=None),
      _descriptor.EnumValueDescriptor(
        name='UNIMPLEMENTED', index=13, number=12,
 -      options=None,
 +      serialized_options=None,
        type=None),
      _descriptor.EnumValueDescriptor(
        name='INTERNAL', index=14, number=13,
 -      options=None,
 +      serialized_options=None,
        type=None),
      _descriptor.EnumValueDescriptor(
        name='UNAVAILABLE', index=15, number=14,
 -      options=None,
 +      serialized_options=None,
        type=None),
      _descriptor.EnumValueDescriptor(
        name='DATA_LOSS', index=16, number=15,
 -      options=None,
 +      serialized_options=None,
        type=None),
    ],
    containing_type=None,
 -  options=None,
 +  serialized_options=None,
    serialized_start=38,
    serialized_end=349,
+ )
@@ -129,6 +129,5 @@ DESCRIPTOR.enum_types_by_name['Code'] = _CODE
  _sym_db.RegisterFileDescriptor(DESCRIPTOR)
 -DESCRIPTOR.has_options = True
 -DESCRIPTOR._options = _descriptor._ParseOptions(descriptor_pb2.FileOptions(), _b('\n\016com.google.rpcB\tCodeProtoP\001Z3google.golang.org/genproto/googleapis/rpc/code;code\242\002\003RPC'))
 +DESCRIPTOR._options = None
  # @@protoc_insertion_point(module_scope)

buildgrid/_protos/google/rpc/status_pb2.py

@@ -7,7 +7,6 @@ from google.protobuf import descriptor as _descriptor
  from google.protobuf import message as _message
  from google.protobuf import reflection as _reflection
  from google.protobuf import symbol_database as _symbol_database
 -from google.protobuf import descriptor_pb2
  # @@protoc_insertion_point(imports)
  _sym_db = _symbol_database.Default()
@@ -20,6 +19,7 @@ DESCRIPTOR = _descriptor.FileDescriptor(
    name='google/rpc/status.proto',
    package='google.rpc',
    syntax='proto3',
 +  serialized_options=_b('\n\016com.google.rpcB\013StatusProtoP\001Z7google.golang.org/genproto/googleapis/rpc/status;status\242\002\003RPC'),
    serialized_pb=_b('\n\x17google/rpc/status.proto\x12\ngoogle.rpc\x1a\x19google/protobuf/any.proto\"N\n\x06Status\x12\x0c\n\x04\x63ode\x18\x01 \x01(\x05\x12\x0f\n\x07message\x18\x02 \x01(\t\x12%\n\x07\x64\x65tails\x18\x03 \x03(\x0b\x32\x14.google.protobuf.AnyB^\n\x0e\x63om.google.rpcB\x0bStatusProtoP\x01Z7google.golang.org/genproto/googleapis/rpc/status;status\xa2\x02\x03RPCb\x06proto3')
+   ,
    dependencies=[google_dot_protobuf_dot_any__pb2.DESCRIPTOR,])
@@ -40,28 +40,28 @@ _STATUS = _descriptor.Descriptor(
        has_default_value=False, default_value=0,
        message_type=None, enum_type=None, containing_type=None,
        is_extension=False, extension_scope=None,
 -      options=None, file=DESCRIPTOR),
 +      serialized_options=None, file=DESCRIPTOR),
      _descriptor.FieldDescriptor(
        name='message', full_name='google.rpc.Status.message', index=1,
        number=2, type=9, cpp_type=9, label=1,
        has_default_value=False, default_value=_b("").decode('utf-8'),
        message_type=None, enum_type=None, containing_type=None,
        is_extension=False, extension_scope=None,
 -      options=None, file=DESCRIPTOR),
 +      serialized_options=None, file=DESCRIPTOR),
      _descriptor.FieldDescriptor(
        name='details', full_name='google.rpc.Status.details', index=2,
        number=3, type=11, cpp_type=10, label=3,
        has_default_value=False, default_value=[],
        message_type=None, enum_type=None, containing_type=None,
        is_extension=False, extension_scope=None,
 -      options=None, file=DESCRIPTOR),
 +      serialized_options=None, file=DESCRIPTOR),
    ],
    extensions=[
    ],
    nested_types=[],
    enum_types=[
    ],
 -  options=None,
 +  serialized_options=None,
    is_extendable=False,
    syntax='proto3',
    extension_ranges=[],
@@ -83,6 +83,5 @@ Status = _reflection.GeneratedProtocolMessageType('Status', (_message.Message,),
  _sym_db.RegisterMessage(Status)
 -DESCRIPTOR.has_options = True
 -DESCRIPTOR._options = _descriptor._ParseOptions(descriptor_pb2.FileOptions(), _b('\n\016com.google.rpcB\013StatusProtoP\001Z7google.golang.org/genproto/googleapis/rpc/status;status\242\002\003RPC'))
 +DESCRIPTOR._options = None
  # @@protoc_insertion_point(module_scope)

docs/source/architecture.rst

 +.. _architecture:
++
 +Architecture
 +============
++
 +This section provides details of the overall BuildGrid architecture.
++
 +.. toctree::
 +   :maxdepth: 3
++
 +   architecture_overview.rst
 \ No newline at end of file

docs/source/architecture_overview.rst

 +.. _architecture-overview:
++
 +Remote execution overview
 +=========================
++
 +Remote execution aims to speed up a build process and to rely on two separate
 +but related concepts that are remote caching and remote execution itself. Remote
 +caching allows users to share build outputs while remote execution allows the running
 +of operations on a remote cluster of machines which may be more powerful than what
 +the user has access to locally.
++
 +The `Remote Execution API`_ (REAPI) describes a `gRPC`_ + `protocol-buffers`_
 +interface that has three main services for remote caching and execution:
++
 +- A ``ContentAddressableStorage`` (CAS) service: a remote storage end-point
 +  where content is addressed by digests, a digest being a pair of the hash and
 +  size of the data stored or retrieved.
 +- An ``ActionCache`` (AC) service: a mapping between build actions already
 +  performed and their corresponding resulting artifact.
 +- An ``Execution`` service: the main end-point allowing one to request build
 +  job to be perform against the build farm.
++
 +The `Remote Worker API`_ (RWAPI) describes another `gRPC`_ + `protocol-buffers`_
 +interface that allows a central ``BotsService`` to manage a farm of pluggable workers.
++
 +BuildGrid is combining these two interfaces in order to provide a complete
 +remote caching and execution service. The high level architecture can be
 +represented like this:
++
 +.. graphviz::
 +   :align: center
++
 +    digraph remote_execution_overview {
 +	node [shape = record,
 +	      width=2,
 +	      height=1];
++
 +	ranksep = 2
 +	compound=true
 +	edge[arrowtail="vee"];
 +	edge[arrowhead="vee"];
++
 +	client [label = "Client",
 +	color="#0342af",
 +	fillcolor="#37c1e8",
 +	style=filled,
 +	shape=box]
++
 +	subgraph cluster_controller{
 +	    label = "Controller";
 +	    labeljust = "c";
 +	    fillcolor="#42edae";
 +	    style=filled;
 +	    controller [label = "{ExecutionService|BotsInterface\n}",
 +			fillcolor="#17e86a",
 +			style=filled];
++
 +	}
++
 +	subgraph cluster_worker0 {
 +	    label = "Worker 1";
 +	    labeljust = "c";
 +	    color="#8e7747";
 +	    fillcolor="#ffda8e";
 +	    style=filled;
 +	    bot0 [label = "{Bot|Host-tools}"
 +		  fillcolor="#ffb214",
 +		  style=filled];
 +	}
++
 +	subgraph cluster_worker1 {
 +	    label = "Worker 2";
 +	    labeljust = "c";
 +	    color="#8e7747";
 +	    fillcolor="#ffda8e";
 +	    style=filled;
 +	    bot1 [label = "{Bot|BuildBox}",
 +		  fillcolor="#ffb214",
 +		  style=filled];
 +	}
++
 +	client -> controller [
 +	    dir = "both",
 +	    headlabel = "REAPI",
 +	    labelangle = 20.0,
 +	    labeldistance = 9,
 +	    labelfontsize = 15.0,
 +	    lhead=cluster_controller];
++
 +	controller -> bot0 [
 +	    dir = "both",
 +	    labelangle= 340.0,
 +		labeldistance = 7.5,
 +		labelfontsize = 15.0,
 +	    taillabel = "RWAPI     ",
 +	    lhead=cluster_worker0,
 +	    ltail=cluster_controller];
++
 +	controller -> bot1 [
 +	    dir = "both",
 +	    labelangle= 20.0,
 +	    labeldistance = 7.5,
 +	    labelfontsize = 15.0,
 +		taillabel = "     RWAPI",
 +	    lhead=cluster_worker1,
 +	    ltail=cluster_controller];
++
 +    }
++
 +BuildGrid can be split up into separate endpoints. It is possible to have
 +a separate ``ActionCache`` and the ``CAS`` from the ``Controller``. The
 +following diagram shows a typical setup.
++
 +.. graphviz::
 +   :align: center
++
 +    digraph remote_execution_overview {
++
 +	node [shape=record,
 +	      width=2,
 +	      height=1];
++
 +	// rank=same actioncache controller cas
 +	compound=true
 +	graph [nodesep=1,
 +	       ranksep=2]
++
 +	edge[arrowtail="vee"];
 +	edge[arrowhead="vee"];
++
 +	client [label="Client",
 +		color="#0342af",
 +		fillcolor="#37c1e8",
 +		style=filled,
 +		shape=box]
++
 +	cas [label="CAS",
 +	     color="#840202",
 +	     fillcolor="#c1034c",
 +	     style=filled,
 +	     shape=box]
++
 +	subgraph cluster_controller{
 +	    label="Controller";
 +	    labeljust="c";
 +	    fillcolor="#42edae";
 +	    style=filled;
 +	    controller [label="{ExecutionService|BotsInterface\n}",
 +			fillcolor="#17e86a",
 +			style=filled];
++
 +	}
++
 +	actioncache [label="ActionCache",
 +		     color="#133f42",
 +		     fillcolor="#219399",
 +		     style=filled,
 +		     shape=box]
++
 +	subgraph cluster_worker0 {
 +	    label="Worker";
 +	    labeljust="c";
 +	    color="#8e7747";
 +	    fillcolor="#ffda8e";
 +	    style=filled;
 +	    bot0 [label="{Bot}"
 +		  fillcolor="#ffb214",
 +		  style=filled];
 +	}
++
 +	client -> controller [
 +	    dir="both"];
++
 +	client -> cas [
 +	    dir="both",
 +	    lhead=cluster_controller];
++
 +	controller -> bot0 [
 +	    dir="both",
 +	    lhead=cluster_worker0];
 +	    //ltail=cluster_controller];
++
 +	cas -> bot0 [
 +	    dir="both",
 +	    lhead=cluster_worker0];
++
 +	actioncache -> controller [
 +	    dir="both"];
++
 +	client -> actioncache [
 +	    dir="both",
 +	    constraint=false,
 +    ];
++
++
 +    }
++
 +.. _Remote Execution API: https://github.com/bazelbuild/remote-apis/blob/master/build/bazel/remote/execution/v2
 +.. _gRPC: https://grpc.io
 +.. _protocol-buffers: https://developers.google.com/protocol-buffers
 +.. _Remote Worker API: https://github.com/googleapis/googleapis/tree/master/google/devtools/remoteworkers/v1test2

docs/source/conf.py

@@ -46,7 +46,8 @@ extensions = [
      'sphinx.ext.autodoc',
      'sphinx.ext.napoleon',
      'sphinx_click.ext',
 -    'sphinxcontrib.apidoc'
 +    'sphinxcontrib.apidoc',
 +    'sphinx.ext.graphviz',
+ ]
  # Add any paths that contain templates here, relative to this directory.

docs/source/faq.rst

 +.. _faq:
++
 +FAQ
 +===
++
 +Q. Which clients are currently supported?
 +R. Currently we support `BuildStream`_, `Bazel`_ and `RECC`_. Though any client which implements v2 of the `Remote Execution API`_ should be supported.
++
 +Q. Where can I get the most up to date information?
 +R. We have a `mailing list`_ you can sign up to and a `slack channel`_ you can join.
++
 +Q. Help! This feature isn't working!?!
 +R. Please `raise`_ an issue or ask us on the `slack channel`_ for some help.
++
 +Q. Can I have feature XYZ? I've made a cool thing, can I have it in BuildGrid?
 +R. Check that a similar issue hasn't been raised already and then `raise`_ one yourself if it hasn't. From there we can discuss the feature. We would encourage you to contact the mailing list if you wish to implement a large feature so everyone aware of your idea. Then, create a `merge request`_. The worst we can do is politely decline your work, otherwise you're now officially a contributor! Have a quick read of the `contributing`_ guidelines before making your patch submission.
++
 +Q. How do I install BuildGrid?
 +R. Check out this `installation page`_.
++
 +Q. How do I check on the status of a job?
 +R. Using the command line tool you can simply list all the current jobs and select one for the status
++
 +    .. code-block:: sh
++
 +       bgd operation list
 +       bgd operatation status <insert-operation-id>
++
 +Q. How does CAS expiry work?
 +R. We are working hard on automatic CAS expiry but until we have that, we recommend you regularly clean the CAS folder yourself.
++
 +Q. What's the difference between a bot and a worker?
 +R. A worker can be thought of but isn't limited to a physical machine. For example, it can be a collection of physical devices, docker images or a selected number of CPUs. The worker runs what we call a bot. This is a program that controls the worker; giving it actions to do, returning results to the central server and monitoring the status of the worker. The central server can communicate with a collection of bots via the `BotsInterface`.
++
 +Q. Where can I find more information about the API?
 +R. We recommend you read the proto files for the `Remote Execution API`_ and `Remote Workers API`_. There is a more `detailed document for the Remote Execution API`_ and another `detailed document for the Remote Workers API`_.
++
 +Q. What's going on in the _proto folder?
 +R. This project uses gRPC and protocol buffers for network messaging. The .proto files are used to generate python modules which are then used in the project. See the `grpc guide`_ for more details.
++
 +Q. How do I set up a BuildGrid?
 +R. You can follow this guide to give you an understanding on basic usecases: :ref:`using`. There is also additional information on how to configure your Grid here: :ref:`parser`.
++
++
 +.. _BuildStream: https://buildstream.build
 +.. _Bazel: https://bazel.build/
 +.. _RECC: https://gitlab.com/bloomberg/recc
 +.. _Remote Execution API: https://gitlab.com/BuildGrid/buildgrid/blob/master/buildgrid/_protos/build/bazel/remote/execution/v2/remote_execution.proto
 +.. _Remote Workers API: https://gitlab.com/BuildGrid/buildgrid/tree/master/buildgrid/_protos/google/devtools/remoteworkers/v1test2
 +.. _mailing list: https://lists.buildgrid.build/cgi-bin/mailman/listinfo/buildgrid
 +.. _slack channel: https://join.slack.com/t/buildteamworld/shared_invite/enQtMzkxNzE0MDMyMDY1LTRmZmM1OWE0OTFkMGE1YjU5Njc4ODEzYjc0MGMyOTM5ZTQ5MmE2YTQ1MzQwZDc5MWNhODY1ZmRkZTE4YjFhNjU
 +.. _merge request: https://gitlab.com/BuildGrid/buildgrid/merge_requests
 +.. _contributing: https://gitlab.com/BuildGrid/buildgrid/blob/master/CONTRIBUTING.rst
 +.. _raise: https://gitlab.com/BuildGrid/buildgrid/issues
 +.. _installation page: https://buildgrid.gitlab.io/buildgrid/installation.html
 +.. _detailed document for the Remote Execution API: https://docs.google.com/document/d/1AaGk7fOPByEvpAbqeXIyE8HX_A3_axxNnvroblTZ_6s/
 +.. _detailed document for the Remote Workers API: https://docs.google.com/document/d/1s_AzRRD2mdyktKUj2HWBn99rMg_3tcPvdjx3MPbFidU/
 +.. _grpc guide: https://grpc.io/docs/guides/

docs/source/index.rst

@@ -19,6 +19,7 @@ Remote execution service implementing Google's REAPI and RWAPI.
     using.rst
     reference.rst
     contributing.rst
 +   architecture.rst
     resources.rst

[Notes] [Git][BuildGrid/buildgrid][mablanch/92-architecture-documentation] 4 commits: Udapte .proto files to their latest version

finn pushed to branch mablanch/92-architecture-documentation at BuildGrid / buildgrid

Commits:

23 changed files:

Changes: