fix linting erros

jandelgado · Jun 6, 2019 · a9ecde7 · a9ecde7
1 parent 895eed2
commit a9ecde7
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 14 deletions.
diff --git a/cmd/rabtap/json_message_formatter_test.go b/cmd/rabtap/json_message_formatter_test.go
@@ -16,7 +16,7 @@ func TestJSONFormatterInvalidArray(t *testing.T) {
 	message := amqp.Delivery{
 		Body: []byte("[ {\"a\":1} "),
 	}
-	formattedMessage := JSONMessageFormatter{}.Format(rabtap.TapMessage{&message, nil, time.Now()})
+	formattedMessage := JSONMessageFormatter{}.Format(rabtap.NewTapMessage(&message, nil, time.Now()))
 	// message is expected to be returned untouched
 	assert.Equal(t, "[ {\"a\":1} ", formattedMessage)
 }
@@ -26,7 +26,7 @@ func TestJSONFormatterValidArray(t *testing.T) {
 	message := amqp.Delivery{
 		Body: []byte(" [   {\"a\":1}    ] "),
 	}
-	formattedMessage := JSONMessageFormatter{}.Format(rabtap.TapMessage{&message, nil, time.Now()})
+	formattedMessage := JSONMessageFormatter{}.Format(rabtap.NewTapMessage(&message, nil, time.Now()))
 	assert.Equal(t, "[\n  {\n    \"a\": 1\n  }\n]", formattedMessage)
 }
 
@@ -35,7 +35,7 @@ func TestJSONFormatterInvalidObject(t *testing.T) {
 	message := amqp.Delivery{
 		Body: []byte("[ {\"a\":1 "),
 	}
-	formattedMessage := JSONMessageFormatter{}.Format(rabtap.TapMessage{&message, nil, time.Now()})
+	formattedMessage := JSONMessageFormatter{}.Format(rabtap.NewTapMessage(&message, nil, time.Now()))
 	// message is expected to be returned untouched
 	assert.Equal(t, "[ {\"a\":1 ", formattedMessage)
 }
@@ -45,6 +45,6 @@ func TestJSONFormatterValidObject(t *testing.T) {
 	message := amqp.Delivery{
 		Body: []byte("  {\"a\":1}   "),
 	}
-	formattedMessage := JSONMessageFormatter{}.Format(rabtap.TapMessage{&message, nil, time.Now()})
+	formattedMessage := JSONMessageFormatter{}.Format(rabtap.NewTapMessage(&message, nil, time.Now()))
 	assert.Equal(t, "{\n  \"a\": 1\n}", formattedMessage)
 }
diff --git a/cmd/rabtap/message_printer_test.go b/cmd/rabtap/message_printer_test.go
@@ -38,7 +38,7 @@ func ExamplePrettyPrintMessage() {
 	}
 
 	ts := time.Date(2019, time.June, 6, 23, 0, 0, 0, time.UTC)
-	_ = PrettyPrintMessage(os.Stdout, rabtap.TapMessage{&message, nil, ts}, "title", true)
+	_ = PrettyPrintMessage(os.Stdout, rabtap.NewTapMessage(&message, nil, ts), "title", true)
 
 	// Output:
 	// ------ title ------
@@ -65,7 +65,7 @@ func ExamplePrettyPrintMessage_withFilteredAtributes() {
 	}
 
 	ts := time.Date(2019, time.June, 6, 23, 0, 0, 0, time.UTC)
-	_ = PrettyPrintMessage(os.Stdout, rabtap.TapMessage{&message, nil, ts}, "title", true)
+	_ = PrettyPrintMessage(os.Stdout, rabtap.NewTapMessage(&message, nil, ts), "title", true)
 
 	// Output:
 	// ------ title ------

