SCFF-21 changed the name of the library to sumoCFFirehose

Author: nmillalaf

eventRouting/eventRouting_test.go

@@ -4,7 +4,7 @@ import (
 	. "bitbucket.org/mcplusa-ondemand/firehouse-to-sumologic/caching/cachingfakes"
 	. "bitbucket.org/mcplusa-ondemand/firehouse-to-sumologic/eventRouting"
 	. "bitbucket.org/mcplusa-ondemand/firehouse-to-sumologic/logging/loggingfakes"
-	. "bitbucket.org/mcplusa-ondemand/firehouse-to-sumologic/sumoLog4go/sumoLog4gofakes" //**
+	. "bitbucket.org/mcplusa-ondemand/firehouse-to-sumologic/sumoCFFirehose/sumoLog4gofakes" //**
 	. "github.com/cloudfoundry/sonde-go/events"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"

eventRouting/eventrouting.go

@@ -12,7 +12,7 @@ import (
 	fevents "bitbucket.org/mcplusa-ondemand/firehouse-to-sumologic/events"
 	"bitbucket.org/mcplusa-ondemand/firehouse-to-sumologic/extrafields"
 	"bitbucket.org/mcplusa-ondemand/firehouse-to-sumologic/logging"
-	"bitbucket.org/mcplusa-ondemand/firehouse-to-sumologic/sumoLog4go" //**
+	"bitbucket.org/mcplusa-ondemand/firehouse-to-sumologic/sumoCFFirehose" //**
 	"github.com/Sirupsen/logrus"
 	"github.com/cloudfoundry/sonde-go/events"
 )
@@ -22,12 +22,12 @@ type EventRouting struct {
 	selectedEvents      map[string]bool
 	selectedEventsCount map[string]uint64
 	mutex               *sync.Mutex
-	sLAppender          sumoLog4go.SumoLog4go //**
+	sLAppender          sumoCFFirehose.SumoCFFirehose //**
 	log                 logging.Logging
 	ExtraFields         map[string]string
 }
 
-func NewEventRouting(caching caching.Caching, logging logging.Logging, sLAppender sumoLog4go.SumoLog4go) *EventRouting {
+func NewEventRouting(caching caching.Caching, logging logging.Logging, sLAppender sumoCFFirehose.SumoCFFirehose) *EventRouting {
 	return &EventRouting{
 		CachingClient:       caching,
 		selectedEvents:      make(map[string]bool),

events/events.go

@@ -2,9 +2,10 @@ package events
 
 import (
 	"fmt"
-	"github.com/Sirupsen/logrus"
+
 	"bitbucket.org/mcplusa-ondemand/firehouse-to-sumologic/caching"
 	"bitbucket.org/mcplusa-ondemand/firehouse-to-sumologic/utils"
+	"github.com/Sirupsen/logrus"
 	"github.com/cloudfoundry/sonde-go/events"
 )
 

firehoseclient/firehoseclient.go

@@ -2,13 +2,14 @@ package firehoseclient
 
 import (
 	"crypto/tls"
+	"time"
+
 	"bitbucket.org/mcplusa-ondemand/firehouse-to-sumologic/eventRouting"
 	"bitbucket.org/mcplusa-ondemand/firehouse-to-sumologic/logging"
 	"github.com/cloudfoundry-community/go-cfclient"
 	"github.com/cloudfoundry/noaa/consumer"
 	"github.com/cloudfoundry/sonde-go/events"
 	"github.com/gorilla/websocket"
-	"time"
 )
 
 type FirehoseNozzle struct {

main.go

@@ -9,7 +9,7 @@ import (
 	"bitbucket.org/mcplusa-ondemand/firehouse-to-sumologic/eventRouting"
 	"bitbucket.org/mcplusa-ondemand/firehouse-to-sumologic/firehoseclient"
 	"bitbucket.org/mcplusa-ondemand/firehouse-to-sumologic/logging"
-	"bitbucket.org/mcplusa-ondemand/firehouse-to-sumologic/sumoLog4go"
+	"bitbucket.org/mcplusa-ondemand/firehouse-to-sumologic/sumoCFFirehose"
 	"github.com/cloudfoundry-community/go-cfclient"
 	"github.com/pkg/profile"
 	"gopkg.in/alecthomas/kingpin.v2"
@@ -48,7 +48,7 @@ func main() {
 	//Setup Logging <-- this loggingClient has to be removed when sumoLog4go Library is working
 	loggingClient := logging.NewLogging(syslogServer, syslogProtocol, *logFormatterType, *debug)
 	//Setup Loggin with sumoLog4go library
-	loggingClientSumo := sumoLog4go.NewSumoLogicAppender("http://httpbin.org/post", 1000)
+	loggingClientSumo := sumoCFFirehose.NewSumoLogicAppender("http://httpbin.org/post", 1000)
 
 	logging.LogStd(fmt.Sprintf("Starting firehose-to-sumo %s ", version), true)
 

sumoLog4go/sumoLog4go.go sumoCFFirehose/sumoCFFirehose.gosumoLog4go/sumoLog4go.go renamed to sumoCFFirehose/sumoCFFirehose.go

@@ -1,6 +1,6 @@
-package sumoLog4go
+package sumoCFFirehose
 
-type SumoLog4go interface {
+type SumoCFFirehose interface {
 	Connect() bool
 	AppendLogs(map[string]interface{})
 }

…og4go/sumoLog4gofakes/fake_SumoLog4go.go …ehose/sumoLog4gofakes/fake_SumoLog4go.gosumoLog4go/sumoLog4gofakes/fake_SumoLog4go.go renamed to sumoCFFirehose/sumoLog4gofakes/fake_SumoLog4go.go sumoLog4go/sumoLog4gofakes/fake_SumoLog4go.go renamed to sumoCFFirehose/sumoLog4gofakes/fake_SumoLog4go.go

@@ -4,7 +4,7 @@ package sumoLog4gofakes
 import (
 	"sync"
 
-	"bitbucket.org/mcplusa-ondemand/firehouse-to-sumologic/sumolog4go"
+	"bitbucket.org/mcplusa-ondemand/firehouse-to-sumologic/sumoCFFirehose"
 )
 
 type FakeSumoLog4go struct {
@@ -14,11 +14,10 @@ type FakeSumoLog4go struct {
 	connectReturns     struct {
 		result1 bool
 	}
-	AppendLogsStub        func(map[string]interface{}, string)
+	AppendLogsStub        func(map[string]interface{})
 	AppendLogsMutex       sync.RWMutex
 	AppendLogsArgsForCall []struct {
 		arg1 map[string]interface{}
-		arg2 string
 	}
 	invocations      map[string][][]interface{}
 	invocationsMutex sync.RWMutex
@@ -49,16 +48,16 @@ func (fake *FakeSumoLog4go) ConnectReturns(result1 bool) {
 	}{result1}
 }
 
-func (fake *FakeSumoLog4go) AppendLogs(arg1 map[string]interface{}, arg2 string) {
+func (fake *FakeSumoLog4go) AppendLogs(arg1 map[string]interface{}) {
 	fake.AppendLogsMutex.Lock()
 	fake.AppendLogsArgsForCall = append(fake.AppendLogsArgsForCall, struct {
 		arg1 map[string]interface{}
-		arg2 string
-	}{arg1, arg2})
-	fake.recordInvocation("ShipEvents", []interface{}{arg1, arg2})
+		//arg2 string
+	}{arg1 /*, arg2*/})
+	fake.recordInvocation("ShipEvents", []interface{}{arg1 /*, arg2*/})
 	fake.AppendLogsMutex.Unlock()
 	if fake.AppendLogsStub != nil {
-		fake.AppendLogsStub(arg1, arg2)
+		fake.AppendLogsStub(arg1 /*, arg2*/)
 	}
 }
 
@@ -68,10 +67,10 @@ func (fake *FakeSumoLog4go) ShipEventsCallCount() int {
 	return len(fake.AppendLogsArgsForCall)
 }
 
-func (fake *FakeSumoLog4go) ShipEventsArgsForCall(i int) (map[string]interface{}, string) {
+func (fake *FakeSumoLog4go) ShipEventsArgsForCall(i int) map[string]interface{} {
 	fake.AppendLogsMutex.RLock()
 	defer fake.AppendLogsMutex.RUnlock()
-	return fake.AppendLogsArgsForCall[i].arg1, fake.AppendLogsArgsForCall[i].arg2
+	return fake.AppendLogsArgsForCall[i].arg1
 }
 
 func (fake *FakeSumoLog4go) Invocations() map[string][][]interface{} {
@@ -96,4 +95,4 @@ func (fake *FakeSumoLog4go) recordInvocation(key string, args []interface{}) {
 	fake.invocations[key] = append(fake.invocations[key], args)
 }
 
-var _ sumoLog4go.SumoLog4go = new(FakeSumoLog4go)
+var _ sumoCFFirehose.SumoCFFirehose = new(FakeSumoLog4go)

sumoLog4go/sumoLogicAppender.go sumoCFFirehose/sumoLogicAppender.gosumoLog4go/sumoLogicAppender.go renamed to sumoCFFirehose/sumoLogicAppender.go

@@ -1,4 +1,4 @@
-package sumoLog4go
+package sumoCFFirehose
 
 import (
 	"bytes"