From c52fd886529bbc11d6c37e0552d399d00d4d7eb4 Mon Sep 17 00:00:00 2001
From: JP Phillips <jp@compose.io>
Date: Mon, 6 Feb 2017 16:14:30 -0600
Subject: [PATCH] return a nil message to get skipped in the pipeline (#261)

---
 pkg/adaptor/transformer/transformer.go      | 4 ++--
 pkg/adaptor/transformer/transformer_test.go | 5 ++++-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/pkg/adaptor/transformer/transformer.go b/pkg/adaptor/transformer/transformer.go
index 92d5a7430..297cbe8f2 100644
--- a/pkg/adaptor/transformer/transformer.go
+++ b/pkg/adaptor/transformer/transformer.go
@@ -6,13 +6,13 @@ import (
 	"regexp"
 	"time"
 
+	"github.com/compose/mejson"
 	"github.com/compose/transporter/pkg/adaptor"
 	"github.com/compose/transporter/pkg/message"
 	"github.com/compose/transporter/pkg/message/adaptor/transformer"
 	"github.com/compose/transporter/pkg/message/data"
 	"github.com/compose/transporter/pkg/message/ops"
 	"github.com/compose/transporter/pkg/pipe"
-	"github.com/compose/mejson"
 	"github.com/robertkrimen/otto"
 	_ "github.com/robertkrimen/otto/underscore" // enable underscore
 )
@@ -236,7 +236,7 @@ func (t *Transformer) toMsg(origMsg message.Msg, incoming interface{}) (message.
 		}
 	case bool: // skip this doc if we're a bool and we're false
 		if !newMsg {
-			op = ops.Noop
+			return nil, nil
 		}
 	default: // something went wrong
 		return nil, fmt.Errorf("returned doc was not a map[string]interface{}: was %T", newMsg)
diff --git a/pkg/adaptor/transformer/transformer_test.go b/pkg/adaptor/transformer/transformer_test.go
index 7b96d098d..66f1cda8c 100644
--- a/pkg/adaptor/transformer/transformer_test.go
+++ b/pkg/adaptor/transformer/transformer_test.go
@@ -102,7 +102,7 @@ func TestTransformOne(t *testing.T) {
 			"we should be able to skip a nil message",
 			"module.exports=function(doc) { return false }",
 			message.MustUseAdaptor("transformer").From(ops.Insert, "database.collection", data.Data{"id": bsonID1, "name": "nick"}),
-			message.MustUseAdaptor("transformer").From(ops.Noop, "database.collection", data.Data{"id": bsonID1, "name": "nick"}),
+			nil,
 			false,
 		},
 		{
@@ -138,6 +138,9 @@ func TestTransformOne(t *testing.T) {
 }
 
 func isEqual(m1 message.Msg, m2 message.Msg) bool {
+	if m1 == nil && m2 == nil {
+		return true
+	}
 	if m1.ID() != m2.ID() {
 		return false
 	}