remove goembed, use attachment read conditionally in bulk docs

db/util_testing.go

@@ -12,7 +12,6 @@ package db
 
 import (
 	"context"
-	_ "embed"
 	"errors"
 	"fmt"
 	"sync/atomic"
@@ -27,9 +26,6 @@ import (
 	"github.com/stretchr/testify/require"
 )
 
-//go:embed raw_doc_with_inline_sync.json
-var TestRawDocWithSyncMeta string
-
 // WaitForPrimaryIndexEmpty waits for #primary to be empty.
 // Workaround SG #3570 by doing a polling loop until the star channel query returns 0 results.
 func WaitForPrimaryIndexEmpty(ctx context.Context, store base.N1QLStore) error {
@@ -772,3 +768,22 @@ func DefaultMutateInOpts() *sgbucket.MutateInOptions {
 		MacroExpansion: macroExpandSpec(base.SyncXattrName),
 	}
 }
+
+func RawDocWithInlineSyncData(_ testing.TB) string {
+	return `
+{
+  "_sync": {
+    "rev": "1-ca9ad22802b66f662ff171f226211d5c",
+    "sequence": 1,
+    "recent_sequences": [1],
+    "history": {
+      "revs": ["1-ca9ad22802b66f662ff171f226211d5c"],
+      "parents": [-1],
+      "channels": [null]
+    },
+    "cas": "",
+    "time_saved": "2017-11-29T12:46:13.456631-08:00"
+  }
+}
+`
+}

rest/audit_test.go

@@ -1034,7 +1034,7 @@ func TestAuditDocumentCreateUpdateEvents(t *testing.T) {
 			{
 				name: "import doc with inline sync meta",
 				auditableCode: func(t testing.TB, docID string, docVersion DocVersion) {
-					_, err := rt.GetSingleDataStore().Add(docID, 0, []byte(db.TestRawDocWithSyncMeta))
+					_, err := rt.GetSingleDataStore().Add(docID, 0, []byte(db.RawDocWithInlineSyncData(t)))
 					require.NoError(t, err)
 					// this may get picked up by auto import or on demand import
 					_, _ = rt.GetDoc(docID)

rest/bulk_api.go

@@ -458,17 +458,19 @@ func (h *handler) handleBulkGet() error {
 				base.AuditFieldDocID:      docid,
 				base.AuditFieldDocVersion: revid,
 			})
-			if atts, ok := body[db.BodyAttachments]; ok && atts != nil {
-				attsMap, ok := atts.(db.AttachmentsMeta)
-				if !ok {
-					base.WarnfCtx(h.ctx(), "Unexpected format of attachments in the body %+v", atts)
-				}
-				for attachment := range attsMap {
-					base.Audit(h.ctx(), base.AuditIDAttachmentRead, base.AuditFields{
-						base.AuditFieldDocID:        docid,
-						base.AuditFieldDocVersion:   revid,
-						base.AuditFieldAttachmentID: attachment,
-					})
+			if includeAttachments {
+				if atts, ok := body[db.BodyAttachments]; ok && atts != nil {
+					attsMap, ok := atts.(db.AttachmentsMeta)
+					if !ok {
+						base.WarnfCtx(h.ctx(), "Unexpected format of attachments in the body %+v", atts)
+					}
+					for attachment := range attsMap {
+						base.Audit(h.ctx(), base.AuditIDAttachmentRead, base.AuditFields{
+							base.AuditFieldDocID:        docid,
+							base.AuditFieldDocVersion:   revid,
+							base.AuditFieldAttachmentID: attachment,
+						})
+					}
 				}
 			}
 			h.db.DbStats.Database().NumDocReadsRest.Add(1)

rest/importtest/import_test.go

@@ -1101,7 +1101,7 @@ func TestFeedBasedMigrateWithExpiry(t *testing.T) {
 	// Create via the SDK with sync metadata intact
 	expirySeconds := time.Second * 30
 	testExpiry := uint32(time.Now().Add(expirySeconds).Unix())
-	bodyString := db.TestRawDocWithSyncMeta
+	bodyString := db.RawDocWithInlineSyncData(t)
 	_, err := dataStore.Add(key, testExpiry, []byte(bodyString))
 	assert.NoError(t, err, "Error writing doc w/ expiry")
 
@@ -1343,7 +1343,7 @@ func TestOnDemandMigrateWithExpiry(t *testing.T) {
 			// Create via the SDK with sync metadata intact
 			expirySeconds := time.Second * 30
 			syncMetaExpiry := time.Now().Add(expirySeconds)
-			bodyString := db.TestRawDocWithSyncMeta
+			bodyString := db.RawDocWithInlineSyncData(t)
 			_, err := dataStore.Add(key, uint32(syncMetaExpiry.Unix()), []byte(bodyString))
 			assert.NoError(t, err, "Error writing doc w/ expiry")