Merge branch 'zj-remove-bfg-object-map' into 'master'

Remove deprecated ApplyBfgObjectMap

Closes #2094

See merge request gitlab-org/gitaly!1559

7 files changed, 27 insertions, 352 deletions

diff --git a/internal/praefect/protoregistry/protoregistry_test.go b/internal/praefect/protoregistry/protoregistry_test.go
index aecb86ddc..540d73926 100644
--- a/internal/praefect/protoregistry/protoregistry_test.go
+++ b/internal/praefect/protoregistry/protoregistry_test.go
@@ -23,7 +23,7 @@ func TestPopulatesProtoRegistry(t *testing.T) {
 			"GetAllLFSPointers": protoregistry.OpAccessor,
 		},
 		"CleanupService": map[string]protoregistry.OpType{
-			"ApplyBfgObjectMap": protoregistry.OpMutator,
+			"ApplyBfgObjectMapStream": protoregistry.OpMutator,
 		},
 		"CommitService": map[string]protoregistry.OpType{
 			"CommitIsAncestor":         protoregistry.OpAccessor,
diff --git a/internal/service/cleanup/apply_bfg_object_map.go b/internal/service/cleanup/apply_bfg_object_map.go
deleted file mode 100644
index 35b7aabe7..000000000
--- a/internal/service/cleanup/apply_bfg_object_map.go
+++ /dev/null
@@ -1,52 +0,0 @@
-package cleanup
-
-import (
-	"gitlab.com/gitlab-org/gitaly/proto/go/gitalypb"
-	"google.golang.org/grpc/codes"
-	"google.golang.org/grpc/status"
-
-	"gitlab.com/gitlab-org/gitaly/internal/service/cleanup/internalrefs"
-	"gitlab.com/gitlab-org/gitaly/streamio"
-)
-
-func (s *server) ApplyBfgObjectMap(stream gitalypb.CleanupService_ApplyBfgObjectMapServer) error {
-	firstRequest, err := stream.Recv()
-	if err != nil {
-		return status.Errorf(codes.Internal, "first request failed: %v", err)
-	}
-
-	repo := firstRequest.GetRepository()
-	if repo == nil {
-		return status.Errorf(codes.InvalidArgument, "empty repository")
-	}
-
-	firstRead := false
-	reader := streamio.NewReader(func() ([]byte, error) {
-		if !firstRead {
-			firstRead = true
-			return firstRequest.GetObjectMap(), nil
-		}
-
-		request, err := stream.Recv()
-		return request.GetObjectMap(), err
-	})
-
-	ctx := stream.Context()
-
-	// It doesn't matter if new internal references are added after this RPC
-	// starts running - they shouldn't point to the objects removed by the BFG
-	cleaner, err := internalrefs.NewCleaner(ctx, repo, nil)
-	if err != nil {
-		return status.Errorf(codes.Internal, err.Error())
-	}
-
-	if err := cleaner.ApplyObjectMap(reader); err != nil {
-		if invalidErr, ok := err.(internalrefs.ErrInvalidObjectMap); ok {
-			return status.Errorf(codes.InvalidArgument, "%s", invalidErr)
-		}
-
-		return status.Errorf(codes.Internal, "%s", err)
-	}
-
-	return stream.SendAndClose(&gitalypb.ApplyBfgObjectMapResponse{})
-}
diff --git a/internal/service/cleanup/apply_bfg_object_map_test.go b/internal/service/cleanup/apply_bfg_object_map_test.go
deleted file mode 100644
index ec6bb2705..000000000
--- a/internal/service/cleanup/apply_bfg_object_map_test.go
+++ /dev/null
@@ -1,88 +0,0 @@
-package cleanup
-
-import (
-	"context"
-	"fmt"
-	"strings"
-	"testing"
-
-	"github.com/stretchr/testify/assert"
-	"github.com/stretchr/testify/require"
-	"gitlab.com/gitlab-org/gitaly/proto/go/gitalypb"
-	"google.golang.org/grpc/codes"
-
-	"gitlab.com/gitlab-org/gitaly/internal/git/log"
-	"gitlab.com/gitlab-org/gitaly/internal/testhelper"
-)
-
-func TestApplyBfgObjectMapSuccess(t *testing.T) {
-	server, serverSocketPath := runCleanupServiceServer(t)
-	defer server.Stop()
-
-	client, conn := newCleanupServiceClient(t, serverSocketPath)
-	defer conn.Close()
-
-	testRepo, testRepoPath, cleanupFn := testhelper.NewTestRepo(t)
-	defer cleanupFn()
-
-	ctx, cancel := testhelper.Context()
-	defer cancel()
-
-	headCommit, err := log.GetCommit(ctx, testRepo, "HEAD")
-	require.NoError(t, err)
-
-	// Create some refs pointing to HEAD
-	for _, ref := range []string{
-		"refs/environments/1", "refs/keep-around/1", "refs/merge-requests/1",
-		"refs/heads/_keep", "refs/tags/_keep", "refs/notes/_keep",
-	} {
-		testhelper.MustRunCommand(t, nil, "git", "-C", testRepoPath, "update-ref", ref, headCommit.Id)
-	}
-
-	objectMapData := fmt.Sprintf("%s %s\n", headCommit.Id, strings.Repeat("0", 40))
-	require.NoError(t, doRequest(ctx, t, testRepo, client, objectMapData))
-
-	// Ensure that the internal refs are gone, but the others still exist
-	refs := testhelper.GetRepositoryRefs(t, testRepoPath)
-	assert.NotContains(t, refs, "refs/environments/1")
-	assert.NotContains(t, refs, "refs/keep-around/1")
-	assert.NotContains(t, refs, "refs/merge-requests/1")
-	assert.Contains(t, refs, "refs/heads/_keep")
-	assert.Contains(t, refs, "refs/tags/_keep")
-	assert.Contains(t, refs, "refs/notes/_keep")
-}
-
-func TestApplyBfgObjectMapFailsOnInvalidInput(t *testing.T) {
-	server, serverSocketPath := runCleanupServiceServer(t)
-	defer server.Stop()
-
-	client, conn := newCleanupServiceClient(t, serverSocketPath)
-	defer conn.Close()
-
-	testRepo, _, cleanupFn := testhelper.NewTestRepo(t)
-	defer cleanupFn()
-
-	ctx, cancel := testhelper.Context()
-	defer cancel()
-
-	err := doRequest(ctx, t, testRepo, client, "invalid-data here as you can see")
-	testhelper.RequireGrpcError(t, err, codes.InvalidArgument)
-}
-
-func doRequest(ctx context.Context, t *testing.T, repo *gitalypb.Repository, client gitalypb.CleanupServiceClient, objectMap string) error {
-	// Split the data across multiple requests
-	parts := strings.SplitN(objectMap, " ", 2)
-	req1 := &gitalypb.ApplyBfgObjectMapRequest{
-		Repository: repo,
-		ObjectMap:  []byte(parts[0] + " "),
-	}
-	req2 := &gitalypb.ApplyBfgObjectMapRequest{ObjectMap: []byte(parts[1])}
-
-	stream, err := client.ApplyBfgObjectMap(ctx)
-	require.NoError(t, err)
-	require.NoError(t, stream.Send(req1))
-	require.NoError(t, stream.Send(req2))
-
-	_, err = stream.CloseAndRecv()
-	return err
-}
diff --git a/proto/cleanup.proto b/proto/cleanup.proto
index c4cc1480d..db4cbcc50 100644
--- a/proto/cleanup.proto
+++ b/proto/cleanup.proto
@@ -7,14 +7,6 @@ option go_package = "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb";
 import "shared.proto";
 
 service CleanupService {
-  // Deprecated in favour of ApplyBfgObjectMapStream
-  rpc ApplyBfgObjectMap(stream ApplyBfgObjectMapRequest) returns (ApplyBfgObjectMapResponse) {
-    option (op_type) = {
-      op: MUTATOR
-      target_repository_field: "1"
-    };
-  }
-
   rpc ApplyBfgObjectMapStream(stream ApplyBfgObjectMapStreamRequest) returns (stream ApplyBfgObjectMapStreamResponse) {
     option (op_type) = {
       op: MUTATOR
@@ -23,16 +15,6 @@ service CleanupService {
   }
 }
 
-message ApplyBfgObjectMapRequest {
-  Repository repository = 1;
-  // A raw object-map file as generated by BFG: https://rtyley.github.io/bfg-repo-cleaner
-  // Each line in the file has two object SHAs, space-separated - the original
-  // SHA of the object, and the SHA after BFG has rewritten the object.
-  bytes object_map = 2;
-}
-
-message ApplyBfgObjectMapResponse {}
-
 message ApplyBfgObjectMapStreamRequest {
   // Only available on the first message
   Repository repository = 1;
diff --git a/proto/go/gitalypb/cleanup.pb.go b/proto/go/gitalypb/cleanup.pb.go
index e7577fc03..abed3287c 100644
--- a/proto/go/gitalypb/cleanup.pb.go
+++ b/proto/go/gitalypb/cleanup.pb.go
@@ -24,87 +24,6 @@ var _ = math.Inf
 // proto package needs to be updated.
 const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
-type ApplyBfgObjectMapRequest struct {
-	Repository *Repository `protobuf:"bytes,1,opt,name=repository,proto3" json:"repository,omitempty"`
-	// A raw object-map file as generated by BFG: https://rtyley.github.io/bfg-repo-cleaner
-	// Each line in the file has two object SHAs, space-separated - the original
-	// SHA of the object, and the SHA after BFG has rewritten the object.
-	ObjectMap            []byte   `protobuf:"bytes,2,opt,name=object_map,json=objectMap,proto3" json:"object_map,omitempty"`
-	XXX_NoUnkeyedLiteral struct{} `json:"-"`
-	XXX_unrecognized     []byte   `json:"-"`
-	XXX_sizecache        int32    `json:"-"`
-}
-
-func (m *ApplyBfgObjectMapRequest) Reset()         { *m = ApplyBfgObjectMapRequest{} }
-func (m *ApplyBfgObjectMapRequest) String() string { return proto.CompactTextString(m) }
-func (*ApplyBfgObjectMapRequest) ProtoMessage()    {}
-func (*ApplyBfgObjectMapRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_1b19e990e4662c9c, []int{0}
-}
-
-func (m *ApplyBfgObjectMapRequest) XXX_Unmarshal(b []byte) error {
-	return xxx_messageInfo_ApplyBfgObjectMapRequest.Unmarshal(m, b)
-}
-func (m *ApplyBfgObjectMapRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
-	return xxx_messageInfo_ApplyBfgObjectMapRequest.Marshal(b, m, deterministic)
-}
-func (m *ApplyBfgObjectMapRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ApplyBfgObjectMapRequest.Merge(m, src)
-}
-func (m *ApplyBfgObjectMapRequest) XXX_Size() int {
-	return xxx_messageInfo_ApplyBfgObjectMapRequest.Size(m)
-}
-func (m *ApplyBfgObjectMapRequest) XXX_DiscardUnknown() {
-	xxx_messageInfo_ApplyBfgObjectMapRequest.DiscardUnknown(m)
-}
-
-var xxx_messageInfo_ApplyBfgObjectMapRequest proto.InternalMessageInfo
-
-func (m *ApplyBfgObjectMapRequest) GetRepository() *Repository {
-	if m != nil {
-		return m.Repository
-	}
-	return nil
-}
-
-func (m *ApplyBfgObjectMapRequest) GetObjectMap() []byte {
-	if m != nil {
-		return m.ObjectMap
-	}
-	return nil
-}
-
-type ApplyBfgObjectMapResponse struct {
-	XXX_NoUnkeyedLiteral struct{} `json:"-"`
-	XXX_unrecognized     []byte   `json:"-"`
-	XXX_sizecache        int32    `json:"-"`
-}
-
-func (m *ApplyBfgObjectMapResponse) Reset()         { *m = ApplyBfgObjectMapResponse{} }
-func (m *ApplyBfgObjectMapResponse) String() string { return proto.CompactTextString(m) }
-func (*ApplyBfgObjectMapResponse) ProtoMessage()    {}
-func (*ApplyBfgObjectMapResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_1b19e990e4662c9c, []int{1}
-}
-
-func (m *ApplyBfgObjectMapResponse) XXX_Unmarshal(b []byte) error {
-	return xxx_messageInfo_ApplyBfgObjectMapResponse.Unmarshal(m, b)
-}
-func (m *ApplyBfgObjectMapResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
-	return xxx_messageInfo_ApplyBfgObjectMapResponse.Marshal(b, m, deterministic)
-}
-func (m *ApplyBfgObjectMapResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ApplyBfgObjectMapResponse.Merge(m, src)
-}
-func (m *ApplyBfgObjectMapResponse) XXX_Size() int {
-	return xxx_messageInfo_ApplyBfgObjectMapResponse.Size(m)
-}
-func (m *ApplyBfgObjectMapResponse) XXX_DiscardUnknown() {
-	xxx_messageInfo_ApplyBfgObjectMapResponse.DiscardUnknown(m)
-}
-
-var xxx_messageInfo_ApplyBfgObjectMapResponse proto.InternalMessageInfo
-
 type ApplyBfgObjectMapStreamRequest struct {
 	// Only available on the first message
 	Repository *Repository `protobuf:"bytes,1,opt,name=repository,proto3" json:"repository,omitempty"`
@@ -121,7 +40,7 @@ func (m *ApplyBfgObjectMapStreamRequest) Reset()         { *m = ApplyBfgObjectMa
 func (m *ApplyBfgObjectMapStreamRequest) String() string { return proto.CompactTextString(m) }
 func (*ApplyBfgObjectMapStreamRequest) ProtoMessage()    {}
 func (*ApplyBfgObjectMapStreamRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_1b19e990e4662c9c, []int{2}
+	return fileDescriptor_1b19e990e4662c9c, []int{0}
 }
 
 func (m *ApplyBfgObjectMapStreamRequest) XXX_Unmarshal(b []byte) error {
@@ -167,7 +86,7 @@ func (m *ApplyBfgObjectMapStreamResponse) Reset()         { *m = ApplyBfgObjectM
 func (m *ApplyBfgObjectMapStreamResponse) String() string { return proto.CompactTextString(m) }
 func (*ApplyBfgObjectMapStreamResponse) ProtoMessage()    {}
 func (*ApplyBfgObjectMapStreamResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_1b19e990e4662c9c, []int{3}
+	return fileDescriptor_1b19e990e4662c9c, []int{1}
 }
 
 func (m *ApplyBfgObjectMapStreamResponse) XXX_Unmarshal(b []byte) error {
@@ -210,7 +129,7 @@ func (m *ApplyBfgObjectMapStreamResponse_Entry) Reset()         { *m = ApplyBfgO
 func (m *ApplyBfgObjectMapStreamResponse_Entry) String() string { return proto.CompactTextString(m) }
 func (*ApplyBfgObjectMapStreamResponse_Entry) ProtoMessage()    {}
 func (*ApplyBfgObjectMapStreamResponse_Entry) Descriptor() ([]byte, []int) {
-	return fileDescriptor_1b19e990e4662c9c, []int{3, 0}
+	return fileDescriptor_1b19e990e4662c9c, []int{1, 0}
 }
 
 func (m *ApplyBfgObjectMapStreamResponse_Entry) XXX_Unmarshal(b []byte) error {
@@ -253,8 +172,6 @@ func (m *ApplyBfgObjectMapStreamResponse_Entry) GetNewOid() string {
 }
 
 func init() {
-	proto.RegisterType((*ApplyBfgObjectMapRequest)(nil), "gitaly.ApplyBfgObjectMapRequest")
-	proto.RegisterType((*ApplyBfgObjectMapResponse)(nil), "gitaly.ApplyBfgObjectMapResponse")
 	proto.RegisterType((*ApplyBfgObjectMapStreamRequest)(nil), "gitaly.ApplyBfgObjectMapStreamRequest")
 	proto.RegisterType((*ApplyBfgObjectMapStreamResponse)(nil), "gitaly.ApplyBfgObjectMapStreamResponse")
 	proto.RegisterType((*ApplyBfgObjectMapStreamResponse_Entry)(nil), "gitaly.ApplyBfgObjectMapStreamResponse.Entry")
@@ -263,30 +180,28 @@ func init() {
 func init() { proto.RegisterFile("cleanup.proto", fileDescriptor_1b19e990e4662c9c) }
 
 var fileDescriptor_1b19e990e4662c9c = []byte{
-	// 367 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x52, 0x4d, 0x6f, 0xda, 0x40,
-	0x10, 0xd5, 0x96, 0x02, 0x65, 0xa0, 0x48, 0xdd, 0x0b, 0xae, 0xab, 0xb6, 0x2e, 0x07, 0xea, 0x0b,
-	0x36, 0x75, 0x7f, 0x41, 0xa9, 0xaa, 0x9e, 0x22, 0x24, 0x93, 0x53, 0x2e, 0x68, 0x6d, 0x4f, 0x1c,
-	0x47, 0xb6, 0x77, 0xb3, 0x5e, 0x82, 0xfc, 0x4b, 0xf2, 0xab, 0xf2, 0x67, 0x72, 0xcc, 0x29, 0x62,
-	0x17, 0xf2, 0x21, 0x42, 0xc8, 0x25, 0x37, 0x7b, 0xde, 0xcc, 0x7b, 0x6f, 0xde, 0x2c, 0x7c, 0x8c,
-	0x73, 0x64, 0xe5, 0x52, 0x78, 0x42, 0x72, 0xc5, 0x69, 0x2b, 0xcd, 0x14, 0xcb, 0x6b, 0xbb, 0x57,
-	0x9d, 0x31, 0x89, 0x89, 0xa9, 0x0e, 0x0b, 0xb0, 0xfe, 0x08, 0x91, 0xd7, 0xd3, 0xd3, 0x74, 0x16,
-	0x9d, 0x63, 0xac, 0x8e, 0x98, 0x08, 0xf1, 0x62, 0x89, 0x95, 0xa2, 0x01, 0x80, 0x44, 0xc1, 0xab,
-	0x4c, 0x71, 0x59, 0x5b, 0xc4, 0x21, 0x6e, 0x37, 0xa0, 0x9e, 0xa1, 0xf1, 0xc2, 0x7b, 0x24, 0x7c,
-	0xd4, 0x45, 0xbf, 0x02, 0x70, 0xcd, 0xb3, 0x28, 0x98, 0xb0, 0xde, 0x39, 0xc4, 0xed, 0x85, 0x1d,
-	0xbe, 0x65, 0x1e, 0x7e, 0x81, 0xcf, 0xcf, 0xc8, 0x55, 0x82, 0x97, 0x15, 0x0e, 0x2b, 0xf8, 0xb6,
-	0x03, 0xce, 0x95, 0x44, 0x56, 0xbc, 0xa1, 0xa3, 0x6b, 0x02, 0xdf, 0xf7, 0xaa, 0x1a, 0x63, 0xf4,
-	0x3f, 0xb4, 0xb1, 0x54, 0x32, 0xc3, 0xca, 0x22, 0x4e, 0xc3, 0xed, 0x06, 0xe3, 0xad, 0xe6, 0x81,
-	0x49, 0xef, 0x5f, 0xa9, 0x64, 0x1d, 0x6e, 0xa7, 0x6d, 0x06, 0x4d, 0x5d, 0xa1, 0x23, 0x78, 0xaf,
-	0x6a, 0x81, 0x7a, 0x85, 0xfe, 0xc3, 0x0a, 0x86, 0xe6, 0xb8, 0x16, 0x18, 0x6a, 0x9c, 0x0e, 0xa0,
-	0xcd, 0xf3, 0x64, 0xc1, 0xb3, 0x44, 0x3b, 0xef, 0x84, 0x2d, 0x9e, 0x27, 0xb3, 0x2c, 0x59, 0x03,
-	0x25, 0xae, 0x34, 0xd0, 0x30, 0x40, 0x89, 0xab, 0x59, 0x96, 0x04, 0x37, 0x04, 0xfa, 0x7f, 0xcd,
-	0xe1, 0xe7, 0x28, 0x2f, 0xb3, 0x18, 0x29, 0xc2, 0xa7, 0x1d, 0x9f, 0xd4, 0xd9, 0xbb, 0xc2, 0x26,
-	0x6c, 0xfb, 0xc7, 0x0b, 0x1d, 0x9b, 0x8b, 0x75, 0x6e, 0xaf, 0xdc, 0xe6, 0x07, 0x62, 0x93, 0x5f,
-	0x2e, 0xa1, 0x35, 0x0c, 0xf6, 0xc4, 0x41, 0x47, 0x07, 0xf3, 0x32, 0x92, 0x3f, 0x5f, 0x99, 0xeb,
-	0x13, 0xe1, 0x09, 0x99, 0x4e, 0x4e, 0xd6, 0x83, 0x39, 0x8b, 0xbc, 0x98, 0x17, 0xbe, 0xf9, 0x1c,
-	0x73, 0x99, 0xfa, 0x86, 0xce, 0xd7, 0x6f, 0xdd, 0x4f, 0xf9, 0xe6, 0x5f, 0x44, 0x51, 0x4b, 0x97,
-	0x7e, 0xdf, 0x05, 0x00, 0x00, 0xff, 0xff, 0x5c, 0xdf, 0x1e, 0xf1, 0x25, 0x03, 0x00, 0x00,
+	// 327 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x91, 0x41, 0x4e, 0x02, 0x31,
+	0x14, 0x86, 0x53, 0x11, 0x90, 0x82, 0x2c, 0xba, 0x81, 0x4c, 0xa2, 0x12, 0x16, 0x38, 0x1b, 0x66,
+	0x70, 0x3c, 0x81, 0x18, 0xe3, 0xca, 0x90, 0x14, 0x57, 0x6e, 0x48, 0x67, 0xe6, 0x39, 0xd6, 0x0c,
+	0xd3, 0xda, 0x16, 0x49, 0xcf, 0xe0, 0x01, 0x3c, 0x95, 0x17, 0x72, 0x65, 0x68, 0x45, 0xdd, 0x10,
+	0xdc, 0xb5, 0xef, 0xef, 0xff, 0xbd, 0xf7, 0xbf, 0xe2, 0xe3, 0xac, 0x04, 0x56, 0xad, 0x64, 0x24,
+	0x95, 0x30, 0x82, 0x34, 0x0a, 0x6e, 0x58, 0x69, 0x83, 0x8e, 0x7e, 0x62, 0x0a, 0x72, 0x5f, 0x1d,
+	0x6a, 0x7c, 0x7a, 0x25, 0x65, 0x69, 0xa7, 0x8f, 0xc5, 0x2c, 0x7d, 0x86, 0xcc, 0xdc, 0x31, 0x39,
+	0x37, 0x0a, 0xd8, 0x92, 0xc2, 0xcb, 0x0a, 0xb4, 0x21, 0x09, 0xc6, 0x0a, 0xa4, 0xd0, 0xdc, 0x08,
+	0x65, 0xfb, 0x68, 0x80, 0xc2, 0x76, 0x42, 0x22, 0x0f, 0x8b, 0xe8, 0x8f, 0x42, 0xff, 0xbc, 0x22,
+	0x27, 0x18, 0x0b, 0x47, 0x5b, 0x2c, 0x99, 0xec, 0x1f, 0x0c, 0x50, 0xd8, 0xa1, 0x2d, 0xb1, 0xe5,
+	0x0f, 0x3f, 0x10, 0x3e, 0xdb, 0xd9, 0x55, 0x4b, 0x51, 0x69, 0x20, 0xb7, 0xb8, 0x09, 0x95, 0x51,
+	0x1c, 0x74, 0x1f, 0x0d, 0x6a, 0x61, 0x3b, 0x19, 0x6f, 0x7b, 0xee, 0x71, 0x46, 0x37, 0x95, 0x51,
+	0x96, 0x6e, 0xdd, 0x01, 0xc3, 0x75, 0x57, 0x21, 0x23, 0x7c, 0x68, 0xac, 0x04, 0x17, 0xa1, 0xfb,
+	0x1b, 0xc1, 0x63, 0xee, 0xad, 0x04, 0xea, 0x74, 0xd2, 0xc3, 0x4d, 0x51, 0xe6, 0x0b, 0xc1, 0x73,
+	0x37, 0x79, 0x8b, 0x36, 0x44, 0x99, 0xcf, 0x78, 0xbe, 0x11, 0x2a, 0x58, 0x3b, 0xa1, 0xe6, 0x85,
+	0x0a, 0xd6, 0x33, 0x9e, 0x27, 0x6f, 0x08, 0x77, 0xaf, 0xfd, 0xb2, 0xe7, 0xa0, 0x5e, 0x79, 0x06,
+	0xc4, 0xe2, 0xde, 0x8e, 0x39, 0xc9, 0x68, 0x6f, 0x10, 0xb7, 0xf8, 0xe0, 0xfc, 0x9f, 0x81, 0x87,
+	0xad, 0xcf, 0xf7, 0xb0, 0x7e, 0x84, 0x02, 0x74, 0x11, 0xa2, 0x09, 0x9a, 0x4e, 0x1e, 0x36, 0xc6,
+	0x92, 0xa5, 0x51, 0x26, 0x96, 0xb1, 0x3f, 0x8e, 0x85, 0x2a, 0x62, 0x8f, 0x8b, 0xdd, 0xc7, 0xc7,
+	0x85, 0xf8, 0xbe, 0xcb, 0x34, 0x6d, 0xb8, 0xd2, 0xe5, 0x57, 0x00, 0x00, 0x00, 0xff, 0xff, 0xfd,
+	0xff, 0x83, 0xdb, 0x32, 0x02, 0x00, 0x00,
 }
 
 // Reference imports to suppress errors if they are not otherwise used.
@@ -301,8 +216,6 @@ const _ = grpc.SupportPackageIsVersion4
 //
 // For semantics around ctx use and closing/ending streaming RPCs, please refer to https://godoc.org/google.golang.org/grpc#ClientConn.NewStream.
 type CleanupServiceClient interface {
-	// Deprecated in favour of ApplyBfgObjectMapStream
-	ApplyBfgObjectMap(ctx context.Context, opts ...grpc.CallOption) (CleanupService_ApplyBfgObjectMapClient, error)
 	ApplyBfgObjectMapStream(ctx context.Context, opts ...grpc.CallOption) (CleanupService_ApplyBfgObjectMapStreamClient, error)
 }
 
@@ -314,42 +227,8 @@ func NewCleanupServiceClient(cc *grpc.ClientConn) CleanupServiceClient {
 	return &cleanupServiceClient{cc}
 }
 
-func (c *cleanupServiceClient) ApplyBfgObjectMap(ctx context.Context, opts ...grpc.CallOption) (CleanupService_ApplyBfgObjectMapClient, error) {
-	stream, err := c.cc.NewStream(ctx, &_CleanupService_serviceDesc.Streams[0], "/gitaly.CleanupService/ApplyBfgObjectMap", opts...)
-	if err != nil {
-		return nil, err
-	}
-	x := &cleanupServiceApplyBfgObjectMapClient{stream}
-	return x, nil
-}
-
-type CleanupService_ApplyBfgObjectMapClient interface {
-	Send(*ApplyBfgObjectMapRequest) error
-	CloseAndRecv() (*ApplyBfgObjectMapResponse, error)
-	grpc.ClientStream
-}
-
-type cleanupServiceApplyBfgObjectMapClient struct {
-	grpc.ClientStream
-}
-
-func (x *cleanupServiceApplyBfgObjectMapClient) Send(m *ApplyBfgObjectMapRequest) error {
-	return x.ClientStream.SendMsg(m)
-}
-
-func (x *cleanupServiceApplyBfgObjectMapClient) CloseAndRecv() (*ApplyBfgObjectMapResponse, error) {
-	if err := x.ClientStream.CloseSend(); err != nil {
-		return nil, err
-	}
-	m := new(ApplyBfgObjectMapResponse)
-	if err := x.ClientStream.RecvMsg(m); err != nil {
-		return nil, err
-	}
-	return m, nil
-}
-
 func (c *cleanupServiceClient) ApplyBfgObjectMapStream(ctx context.Context, opts ...grpc.CallOption) (CleanupService_ApplyBfgObjectMapStreamClient, error) {
-	stream, err := c.cc.NewStream(ctx, &_CleanupService_serviceDesc.Streams[1], "/gitaly.CleanupService/ApplyBfgObjectMapStream", opts...)
+	stream, err := c.cc.NewStream(ctx, &_CleanupService_serviceDesc.Streams[0], "/gitaly.CleanupService/ApplyBfgObjectMapStream", opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -381,8 +260,6 @@ func (x *cleanupServiceApplyBfgObjectMapStreamClient) Recv() (*ApplyBfgObjectMap
 
 // CleanupServiceServer is the server API for CleanupService service.
 type CleanupServiceServer interface {
-	// Deprecated in favour of ApplyBfgObjectMapStream
-	ApplyBfgObjectMap(CleanupService_ApplyBfgObjectMapServer) error
 	ApplyBfgObjectMapStream(CleanupService_ApplyBfgObjectMapStreamServer) error
 }
 
@@ -390,9 +267,6 @@ type CleanupServiceServer interface {
 type UnimplementedCleanupServiceServer struct {
 }
 
-func (*UnimplementedCleanupServiceServer) ApplyBfgObjectMap(srv CleanupService_ApplyBfgObjectMapServer) error {
-	return status.Errorf(codes.Unimplemented, "method ApplyBfgObjectMap not implemented")
-}
 func (*UnimplementedCleanupServiceServer) ApplyBfgObjectMapStream(srv CleanupService_ApplyBfgObjectMapStreamServer) error {
 	return status.Errorf(codes.Unimplemented, "method ApplyBfgObjectMapStream not implemented")
 }
@@ -401,32 +275,6 @@ func RegisterCleanupServiceServer(s *grpc.Server, srv CleanupServiceServer) {
 	s.RegisterService(&_CleanupService_serviceDesc, srv)
 }
 
-func _CleanupService_ApplyBfgObjectMap_Handler(srv interface{}, stream grpc.ServerStream) error {
-	return srv.(CleanupServiceServer).ApplyBfgObjectMap(&cleanupServiceApplyBfgObjectMapServer{stream})
-}
-
-type CleanupService_ApplyBfgObjectMapServer interface {
-	SendAndClose(*ApplyBfgObjectMapResponse) error
-	Recv() (*ApplyBfgObjectMapRequest, error)
-	grpc.ServerStream
-}
-
-type cleanupServiceApplyBfgObjectMapServer struct {
-	grpc.ServerStream
-}
-
-func (x *cleanupServiceApplyBfgObjectMapServer) SendAndClose(m *ApplyBfgObjectMapResponse) error {
-	return x.ServerStream.SendMsg(m)
-}
-
-func (x *cleanupServiceApplyBfgObjectMapServer) Recv() (*ApplyBfgObjectMapRequest, error) {
-	m := new(ApplyBfgObjectMapRequest)
-	if err := x.ServerStream.RecvMsg(m); err != nil {
-		return nil, err
-	}
-	return m, nil
-}
-
 func _CleanupService_ApplyBfgObjectMapStream_Handler(srv interface{}, stream grpc.ServerStream) error {
 	return srv.(CleanupServiceServer).ApplyBfgObjectMapStream(&cleanupServiceApplyBfgObjectMapStreamServer{stream})
 }
@@ -459,11 +307,6 @@ var _CleanupService_serviceDesc = grpc.ServiceDesc{
 	Methods:     []grpc.MethodDesc{},
 	Streams: []grpc.StreamDesc{
 		{
-			StreamName:    "ApplyBfgObjectMap",
-			Handler:       _CleanupService_ApplyBfgObjectMap_Handler,
-			ClientStreams: true,
-		},
-		{
 			StreamName:    "ApplyBfgObjectMapStream",
 			Handler:       _CleanupService_ApplyBfgObjectMapStream_Handler,
 			ServerStreams: true,
diff --git a/ruby/proto/gitaly/cleanup_pb.rb b/ruby/proto/gitaly/cleanup_pb.rb
index 9c25db01d..eb7ea5c70 100644
--- a/ruby/proto/gitaly/cleanup_pb.rb
+++ b/ruby/proto/gitaly/cleanup_pb.rb
@@ -5,12 +5,6 @@ require 'google/protobuf'
 
 require 'shared_pb'
 Google::Protobuf::DescriptorPool.generated_pool.build do
-  add_message "gitaly.ApplyBfgObjectMapRequest" do
-    optional :repository, :message, 1, "gitaly.Repository"
-    optional :object_map, :bytes, 2
-  end
-  add_message "gitaly.ApplyBfgObjectMapResponse" do
-  end
   add_message "gitaly.ApplyBfgObjectMapStreamRequest" do
     optional :repository, :message, 1, "gitaly.Repository"
     optional :object_map, :bytes, 2
@@ -26,8 +20,6 @@ Google::Protobuf::DescriptorPool.generated_pool.build do
 end
 
 module Gitaly
-  ApplyBfgObjectMapRequest = Google::Protobuf::DescriptorPool.generated_pool.lookup("gitaly.ApplyBfgObjectMapRequest").msgclass
-  ApplyBfgObjectMapResponse = Google::Protobuf::DescriptorPool.generated_pool.lookup("gitaly.ApplyBfgObjectMapResponse").msgclass
   ApplyBfgObjectMapStreamRequest = Google::Protobuf::DescriptorPool.generated_pool.lookup("gitaly.ApplyBfgObjectMapStreamRequest").msgclass
   ApplyBfgObjectMapStreamResponse = Google::Protobuf::DescriptorPool.generated_pool.lookup("gitaly.ApplyBfgObjectMapStreamResponse").msgclass
   ApplyBfgObjectMapStreamResponse::Entry = Google::Protobuf::DescriptorPool.generated_pool.lookup("gitaly.ApplyBfgObjectMapStreamResponse.Entry").msgclass
diff --git a/ruby/proto/gitaly/cleanup_services_pb.rb b/ruby/proto/gitaly/cleanup_services_pb.rb
index 1817176ee..201eaea17 100644
--- a/ruby/proto/gitaly/cleanup_services_pb.rb
+++ b/ruby/proto/gitaly/cleanup_services_pb.rb
@@ -14,8 +14,6 @@ module Gitaly
       self.unmarshal_class_method = :decode
       self.service_name = 'gitaly.CleanupService'
 
-      # Deprecated in favour of ApplyBfgObjectMapStream
-      rpc :ApplyBfgObjectMap, stream(ApplyBfgObjectMapRequest), ApplyBfgObjectMapResponse
       rpc :ApplyBfgObjectMapStream, stream(ApplyBfgObjectMapStreamRequest), stream(ApplyBfgObjectMapStreamResponse)
     end