Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

CBG-4270: Implement sequence-based storage for BlipTesterClient #7226

Merged
merged 19 commits into from
Dec 11, 2024
+1,073 −339
Merged

CBG-4270: Implement sequence-based storage for BlipTesterClient #7226

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
76bde20
Implement sequence-based storage for BlipTesterClient
bbrks Nov 27, 2024
4472b89
Add fixmes for the 3 bad tests
bbrks Dec 3, 2024
bcf6553
remove accidental test change
bbrks Dec 3, 2024
9edddbf
addlicense
bbrks Dec 3, 2024
cd001c3
pull out old comments and unrelated changes
bbrks Dec 3, 2024
e7daf4b
drop more test logging
bbrks Dec 3, 2024
c793b74
drop more test logging
bbrks Dec 3, 2024
6f7be7b
fix lints
bbrks Dec 3, 2024
3e4a8c6
fix race - not using copied seq value
bbrks Dec 4, 2024
4af74d5
Updates based on review/race fixes
bbrks Dec 5, 2024
1098a31
Inherit context, wrap with cancel and pass through to push changes fe…
bbrks Dec 6, 2024
fb9ec09
Since btcc.ctx inherits from rt.Context, don't do an explicit check -…
bbrks Dec 6, 2024
db8eb15
Block Close until the push replicator goroutine has exited
bbrks Dec 6, 2024
5c5a8e0
misspell fix
bbrks Dec 6, 2024
3d7fa53
log around sync cond/locking to diagnose close deadlock
bbrks Dec 6, 2024
1d69d69
Fix Close deadlock and remove associated investigation logging
bbrks Dec 9, 2024
828f25c
Replace test client logging with debug and drop assertions in favour …
bbrks Dec 10, 2024
7f64c4e
Reduce nesting - defer channel close
bbrks Dec 10, 2024
01c1fec
godoc comments
bbrks Dec 10, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 14 additions & 0 deletions base/util.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -851,6 +851,12 @@ func LogLevelPtr(value LogLevel) *LogLevel {
return &value
}

// Ptr returns a pointer to the given literal.
// This is useful for wrapping around function calls that return a value, where you can't just use `&`.
func Ptr[T any](v T) *T {
return &v
}

