1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
|
package cleanup
import (
"context"
"fmt"
"io"
"strings"
"testing"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
"gitlab.com/gitlab-org/gitaly/internal/git"
"gitlab.com/gitlab-org/gitaly/internal/git/log"
"gitlab.com/gitlab-org/gitaly/internal/gitaly/config"
"gitlab.com/gitlab-org/gitaly/internal/testhelper"
"gitlab.com/gitlab-org/gitaly/proto/go/gitalypb"
"google.golang.org/grpc/codes"
)
func TestApplyBfgObjectMapStreamSuccess(t *testing.T) {
serverSocketPath, stop := runCleanupServiceServer(t, config.Config)
defer 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)
// A known blob: the CHANGELOG in the test repository
blobID := "53855584db773c3df5b5f61f72974cb298822fbb"
// A known tag: v1.0.0
tagID := "f4e6814c3e4e7a0de82a9e7cd20c626cc963a2f8"
// Create some refs pointing to HEAD
for _, ref := range []string{
"refs/environments/1", "refs/keep-around/1", "refs/merge-requests/1", "refs/pipelines/1",
"refs/heads/_keep", "refs/tags/_keep", "refs/notes/_keep",
} {
testhelper.MustRunCommand(t, nil, "git", "-C", testRepoPath, "update-ref", ref, headCommit.Id)
}
// Create some refs pointing to ref/tags/v1.0.0, simulating an unmodified
// commit that predates bad data being added to the repository.
for _, ref := range []string{
"refs/environments/_keep", "refs/keep-around/_keep", "refs/merge-requests/_keep", "refs/pipelines/_keep",
} {
testhelper.MustRunCommand(t, nil, "git", "-C", testRepoPath, "update-ref", ref, tagID)
}
const filterRepoCommitMapHeader = "old new\n"
objectMapData := fmt.Sprintf(
filterRepoCommitMapHeader+strings.Repeat("%s %s\n", 5),
headCommit.Id, git.NullSHA,
git.NullSHA, blobID,
git.NullSHA, tagID,
blobID, git.NullSHA,
tagID, tagID,
)
entries, err := doStreamingRequest(ctx, t, testRepo, client, objectMapData)
require.NoError(t, err)
// Ensure that the internal refs are gone, but the others still exist
refs, err := git.NewRepository(testRepo).GetReferences(ctx, "refs/")
require.NoError(t, err)
refNames := make([]string, len(refs))
for i, branch := range refs {
refNames[i] = branch.Name
}
assert.NotContains(t, refNames, "refs/environments/1")
assert.NotContains(t, refNames, "refs/keep-around/1")
assert.NotContains(t, refNames, "refs/merge-requests/1")
assert.NotContains(t, refNames, "refs/pipelines/1")
assert.Contains(t, refNames, "refs/heads/_keep")
assert.Contains(t, refNames, "refs/tags/_keep")
assert.Contains(t, refNames, "refs/notes/_keep")
assert.Contains(t, refNames, "refs/environments/_keep")
assert.Contains(t, refNames, "refs/keep-around/_keep")
assert.Contains(t, refNames, "refs/merge-requests/_keep")
assert.Contains(t, refNames, "refs/pipelines/_keep")
// Ensure that the returned entry is correct
require.Len(t, entries, 4, "wrong number of entries returned")
requireEntry(t, entries[0], headCommit.Id, git.NullSHA, gitalypb.ObjectType_COMMIT)
requireEntry(t, entries[1], git.NullSHA, blobID, gitalypb.ObjectType_BLOB)
requireEntry(t, entries[2], git.NullSHA, tagID, gitalypb.ObjectType_TAG)
requireEntry(t, entries[3], blobID, git.NullSHA, gitalypb.ObjectType_UNKNOWN)
}
func requireEntry(t *testing.T, entry *gitalypb.ApplyBfgObjectMapStreamResponse_Entry, oldOid, newOid string, objectType gitalypb.ObjectType) {
require.Equal(t, objectType, entry.Type)
require.Equal(t, oldOid, entry.OldOid)
require.Equal(t, newOid, entry.NewOid)
}
func TestApplyBfgObjectMapStreamFailsOnInvalidInput(t *testing.T) {
serverSocketPath, stop := runCleanupServiceServer(t, config.Config)
defer stop()
client, conn := newCleanupServiceClient(t, serverSocketPath)
defer conn.Close()
testRepo, _, cleanupFn := testhelper.NewTestRepo(t)
defer cleanupFn()
ctx, cancel := testhelper.Context()
defer cancel()
entries, err := doStreamingRequest(ctx, t, testRepo, client, "invalid-data here as you can see")
require.Empty(t, entries)
testhelper.RequireGrpcError(t, err, codes.InvalidArgument)
}
func doStreamingRequest(ctx context.Context, t *testing.T, repo *gitalypb.Repository, client gitalypb.CleanupServiceClient, objectMap string) ([]*gitalypb.ApplyBfgObjectMapStreamResponse_Entry, error) {
// Split the data across multiple requests
parts := strings.SplitN(objectMap, " ", 2)
req1 := &gitalypb.ApplyBfgObjectMapStreamRequest{
Repository: repo,
ObjectMap: []byte(parts[0] + " "),
}
req2 := &gitalypb.ApplyBfgObjectMapStreamRequest{ObjectMap: []byte(parts[1])}
server, err := client.ApplyBfgObjectMapStream(ctx)
require.NoError(t, err)
require.NoError(t, server.Send(req1))
require.NoError(t, server.Send(req2))
require.NoError(t, server.CloseSend())
// receive all responses in a loop
var entries []*gitalypb.ApplyBfgObjectMapStreamResponse_Entry
for {
rsp, err := server.Recv()
if rsp != nil {
entries = append(entries, rsp.GetEntries()...)
}
if err == io.EOF {
break
}
if err != nil {
return nil, err
}
}
return entries, nil
}
|
