_protos: Drop BuildStream Artifact and Source services

Replaced by Remote Asset API Fetch and Push services.

9 files changed, 5 insertions, 809 deletions

diff --git a/src/buildstream/_protos/buildstream/v2/artifact.proto b/src/buildstream/_protos/buildstream/v2/artifact.proto
index 87f66cc95..ac362b1f1 100644
--- a/src/buildstream/_protos/buildstream/v2/artifact.proto
+++ b/src/buildstream/_protos/buildstream/v2/artifact.proto
@@ -22,20 +22,6 @@ package buildstream.v2;
 import "build/bazel/remote/execution/v2/remote_execution.proto";
 import "google/api/annotations.proto";
 
-service ArtifactService {
-  // Retrieves an Artifact message
-  //
-  // Errors:
-  // * `NOT_FOUND`: Artifact not found on server
-  rpc GetArtifact(GetArtifactRequest) returns (Artifact) {}
-
-  // Sets an Artifact message
-  //
-  // Errors:
-  // * `FAILED_PRECONDITION`: Files specified in upload aren't present in CAS
-  rpc UpdateArtifact(UpdateArtifactRequest) returns (Artifact) {}
-}
-
 message Artifact {
   // This version number must always be present and can be used to
   // further indicate presence or absence of parts of the proto at a
@@ -79,14 +65,3 @@ message Artifact {
   // digest of a directory
   build.bazel.remote.execution.v2.Digest sources = 13;  // optional
 }
-
-message GetArtifactRequest {
-  string instance_name = 1;
-  string cache_key = 2;
-}
-
-message UpdateArtifactRequest {
-  string instance_name = 1;
-  string cache_key = 2;
-  Artifact artifact = 3;
-}
diff --git a/src/buildstream/_protos/buildstream/v2/artifact_pb2.py b/src/buildstream/_protos/buildstream/v2/artifact_pb2.py
index 8c34ef865..3950264dc 100644
--- a/src/buildstream/_protos/buildstream/v2/artifact_pb2.py
+++ b/src/buildstream/_protos/buildstream/v2/artifact_pb2.py
@@ -20,7 +20,7 @@ DESCRIPTOR = _descriptor.FileDescriptor(
   package='buildstream.v2',
   syntax='proto3',
   serialized_options=None,
-  serialized_pb=b'\n\x1d\x62uildstream/v2/artifact.proto\x12\x0e\x62uildstream.v2\x1a\x36\x62uild/bazel/remote/execution/v2/remote_execution.proto\x1a\x1cgoogle/api/annotations.proto\"\xae\x05\n\x08\x41rtifact\x12\x0f\n\x07version\x18\x01 \x01(\x05\x12\x15\n\rbuild_success\x18\x02 \x01(\x08\x12\x13\n\x0b\x62uild_error\x18\x03 \x01(\t\x12\x1b\n\x13\x62uild_error_details\x18\x04 \x01(\t\x12\x12\n\nstrong_key\x18\x05 \x01(\t\x12\x10\n\x08weak_key\x18\x06 \x01(\t\x12\x16\n\x0ewas_workspaced\x18\x07 \x01(\x08\x12\x36\n\x05\x66iles\x18\x08 \x01(\x0b\x32\'.build.bazel.remote.execution.v2.Digest\x12\x37\n\nbuild_deps\x18\t \x03(\x0b\x32#.buildstream.v2.Artifact.Dependency\x12<\n\x0bpublic_data\x18\n \x01(\x0b\x32\'.build.bazel.remote.execution.v2.Digest\x12.\n\x04logs\x18\x0b \x03(\x0b\x32 .buildstream.v2.Artifact.LogFile\x12:\n\tbuildtree\x18\x0c \x01(\x0b\x32\'.build.bazel.remote.execution.v2.Digest\x12\x38\n\x07sources\x18\r \x01(\x0b\x32\'.build.bazel.remote.execution.v2.Digest\x1a\x63\n\nDependency\x12\x14\n\x0cproject_name\x18\x01 \x01(\t\x12\x14\n\x0c\x65lement_name\x18\x02 \x01(\t\x12\x11\n\tcache_key\x18\x03 \x01(\t\x12\x16\n\x0ewas_workspaced\x18\x04 \x01(\x08\x1aP\n\x07LogFile\x12\x0c\n\x04name\x18\x01 \x01(\t\x12\x37\n\x06\x64igest\x18\x02 \x01(\x0b\x32\'.build.bazel.remote.execution.v2.Digest\">\n\x12GetArtifactRequest\x12\x15\n\rinstance_name\x18\x01 \x01(\t\x12\x11\n\tcache_key\x18\x02 \x01(\t\"m\n\x15UpdateArtifactRequest\x12\x15\n\rinstance_name\x18\x01 \x01(\t\x12\x11\n\tcache_key\x18\x02 \x01(\t\x12*\n\x08\x61rtifact\x18\x03 \x01(\x0b\x32\x18.buildstream.v2.Artifact2\xb5\x01\n\x0f\x41rtifactService\x12M\n\x0bGetArtifact\x12\".buildstream.v2.GetArtifactRequest\x1a\x18.buildstream.v2.Artifact\"\x00\x12S\n\x0eUpdateArtifact\x12%.buildstream.v2.UpdateArtifactRequest\x1a\x18.buildstream.v2.Artifact\"\x00\x62\x06proto3'
+  serialized_pb=b'\n\x1d\x62uildstream/v2/artifact.proto\x12\x0e\x62uildstream.v2\x1a\x36\x62uild/bazel/remote/execution/v2/remote_execution.proto\x1a\x1cgoogle/api/annotations.proto\"\xae\x05\n\x08\x41rtifact\x12\x0f\n\x07version\x18\x01 \x01(\x05\x12\x15\n\rbuild_success\x18\x02 \x01(\x08\x12\x13\n\x0b\x62uild_error\x18\x03 \x01(\t\x12\x1b\n\x13\x62uild_error_details\x18\x04 \x01(\t\x12\x12\n\nstrong_key\x18\x05 \x01(\t\x12\x10\n\x08weak_key\x18\x06 \x01(\t\x12\x16\n\x0ewas_workspaced\x18\x07 \x01(\x08\x12\x36\n\x05\x66iles\x18\x08 \x01(\x0b\x32\'.build.bazel.remote.execution.v2.Digest\x12\x37\n\nbuild_deps\x18\t \x03(\x0b\x32#.buildstream.v2.Artifact.Dependency\x12<\n\x0bpublic_data\x18\n \x01(\x0b\x32\'.build.bazel.remote.execution.v2.Digest\x12.\n\x04logs\x18\x0b \x03(\x0b\x32 .buildstream.v2.Artifact.LogFile\x12:\n\tbuildtree\x18\x0c \x01(\x0b\x32\'.build.bazel.remote.execution.v2.Digest\x12\x38\n\x07sources\x18\r \x01(\x0b\x32\'.build.bazel.remote.execution.v2.Digest\x1a\x63\n\nDependency\x12\x14\n\x0cproject_name\x18\x01 \x01(\t\x12\x14\n\x0c\x65lement_name\x18\x02 \x01(\t\x12\x11\n\tcache_key\x18\x03 \x01(\t\x12\x16\n\x0ewas_workspaced\x18\x04 \x01(\x08\x1aP\n\x07LogFile\x12\x0c\n\x04name\x18\x01 \x01(\t\x12\x37\n\x06\x64igest\x18\x02 \x01(\x0b\x32\'.build.bazel.remote.execution.v2.Digestb\x06proto3'
   ,
   dependencies=[build_dot_bazel_dot_remote_dot_execution_dot_v2_dot_remote__execution__pb2.DESCRIPTOR,google_dot_api_dot_annotations__pb2.DESCRIPTOR,])
 
@@ -229,89 +229,6 @@ _ARTIFACT = _descriptor.Descriptor(
   serialized_end=822,
 )
 
-
-_GETARTIFACTREQUEST = _descriptor.Descriptor(
-  name='GetArtifactRequest',
-  full_name='buildstream.v2.GetArtifactRequest',
-  filename=None,
-  file=DESCRIPTOR,
-  containing_type=None,
-  fields=[
-    _descriptor.FieldDescriptor(
-      name='instance_name', full_name='buildstream.v2.GetArtifactRequest.instance_name', index=0,
-      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,
-      serialized_options=None, file=DESCRIPTOR),
-    _descriptor.FieldDescriptor(
-      name='cache_key', full_name='buildstream.v2.GetArtifactRequest.cache_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,
-      serialized_options=None, file=DESCRIPTOR),
-  ],
-  extensions=[
-  ],
-  nested_types=[],
-  enum_types=[
-  ],
-  serialized_options=None,
-  is_extendable=False,
-  syntax='proto3',
-  extension_ranges=[],
-  oneofs=[
-  ],
-  serialized_start=824,
-  serialized_end=886,
-)
-
-
-_UPDATEARTIFACTREQUEST = _descriptor.Descriptor(
-  name='UpdateArtifactRequest',
-  full_name='buildstream.v2.UpdateArtifactRequest',
-  filename=None,
-  file=DESCRIPTOR,
-  containing_type=None,
-  fields=[
-    _descriptor.FieldDescriptor(
-      name='instance_name', full_name='buildstream.v2.UpdateArtifactRequest.instance_name', index=0,
-      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,
-      serialized_options=None, file=DESCRIPTOR),
-    _descriptor.FieldDescriptor(
-      name='cache_key', full_name='buildstream.v2.UpdateArtifactRequest.cache_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,
-      serialized_options=None, file=DESCRIPTOR),
-    _descriptor.FieldDescriptor(
-      name='artifact', full_name='buildstream.v2.UpdateArtifactRequest.artifact', 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,
-      serialized_options=None, file=DESCRIPTOR),
-  ],
-  extensions=[
-  ],
-  nested_types=[],
-  enum_types=[
-  ],
-  serialized_options=None,
-  is_extendable=False,
-  syntax='proto3',
-  extension_ranges=[],
-  oneofs=[
-  ],
-  serialized_start=888,
-  serialized_end=997,
-)
-
 _ARTIFACT_DEPENDENCY.containing_type = _ARTIFACT
 _ARTIFACT_LOGFILE.fields_by_name['digest'].message_type = build_dot_bazel_dot_remote_dot_execution_dot_v2_dot_remote__execution__pb2._DIGEST
 _ARTIFACT_LOGFILE.containing_type = _ARTIFACT
@@ -321,10 +238,7 @@ _ARTIFACT.fields_by_name['public_data'].message_type = build_dot_bazel_dot_remot
 _ARTIFACT.fields_by_name['logs'].message_type = _ARTIFACT_LOGFILE
 _ARTIFACT.fields_by_name['buildtree'].message_type = build_dot_bazel_dot_remote_dot_execution_dot_v2_dot_remote__execution__pb2._DIGEST
 _ARTIFACT.fields_by_name['sources'].message_type = build_dot_bazel_dot_remote_dot_execution_dot_v2_dot_remote__execution__pb2._DIGEST
-_UPDATEARTIFACTREQUEST.fields_by_name['artifact'].message_type = _ARTIFACT
 DESCRIPTOR.message_types_by_name['Artifact'] = _ARTIFACT
-DESCRIPTOR.message_types_by_name['GetArtifactRequest'] = _GETARTIFACTREQUEST
-DESCRIPTOR.message_types_by_name['UpdateArtifactRequest'] = _UPDATEARTIFACTREQUEST
 _sym_db.RegisterFileDescriptor(DESCRIPTOR)
 
 Artifact = _reflection.GeneratedProtocolMessageType('Artifact', (_message.Message,), {
@@ -350,52 +264,5 @@ _sym_db.RegisterMessage(Artifact)
 _sym_db.RegisterMessage(Artifact.Dependency)
 _sym_db.RegisterMessage(Artifact.LogFile)
 
-GetArtifactRequest = _reflection.GeneratedProtocolMessageType('GetArtifactRequest', (_message.Message,), {
-  'DESCRIPTOR' : _GETARTIFACTREQUEST,
-  '__module__' : 'buildstream.v2.artifact_pb2'
-  # @@protoc_insertion_point(class_scope:buildstream.v2.GetArtifactRequest)
-  })
-_sym_db.RegisterMessage(GetArtifactRequest)
-
-UpdateArtifactRequest = _reflection.GeneratedProtocolMessageType('UpdateArtifactRequest', (_message.Message,), {
-  'DESCRIPTOR' : _UPDATEARTIFACTREQUEST,
-  '__module__' : 'buildstream.v2.artifact_pb2'
-  # @@protoc_insertion_point(class_scope:buildstream.v2.UpdateArtifactRequest)
-  })
-_sym_db.RegisterMessage(UpdateArtifactRequest)
-
-
-
-_ARTIFACTSERVICE = _descriptor.ServiceDescriptor(
-  name='ArtifactService',
-  full_name='buildstream.v2.ArtifactService',
-  file=DESCRIPTOR,
-  index=0,
-  serialized_options=None,
-  serialized_start=1000,
-  serialized_end=1181,
-  methods=[
-  _descriptor.MethodDescriptor(
-    name='GetArtifact',
-    full_name='buildstream.v2.ArtifactService.GetArtifact',
-    index=0,
-    containing_service=None,
-    input_type=_GETARTIFACTREQUEST,
-    output_type=_ARTIFACT,
-    serialized_options=None,
-  ),
-  _descriptor.MethodDescriptor(
-    name='UpdateArtifact',
-    full_name='buildstream.v2.ArtifactService.UpdateArtifact',
-    index=1,
-    containing_service=None,
-    input_type=_UPDATEARTIFACTREQUEST,
-    output_type=_ARTIFACT,
-    serialized_options=None,
-  ),
-])
-_sym_db.RegisterServiceDescriptor(_ARTIFACTSERVICE)
-
-DESCRIPTOR.services_by_name['ArtifactService'] = _ARTIFACTSERVICE
 
 # @@protoc_insertion_point(module_scope)
diff --git a/src/buildstream/_protos/buildstream/v2/artifact_pb2_grpc.py b/src/buildstream/_protos/buildstream/v2/artifact_pb2_grpc.py
index 305a8d53b..a89435267 100644
--- a/src/buildstream/_protos/buildstream/v2/artifact_pb2_grpc.py
+++ b/src/buildstream/_protos/buildstream/v2/artifact_pb2_grpc.py
@@ -1,104 +1,3 @@
 # Generated by the gRPC Python protocol compiler plugin. DO NOT EDIT!
 import grpc
 
-from buildstream._protos.buildstream.v2 import artifact_pb2 as buildstream_dot_v2_dot_artifact__pb2
-
-
-class ArtifactServiceStub(object):
-    """Missing associated documentation comment in .proto file"""
-
-    def __init__(self, channel):
-        """Constructor.
-
-        Args:
-            channel: A grpc.Channel.
-        """
-        self.GetArtifact = channel.unary_unary(
-                '/buildstream.v2.ArtifactService/GetArtifact',
-                request_serializer=buildstream_dot_v2_dot_artifact__pb2.GetArtifactRequest.SerializeToString,
-                response_deserializer=buildstream_dot_v2_dot_artifact__pb2.Artifact.FromString,
-                )
-        self.UpdateArtifact = channel.unary_unary(
-                '/buildstream.v2.ArtifactService/UpdateArtifact',
-                request_serializer=buildstream_dot_v2_dot_artifact__pb2.UpdateArtifactRequest.SerializeToString,
-                response_deserializer=buildstream_dot_v2_dot_artifact__pb2.Artifact.FromString,
-                )
-
-
-class ArtifactServiceServicer(object):
-    """Missing associated documentation comment in .proto file"""
-
-    def GetArtifact(self, request, context):
-        """Retrieves an Artifact message
-
-        Errors:
-        * `NOT_FOUND`: Artifact not found on server
-        """
-        context.set_code(grpc.StatusCode.UNIMPLEMENTED)
-        context.set_details('Method not implemented!')
-        raise NotImplementedError('Method not implemented!')
-
-    def UpdateArtifact(self, request, context):
-        """Sets an Artifact message
-
-        Errors:
-        * `FAILED_PRECONDITION`: Files specified in upload aren't present in CAS
-        """
-        context.set_code(grpc.StatusCode.UNIMPLEMENTED)
-        context.set_details('Method not implemented!')
-        raise NotImplementedError('Method not implemented!')
-
-
-def add_ArtifactServiceServicer_to_server(servicer, server):
-    rpc_method_handlers = {
-            'GetArtifact': grpc.unary_unary_rpc_method_handler(
-                    servicer.GetArtifact,
-                    request_deserializer=buildstream_dot_v2_dot_artifact__pb2.GetArtifactRequest.FromString,
-                    response_serializer=buildstream_dot_v2_dot_artifact__pb2.Artifact.SerializeToString,
-            ),
-            'UpdateArtifact': grpc.unary_unary_rpc_method_handler(
-                    servicer.UpdateArtifact,
-                    request_deserializer=buildstream_dot_v2_dot_artifact__pb2.UpdateArtifactRequest.FromString,
-                    response_serializer=buildstream_dot_v2_dot_artifact__pb2.Artifact.SerializeToString,
-            ),
-    }
-    generic_handler = grpc.method_handlers_generic_handler(
-            'buildstream.v2.ArtifactService', rpc_method_handlers)
-    server.add_generic_rpc_handlers((generic_handler,))
-
-
- # This class is part of an EXPERIMENTAL API.
-class ArtifactService(object):
-    """Missing associated documentation comment in .proto file"""
-
-    @staticmethod
-    def GetArtifact(request,
-            target,
-            options=(),
-            channel_credentials=None,
-            call_credentials=None,
-            compression=None,
-            wait_for_ready=None,
-            timeout=None,
-            metadata=None):
-        return grpc.experimental.unary_unary(request, target, '/buildstream.v2.ArtifactService/GetArtifact',
-            buildstream_dot_v2_dot_artifact__pb2.GetArtifactRequest.SerializeToString,
-            buildstream_dot_v2_dot_artifact__pb2.Artifact.FromString,
-            options, channel_credentials,
-            call_credentials, compression, wait_for_ready, timeout, metadata)
-
-    @staticmethod
-    def UpdateArtifact(request,
-            target,
-            options=(),
-            channel_credentials=None,
-            call_credentials=None,
-            compression=None,
-            wait_for_ready=None,
-            timeout=None,
-            metadata=None):
-        return grpc.experimental.unary_unary(request, target, '/buildstream.v2.ArtifactService/UpdateArtifact',
-            buildstream_dot_v2_dot_artifact__pb2.UpdateArtifactRequest.SerializeToString,
-            buildstream_dot_v2_dot_artifact__pb2.Artifact.FromString,
-            options, channel_credentials,
-            call_credentials, compression, wait_for_ready, timeout, metadata)
diff --git a/src/buildstream/_protos/buildstream/v2/buildstream.proto b/src/buildstream/_protos/buildstream/v2/buildstream.proto
index d5cac2892..f283d6f3f 100644
--- a/src/buildstream/_protos/buildstream/v2/buildstream.proto
+++ b/src/buildstream/_protos/buildstream/v2/buildstream.proto
@@ -44,15 +44,6 @@ service ReferenceStorage {
   }
 }
 
-service Capabilities {
-  // GetCapabilities mirrors
-  rpc GetCapabilities(GetCapabilitiesRequest) returns (ServerCapabilities) {
-    option (google.api.http) = {
-      get: "/v2/{instance_name=**}/capabilities"
-    };
-  }
-}
-
 message GetReferenceRequest {
   // The instance of the execution system to operate against. A server may
   // support multiple instances of the execution system (with their own workers,
@@ -102,23 +93,3 @@ message StatusResponse {
   // Whether reference updates are allowed for the connected client.
   bool allow_updates = 1;
 }
-
-message GetCapabilitiesRequest {
-  string instance_name = 1;
-}
-
-// Capabilities of the artifact service
-message ArtifactCapabilities {
-  bool allow_updates = 1;
-}
-
-// Capabilities of the source service
-message SourceCapabilities {
-  bool allow_updates = 1;
-}
-
-// All capabalities will be unset if the service isn't present
-message ServerCapabilities {
-  ArtifactCapabilities artifact_capabilities = 1;
-  SourceCapabilities source_capabilities = 2;
-}
\ No newline at end of file
diff --git a/src/buildstream/_protos/buildstream/v2/buildstream_pb2.py b/src/buildstream/_protos/buildstream/v2/buildstream_pb2.py
index 0780c9fa2..558d4f059 100644
--- a/src/buildstream/_protos/buildstream/v2/buildstream_pb2.py
+++ b/src/buildstream/_protos/buildstream/v2/buildstream_pb2.py
@@ -20,7 +20,7 @@ DESCRIPTOR = _descriptor.FileDescriptor(
   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\"/\n\x16GetCapabilitiesRequest\x12\x15\n\rinstance_name\x18\x01 \x01(\t\"-\n\x14\x41rtifactCapabilities\x12\x15\n\rallow_updates\x18\x01 \x01(\x08\"+\n\x12SourceCapabilities\x12\x15\n\rallow_updates\x18\x01 \x01(\x08\"\x9a\x01\n\x12ServerCapabilities\x12\x43\n\x15\x61rtifact_capabilities\x18\x01 \x01(\x0b\x32$.buildstream.v2.ArtifactCapabilities\x12?\n\x13source_capabilities\x18\x02 \x01(\x0b\x32\".buildstream.v2.SourceCapabilities2\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:status2\x9b\x01\n\x0c\x43\x61pabilities\x12\x8a\x01\n\x0fGetCapabilities\x12&.buildstream.v2.GetCapabilitiesRequest\x1a\".buildstream.v2.ServerCapabilities\"+\x82\xd3\xe4\x93\x02%\x12#/v2/{instance_name=**}/capabilitiesb\x06proto3'
+  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,])
 
@@ -226,151 +226,14 @@ _STATUSRESPONSE = _descriptor.Descriptor(
   serialized_end=504,
 )
 
-
-_GETCAPABILITIESREQUEST = _descriptor.Descriptor(
-  name='GetCapabilitiesRequest',
-  full_name='buildstream.v2.GetCapabilitiesRequest',
-  filename=None,
-  file=DESCRIPTOR,
-  containing_type=None,
-  fields=[
-    _descriptor.FieldDescriptor(
-      name='instance_name', full_name='buildstream.v2.GetCapabilitiesRequest.instance_name', index=0,
-      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,
-      serialized_options=None, file=DESCRIPTOR),
-  ],
-  extensions=[
-  ],
-  nested_types=[],
-  enum_types=[
-  ],
-  serialized_options=None,
-  is_extendable=False,
-  syntax='proto3',
-  extension_ranges=[],
-  oneofs=[
-  ],
-  serialized_start=506,
-  serialized_end=553,
-)
-
-
-_ARTIFACTCAPABILITIES = _descriptor.Descriptor(
-  name='ArtifactCapabilities',
-  full_name='buildstream.v2.ArtifactCapabilities',
-  filename=None,
-  file=DESCRIPTOR,
-  containing_type=None,
-  fields=[
-    _descriptor.FieldDescriptor(
-      name='allow_updates', full_name='buildstream.v2.ArtifactCapabilities.allow_updates', index=0,
-      number=1, 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,
-      serialized_options=None, file=DESCRIPTOR),
-  ],
-  extensions=[
-  ],
-  nested_types=[],
-  enum_types=[
-  ],
-  serialized_options=None,
-  is_extendable=False,
-  syntax='proto3',
-  extension_ranges=[],
-  oneofs=[
-  ],
-  serialized_start=555,
-  serialized_end=600,
-)
-
-
-_SOURCECAPABILITIES = _descriptor.Descriptor(
-  name='SourceCapabilities',
-  full_name='buildstream.v2.SourceCapabilities',
-  filename=None,
-  file=DESCRIPTOR,
-  containing_type=None,
-  fields=[
-    _descriptor.FieldDescriptor(
-      name='allow_updates', full_name='buildstream.v2.SourceCapabilities.allow_updates', index=0,
-      number=1, 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,
-      serialized_options=None, file=DESCRIPTOR),
-  ],
-  extensions=[
-  ],
-  nested_types=[],
-  enum_types=[
-  ],
-  serialized_options=None,
-  is_extendable=False,
-  syntax='proto3',
-  extension_ranges=[],
-  oneofs=[
-  ],
-  serialized_start=602,
-  serialized_end=645,
-)
-
-
-_SERVERCAPABILITIES = _descriptor.Descriptor(
-  name='ServerCapabilities',
-  full_name='buildstream.v2.ServerCapabilities',
-  filename=None,
-  file=DESCRIPTOR,
-  containing_type=None,
-  fields=[
-    _descriptor.FieldDescriptor(
-      name='artifact_capabilities', full_name='buildstream.v2.ServerCapabilities.artifact_capabilities', index=0,
-      number=1, 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,
-      serialized_options=None, file=DESCRIPTOR),
-    _descriptor.FieldDescriptor(
-      name='source_capabilities', full_name='buildstream.v2.ServerCapabilities.source_capabilities', 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,
-      serialized_options=None, file=DESCRIPTOR),
-  ],
-  extensions=[
-  ],
-  nested_types=[],
-  enum_types=[
-  ],
-  serialized_options=None,
-  is_extendable=False,
-  syntax='proto3',
-  extension_ranges=[],
-  oneofs=[
-  ],
-  serialized_start=648,
-  serialized_end=802,
-)
-
 _GETREFERENCERESPONSE.fields_by_name['digest'].message_type = build_dot_bazel_dot_remote_dot_execution_dot_v2_dot_remote__execution__pb2._DIGEST
 _UPDATEREFERENCEREQUEST.fields_by_name['digest'].message_type = build_dot_bazel_dot_remote_dot_execution_dot_v2_dot_remote__execution__pb2._DIGEST
-_SERVERCAPABILITIES.fields_by_name['artifact_capabilities'].message_type = _ARTIFACTCAPABILITIES
-_SERVERCAPABILITIES.fields_by_name['source_capabilities'].message_type = _SOURCECAPABILITIES
 DESCRIPTOR.message_types_by_name['GetReferenceRequest'] = _GETREFERENCEREQUEST
 DESCRIPTOR.message_types_by_name['GetReferenceResponse'] = _GETREFERENCERESPONSE
 DESCRIPTOR.message_types_by_name['UpdateReferenceRequest'] = _UPDATEREFERENCEREQUEST
 DESCRIPTOR.message_types_by_name['UpdateReferenceResponse'] = _UPDATEREFERENCERESPONSE
 DESCRIPTOR.message_types_by_name['StatusRequest'] = _STATUSREQUEST
 DESCRIPTOR.message_types_by_name['StatusResponse'] = _STATUSRESPONSE
-DESCRIPTOR.message_types_by_name['GetCapabilitiesRequest'] = _GETCAPABILITIESREQUEST
-DESCRIPTOR.message_types_by_name['ArtifactCapabilities'] = _ARTIFACTCAPABILITIES
-DESCRIPTOR.message_types_by_name['SourceCapabilities'] = _SOURCECAPABILITIES
-DESCRIPTOR.message_types_by_name['ServerCapabilities'] = _SERVERCAPABILITIES
 _sym_db.RegisterFileDescriptor(DESCRIPTOR)
 
 GetReferenceRequest = _reflection.GeneratedProtocolMessageType('GetReferenceRequest', (_message.Message,), {
@@ -415,34 +278,6 @@ StatusResponse = _reflection.GeneratedProtocolMessageType('StatusResponse', (_me
   })
 _sym_db.RegisterMessage(StatusResponse)
 
-GetCapabilitiesRequest = _reflection.GeneratedProtocolMessageType('GetCapabilitiesRequest', (_message.Message,), {
-  'DESCRIPTOR' : _GETCAPABILITIESREQUEST,
-  '__module__' : 'buildstream.v2.buildstream_pb2'
-  # @@protoc_insertion_point(class_scope:buildstream.v2.GetCapabilitiesRequest)
-  })
-_sym_db.RegisterMessage(GetCapabilitiesRequest)
-
-ArtifactCapabilities = _reflection.GeneratedProtocolMessageType('ArtifactCapabilities', (_message.Message,), {
-  'DESCRIPTOR' : _ARTIFACTCAPABILITIES,
-  '__module__' : 'buildstream.v2.buildstream_pb2'
-  # @@protoc_insertion_point(class_scope:buildstream.v2.ArtifactCapabilities)
-  })
-_sym_db.RegisterMessage(ArtifactCapabilities)
-
-SourceCapabilities = _reflection.GeneratedProtocolMessageType('SourceCapabilities', (_message.Message,), {
-  'DESCRIPTOR' : _SOURCECAPABILITIES,
-  '__module__' : 'buildstream.v2.buildstream_pb2'
-  # @@protoc_insertion_point(class_scope:buildstream.v2.SourceCapabilities)
-  })
-_sym_db.RegisterMessage(SourceCapabilities)
-
-ServerCapabilities = _reflection.GeneratedProtocolMessageType('ServerCapabilities', (_message.Message,), {
-  'DESCRIPTOR' : _SERVERCAPABILITIES,
-  '__module__' : 'buildstream.v2.buildstream_pb2'
-  # @@protoc_insertion_point(class_scope:buildstream.v2.ServerCapabilities)
-  })
-_sym_db.RegisterMessage(ServerCapabilities)
-
 
 
 _REFERENCESTORAGE = _descriptor.ServiceDescriptor(
@@ -451,8 +286,8 @@ _REFERENCESTORAGE = _descriptor.ServiceDescriptor(
   file=DESCRIPTOR,
   index=0,
   serialized_options=None,
-  serialized_start=805,
-  serialized_end=1263,
+  serialized_start=507,
+  serialized_end=965,
   methods=[
   _descriptor.MethodDescriptor(
     name='GetReference',
@@ -486,28 +321,4 @@ _sym_db.RegisterServiceDescriptor(_REFERENCESTORAGE)
 
 DESCRIPTOR.services_by_name['ReferenceStorage'] = _REFERENCESTORAGE
 
-
-_CAPABILITIES = _descriptor.ServiceDescriptor(
-  name='Capabilities',
-  full_name='buildstream.v2.Capabilities',
-  file=DESCRIPTOR,
-  index=1,
-  serialized_options=None,
-  serialized_start=1266,
-  serialized_end=1421,
-  methods=[
-  _descriptor.MethodDescriptor(
-    name='GetCapabilities',
-    full_name='buildstream.v2.Capabilities.GetCapabilities',
-    index=0,
-    containing_service=None,
-    input_type=_GETCAPABILITIESREQUEST,
-    output_type=_SERVERCAPABILITIES,
-    serialized_options=b'\202\323\344\223\002%\022#/v2/{instance_name=**}/capabilities',
-  ),
-])
-_sym_db.RegisterServiceDescriptor(_CAPABILITIES)
-
-DESCRIPTOR.services_by_name['Capabilities'] = _CAPABILITIES
-
 # @@protoc_insertion_point(module_scope)
diff --git a/src/buildstream/_protos/buildstream/v2/buildstream_pb2_grpc.py b/src/buildstream/_protos/buildstream/v2/buildstream_pb2_grpc.py
index e60fd7f65..26a39d06e 100644
--- a/src/buildstream/_protos/buildstream/v2/buildstream_pb2_grpc.py
+++ b/src/buildstream/_protos/buildstream/v2/buildstream_pb2_grpc.py
@@ -137,64 +137,3 @@ class ReferenceStorage(object):
             buildstream_dot_v2_dot_buildstream__pb2.StatusResponse.FromString,
             options, channel_credentials,
             call_credentials, compression, wait_for_ready, timeout, metadata)
-
-
-class CapabilitiesStub(object):
-    """Missing associated documentation comment in .proto file"""
-
-    def __init__(self, channel):
-        """Constructor.
-
-        Args:
-            channel: A grpc.Channel.
-        """
-        self.GetCapabilities = channel.unary_unary(
-                '/buildstream.v2.Capabilities/GetCapabilities',
-                request_serializer=buildstream_dot_v2_dot_buildstream__pb2.GetCapabilitiesRequest.SerializeToString,
-                response_deserializer=buildstream_dot_v2_dot_buildstream__pb2.ServerCapabilities.FromString,
-                )
-
-
-class CapabilitiesServicer(object):
-    """Missing associated documentation comment in .proto file"""
-
-    def GetCapabilities(self, request, context):
-        """GetCapabilities mirrors
-        """
-        context.set_code(grpc.StatusCode.UNIMPLEMENTED)
-        context.set_details('Method not implemented!')
-        raise NotImplementedError('Method not implemented!')
-
-
-def add_CapabilitiesServicer_to_server(servicer, server):
-    rpc_method_handlers = {
-            'GetCapabilities': grpc.unary_unary_rpc_method_handler(
-                    servicer.GetCapabilities,
-                    request_deserializer=buildstream_dot_v2_dot_buildstream__pb2.GetCapabilitiesRequest.FromString,
-                    response_serializer=buildstream_dot_v2_dot_buildstream__pb2.ServerCapabilities.SerializeToString,
-            ),
-    }
-    generic_handler = grpc.method_handlers_generic_handler(
-            'buildstream.v2.Capabilities', rpc_method_handlers)
-    server.add_generic_rpc_handlers((generic_handler,))
-
-
- # This class is part of an EXPERIMENTAL API.
-class Capabilities(object):
-    """Missing associated documentation comment in .proto file"""
-
-    @staticmethod
-    def GetCapabilities(request,
-            target,
-            options=(),
-            channel_credentials=None,
-            call_credentials=None,
-            compression=None,
-            wait_for_ready=None,
-            timeout=None,
-            metadata=None):
-        return grpc.experimental.unary_unary(request, target, '/buildstream.v2.Capabilities/GetCapabilities',
-            buildstream_dot_v2_dot_buildstream__pb2.GetCapabilitiesRequest.SerializeToString,
-            buildstream_dot_v2_dot_buildstream__pb2.ServerCapabilities.FromString,
-            options, channel_credentials,
-            call_credentials, compression, wait_for_ready, timeout, metadata)
diff --git a/src/buildstream/_protos/buildstream/v2/source.proto b/src/buildstream/_protos/buildstream/v2/source.proto
index 6fcb43725..fdab98602 100644
--- a/src/buildstream/_protos/buildstream/v2/source.proto
+++ b/src/buildstream/_protos/buildstream/v2/source.proto
@@ -19,21 +19,6 @@ package buildstream.v2;
 import "build/bazel/remote/execution/v2/remote_execution.proto";
 import "google/api/annotations.proto";
 
-service SourceService {
-  // Retrieve a source message given a reference name from the service
-  //
-  // Errors:
-  // * `NOT_FOUND`: The requested reference is not in the cache.
-  rpc GetSource(GetSourceRequest) returns (Source) {}
-
-  // Sets a source message on the service
-  //
-  // Errors:
-  // * `RESOURCE_EXHAUSTED`: There is insufficient storage space to add the
-  //   entry to the cache.
-  rpc UpdateSource(UpdateSourceRequest) returns (Source) {}
-}
-
 message Source {
   // This version number must always be present and can be used to
   // further indicate presence or absence of parts of the proto at a
@@ -43,19 +28,3 @@ message Source {
   // root directory digest of the files
   build.bazel.remote.execution.v2.Digest files = 2;
 }
-
-message GetSourceRequest {
-  // instance of the service we want to query
-  string instance_name = 1;
-  // reference key for the source
-  string cache_key = 2;
-}
-
-message UpdateSourceRequest {
-  // instance of the service we want to query
-  string instance_name = 1;
-  // reference key ofr the source 
-  string cache_key = 2;
-  // Source that we want to upload to the service
-  Source source = 3;
-}
\ No newline at end of file
diff --git a/src/buildstream/_protos/buildstream/v2/source_pb2.py b/src/buildstream/_protos/buildstream/v2/source_pb2.py
index 136c4cb2e..8d93de2da 100644
--- a/src/buildstream/_protos/buildstream/v2/source_pb2.py
+++ b/src/buildstream/_protos/buildstream/v2/source_pb2.py
@@ -20,7 +20,7 @@ DESCRIPTOR = _descriptor.FileDescriptor(
   package='buildstream.v2',
   syntax='proto3',
   serialized_options=None,
-  serialized_pb=b'\n\x1b\x62uildstream/v2/source.proto\x12\x0e\x62uildstream.v2\x1a\x36\x62uild/bazel/remote/execution/v2/remote_execution.proto\x1a\x1cgoogle/api/annotations.proto\"Q\n\x06Source\x12\x0f\n\x07version\x18\x01 \x01(\x05\x12\x36\n\x05\x66iles\x18\x02 \x01(\x0b\x32\'.build.bazel.remote.execution.v2.Digest\"<\n\x10GetSourceRequest\x12\x15\n\rinstance_name\x18\x01 \x01(\t\x12\x11\n\tcache_key\x18\x02 \x01(\t\"g\n\x13UpdateSourceRequest\x12\x15\n\rinstance_name\x18\x01 \x01(\t\x12\x11\n\tcache_key\x18\x02 \x01(\t\x12&\n\x06source\x18\x03 \x01(\x0b\x32\x16.buildstream.v2.Source2\xa7\x01\n\rSourceService\x12G\n\tGetSource\x12 .buildstream.v2.GetSourceRequest\x1a\x16.buildstream.v2.Source\"\x00\x12M\n\x0cUpdateSource\x12#.buildstream.v2.UpdateSourceRequest\x1a\x16.buildstream.v2.Source\"\x00\x62\x06proto3'
+  serialized_pb=b'\n\x1b\x62uildstream/v2/source.proto\x12\x0e\x62uildstream.v2\x1a\x36\x62uild/bazel/remote/execution/v2/remote_execution.proto\x1a\x1cgoogle/api/annotations.proto\"Q\n\x06Source\x12\x0f\n\x07version\x18\x01 \x01(\x05\x12\x36\n\x05\x66iles\x18\x02 \x01(\x0b\x32\'.build.bazel.remote.execution.v2.Digestb\x06proto3'
   ,
   dependencies=[build_dot_bazel_dot_remote_dot_execution_dot_v2_dot_remote__execution__pb2.DESCRIPTOR,google_dot_api_dot_annotations__pb2.DESCRIPTOR,])
 
@@ -64,94 +64,8 @@ _SOURCE = _descriptor.Descriptor(
   serialized_end=214,
 )
 
-
-_GETSOURCEREQUEST = _descriptor.Descriptor(
-  name='GetSourceRequest',
-  full_name='buildstream.v2.GetSourceRequest',
-  filename=None,
-  file=DESCRIPTOR,
-  containing_type=None,
-  fields=[
-    _descriptor.FieldDescriptor(
-      name='instance_name', full_name='buildstream.v2.GetSourceRequest.instance_name', index=0,
-      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,
-      serialized_options=None, file=DESCRIPTOR),
-    _descriptor.FieldDescriptor(
-      name='cache_key', full_name='buildstream.v2.GetSourceRequest.cache_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,
-      serialized_options=None, file=DESCRIPTOR),
-  ],
-  extensions=[
-  ],
-  nested_types=[],
-  enum_types=[
-  ],
-  serialized_options=None,
-  is_extendable=False,
-  syntax='proto3',
-  extension_ranges=[],
-  oneofs=[
-  ],
-  serialized_start=216,
-  serialized_end=276,
-)
-
-
-_UPDATESOURCEREQUEST = _descriptor.Descriptor(
-  name='UpdateSourceRequest',
-  full_name='buildstream.v2.UpdateSourceRequest',
-  filename=None,
-  file=DESCRIPTOR,
-  containing_type=None,
-  fields=[
-    _descriptor.FieldDescriptor(
-      name='instance_name', full_name='buildstream.v2.UpdateSourceRequest.instance_name', index=0,
-      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,
-      serialized_options=None, file=DESCRIPTOR),
-    _descriptor.FieldDescriptor(
-      name='cache_key', full_name='buildstream.v2.UpdateSourceRequest.cache_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,
-      serialized_options=None, file=DESCRIPTOR),
-    _descriptor.FieldDescriptor(
-      name='source', full_name='buildstream.v2.UpdateSourceRequest.source', 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,
-      serialized_options=None, file=DESCRIPTOR),
-  ],
-  extensions=[
-  ],
-  nested_types=[],
-  enum_types=[
-  ],
-  serialized_options=None,
-  is_extendable=False,
-  syntax='proto3',
-  extension_ranges=[],
-  oneofs=[
-  ],
-  serialized_start=278,
-  serialized_end=381,
-)
-
 _SOURCE.fields_by_name['files'].message_type = build_dot_bazel_dot_remote_dot_execution_dot_v2_dot_remote__execution__pb2._DIGEST
-_UPDATESOURCEREQUEST.fields_by_name['source'].message_type = _SOURCE
 DESCRIPTOR.message_types_by_name['Source'] = _SOURCE
-DESCRIPTOR.message_types_by_name['GetSourceRequest'] = _GETSOURCEREQUEST
-DESCRIPTOR.message_types_by_name['UpdateSourceRequest'] = _UPDATESOURCEREQUEST
 _sym_db.RegisterFileDescriptor(DESCRIPTOR)
 
 Source = _reflection.GeneratedProtocolMessageType('Source', (_message.Message,), {
@@ -161,52 +75,5 @@ Source = _reflection.GeneratedProtocolMessageType('Source', (_message.Message,),
   })
 _sym_db.RegisterMessage(Source)
 
-GetSourceRequest = _reflection.GeneratedProtocolMessageType('GetSourceRequest', (_message.Message,), {
-  'DESCRIPTOR' : _GETSOURCEREQUEST,
-  '__module__' : 'buildstream.v2.source_pb2'
-  # @@protoc_insertion_point(class_scope:buildstream.v2.GetSourceRequest)
-  })
-_sym_db.RegisterMessage(GetSourceRequest)
-
-UpdateSourceRequest = _reflection.GeneratedProtocolMessageType('UpdateSourceRequest', (_message.Message,), {
-  'DESCRIPTOR' : _UPDATESOURCEREQUEST,
-  '__module__' : 'buildstream.v2.source_pb2'
-  # @@protoc_insertion_point(class_scope:buildstream.v2.UpdateSourceRequest)
-  })
-_sym_db.RegisterMessage(UpdateSourceRequest)
-
-
-
-_SOURCESERVICE = _descriptor.ServiceDescriptor(
-  name='SourceService',
-  full_name='buildstream.v2.SourceService',
-  file=DESCRIPTOR,
-  index=0,
-  serialized_options=None,
-  serialized_start=384,
-  serialized_end=551,
-  methods=[
-  _descriptor.MethodDescriptor(
-    name='GetSource',
-    full_name='buildstream.v2.SourceService.GetSource',
-    index=0,
-    containing_service=None,
-    input_type=_GETSOURCEREQUEST,
-    output_type=_SOURCE,
-    serialized_options=None,
-  ),
-  _descriptor.MethodDescriptor(
-    name='UpdateSource',
-    full_name='buildstream.v2.SourceService.UpdateSource',
-    index=1,
-    containing_service=None,
-    input_type=_UPDATESOURCEREQUEST,
-    output_type=_SOURCE,
-    serialized_options=None,
-  ),
-])
-_sym_db.RegisterServiceDescriptor(_SOURCESERVICE)
-
-DESCRIPTOR.services_by_name['SourceService'] = _SOURCESERVICE
 
 # @@protoc_insertion_point(module_scope)
diff --git a/src/buildstream/_protos/buildstream/v2/source_pb2_grpc.py b/src/buildstream/_protos/buildstream/v2/source_pb2_grpc.py
index 8b1b37b0b..a89435267 100644
--- a/src/buildstream/_protos/buildstream/v2/source_pb2_grpc.py
+++ b/src/buildstream/_protos/buildstream/v2/source_pb2_grpc.py
@@ -1,105 +1,3 @@
 # Generated by the gRPC Python protocol compiler plugin. DO NOT EDIT!
 import grpc
 
-from buildstream._protos.buildstream.v2 import source_pb2 as buildstream_dot_v2_dot_source__pb2
-
-
-class SourceServiceStub(object):
-    """Missing associated documentation comment in .proto file"""
-
-    def __init__(self, channel):
-        """Constructor.
-
-        Args:
-            channel: A grpc.Channel.
-        """
-        self.GetSource = channel.unary_unary(
-                '/buildstream.v2.SourceService/GetSource',
-                request_serializer=buildstream_dot_v2_dot_source__pb2.GetSourceRequest.SerializeToString,
-                response_deserializer=buildstream_dot_v2_dot_source__pb2.Source.FromString,
-                )
-        self.UpdateSource = channel.unary_unary(
-                '/buildstream.v2.SourceService/UpdateSource',
-                request_serializer=buildstream_dot_v2_dot_source__pb2.UpdateSourceRequest.SerializeToString,
-                response_deserializer=buildstream_dot_v2_dot_source__pb2.Source.FromString,
-                )
-
-
-class SourceServiceServicer(object):
-    """Missing associated documentation comment in .proto file"""
-
-    def GetSource(self, request, context):
-        """Retrieve a source message given a reference name from the service
-
-        Errors:
-        * `NOT_FOUND`: The requested reference is not in the cache.
-        """
-        context.set_code(grpc.StatusCode.UNIMPLEMENTED)
-        context.set_details('Method not implemented!')
-        raise NotImplementedError('Method not implemented!')
-
-    def UpdateSource(self, request, context):
-        """Sets a source message on the service
-
-        Errors:
-        * `RESOURCE_EXHAUSTED`: There is insufficient storage space to add the
-        entry to the cache.
-        """
-        context.set_code(grpc.StatusCode.UNIMPLEMENTED)
-        context.set_details('Method not implemented!')
-        raise NotImplementedError('Method not implemented!')
-
-
-def add_SourceServiceServicer_to_server(servicer, server):
-    rpc_method_handlers = {
-            'GetSource': grpc.unary_unary_rpc_method_handler(
-                    servicer.GetSource,
-                    request_deserializer=buildstream_dot_v2_dot_source__pb2.GetSourceRequest.FromString,
-                    response_serializer=buildstream_dot_v2_dot_source__pb2.Source.SerializeToString,
-            ),
-            'UpdateSource': grpc.unary_unary_rpc_method_handler(
-                    servicer.UpdateSource,
-                    request_deserializer=buildstream_dot_v2_dot_source__pb2.UpdateSourceRequest.FromString,
-                    response_serializer=buildstream_dot_v2_dot_source__pb2.Source.SerializeToString,
-            ),
-    }
-    generic_handler = grpc.method_handlers_generic_handler(
-            'buildstream.v2.SourceService', rpc_method_handlers)
-    server.add_generic_rpc_handlers((generic_handler,))
-
-
- # This class is part of an EXPERIMENTAL API.
-class SourceService(object):
-    """Missing associated documentation comment in .proto file"""
-
-    @staticmethod
-    def GetSource(request,
-            target,
-            options=(),
-            channel_credentials=None,
-            call_credentials=None,
-            compression=None,
-            wait_for_ready=None,
-            timeout=None,
-            metadata=None):
-        return grpc.experimental.unary_unary(request, target, '/buildstream.v2.SourceService/GetSource',
-            buildstream_dot_v2_dot_source__pb2.GetSourceRequest.SerializeToString,
-            buildstream_dot_v2_dot_source__pb2.Source.FromString,
-            options, channel_credentials,
-            call_credentials, compression, wait_for_ready, timeout, metadata)
-
-    @staticmethod
-    def UpdateSource(request,
-            target,
-            options=(),
-            channel_credentials=None,
-            call_credentials=None,
-            compression=None,
-            wait_for_ready=None,
-            timeout=None,
-            metadata=None):
-        return grpc.experimental.unary_unary(request, target, '/buildstream.v2.SourceService/UpdateSource',
-            buildstream_dot_v2_dot_source__pb2.UpdateSourceRequest.SerializeToString,
-            buildstream_dot_v2_dot_source__pb2.Source.FromString,
-            options, channel_credentials,
-            call_credentials, compression, wait_for_ready, timeout, metadata)