add logging to import filter dry run

Author: RIT3shSapata

db/import.go

@@ -489,11 +489,9 @@ func (db *DatabaseCollectionWithUser) backupPreImportRevision(ctx context.Contex
 // ////// Import Filter Function
 
 // Compiles a JavaScript event function to a jsImportFilterRunner object.
-func newImportFilterRunner(ctx context.Context, funcSource string, timeout time.Duration) (sgbucket.JSServerTask, error) {
+func newImportFilterRunnerWithLogging(ctx context.Context, funcSource string, timeout time.Duration, errorLogFunc, infoLogFunc func(string)) (sgbucket.JSServerTask, error) {
 	importFilterRunner := &jsEventTask{}
-	err := importFilterRunner.InitWithLogging(funcSource, timeout,
-		func(s string) { base.ErrorfCtx(ctx, base.KeyJavascript.String()+": Import %s", base.UD(s)) },
-		func(s string) { base.InfofCtx(ctx, base.KeyJavascript, "Import %s", base.UD(s)) })
+	err := importFilterRunner.InitWithLogging(funcSource, timeout, errorLogFunc, infoLogFunc)
 	if err != nil {
 		return nil, err
 	}
@@ -506,6 +504,12 @@ func newImportFilterRunner(ctx context.Context, funcSource string, timeout time.
 	return importFilterRunner, nil
 }
 
+func newImportFilterRunner(ctx context.Context, funcSource string, timeout time.Duration) (sgbucket.JSServerTask, error) {
+	errLogFunc := func(s string) { base.ErrorfCtx(ctx, base.KeyJavascript.String()+": Import %s", base.UD(s)) }
+	infoLogFunc := func(s string) { base.InfofCtx(ctx, base.KeyJavascript, "Import %s", base.UD(s)) }
+	return newImportFilterRunnerWithLogging(ctx, funcSource, timeout, errLogFunc, infoLogFunc)
+}
+
 type ImportFilterFunction struct {
 	*sgbucket.JSServer
 }
@@ -547,7 +551,7 @@ func (i *ImportFilterFunction) EvaluateFunction(ctx context.Context, doc Body, d
 }
 
 // ImportFilterDryRun Runs a document through the import filter and returns a boolean and error
-func (db *DatabaseCollectionWithUser) ImportFilterDryRun(ctx context.Context, doc Body, importFn string) (bool, error) {
+func (db *DatabaseCollectionWithUser) ImportFilterDryRun(ctx context.Context, doc Body, importFn string, errorLogFunc, infoLogFunc func(string)) (bool, error) {
 
 	var shouldImport bool
 
@@ -562,7 +566,7 @@ func (db *DatabaseCollectionWithUser) ImportFilterDryRun(ctx context.Context, do
 
 	// create new import filter runner for this dry run
 	jsTimeout := time.Duration(base.DefaultJavascriptTimeoutSecs) * time.Second
-	importRunner, err := newImportFilterRunner(ctx, importFn, jsTimeout)
+	importRunner, err := newImportFilterRunnerWithLogging(ctx, importFn, jsTimeout, errorLogFunc, infoLogFunc)
 	if err != nil {
 		return false, errors.New("failed to create import filter runner: " + err.Error())
 	}

rest/diagnostic_doc_api.go

@@ -20,23 +20,24 @@ import (
 	"github.com/couchbase/sync_gateway/db"
 )
 
-type SyncFnDryRunLogging struct {
+type DryRunLogging struct {
 	Errors []string `json:"errors"`
 	Info   []string `json:"info"`
 }
 
 type SyncFnDryRun struct {
-	Channels  base.Set            `json:"channels"`
-	Access    channels.AccessMap  `json:"access"`
-	Roles     channels.AccessMap  `json:"roles"`
-	Exception string              `json:"exception,omitempty"`
-	Expiry    *uint32             `json:"expiry,omitempty"`
-	Logging   SyncFnDryRunLogging `json:"logging"`
+	Channels  base.Set           `json:"channels"`
+	Access    channels.AccessMap `json:"access"`
+	Roles     channels.AccessMap `json:"roles"`
+	Exception string             `json:"exception,omitempty"`
+	Expiry    *uint32            `json:"expiry,omitempty"`
+	Logging   DryRunLogging      `json:"logging"`
 }
 
 type ImportFilterDryRun struct {
-	ShouldImport bool   `json:"shouldImport"`
-	Error        string `json:"error"`
+	ShouldImport bool          `json:"shouldImport"`
+	Error        string        `json:"error"`
+	Logging      DryRunLogging `json:"logging"`
 }
 
 type SyncFnDryRunPayload struct {
@@ -173,7 +174,7 @@ func (h *handler) handleSyncFnDryRun() error {
 		errMsg := syncFnDryRunErr.Error()
 		resp := SyncFnDryRun{
 			Exception: errMsg,
-			Logging:   SyncFnDryRunLogging{Errors: logErrors, Info: logInfo},
+			Logging:   DryRunLogging{Errors: logErrors, Info: logInfo},
 		}
 		h.writeJSON(resp)
 		return nil
@@ -189,7 +190,7 @@ func (h *handler) handleSyncFnDryRun() error {
 		output.Roles,
 		errorMsg,
 		output.Expiry,
-		SyncFnDryRunLogging{Errors: logErrors, Info: logInfo},
+		DryRunLogging{Errors: logErrors, Info: logInfo},
 	}
 	h.writeJSON(resp)
 	return nil
@@ -220,7 +221,16 @@ func (h *handler) handleImportFilterDryRun() error {
 	} else {
 		doc = importFilterPayload.Doc
 	}
-	shouldImport, err := h.collection.ImportFilterDryRun(h.ctx(), doc, importFilterPayload.Function)
+
+	logErrors := make([]string, 0)
+	logInfo := make([]string, 0)
+	errorLogFn := func(s string) {
+		logErrors = append(logErrors, s)
+	}
+	infoLogFn := func(s string) {
+		logInfo = append(logInfo, s)
+	}
+	shouldImport, err := h.collection.ImportFilterDryRun(h.ctx(), doc, importFilterPayload.Function, errorLogFn, infoLogFn)
 	errorMsg := ""
 	if err != nil {
 		var importFilterDryRunErr *base.ImportFilterDryRunError
@@ -232,6 +242,7 @@ func (h *handler) handleImportFilterDryRun() error {
 	resp := ImportFilterDryRun{
 		shouldImport,
 		errorMsg,
+		DryRunLogging{Errors: logErrors, Info: logInfo},
 	}
 	h.writeJSON(resp)
 	return nil