diff --git a/cmd/rabtap/message_writer_test.go b/cmd/rabtap/message_writer_test.go
@@ -44,7 +44,7 @@ func TestSaveMessageToRawFile(t *testing.T) {
 	// SaveMessagesToFiles() will create files "test.dat" and "test.json" in
 	// testdir.
 	basename := filepath.Join(testdir, "test")
-	err = SaveMessageToRawFile(basename, rabtap.TapMessage{testMessage, nil, time.Now()})
+	err = SaveMessageToRawFile(basename, rabtap.NewTapMessage(testMessage, nil, time.Now()))
 	assert.Nil(t, err)
 
 	// check contents of message body .dat file
@@ -72,7 +72,7 @@ func TestSaveMessageToRawFile(t *testing.T) {
 func TestSaveMessageToFilesToInvalidDir(t *testing.T) {
 	// use nonexisting path
 	filename := filepath.Join("/thispathshouldnotexist", "test")
-	err := SaveMessageToRawFile(filename, rabtap.TapMessage{testMessage, nil, time.Now()})
+	err := SaveMessageToRawFile(filename, rabtap.NewTapMessage(testMessage, nil, time.Now()))
 	assert.NotNil(t, err)
 }
 
@@ -84,7 +84,7 @@ func TestSaveMessageToJSONFile(t *testing.T) {
 	defer os.RemoveAll(testdir)
 
 	filename := filepath.Join(testdir, "test")
-	err = SaveMessageToJSONFile(filename, rabtap.TapMessage{testMessage, nil, time.Now()})
+	err = SaveMessageToJSONFile(filename, rabtap.NewTapMessage(testMessage, nil, time.Now()))
 	assert.Nil(t, err)
 
 	contents, err := ioutil.ReadFile(filename)
@@ -104,7 +104,7 @@ func TestSaveMessageToJSONFile(t *testing.T) {
 func TestSaveMessageToFileToInvalidDir(t *testing.T) {
 	// use nonexisting path
 	filename := filepath.Join("/thispathshouldnotexist", "test")
-	err := SaveMessageToJSONFile(filename, rabtap.TapMessage{testMessage, nil, time.Now()})
+	err := SaveMessageToJSONFile(filename, rabtap.NewTapMessage(testMessage, nil, time.Now()))
 	assert.NotNil(t, err)
 }
 
@@ -129,7 +129,7 @@ func ExampleWriteMessageBodyBlob() {
 func ExampleWriteMessageJSON_withBody() {
 
 	// serialize with message body, Body will be base64 encoded.
-	err := WriteMessageJSON(os.Stdout, true /* w/ body*/, rabtap.TapMessage{testMessage, nil, time.Now()})
+	err := WriteMessageJSON(os.Stdout, true /* w/ body*/, rabtap.NewTapMessage(testMessage, nil, time.Now()))
 	if err != nil {
 		log.Fatal(err)
 	}
@@ -160,7 +160,7 @@ func ExampleWriteMessageJSON_withBody() {
 }
 
 func ExampleWriteMessageJSON_withoutBody() {
-	err := WriteMessageJSON(os.Stdout, false /*w/o body*/, rabtap.TapMessage{testMessage, nil, time.Now()})
+	err := WriteMessageJSON(os.Stdout, false /*w/o body*/, rabtap.NewTapMessage(testMessage, nil, time.Now()))
 	if err != nil {
 		log.Fatal(err)
 	}

diff --git a/cmd/rabtap/subscribe_test.go b/cmd/rabtap/subscribe_test.go
@@ -23,7 +23,7 @@ func TestCreateMessageReceiveFuncRawToFile(t *testing.T) {
 
 	var b bytes.Buffer
 	rcvFunc := createMessageReceiveFunc(&b, false, &testDir, false)
-	message := rabtap.TapMessage{&amqp.Delivery{Body: []byte("Testmessage")}, nil, time.Now()}
+	message := rabtap.NewTapMessage(&amqp.Delivery{Body: []byte("Testmessage")}, nil, time.Now())
 
 	_ = rcvFunc(message)
 
@@ -39,7 +39,7 @@ func TestCreateMessageReceiveFuncJSONToFile(t *testing.T) {
 
 	var b bytes.Buffer
 	rcvFunc := createMessageReceiveFunc(&b, true, &testDir, false)
-	message := rabtap.TapMessage{&amqp.Delivery{Body: []byte("Testmessage")}, nil, time.Now()}
+	message := rabtap.NewTapMessage(&amqp.Delivery{Body: []byte("Testmessage")}, nil, time.Now())
 
 	_ = rcvFunc(message)
 

diff --git a/pkg/subscribe.go b/pkg/subscribe.go
@@ -35,6 +35,11 @@ type TapMessage struct {
 	TimeReceived time.Time
 }
 
+// NewTapMessage constructs a new TapMessage
+func NewTapMessage(message *amqp.Delivery, err error, ts time.Time) TapMessage {
+	return TapMessage{AmqpMessage: message, Error: err, TimeReceived: ts}
+}
+
 // TapChannel is a channel for *TapMessage objects
 type TapChannel chan *TapMessage