diff options
| -rw-r--r-- | internal/gitaly/service/blob/lfs_pointers.go | 38 | ||||
| -rw-r--r-- | internal/gitaly/service/blob/lfs_pointers_test.go | 116 | ||||
| -rw-r--r-- | internal/praefect/protoregistry/protoregistry_test.go | 7 | ||||
| -rw-r--r-- | proto/blob.proto | 28 | ||||
| -rw-r--r-- | proto/go/gitalypb/blob.pb.go | 261 | ||||
| -rw-r--r-- | ruby/proto/gitaly/blob_pb.rb | 8 | ||||
| -rw-r--r-- | ruby/proto/gitaly/blob_services_pb.rb | 9 |
7 files changed, 58 insertions, 409 deletions
diff --git a/internal/gitaly/service/blob/lfs_pointers.go b/internal/gitaly/service/blob/lfs_pointers.go index 7db007fdf..9a0736695 100644 --- a/internal/gitaly/service/blob/lfs_pointers.go +++ b/internal/gitaly/service/blob/lfs_pointers.go @@ -147,44 +147,6 @@ func validateGetLFSPointersRequest(req *gitalypb.GetLFSPointersRequest) error { return nil } -// GetAllLFSPointers returns all LFS pointers of the git repository which are reachable by any git -// reference. LFS pointers are streamed back in batches of lfsPointerSliceSize. -func (s *server) GetAllLFSPointers(in *gitalypb.GetAllLFSPointersRequest, stream gitalypb.BlobService_GetAllLFSPointersServer) error { - ctx := stream.Context() - - if err := validateGetAllLFSPointersRequest(in); err != nil { - return status.Errorf(codes.InvalidArgument, "GetAllLFSPointers: %v", err) - } - - repo := localrepo.New(s.gitCmdFactory, in.Repository, s.cfg) - - lfsPointers, err := findLFSPointersByRevisions(ctx, repo, s.gitCmdFactory, 0, "--all") - if err != nil { - if errors.Is(err, errInvalidRevision) { - return status.Errorf(codes.InvalidArgument, err.Error()) - } - return err - } - - err = sliceLFSPointers(lfsPointers, func(slice []*gitalypb.LFSPointer) error { - return stream.Send(&gitalypb.GetAllLFSPointersResponse{ - LfsPointers: slice, - }) - }) - if err != nil { - return err - } - - return nil -} - -func validateGetAllLFSPointersRequest(in *gitalypb.GetAllLFSPointersRequest) error { - if in.GetRepository() == nil { - return fmt.Errorf("empty Repository") - } - return nil -} - // findLFSPointersByRevisions will return all LFS objects reachable via the given set of revisions. // Revisions accept all syntax supported by git-rev-list(1). func findLFSPointersByRevisions( diff --git a/internal/gitaly/service/blob/lfs_pointers_test.go b/internal/gitaly/service/blob/lfs_pointers_test.go index 1bc050f8c..213a75bd0 100644 --- a/internal/gitaly/service/blob/lfs_pointers_test.go +++ b/internal/gitaly/service/blob/lfs_pointers_test.go @@ -375,122 +375,6 @@ func TestFailedGetLFSPointersRequestDueToValidations(t *testing.T) { } } -func TestSuccessfulGetAllLFSPointersRequest(t *testing.T) { - _, repo, _, client := setup(t) - - ctx, cancel := testhelper.Context() - defer cancel() - - request := &gitalypb.GetAllLFSPointersRequest{ - Repository: repo, - } - - expectedLFSPointers := []*gitalypb.LFSPointer{ - lfsPointers[lfsPointer1], - lfsPointers[lfsPointer2], - lfsPointers[lfsPointer3], - lfsPointers[lfsPointer4], - lfsPointers[lfsPointer5], - lfsPointers[lfsPointer6], - } - - c, err := client.GetAllLFSPointers(ctx, request) - require.NoError(t, err) - - require.ElementsMatch(t, expectedLFSPointers, getAllPointers(t, c)) -} - -func getAllPointers(t *testing.T, c gitalypb.BlobService_GetAllLFSPointersClient) []*gitalypb.LFSPointer { - var receivedLFSPointers []*gitalypb.LFSPointer - for { - resp, err := c.Recv() - if err == io.EOF { - break - } - require.NoError(t, err) - - receivedLFSPointers = append(receivedLFSPointers, resp.GetLfsPointers()...) - } - - return receivedLFSPointers -} - -func TestFailedGetAllLFSPointersRequestDueToValidations(t *testing.T) { - _, _, _, client := setup(t) - - ctx, cancel := testhelper.Context() - defer cancel() - - testCases := []struct { - desc string - repository *gitalypb.Repository - }{ - { - desc: "empty Repository", - repository: nil, - }, - } - - for _, tc := range testCases { - t.Run(tc.desc, func(t *testing.T) { - request := &gitalypb.GetAllLFSPointersRequest{ - Repository: tc.repository, - } - - c, err := client.GetAllLFSPointers(ctx, request) - require.NoError(t, err) - - err = drainAllPointers(c) - testhelper.RequireGrpcError(t, err, codes.InvalidArgument) - require.Contains(t, err.Error(), tc.desc) - }) - } -} - -func drainAllPointers(c gitalypb.BlobService_GetAllLFSPointersClient) error { - for { - _, err := c.Recv() - if err != nil { - return err - } - } -} - -// TestGetAllLFSPointersVerifyScope verifies that this RPC returns all LFS -// pointers in a repository, not only ones reachable from the default branch -func TestGetAllLFSPointersVerifyScope(t *testing.T) { - _, repo, repoPath, client := setup(t) - - ctx, cancel := testhelper.Context() - defer cancel() - - request := &gitalypb.GetAllLFSPointersRequest{ - Repository: repo, - } - - c, err := client.GetAllLFSPointers(ctx, request) - require.NoError(t, err) - - lfsPtr := lfsPointers[lfsPointer2] - - // the LFS pointer is reachable from a non-default branch: - require.True(t, refHasPtr(t, repoPath, "moar-lfs-ptrs", lfsPtr)) - - // the same pointer is not reachable from a default branch - require.False(t, refHasPtr(t, repoPath, "master", lfsPtr)) - - require.Contains(t, getAllPointers(t, c), lfsPtr, - "RPC should return all LFS pointers, not just ones in the default branch") -} - -// refHasPtr verifies the provided ref has connectivity to the LFS pointer -func refHasPtr(t *testing.T, repoPath, ref string, lfsPtr *gitalypb.LFSPointer) bool { - objects := string(testhelper.MustRunCommand(t, nil, - "git", "-C", repoPath, "rev-list", "--objects", ref)) - - return strings.Contains(objects, lfsPtr.Oid) -} - func TestFindLFSPointersByRevisions(t *testing.T) { cfg := testcfg.Build(t) diff --git a/internal/praefect/protoregistry/protoregistry_test.go b/internal/praefect/protoregistry/protoregistry_test.go index 4b6052187..60078bd13 100644 --- a/internal/praefect/protoregistry/protoregistry_test.go +++ b/internal/praefect/protoregistry/protoregistry_test.go @@ -16,10 +16,9 @@ func TestNewProtoRegistry(t *testing.T) { expectedResults := map[string]map[string]protoregistry.OpType{ "BlobService": map[string]protoregistry.OpType{ - "GetBlob": protoregistry.OpAccessor, - "GetBlobs": protoregistry.OpAccessor, - "GetLFSPointers": protoregistry.OpAccessor, - "GetAllLFSPointers": protoregistry.OpAccessor, + "GetBlob": protoregistry.OpAccessor, + "GetBlobs": protoregistry.OpAccessor, + "GetLFSPointers": protoregistry.OpAccessor, }, "CleanupService": map[string]protoregistry.OpType{ "ApplyBfgObjectMapStream": protoregistry.OpMutator, diff --git a/proto/blob.proto b/proto/blob.proto index 68a804a87..671a03b93 100644 --- a/proto/blob.proto +++ b/proto/blob.proto @@ -33,15 +33,6 @@ service BlobService { }; } - // GetAllLFSPointers retrieves all LFS pointers of the given repository. - // - // Deprecated in favor of `ListLFSPointers`, passing `--all` as revision. - rpc GetAllLFSPointers(GetAllLFSPointersRequest) returns (stream GetAllLFSPointersResponse) { - option (op_type) = { - op: ACCESSOR - }; - } - // ListLFSPointers retrieves LFS pointers reachable from a given set of // revisions by doing a graph walk. This includes both normal revisions like // an object ID or branch, but also the pseudo-revisions "--all" and "--not" @@ -54,9 +45,8 @@ service BlobService { }; } - // ListAllLFSPointers retrieves all LFS pointers in the repository. In - // contrast to `GetAllLFSPointers`, this RPC also includes LFS pointers which - // are not reachable by any reference. + // ListAllLFSPointers retrieves all LFS pointers in the repository, including + // those not reachable by any reference. rpc ListAllLFSPointers(ListAllLFSPointersRequest) returns (stream ListAllLFSPointersResponse) { option (op_type) = { op: ACCESSOR @@ -145,20 +135,6 @@ message GetLFSPointersResponse { repeated LFSPointer lfs_pointers = 1; } -// GetAllLFSPointersRequest is a request for the GetAllLFSPointers RPC. -message GetAllLFSPointersRequest { - // Repository is the repository for which LFS pointers shoul be retrieved - // from. - Repository repository = 1[(target_repository)=true]; - reserved 2; -} - -// GetAllLFSPointersResponse is a response for the GetAllLFSPointers RPC. -message GetAllLFSPointersResponse { - // LfsPointers is the list of LFS pointers. - repeated LFSPointer lfs_pointers = 1; -} - // ListLFSPointersRequest is a request for the ListLFSPointers RPC. message ListLFSPointersRequest { // Repository is the repository for which LFS pointers should be retrieved diff --git a/proto/go/gitalypb/blob.pb.go b/proto/go/gitalypb/blob.pb.go index 1c11ba06f..81c5f8499 100644 --- a/proto/go/gitalypb/blob.pb.go +++ b/proto/go/gitalypb/blob.pb.go @@ -550,89 +550,6 @@ func (m *GetLFSPointersResponse) GetLfsPointers() []*LFSPointer { return nil } -// GetAllLFSPointersRequest is a request for the GetAllLFSPointers RPC. -type GetAllLFSPointersRequest struct { - // Repository is the repository for which LFS pointers shoul be retrieved - // from. - Repository *Repository `protobuf:"bytes,1,opt,name=repository,proto3" json:"repository,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` -} - -func (m *GetAllLFSPointersRequest) Reset() { *m = GetAllLFSPointersRequest{} } -func (m *GetAllLFSPointersRequest) String() string { return proto.CompactTextString(m) } -func (*GetAllLFSPointersRequest) ProtoMessage() {} -func (*GetAllLFSPointersRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_6903d1e8a20272e8, []int{8} -} - -func (m *GetAllLFSPointersRequest) XXX_Unmarshal(b []byte) error { - return xxx_messageInfo_GetAllLFSPointersRequest.Unmarshal(m, b) -} -func (m *GetAllLFSPointersRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - return xxx_messageInfo_GetAllLFSPointersRequest.Marshal(b, m, deterministic) -} -func (m *GetAllLFSPointersRequest) XXX_Merge(src proto.Message) { - xxx_messageInfo_GetAllLFSPointersRequest.Merge(m, src) -} -func (m *GetAllLFSPointersRequest) XXX_Size() int { - return xxx_messageInfo_GetAllLFSPointersRequest.Size(m) -} -func (m *GetAllLFSPointersRequest) XXX_DiscardUnknown() { - xxx_messageInfo_GetAllLFSPointersRequest.DiscardUnknown(m) -} - -var xxx_messageInfo_GetAllLFSPointersRequest proto.InternalMessageInfo - -func (m *GetAllLFSPointersRequest) GetRepository() *Repository { - if m != nil { - return m.Repository - } - return nil -} - -// GetAllLFSPointersResponse is a response for the GetAllLFSPointers RPC. -type GetAllLFSPointersResponse struct { - // LfsPointers is the list of LFS pointers. - LfsPointers []*LFSPointer `protobuf:"bytes,1,rep,name=lfs_pointers,json=lfsPointers,proto3" json:"lfs_pointers,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` -} - -func (m *GetAllLFSPointersResponse) Reset() { *m = GetAllLFSPointersResponse{} } -func (m *GetAllLFSPointersResponse) String() string { return proto.CompactTextString(m) } -func (*GetAllLFSPointersResponse) ProtoMessage() {} -func (*GetAllLFSPointersResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_6903d1e8a20272e8, []int{9} -} - -func (m *GetAllLFSPointersResponse) XXX_Unmarshal(b []byte) error { - return xxx_messageInfo_GetAllLFSPointersResponse.Unmarshal(m, b) -} -func (m *GetAllLFSPointersResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - return xxx_messageInfo_GetAllLFSPointersResponse.Marshal(b, m, deterministic) -} -func (m *GetAllLFSPointersResponse) XXX_Merge(src proto.Message) { - xxx_messageInfo_GetAllLFSPointersResponse.Merge(m, src) -} -func (m *GetAllLFSPointersResponse) XXX_Size() int { - return xxx_messageInfo_GetAllLFSPointersResponse.Size(m) -} -func (m *GetAllLFSPointersResponse) XXX_DiscardUnknown() { - xxx_messageInfo_GetAllLFSPointersResponse.DiscardUnknown(m) -} - -var xxx_messageInfo_GetAllLFSPointersResponse proto.InternalMessageInfo - -func (m *GetAllLFSPointersResponse) GetLfsPointers() []*LFSPointer { - if m != nil { - return m.LfsPointers - } - return nil -} - // ListLFSPointersRequest is a request for the ListLFSPointers RPC. type ListLFSPointersRequest struct { // Repository is the repository for which LFS pointers should be retrieved @@ -652,7 +569,7 @@ func (m *ListLFSPointersRequest) Reset() { *m = ListLFSPointersRequest{} func (m *ListLFSPointersRequest) String() string { return proto.CompactTextString(m) } func (*ListLFSPointersRequest) ProtoMessage() {} func (*ListLFSPointersRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_6903d1e8a20272e8, []int{10} + return fileDescriptor_6903d1e8a20272e8, []int{8} } func (m *ListLFSPointersRequest) XXX_Unmarshal(b []byte) error { @@ -707,7 +624,7 @@ func (m *ListLFSPointersResponse) Reset() { *m = ListLFSPointersResponse func (m *ListLFSPointersResponse) String() string { return proto.CompactTextString(m) } func (*ListLFSPointersResponse) ProtoMessage() {} func (*ListLFSPointersResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_6903d1e8a20272e8, []int{11} + return fileDescriptor_6903d1e8a20272e8, []int{9} } func (m *ListLFSPointersResponse) XXX_Unmarshal(b []byte) error { @@ -751,7 +668,7 @@ func (m *ListAllLFSPointersRequest) Reset() { *m = ListAllLFSPointersReq func (m *ListAllLFSPointersRequest) String() string { return proto.CompactTextString(m) } func (*ListAllLFSPointersRequest) ProtoMessage() {} func (*ListAllLFSPointersRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_6903d1e8a20272e8, []int{12} + return fileDescriptor_6903d1e8a20272e8, []int{10} } func (m *ListAllLFSPointersRequest) XXX_Unmarshal(b []byte) error { @@ -799,7 +716,7 @@ func (m *ListAllLFSPointersResponse) Reset() { *m = ListAllLFSPointersRe func (m *ListAllLFSPointersResponse) String() string { return proto.CompactTextString(m) } func (*ListAllLFSPointersResponse) ProtoMessage() {} func (*ListAllLFSPointersResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_6903d1e8a20272e8, []int{13} + return fileDescriptor_6903d1e8a20272e8, []int{11} } func (m *ListAllLFSPointersResponse) XXX_Unmarshal(b []byte) error { @@ -837,8 +754,6 @@ func init() { proto.RegisterType((*NewBlobObject)(nil), "gitaly.NewBlobObject") proto.RegisterType((*GetLFSPointersRequest)(nil), "gitaly.GetLFSPointersRequest") proto.RegisterType((*GetLFSPointersResponse)(nil), "gitaly.GetLFSPointersResponse") - proto.RegisterType((*GetAllLFSPointersRequest)(nil), "gitaly.GetAllLFSPointersRequest") - proto.RegisterType((*GetAllLFSPointersResponse)(nil), "gitaly.GetAllLFSPointersResponse") proto.RegisterType((*ListLFSPointersRequest)(nil), "gitaly.ListLFSPointersRequest") proto.RegisterType((*ListLFSPointersResponse)(nil), "gitaly.ListLFSPointersResponse") proto.RegisterType((*ListAllLFSPointersRequest)(nil), "gitaly.ListAllLFSPointersRequest") @@ -848,50 +763,47 @@ func init() { func init() { proto.RegisterFile("blob.proto", fileDescriptor_6903d1e8a20272e8) } var fileDescriptor_6903d1e8a20272e8 = []byte{ - // 678 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x56, 0xcd, 0x6e, 0xd3, 0x40, - 0x10, 0xd6, 0xc6, 0x49, 0xea, 0x4c, 0xd2, 0x1f, 0x56, 0xd0, 0xba, 0x16, 0x3f, 0xae, 0x85, 0x90, - 0x0f, 0x90, 0x54, 0x45, 0x48, 0x9c, 0x90, 0xa8, 0x50, 0xa3, 0xd2, 0x8a, 0x56, 0x1b, 0x2e, 0x54, - 0x48, 0x91, 0x5d, 0x6f, 0xdb, 0x05, 0x27, 0x6b, 0xbc, 0x9b, 0xa2, 0xf0, 0x00, 0xbc, 0x02, 0x1c, - 0x79, 0x1a, 0x5e, 0x82, 0x77, 0xe0, 0x01, 0x38, 0xa1, 0xb5, 0x63, 0xc7, 0x8d, 0x9d, 0x5e, 0x92, - 0xdb, 0xcc, 0xec, 0xce, 0xf7, 0x7d, 0x33, 0x3b, 0xbb, 0x36, 0x80, 0x17, 0x70, 0xaf, 0x1d, 0x46, - 0x5c, 0x72, 0x5c, 0xbf, 0x64, 0xd2, 0x0d, 0xc6, 0x26, 0x04, 0x6c, 0x28, 0x93, 0x98, 0xd9, 0x12, - 0x57, 0x6e, 0x44, 0xfd, 0xc4, 0xb3, 0x23, 0x58, 0xeb, 0x52, 0xb9, 0x1f, 0x70, 0x8f, 0xd0, 0x2f, - 0x23, 0x2a, 0x24, 0x7e, 0x09, 0x10, 0xd1, 0x90, 0x0b, 0x26, 0x79, 0x34, 0x36, 0x90, 0x85, 0x9c, - 0xe6, 0x1e, 0x6e, 0x27, 0x40, 0x6d, 0x92, 0xad, 0xec, 0x57, 0x7f, 0xfe, 0x7e, 0x8a, 0x48, 0x6e, - 0x2f, 0xde, 0x00, 0x8d, 0x33, 0xdf, 0xa8, 0x58, 0xc8, 0x69, 0x10, 0x65, 0xe2, 0xbb, 0x50, 0x0b, - 0xd8, 0x80, 0x49, 0x43, 0xb3, 0x90, 0xa3, 0x91, 0xc4, 0xb1, 0x8f, 0x60, 0x3d, 0xe3, 0x14, 0x21, - 0x1f, 0x0a, 0x8a, 0x31, 0x54, 0x05, 0xfb, 0x46, 0x63, 0x3a, 0x8d, 0xc4, 0xb6, 0x8a, 0xf9, 0xae, - 0x74, 0x63, 0xbc, 0x16, 0x89, 0xed, 0x94, 0x42, 0xcb, 0x28, 0xec, 0xbf, 0x28, 0x43, 0x13, 0x8b, - 0x97, 0x70, 0x04, 0x6b, 0x11, 0xbd, 0x66, 0x82, 0xf1, 0x61, 0x3f, 0x74, 0xe5, 0x95, 0x30, 0x2a, - 0x96, 0xe6, 0x34, 0xf7, 0x1e, 0xa7, 0xd9, 0x33, 0x54, 0x6d, 0x32, 0xd9, 0x7d, 0xea, 0xca, 0x2b, - 0xb2, 0x1a, 0xe5, 0x3c, 0x51, 0x5e, 0xbd, 0xf9, 0x0a, 0x5a, 0xf9, 0x24, 0x6c, 0x82, 0x9e, 0xa6, - 0xc5, 0x52, 0x1b, 0x24, 0xf3, 0x55, 0x0b, 0x94, 0x8a, 0xb4, 0x05, 0xca, 0xb6, 0xff, 0x20, 0xd8, - 0x98, 0xaa, 0x58, 0xb4, 0x7f, 0x78, 0x07, 0x5a, 0x4c, 0xf4, 0xc5, 0xc8, 0x1b, 0x70, 0x7f, 0x14, - 0x50, 0xa3, 0x6a, 0x21, 0x47, 0x27, 0x4d, 0x26, 0x7a, 0x69, 0x48, 0x01, 0x0d, 0xb8, 0x4f, 0x8d, - 0x9a, 0x85, 0x9c, 0x1a, 0x89, 0xed, 0x1b, 0xaa, 0xeb, 0x73, 0x54, 0xaf, 0x4c, 0x55, 0xe3, 0x27, - 0x50, 0x95, 0xe3, 0x90, 0x1a, 0xba, 0x85, 0x9c, 0xb5, 0xe9, 0x61, 0x9c, 0x78, 0x9f, 0xe8, 0xb9, - 0x7c, 0x3f, 0x0e, 0x29, 0x89, 0xd7, 0xed, 0x03, 0x80, 0xe3, 0x83, 0xde, 0x29, 0x67, 0x43, 0x49, - 0xa3, 0x05, 0xc6, 0xe2, 0x10, 0x56, 0xdf, 0xd1, 0xaf, 0xaa, 0x49, 0x09, 0x45, 0x29, 0x54, 0x71, - 0x60, 0x53, 0xe9, 0x5a, 0xae, 0xe1, 0x01, 0xdc, 0xeb, 0x52, 0x39, 0x55, 0xb5, 0x84, 0x31, 0xdb, - 0x06, 0x5d, 0xdd, 0xd2, 0x3e, 0xf3, 0x93, 0x01, 0x6b, 0x90, 0x15, 0xe5, 0x1f, 0xfa, 0xc2, 0x3e, - 0x81, 0xcd, 0x59, 0xb6, 0xc9, 0x19, 0xbf, 0x80, 0x56, 0x70, 0x21, 0xfa, 0xe1, 0x24, 0x6e, 0xa0, - 0x78, 0x32, 0x33, 0xc2, 0x69, 0x0a, 0x69, 0x06, 0x17, 0x22, 0x4d, 0xb7, 0xcf, 0xc0, 0xe8, 0x52, - 0xf9, 0x3a, 0x08, 0x96, 0x59, 0xc1, 0xdb, 0xaa, 0x5e, 0xd9, 0xd0, 0x6c, 0x02, 0xdb, 0x25, 0xd8, - 0x8b, 0xe9, 0xfd, 0x8e, 0x60, 0xf3, 0x98, 0x89, 0xe5, 0x36, 0xfc, 0x3e, 0x34, 0xd2, 0xf1, 0x4c, - 0x3b, 0x3e, 0x0d, 0xdc, 0xbc, 0xa8, 0xb5, 0xf4, 0x99, 0x3a, 0x85, 0xad, 0x82, 0x8e, 0xc5, 0x4a, - 0xfb, 0x0c, 0xdb, 0x0a, 0x71, 0xc9, 0x67, 0x31, 0x47, 0x7e, 0x0f, 0xcc, 0x32, 0xb2, 0x85, 0x2a, - 0xd8, 0xfb, 0x55, 0x85, 0xa6, 0xba, 0x54, 0x3d, 0x1a, 0x5d, 0xb3, 0x73, 0x8a, 0xdf, 0xc0, 0xca, - 0xe4, 0x2d, 0xc2, 0x9b, 0x33, 0x4f, 0xe4, 0xa4, 0x2e, 0x73, 0xab, 0x10, 0x4f, 0x24, 0xd8, 0xf5, - 0x7f, 0x3f, 0x9c, 0x8a, 0x5e, 0xd9, 0x45, 0xb8, 0x0b, 0x7a, 0xfa, 0xa2, 0xe1, 0xad, 0x39, 0x2f, - 0xad, 0x69, 0x14, 0x17, 0x0a, 0x40, 0x1f, 0xe2, 0xaf, 0x59, 0xae, 0x5e, 0xfc, 0x20, 0x97, 0x55, - 0x6c, 0xba, 0xf9, 0x70, 0xde, 0x72, 0x01, 0xda, 0x83, 0x3b, 0x85, 0x51, 0xc7, 0x56, 0x2e, 0xbd, - 0xf4, 0x54, 0xcd, 0x9d, 0x5b, 0x76, 0x14, 0x38, 0x3e, 0xc2, 0xfa, 0xcc, 0xc4, 0xe1, 0x4c, 0x60, - 0xf9, 0x95, 0x30, 0x1f, 0xcd, 0x5d, 0x2f, 0xa0, 0x53, 0xc0, 0xc5, 0x81, 0xc0, 0x3b, 0x79, 0x80, - 0xf2, 0x1a, 0xec, 0xdb, 0xb6, 0xcc, 0xd2, 0xec, 0xef, 0x9e, 0xa9, 0xed, 0x81, 0xeb, 0xb5, 0xcf, - 0xf9, 0xa0, 0x93, 0x98, 0xcf, 0x78, 0x74, 0xd9, 0x49, 0x40, 0x3a, 0xf1, 0x7f, 0x47, 0xe7, 0x92, - 0x4f, 0xfc, 0xd0, 0xf3, 0xea, 0x71, 0xe8, 0xf9, 0xff, 0x00, 0x00, 0x00, 0xff, 0xff, 0x47, 0x40, - 0xce, 0xf3, 0xba, 0x08, 0x00, 0x00, + // 639 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x55, 0xcb, 0x6e, 0xd3, 0x40, + 0x14, 0xd5, 0xc4, 0x49, 0x9a, 0xdc, 0xa4, 0x0f, 0x8d, 0xa0, 0x75, 0x2d, 0x1e, 0xae, 0x85, 0x90, + 0x17, 0x90, 0x54, 0x45, 0x48, 0xac, 0x90, 0xa8, 0x50, 0xab, 0xaa, 0x15, 0xad, 0x26, 0x6c, 0x40, + 0x48, 0x91, 0x5d, 0x4f, 0xdb, 0x81, 0x49, 0xc6, 0x78, 0xa6, 0x45, 0xe1, 0x03, 0xf8, 0x05, 0xf8, + 0x18, 0xd6, 0xfc, 0x04, 0xff, 0xc0, 0x07, 0xb0, 0x42, 0x63, 0xc7, 0x8f, 0xc6, 0x0e, 0x9b, 0x64, + 0x77, 0x1f, 0x73, 0xcf, 0x3d, 0xf7, 0xce, 0xf1, 0x18, 0xc0, 0xe7, 0xc2, 0xef, 0x85, 0x91, 0x50, + 0x02, 0x37, 0x2f, 0x99, 0xf2, 0xf8, 0xc4, 0x02, 0xce, 0xc6, 0x2a, 0x89, 0x59, 0x5d, 0x79, 0xe5, + 0x45, 0x34, 0x48, 0x3c, 0x27, 0x82, 0xb5, 0x43, 0xaa, 0xf6, 0xb9, 0xf0, 0x09, 0xfd, 0x7c, 0x4d, + 0xa5, 0xc2, 0x2f, 0x00, 0x22, 0x1a, 0x0a, 0xc9, 0x94, 0x88, 0x26, 0x26, 0xb2, 0x91, 0xdb, 0xd9, + 0xc3, 0xbd, 0x04, 0xa8, 0x47, 0xb2, 0xcc, 0x7e, 0xfd, 0xc7, 0xaf, 0x27, 0x88, 0x14, 0xce, 0xe2, + 0x0d, 0x30, 0x04, 0x0b, 0xcc, 0x9a, 0x8d, 0xdc, 0x36, 0xd1, 0x26, 0xbe, 0x03, 0x0d, 0xce, 0x46, + 0x4c, 0x99, 0x86, 0x8d, 0x5c, 0x83, 0x24, 0x8e, 0x73, 0x0c, 0xeb, 0x59, 0x4f, 0x19, 0x8a, 0xb1, + 0xa4, 0x18, 0x43, 0x5d, 0xb2, 0xaf, 0x34, 0x6e, 0x67, 0x90, 0xd8, 0xd6, 0xb1, 0xc0, 0x53, 0x5e, + 0x8c, 0xd7, 0x25, 0xb1, 0x9d, 0xb6, 0x30, 0xb2, 0x16, 0xce, 0x1f, 0x94, 0xa1, 0xc9, 0xc5, 0x47, + 0x38, 0x86, 0xb5, 0x88, 0xde, 0x30, 0xc9, 0xc4, 0x78, 0x18, 0x7a, 0xea, 0x4a, 0x9a, 0x35, 0xdb, + 0x70, 0x3b, 0x7b, 0x8f, 0xd2, 0xea, 0x99, 0x56, 0x3d, 0x32, 0x3d, 0x7d, 0xe6, 0xa9, 0x2b, 0xb2, + 0x1a, 0x15, 0x3c, 0x59, 0x3d, 0xbd, 0xf5, 0x12, 0xba, 0xc5, 0x22, 0x6c, 0x41, 0x2b, 0x2d, 0x8b, + 0xa9, 0xb6, 0x49, 0xe6, 0xeb, 0x15, 0x68, 0x16, 0xe9, 0x0a, 0xb4, 0xed, 0xfc, 0x46, 0xb0, 0x91, + 0xb3, 0x58, 0x74, 0x7f, 0x78, 0x07, 0xba, 0x4c, 0x0e, 0xe5, 0xb5, 0x3f, 0x12, 0xc1, 0x35, 0xa7, + 0x66, 0xdd, 0x46, 0x6e, 0x8b, 0x74, 0x98, 0x1c, 0xa4, 0x21, 0x0d, 0x34, 0x12, 0x01, 0x35, 0x1b, + 0x36, 0x72, 0x1b, 0x24, 0xb6, 0x6f, 0xb1, 0x6e, 0xce, 0x61, 0xbd, 0x92, 0xb3, 0xc6, 0x8f, 0xa1, + 0xae, 0x26, 0x21, 0x35, 0x5b, 0x36, 0x72, 0xd7, 0xf2, 0xcb, 0x38, 0xf5, 0x3f, 0xd2, 0x73, 0xf5, + 0x76, 0x12, 0x52, 0x12, 0xe7, 0x9d, 0x03, 0x80, 0x93, 0x83, 0xc1, 0x99, 0x60, 0x63, 0x45, 0xa3, + 0x05, 0x64, 0x71, 0x04, 0xab, 0x6f, 0xe8, 0x17, 0xbd, 0xa4, 0xa4, 0x45, 0x25, 0x54, 0x59, 0xb0, + 0x29, 0x75, 0xa3, 0xb0, 0x70, 0x0e, 0x77, 0x0f, 0xa9, 0xca, 0x59, 0x2d, 0x41, 0x66, 0xdb, 0xd0, + 0xd2, 0x5f, 0xe9, 0x90, 0x05, 0x89, 0xc0, 0xda, 0x64, 0x45, 0xfb, 0x47, 0x81, 0x74, 0x4e, 0x61, + 0x73, 0xb6, 0xdb, 0xf4, 0x8e, 0x9f, 0x43, 0x97, 0x5f, 0xc8, 0x61, 0x38, 0x8d, 0x9b, 0x28, 0x56, + 0x66, 0xd6, 0x30, 0x2f, 0x21, 0x1d, 0x7e, 0x21, 0xd3, 0x72, 0xe7, 0x1b, 0x82, 0xcd, 0x13, 0x26, + 0x97, 0x3b, 0xc0, 0x3d, 0x68, 0xa7, 0xd7, 0x9d, 0x4e, 0x90, 0x07, 0x6e, 0x0b, 0xbf, 0x91, 0x7e, + 0xf6, 0x67, 0xb0, 0x55, 0xe2, 0xb1, 0xd8, 0x68, 0x9f, 0x60, 0x5b, 0x23, 0xbe, 0xe2, 0x7c, 0xa9, + 0xc3, 0x55, 0xd3, 0x1f, 0x80, 0x55, 0xd5, 0x6c, 0xa1, 0x09, 0xf6, 0x7e, 0x1a, 0xd0, 0xd1, 0x22, + 0x1d, 0xd0, 0xe8, 0x86, 0x9d, 0x53, 0xfc, 0x1a, 0x56, 0xa6, 0xdf, 0x36, 0xde, 0x9c, 0x79, 0x72, + 0xa6, 0x73, 0x59, 0x5b, 0xa5, 0x78, 0x42, 0xc1, 0x69, 0xfe, 0xfd, 0xee, 0xd6, 0x5a, 0xb5, 0x5d, + 0x84, 0x0f, 0xa1, 0x95, 0xbe, 0x10, 0x78, 0x6b, 0xce, 0xcb, 0x65, 0x99, 0xe5, 0x44, 0x09, 0xe8, + 0x5d, 0xfc, 0x77, 0x28, 0xcc, 0x8b, 0xef, 0x17, 0xaa, 0xca, 0x4b, 0xb7, 0x1e, 0xcc, 0x4b, 0x97, + 0xa0, 0x3f, 0xc0, 0xfa, 0x8c, 0x1a, 0x70, 0x56, 0x5c, 0x2d, 0x57, 0xeb, 0xe1, 0xdc, 0x7c, 0x09, + 0x9d, 0x02, 0x2e, 0x5f, 0x16, 0xde, 0x29, 0x02, 0x54, 0xaa, 0xc6, 0x72, 0xfe, 0x77, 0x64, 0xb6, + 0xcd, 0xfe, 0xee, 0x7b, 0x7d, 0x9c, 0x7b, 0x7e, 0xef, 0x5c, 0x8c, 0xfa, 0x89, 0xf9, 0x54, 0x44, + 0x97, 0xfd, 0x04, 0xa4, 0x1f, 0xff, 0x63, 0xfb, 0x97, 0x62, 0xea, 0x87, 0xbe, 0xdf, 0x8c, 0x43, + 0xcf, 0xfe, 0x05, 0x00, 0x00, 0xff, 0xff, 0xcf, 0x77, 0x87, 0x52, 0xa6, 0x07, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. @@ -917,10 +829,6 @@ type BlobServiceClient interface { // // Deprecated in favor of `ListLFSPointers`, passing object IDs as revisions. GetLFSPointers(ctx context.Context, in *GetLFSPointersRequest, opts ...grpc.CallOption) (BlobService_GetLFSPointersClient, error) - // GetAllLFSPointers retrieves all LFS pointers of the given repository. - // - // Deprecated in favor of `ListLFSPointers`, passing `--all` as revision. - GetAllLFSPointers(ctx context.Context, in *GetAllLFSPointersRequest, opts ...grpc.CallOption) (BlobService_GetAllLFSPointersClient, error) // ListLFSPointers retrieves LFS pointers reachable from a given set of // revisions by doing a graph walk. This includes both normal revisions like // an object ID or branch, but also the pseudo-revisions "--all" and "--not" @@ -928,9 +836,8 @@ type BlobServiceClient interface { // transitively reference any LFS pointers are ignored. It is not valid to // pass revisions which do not resolve to an existing object. ListLFSPointers(ctx context.Context, in *ListLFSPointersRequest, opts ...grpc.CallOption) (BlobService_ListLFSPointersClient, error) - // ListAllLFSPointers retrieves all LFS pointers in the repository. In - // contrast to `GetAllLFSPointers`, this RPC also includes LFS pointers which - // are not reachable by any reference. + // ListAllLFSPointers retrieves all LFS pointers in the repository, including + // those not reachable by any reference. ListAllLFSPointers(ctx context.Context, in *ListAllLFSPointersRequest, opts ...grpc.CallOption) (BlobService_ListAllLFSPointersClient, error) } @@ -1038,40 +945,8 @@ func (x *blobServiceGetLFSPointersClient) Recv() (*GetLFSPointersResponse, error return m, nil } -func (c *blobServiceClient) GetAllLFSPointers(ctx context.Context, in *GetAllLFSPointersRequest, opts ...grpc.CallOption) (BlobService_GetAllLFSPointersClient, error) { - stream, err := c.cc.NewStream(ctx, &_BlobService_serviceDesc.Streams[3], "/gitaly.BlobService/GetAllLFSPointers", opts...) - if err != nil { - return nil, err - } - x := &blobServiceGetAllLFSPointersClient{stream} - if err := x.ClientStream.SendMsg(in); err != nil { - return nil, err - } - if err := x.ClientStream.CloseSend(); err != nil { - return nil, err - } - return x, nil -} - -type BlobService_GetAllLFSPointersClient interface { - Recv() (*GetAllLFSPointersResponse, error) - grpc.ClientStream -} - -type blobServiceGetAllLFSPointersClient struct { - grpc.ClientStream -} - -func (x *blobServiceGetAllLFSPointersClient) Recv() (*GetAllLFSPointersResponse, error) { - m := new(GetAllLFSPointersResponse) - if err := x.ClientStream.RecvMsg(m); err != nil { - return nil, err - } - return m, nil -} - func (c *blobServiceClient) ListLFSPointers(ctx context.Context, in *ListLFSPointersRequest, opts ...grpc.CallOption) (BlobService_ListLFSPointersClient, error) { - stream, err := c.cc.NewStream(ctx, &_BlobService_serviceDesc.Streams[4], "/gitaly.BlobService/ListLFSPointers", opts...) + stream, err := c.cc.NewStream(ctx, &_BlobService_serviceDesc.Streams[3], "/gitaly.BlobService/ListLFSPointers", opts...) if err != nil { return nil, err } @@ -1103,7 +978,7 @@ func (x *blobServiceListLFSPointersClient) Recv() (*ListLFSPointersResponse, err } func (c *blobServiceClient) ListAllLFSPointers(ctx context.Context, in *ListAllLFSPointersRequest, opts ...grpc.CallOption) (BlobService_ListAllLFSPointersClient, error) { - stream, err := c.cc.NewStream(ctx, &_BlobService_serviceDesc.Streams[5], "/gitaly.BlobService/ListAllLFSPointers", opts...) + stream, err := c.cc.NewStream(ctx, &_BlobService_serviceDesc.Streams[4], "/gitaly.BlobService/ListAllLFSPointers", opts...) if err != nil { return nil, err } @@ -1147,10 +1022,6 @@ type BlobServiceServer interface { // // Deprecated in favor of `ListLFSPointers`, passing object IDs as revisions. GetLFSPointers(*GetLFSPointersRequest, BlobService_GetLFSPointersServer) error - // GetAllLFSPointers retrieves all LFS pointers of the given repository. - // - // Deprecated in favor of `ListLFSPointers`, passing `--all` as revision. - GetAllLFSPointers(*GetAllLFSPointersRequest, BlobService_GetAllLFSPointersServer) error // ListLFSPointers retrieves LFS pointers reachable from a given set of // revisions by doing a graph walk. This includes both normal revisions like // an object ID or branch, but also the pseudo-revisions "--all" and "--not" @@ -1158,9 +1029,8 @@ type BlobServiceServer interface { // transitively reference any LFS pointers are ignored. It is not valid to // pass revisions which do not resolve to an existing object. ListLFSPointers(*ListLFSPointersRequest, BlobService_ListLFSPointersServer) error - // ListAllLFSPointers retrieves all LFS pointers in the repository. In - // contrast to `GetAllLFSPointers`, this RPC also includes LFS pointers which - // are not reachable by any reference. + // ListAllLFSPointers retrieves all LFS pointers in the repository, including + // those not reachable by any reference. ListAllLFSPointers(*ListAllLFSPointersRequest, BlobService_ListAllLFSPointersServer) error } @@ -1177,9 +1047,6 @@ func (*UnimplementedBlobServiceServer) GetBlobs(req *GetBlobsRequest, srv BlobSe func (*UnimplementedBlobServiceServer) GetLFSPointers(req *GetLFSPointersRequest, srv BlobService_GetLFSPointersServer) error { return status.Errorf(codes.Unimplemented, "method GetLFSPointers not implemented") } -func (*UnimplementedBlobServiceServer) GetAllLFSPointers(req *GetAllLFSPointersRequest, srv BlobService_GetAllLFSPointersServer) error { - return status.Errorf(codes.Unimplemented, "method GetAllLFSPointers not implemented") -} func (*UnimplementedBlobServiceServer) ListLFSPointers(req *ListLFSPointersRequest, srv BlobService_ListLFSPointersServer) error { return status.Errorf(codes.Unimplemented, "method ListLFSPointers not implemented") } @@ -1254,27 +1121,6 @@ func (x *blobServiceGetLFSPointersServer) Send(m *GetLFSPointersResponse) error return x.ServerStream.SendMsg(m) } -func _BlobService_GetAllLFSPointers_Handler(srv interface{}, stream grpc.ServerStream) error { - m := new(GetAllLFSPointersRequest) - if err := stream.RecvMsg(m); err != nil { - return err - } - return srv.(BlobServiceServer).GetAllLFSPointers(m, &blobServiceGetAllLFSPointersServer{stream}) -} - -type BlobService_GetAllLFSPointersServer interface { - Send(*GetAllLFSPointersResponse) error - grpc.ServerStream -} - -type blobServiceGetAllLFSPointersServer struct { - grpc.ServerStream -} - -func (x *blobServiceGetAllLFSPointersServer) Send(m *GetAllLFSPointersResponse) error { - return x.ServerStream.SendMsg(m) -} - func _BlobService_ListLFSPointers_Handler(srv interface{}, stream grpc.ServerStream) error { m := new(ListLFSPointersRequest) if err := stream.RecvMsg(m); err != nil { @@ -1338,11 +1184,6 @@ var _BlobService_serviceDesc = grpc.ServiceDesc{ ServerStreams: true, }, { - StreamName: "GetAllLFSPointers", - Handler: _BlobService_GetAllLFSPointers_Handler, - ServerStreams: true, - }, - { StreamName: "ListLFSPointers", Handler: _BlobService_ListLFSPointers_Handler, ServerStreams: true, diff --git a/ruby/proto/gitaly/blob_pb.rb b/ruby/proto/gitaly/blob_pb.rb index 2924df540..77d5a22f5 100644 --- a/ruby/proto/gitaly/blob_pb.rb +++ b/ruby/proto/gitaly/blob_pb.rb @@ -53,12 +53,6 @@ Google::Protobuf::DescriptorPool.generated_pool.build do add_message "gitaly.GetLFSPointersResponse" do repeated :lfs_pointers, :message, 1, "gitaly.LFSPointer" end - add_message "gitaly.GetAllLFSPointersRequest" do - optional :repository, :message, 1, "gitaly.Repository" - end - add_message "gitaly.GetAllLFSPointersResponse" do - repeated :lfs_pointers, :message, 1, "gitaly.LFSPointer" - end add_message "gitaly.ListLFSPointersRequest" do optional :repository, :message, 1, "gitaly.Repository" repeated :revisions, :string, 2 @@ -87,8 +81,6 @@ module Gitaly NewBlobObject = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("gitaly.NewBlobObject").msgclass GetLFSPointersRequest = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("gitaly.GetLFSPointersRequest").msgclass GetLFSPointersResponse = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("gitaly.GetLFSPointersResponse").msgclass - GetAllLFSPointersRequest = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("gitaly.GetAllLFSPointersRequest").msgclass - GetAllLFSPointersResponse = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("gitaly.GetAllLFSPointersResponse").msgclass ListLFSPointersRequest = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("gitaly.ListLFSPointersRequest").msgclass ListLFSPointersResponse = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("gitaly.ListLFSPointersResponse").msgclass ListAllLFSPointersRequest = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("gitaly.ListAllLFSPointersRequest").msgclass diff --git a/ruby/proto/gitaly/blob_services_pb.rb b/ruby/proto/gitaly/blob_services_pb.rb index 638c961df..f37157b23 100644 --- a/ruby/proto/gitaly/blob_services_pb.rb +++ b/ruby/proto/gitaly/blob_services_pb.rb @@ -25,10 +25,6 @@ module Gitaly # # Deprecated in favor of `ListLFSPointers`, passing object IDs as revisions. rpc :GetLFSPointers, Gitaly::GetLFSPointersRequest, stream(Gitaly::GetLFSPointersResponse) - # GetAllLFSPointers retrieves all LFS pointers of the given repository. - # - # Deprecated in favor of `ListLFSPointers`, passing `--all` as revision. - rpc :GetAllLFSPointers, Gitaly::GetAllLFSPointersRequest, stream(Gitaly::GetAllLFSPointersResponse) # ListLFSPointers retrieves LFS pointers reachable from a given set of # revisions by doing a graph walk. This includes both normal revisions like # an object ID or branch, but also the pseudo-revisions "--all" and "--not" @@ -36,9 +32,8 @@ module Gitaly # transitively reference any LFS pointers are ignored. It is not valid to # pass revisions which do not resolve to an existing object. rpc :ListLFSPointers, Gitaly::ListLFSPointersRequest, stream(Gitaly::ListLFSPointersResponse) - # ListAllLFSPointers retrieves all LFS pointers in the repository. In - # contrast to `GetAllLFSPointers`, this RPC also includes LFS pointers which - # are not reachable by any reference. + # ListAllLFSPointers retrieves all LFS pointers in the repository, including + # those not reachable by any reference. rpc :ListAllLFSPointers, Gitaly::ListAllLFSPointersRequest, stream(Gitaly::ListAllLFSPointersResponse) end |