// StringPtr returns a pointer to the given string literal.
func StringPtr(value string) *string {
return &value
Expand Down Expand Up @@ -889,6 +895,14 @@ func IntPtr(i int) *int {
return &i
}

// IntDefault returns ifNil if i is nil, or else returns dereferenced value of i
func IntDefault(i *int, ifNil int) int {
if i != nil {
return *i
}
return ifNil
}

// BoolPtr returns a pointer to the given bool literal.
func BoolPtr(b bool) *bool {
return &b
Expand Down
9 changes: 5 additions & 4 deletions rest/api_test_helpers.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ type PutDocResponse struct {

// PutNewEditsFalse builds a new_edits=false style put to create a revision with the specified revID.
// If parentRevID is not specified, treated as insert
func (rt *RestTester) PutNewEditsFalse(docID string, newVersion DocVersion, parentVersion DocVersion, bodyString string) DocVersion {
func (rt *RestTester) PutNewEditsFalse(docID string, newVersion DocVersion, parentVersion *DocVersion, bodyString string) *DocVersion {

var body db.Body
marshalErr := base.JSONUnmarshal([]byte(bodyString), &body)
Expand All @@ -55,8 +55,9 @@ func (rt *RestTester) PutNewEditsFalse(docID string, newVersion DocVersion, pare
revisions := make(map[string]interface{})
revisions["start"] = newRevGeneration
ids := []string{newRevDigest}
if parentVersion.RevID != "" {
_, parentDigest := db.ParseRevID(base.TestCtx(rt.TB()), parentVersion.RevID)
if parentVersion != nil {
parentVersionCopy := *parentVersion
_, parentDigest := db.ParseRevID(base.TestCtx(rt.TB()), parentVersionCopy.RevID)
ids = append(ids, parentDigest)
}
revisions["ids"] = ids
Expand All @@ -69,7 +70,7 @@ func (rt *RestTester) PutNewEditsFalse(docID string, newVersion DocVersion, pare

rt.WaitForPendingChanges()

return DocVersionFromPutResponse(rt.TB(), resp)
return base.Ptr(DocVersionFromPutResponse(rt.TB(), resp))
bbrks marked this conversation as resolved.
Show resolved Hide resolved
}

func (rt *RestTester) RequireWaitChanges(numChangesExpected int, since string) ChangesResults {
Expand Down
97 changes: 63 additions & 34 deletions rest/attachment_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -720,7 +720,7 @@ func TestConflictWithInvalidAttachment(t *testing.T) {
require.NoError(t, base.JSONUnmarshal(response.Body.Bytes(), &body))

// Modify Doc
parentRevList := [3]string{"foo3", "foo2", version.Digest()}
parentRevList := [3]string{"foo3", "foo2", version.RevIDDigest()}
body["_rev"] = "3-foo3"
body["rev"] = "3-foo3"
body["_revisions"].(map[string]interface{})["ids"] = parentRevList
Expand Down Expand Up @@ -786,13 +786,13 @@ func TestConflictingBranchAttachments(t *testing.T) {

// //Create diverging tree

reqBodyRev2 := `{"_rev": "2-two", "_revisions": {"ids": ["two", "` + version.Digest() + `"], "start": 2}}`
reqBodyRev2 := `{"_rev": "2-two", "_revisions": {"ids": ["two", "` + version.RevIDDigest() + `"], "start": 2}}`
response := rt.SendAdminRequest("PUT", "/{{.keyspace}}/doc1?new_edits=false", reqBodyRev2)
RequireStatus(t, response, http.StatusCreated)

docVersion2 := DocVersionFromPutResponse(t, response)

reqBodyRev2a := `{"_rev": "2-two", "_revisions": {"ids": ["twoa", "` + version.Digest() + `"], "start": 2}}`
reqBodyRev2a := `{"_rev": "2-two", "_revisions": {"ids": ["twoa", "` + version.RevIDDigest() + `"], "start": 2}}`
response = rt.SendAdminRequest("PUT", "/{{.keyspace}}/doc1?new_edits=false", reqBodyRev2a)
RequireStatus(t, response, http.StatusCreated)
docVersion2a := DocVersionFromPutResponse(t, response)
Expand Down Expand Up @@ -2104,10 +2104,10 @@ func TestAttachmentRemovalWithConflicts(t *testing.T) {
losingVersion3 := rt.UpdateDoc(docID, version, `{"_attachments": {"hello.txt": {"revpos":2,"stub":true,"digest":"sha1-Kq5sNclPz7QV2+lfQIuc6R7oRu0="}}}`)

// Create doc conflicting with previous revid referencing previous attachment too
winningVersion3 := rt.PutNewEditsFalse(docID, NewDocVersionFromFakeRev("3-b"), version, `{"_attachments": {"hello.txt": {"revpos":2,"stub":true,"digest":"sha1-Kq5sNclPz7QV2+lfQIuc6R7oRu0="}}, "Winning Rev": true}`)
winningVersion3 := rt.PutNewEditsFalse(docID, NewDocVersionFromFakeRev("3-b"), &version, `{"_attachments": {"hello.txt": {"revpos":2,"stub":true,"digest":"sha1-Kq5sNclPz7QV2+lfQIuc6R7oRu0="}}, "Winning Rev": true}`)

// Update the winning rev 3 and ensure attachment remains around as the other leaf still references this attachment
finalVersion4 := rt.UpdateDoc(docID, winningVersion3, `{"update": 2}`)
finalVersion4 := rt.UpdateDoc(docID, *winningVersion3, `{"update": 2}`)

type docResp struct {
Attachments db.AttachmentsMeta `json:"_attachments"`
Expand Down Expand Up @@ -2158,7 +2158,7 @@ func TestAttachmentsMissing(t *testing.T) {

version2 := rt.UpdateDoc(docID, version1, `{"_attachments": {"hello.txt": {"revpos":1,"stub":true,"digest":"sha1-Kq5sNclPz7QV2+lfQIuc6R7oRu0="}}, "testval": ["xxx","xxx"]}`)

_ = rt.PutNewEditsFalse(docID, NewDocVersionFromFakeRev("2-b"), version1, `{"_rev": "2-b", "_revisions": {"ids": ["b", "ca9ad22802b66f662ff171f226211d5c"], "start": 2}, "Winning Rev": true}`)
_ = rt.PutNewEditsFalse(docID, NewDocVersionFromFakeRev("2-b"), &version1, `{"_rev": "2-b", "_revisions": {"ids": ["b", "ca9ad22802b66f662ff171f226211d5c"], "start": 2}, "Winning Rev": true}`)

rt.GetDatabase().FlushRevisionCacheForTest()

Expand All @@ -2177,7 +2177,7 @@ func TestAttachmentsMissingNoBody(t *testing.T) {

version2 := rt.UpdateDoc(docID, version1, `{"_attachments": {"hello.txt": {"revpos":1,"stub":true,"digest":"sha1-Kq5sNclPz7QV2+lfQIuc6R7oRu0="}}}`)

_ = rt.PutNewEditsFalse(docID, NewDocVersionFromFakeRev("2-b"), version1, `{}`)
_ = rt.PutNewEditsFalse(docID, NewDocVersionFromFakeRev("2-b"), &version1, `{}`)

rt.GetDatabase().FlushRevisionCacheForTest()

Expand Down Expand Up @@ -2272,38 +2272,41 @@ func TestUpdateExistingAttachment(t *testing.T) {
btc := btcRunner.NewBlipTesterClientOptsWithRT(rt, opts)
defer btc.Close()

btcRunner.StartPull(btc.id)
btcRunner.StartPush(btc.id)

doc1Version := rt.PutDoc(doc1ID, `{}`)
doc2Version := rt.PutDoc(doc2ID, `{}`)

rt.WaitForPendingChanges()
btcRunner.StartOneshotPull(btc.id)

bbrks marked this conversation as resolved.
Show resolved Hide resolved
btcRunner.WaitForVersion(btc.id, doc1ID, doc1Version)
btcRunner.WaitForVersion(btc.id, doc2ID, doc2Version)

attachmentAData := base64.StdEncoding.EncodeToString([]byte("attachmentA"))
attachmentBData := base64.StdEncoding.EncodeToString([]byte("attachmentB"))

doc1Version, err := btcRunner.PushRev(btc.id, doc1ID, doc1Version, []byte(`{"key": "val", "_attachments": {"attachment": {"data": "`+attachmentAData+`"}}}`))
var err error
doc1Version, err = btcRunner.AddRev(btc.id, doc1ID, &doc1Version, []byte(`{"key": "val", "_attachments": {"attachment": {"data": "`+attachmentAData+`"}}}`))
require.NoError(t, err)
doc2Version, err = btcRunner.PushRev(btc.id, doc2ID, doc2Version, []byte(`{"key": "val", "_attachments": {"attachment": {"data": "`+attachmentBData+`"}}}`))
doc2Version, err = btcRunner.AddRev(btc.id, doc2ID, &doc2Version, []byte(`{"key": "val", "_attachments": {"attachment": {"data": "`+attachmentBData+`"}}}`))
require.NoError(t, err)

assert.NoError(t, rt.WaitForVersion(doc1ID, doc1Version))
assert.NoError(t, rt.WaitForVersion(doc2ID, doc2Version))
require.NoError(t, rt.WaitForVersion(doc1ID, doc1Version))
bbrks marked this conversation as resolved.
Show resolved Hide resolved
require.NoError(t, rt.WaitForVersion(doc2ID, doc2Version))

collection, ctx := rt.GetSingleTestDatabaseCollection()
_, err = collection.GetDocument(ctx, "doc1", db.DocUnmarshalAll)
require.NoError(t, err)
_, err = collection.GetDocument(ctx, "doc2", db.DocUnmarshalAll)
require.NoError(t, err)

doc1Version, err = btcRunner.PushRev(btc.id, doc1ID, doc1Version, []byte(`{"key": "val", "_attachments":{"attachment":{"digest":"sha1-SKk0IV40XSHW37d3H0xpv2+z9Ck=","length":11,"content_type":"","stub":true,"revpos":3}}}`))
doc1Version, err = btcRunner.AddRev(btc.id, doc1ID, &doc1Version, []byte(`{"key": "val", "_attachments":{"attachment":{"digest":"sha1-SKk0IV40XSHW37d3H0xpv2+z9Ck=","length":11,"content_type":"","stub":true,"revpos":3}}}`))
require.NoError(t, err)

assert.NoError(t, rt.WaitForVersion(doc1ID, doc1Version))

doc1, err := collection.GetDocument(ctx, "doc1", db.DocUnmarshalAll)
assert.NoError(t, err)
require.NoError(t, err)

assert.Equal(t, "sha1-SKk0IV40XSHW37d3H0xpv2+z9Ck=", doc1.Attachments["attachment"].(map[string]interface{})["digest"])

Expand All @@ -2328,11 +2331,13 @@ func TestPushUnknownAttachmentAsStub(t *testing.T) {
opts := BlipTesterClientOpts{SupportedBLIPProtocols: SupportedBLIPProtocols}
btc := btcRunner.NewBlipTesterClientOptsWithRT(rt, &opts)
defer btc.Close()

btcRunner.StartPull(btc.id)
btcRunner.StartPush(btc.id)

// Add doc1 and doc2
doc1Version := btc.rt.PutDoc(doc1ID, `{}`)

btc.rt.WaitForPendingChanges()
btcRunner.StartOneshotPull(btc.id)

btcRunner.WaitForVersion(btc.id, doc1ID, doc1Version)

Expand All @@ -2343,7 +2348,7 @@ func TestPushUnknownAttachmentAsStub(t *testing.T) {
length, digest, err := btcRunner.saveAttachment(btc.id, contentType, attachmentAData)
require.NoError(t, err)
// Update doc1, include reference to non-existing attachment with recent revpos
doc1Version, err = btcRunner.PushRev(btc.id, doc1ID, doc1Version, []byte(fmt.Sprintf(`{"key": "val", "_attachments":{"attachment":{"digest":"%s","length":%d,"content_type":"%s","stub":true,"revpos":1}}}`, digest, length, contentType)))
doc1Version, err = btcRunner.AddRev(btc.id, doc1ID, &doc1Version, []byte(fmt.Sprintf(`{"key": "val", "_attachments":{"attachment":{"digest":"%s","length":%d,"content_type":"%s","stub":true,"revpos":1}}}`, digest, length, contentType)))
require.NoError(t, err)

require.NoError(t, btc.rt.WaitForVersion(doc1ID, doc1Version))
Expand All @@ -2356,7 +2361,6 @@ func TestPushUnknownAttachmentAsStub(t *testing.T) {
}

func TestMinRevPosWorkToAvoidUnnecessaryProveAttachment(t *testing.T) {
base.SetUpTestLogging(t, base.LevelDebug, base.KeyAll)
rtConfig := &RestTesterConfig{
GuestEnabled: true,
DatabaseConfig: &DatabaseConfig{
Expand All @@ -2376,25 +2380,44 @@ func TestMinRevPosWorkToAvoidUnnecessaryProveAttachment(t *testing.T) {
opts := BlipTesterClientOpts{SupportedBLIPProtocols: SupportedBLIPProtocols}
btc := btcRunner.NewBlipTesterClientOptsWithRT(rt, &opts)
defer btc.Close()
// Push an initial rev with attachment data

btcRunner.StartPull(btc.id)

// Write an initial rev with attachment data
initialVersion := btc.rt.PutDoc(docID, `{"_attachments": {"hello.txt": {"data": "aGVsbG8gd29ybGQ="}}}`)

// Replicate data to client and ensure doc arrives
btc.rt.WaitForPendingChanges()
btcRunner.StartOneshotPull(btc.id)
btcRunner.WaitForVersion(btc.id, docID, initialVersion)

// Push a revision with a bunch of history simulating doc updated on mobile device
// Note this references revpos 1 and therefore SGW has it - Shouldn't need proveAttachment
// Create a set of revisions before we start the replicator to ensure there's a significant amount of history to push
bbrks marked this conversation as resolved.
Show resolved Hide resolved
version := initialVersion
for i := 0; i < 25; i++ {
var err error
version, err = btcRunner.AddRev(btc.id, docID, &version, []byte(`{"update_count":`+strconv.Itoa(i)+`,"_attachments": {"hello.txt": {"revpos":1,"stub":true,"digest":"sha1-Kq5sNclPz7QV2+lfQIuc6R7oRu0="}}}`))
require.NoError(t, err)
}

// Note this references revpos 1 and therefore SGW has it - Shouldn't need proveAttachment, even when we replicate it
proveAttachmentBefore := btc.pushReplication.replicationStats.ProveAttachment.Value()
revid, err := btcRunner.PushRevWithHistory(btc.id, docID, initialVersion.RevID, []byte(`{"_attachments": {"hello.txt": {"revpos":1,"stub":true,"digest":"sha1-Kq5sNclPz7QV2+lfQIuc6R7oRu0="}}}`), 25, 5)
assert.NoError(t, err)
btcRunner.StartPushWithOpts(btc.id, BlipTesterPushOptions{Continuous: false})
require.NoError(t, rt.WaitForVersion(docID, version))

proveAttachmentAfter := btc.pushReplication.replicationStats.ProveAttachment.Value()
assert.Equal(t, proveAttachmentBefore, proveAttachmentAfter)

// Push another bunch of history
_, err = btcRunner.PushRevWithHistory(btc.id, docID, revid, []byte(`{"_attachments": {"hello.txt": {"revpos":1,"stub":true,"digest":"sha1-Kq5sNclPz7QV2+lfQIuc6R7oRu0="}}}`), 25, 5)
assert.NoError(t, err)
// start another push to run in the background from where we last left off
latestSeq := btcRunner.SingleCollection(btc.id).lastSeq()
btcRunner.StartPushWithOpts(btc.id, BlipTesterPushOptions{Continuous: true, Since: strconv.Itoa(int(latestSeq))})

// Push another bunch of history, this time whilst a replicator is actively pushing them
for i := 25; i < 50; i++ {
var err error
version, err = btcRunner.AddRev(btc.id, docID, &version, []byte(`{"update_count":`+strconv.Itoa(i)+`,"_attachments": {"hello.txt": {"revpos":1,"stub":true,"digest":"sha1-Kq5sNclPz7QV2+lfQIuc6R7oRu0="}}}`))
require.NoError(t, err)
}

require.NoError(t, rt.WaitForVersion(docID, version))
proveAttachmentAfter = btc.pushReplication.replicationStats.ProveAttachment.Value()
assert.Equal(t, proveAttachmentBefore, proveAttachmentAfter)
})
Expand Down Expand Up @@ -2430,7 +2453,7 @@ func TestAttachmentWithErroneousRevPos(t *testing.T) {
btcRunner.AttachmentsLock(btc.id).Unlock()

// Put doc with an erroneous revpos 1 but with a different digest, referring to the above attachment
_, err := btcRunner.PushRevWithHistory(btc.id, docID, version.RevID, []byte(`{"_attachments": {"hello.txt": {"revpos":1,"stub":true,"length": 19,"digest":"sha1-l+N7VpXGnoxMm8xfvtWPbz2YvDc="}}}`), 1, 0)
_, err := btcRunner.PushRevWithHistory(btc.id, docID, &version, []byte(`{"_attachments": {"hello.txt": {"revpos":1,"stub":true,"length": 19,"digest":"sha1-l+N7VpXGnoxMm8xfvtWPbz2YvDc="}}}`), 1, 0)
require.NoError(t, err)

// Ensure message and attachment is pushed up
Expand Down Expand Up @@ -2605,12 +2628,14 @@ func TestCBLRevposHandling(t *testing.T) {
btcRunner.WaitForVersion(btc.id, doc1ID, doc1Version)
btcRunner.WaitForVersion(btc.id, doc2ID, doc2Version)

btcRunner.StartPush(btc.id)

attachmentAData := base64.StdEncoding.EncodeToString([]byte("attachmentA"))
attachmentBData := base64.StdEncoding.EncodeToString([]byte("attachmentB"))

doc1Version, err := btcRunner.PushRev(btc.id, doc1ID, doc1Version, []byte(`{"key": "val", "_attachments": {"attachment": {"data": "`+attachmentAData+`"}}}`))
doc1Version, err := btcRunner.AddRev(btc.id, doc1ID, &doc1Version, []byte(`{"key": "val", "_attachments": {"attachment": {"data": "`+attachmentAData+`"}}}`))
require.NoError(t, err)
doc2Version, err = btcRunner.PushRev(btc.id, doc2ID, doc2Version, []byte(`{"key": "val", "_attachments": {"attachment": {"data": "`+attachmentBData+`"}}}`))
doc2Version, err = btcRunner.AddRev(btc.id, doc2ID, &doc2Version, []byte(`{"key": "val", "_attachments": {"attachment": {"data": "`+attachmentBData+`"}}}`))
require.NoError(t, err)

assert.NoError(t, btc.rt.WaitForVersion(doc1ID, doc1Version))
Expand All @@ -2623,25 +2648,29 @@ func TestCBLRevposHandling(t *testing.T) {
require.NoError(t, err)

// Update doc1, don't change attachment, use correct revpos
doc1Version, err = btcRunner.PushRev(btc.id, doc1ID, doc1Version, []byte(`{"key": "val", "_attachments":{"attachment":{"digest":"sha1-wzp8ZyykdEuZ9GuqmxQ7XDrY7Co=","length":11,"content_type":"","stub":true,"revpos":2}}}`))
doc1Version, err = btcRunner.AddRev(btc.id, doc1ID, &doc1Version, []byte(`{"key": "val", "_attachments":{"attachment":{"digest":"sha1-wzp8ZyykdEuZ9GuqmxQ7XDrY7Co=","length":11,"content_type":"","stub":true,"revpos":2}}}`))
require.NoError(t, err)

assert.NoError(t, btc.rt.WaitForVersion(doc1ID, doc1Version))

// Update doc1, don't change attachment, use revpos=generation of revid, as CBL 2.x does. Should not proveAttachment on digest match.
doc1Version, err = btcRunner.PushRev(btc.id, doc1ID, doc1Version, []byte(`{"key": "val", "_attachments":{"attachment":{"digest":"sha1-wzp8ZyykdEuZ9GuqmxQ7XDrY7Co=","length":11,"content_type":"","stub":true,"revpos":4}}}`))
doc1Version, err = btcRunner.AddRev(btc.id, doc1ID, &doc1Version, []byte(`{"key": "val", "_attachments":{"attachment":{"digest":"sha1-wzp8ZyykdEuZ9GuqmxQ7XDrY7Co=","length":11,"content_type":"","stub":true,"revpos":4}}}`))
require.NoError(t, err)

require.NoError(t, rt.WaitForVersion(doc1ID, doc1Version))

// Validate attachment exists
attResponse := btc.rt.SendAdminRequest("GET", "/{{.keyspace}}/doc1/attachment", "")
assert.Equal(t, 200, attResponse.Code)
assert.Equal(t, "attachmentA", string(attResponse.BodyBytes()))

attachmentPushCount := btc.rt.GetDatabase().DbStats.CBLReplicationPushStats.AttachmentPushCount.Value()
// Update doc1, change attachment digest with CBL revpos=generation. Should getAttachment
_, err = btcRunner.PushRev(btc.id, doc1ID, doc1Version, []byte(`{"key": "val", "_attachments":{"attachment":{"digest":"sha1-SKk0IV40XSHW37d3H0xpv2+z9Ck=","length":11,"content_type":"","stub":true,"revpos":5}}}`))
doc1Version, err = btcRunner.AddRev(btc.id, doc1ID, &doc1Version, []byte(`{"key": "val", "_attachments":{"attachment":{"digest":"sha1-SKk0IV40XSHW37d3H0xpv2+z9Ck=","length":11,"content_type":"","stub":true,"revpos":5}}}`))
require.NoError(t, err)

require.NoError(t, rt.WaitForVersion(doc1ID, doc1Version))

// Validate attachment exists and is updated
attResponse = btc.rt.SendAdminRequest("GET", "/{{.keyspace}}/doc1/attachment", "")
assert.Equal(t, 200, attResponse.Code)
Expand Down
21 changes: 12 additions & 9 deletions rest/audit_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1507,12 +1507,16 @@ func TestAuditBlipCRUD(t *testing.T) {
{
name: "add attachment",
attachmentName: "attachment1",
auditableCode: func(t testing.TB, docID string, docVersion DocVersion) {
setupCode: func(t testing.TB, docID string) DocVersion {
attData := base64.StdEncoding.EncodeToString([]byte("attach"))

version, err := btcRunner.PushRev(btc.id, docID, EmptyDocVersion(), []byte(`{"key":"val","_attachments":{"attachment1":{"data":"`+attData+`"}}}`))
version, err := btcRunner.AddRev(btc.id, docID, EmptyDocVersion(), []byte(`{"key":"val","_attachments":{"attachment1":{"data":"`+attData+`"}}}`))
require.NoError(t, err)
btcRunner.WaitForVersion(btc.id, docID, version)
return version
},
auditableCode: func(t testing.TB, docID string, version DocVersion) {
btcRunner.StartPushWithOpts(btc.id, BlipTesterPushOptions{Continuous: false})
// wait for the doc to be replicated, since that's what we're actually auditing
require.NoError(t, rt.WaitForVersion(docID, version))
},
attachmentCreateCount: 1,
},
Expand All @@ -1527,12 +1531,11 @@ func TestAuditBlipCRUD(t *testing.T) {
output := base.AuditLogContents(t, func(t testing.TB) {
testCase.auditableCode(t, docID, docVersion)
})
postAttachmentVersion, _ := rt.GetDoc(docID)

requireAttachmentEvents(rt, base.AuditIDAttachmentCreate, output, docID, postAttachmentVersion.RevID, testCase.attachmentName, testCase.attachmentCreateCount)
requireAttachmentEvents(rt, base.AuditIDAttachmentRead, output, docID, postAttachmentVersion.RevID, testCase.attachmentName, testCase.attachmentReadCount)
requireAttachmentEvents(rt, base.AuditIDAttachmentUpdate, output, docID, postAttachmentVersion.RevID, testCase.attachmentName, testCase.attachmentUpdateCount)
requireAttachmentEvents(rt, base.AuditIDAttachmentDelete, output, docID, postAttachmentVersion.RevID, testCase.attachmentName, testCase.attachmentDeleteCount)
requireAttachmentEvents(rt, base.AuditIDAttachmentCreate, output, docID, docVersion.RevID, testCase.attachmentName, testCase.attachmentCreateCount)
requireAttachmentEvents(rt, base.AuditIDAttachmentRead, output, docID, docVersion.RevID, testCase.attachmentName, testCase.attachmentReadCount)
requireAttachmentEvents(rt, base.AuditIDAttachmentUpdate, output, docID, docVersion.RevID, testCase.attachmentName, testCase.attachmentUpdateCount)
requireAttachmentEvents(rt, base.AuditIDAttachmentDelete, output, docID, docVersion.RevID, testCase.attachmentName, testCase.attachmentDeleteCount)
})
}
})
Expand Down
Loading
Loading