Merge pull request digitalocean#3 from digitalocean/replace-import-path

jnadler · web-flow · commit f956e810fb58 · 2019-11-11T16:04:16.000-08:00
Update all package paths
diff --git a/config/config.go b/config/config.go
@@ -10,8 +10,8 @@ import (
 	log "github.com/sirupsen/logrus"
 	"gopkg.in/yaml.v2"
 
-	"github.internal.digitalocean.com/observability/firebolt"
-	"github.internal.digitalocean.com/observability/firebolt/node"
+	"github.com/digitalocean/firebolt"
+	"github.com/digitalocean/firebolt/node"
 )
 
 // Config is the firebolt application configuration, including the configured source and all processing nodes
diff --git a/config/config_test.go b/config/config_test.go
@@ -3,7 +3,7 @@ package config_test
 import (
 	"testing"
 
-	"github.internal.digitalocean.com/observability/firebolt/node/kafkaproducer"
+	"github.com/digitalocean/firebolt/node/kafkaproducer"
 
 	"strings"
 
@@ -13,11 +13,11 @@ import (
 
 	"github.com/stretchr/testify/assert"
 
-	"github.internal.digitalocean.com/observability/firebolt"
-	"github.internal.digitalocean.com/observability/firebolt/config"
-	"github.internal.digitalocean.com/observability/firebolt/node"
-	"github.internal.digitalocean.com/observability/firebolt/node/kafkaconsumer"
-	"github.internal.digitalocean.com/observability/firebolt/node/syslogparser"
+	"github.com/digitalocean/firebolt"
+	"github.com/digitalocean/firebolt/config"
+	"github.com/digitalocean/firebolt/node"
+	"github.com/digitalocean/firebolt/node/kafkaconsumer"
+	"github.com/digitalocean/firebolt/node/syslogparser"
 )
 
 func TestParseConfig(t *testing.T) {
diff --git a/error_test.go b/error_test.go
@@ -6,7 +6,7 @@ import (
 	"testing"
 	"time"
 
-	"github.internal.digitalocean.com/observability/firebolt"
+	"github.com/digitalocean/firebolt"
 
 	"github.com/stretchr/testify/assert"
 )
diff --git a/executor/executor.go b/executor/executor.go
@@ -8,17 +8,17 @@ import (
 	"syscall"
 	"time"
 
-	"github.internal.digitalocean.com/observability/firebolt"
+	"github.com/digitalocean/firebolt"
 
-	"github.internal.digitalocean.com/observability/firebolt/util"
+	"github.com/digitalocean/firebolt/util"
 
-	"github.internal.digitalocean.com/observability/firebolt/leader"
+	"github.com/digitalocean/firebolt/leader"
 
-	"github.internal.digitalocean.com/observability/firebolt/config"
-	"github.internal.digitalocean.com/observability/firebolt/fbcontext"
-	"github.internal.digitalocean.com/observability/firebolt/message"
-	"github.internal.digitalocean.com/observability/firebolt/metrics"
-	"github.internal.digitalocean.com/observability/firebolt/node"
+	"github.com/digitalocean/firebolt/config"
+	"github.com/digitalocean/firebolt/fbcontext"
+	"github.com/digitalocean/firebolt/message"
+	"github.com/digitalocean/firebolt/metrics"
+	"github.com/digitalocean/firebolt/node"
 
 	log "github.com/sirupsen/logrus"
 )
diff --git a/executor/executor_test.go b/executor/executor_test.go
@@ -7,8 +7,8 @@ import (
 
 	"github.com/stretchr/testify/assert"
 
-	"github.internal.digitalocean.com/observability/firebolt/executor"
-	"github.internal.digitalocean.com/observability/firebolt/internal"
+	"github.com/digitalocean/firebolt/executor"
+	"github.com/digitalocean/firebolt/internal"
 )
 
 func TestNewInvalidConfig(t *testing.T) {
diff --git a/executor/message.go b/executor/message.go
@@ -6,10 +6,10 @@ import (
 
 	log "github.com/sirupsen/logrus"
 
-	"github.internal.digitalocean.com/observability/firebolt/config"
-	"github.internal.digitalocean.com/observability/firebolt/fbcontext"
-	"github.internal.digitalocean.com/observability/firebolt/message"
-	"github.internal.digitalocean.com/observability/firebolt/node"
+	"github.com/digitalocean/firebolt/config"
+	"github.com/digitalocean/firebolt/fbcontext"
+	"github.com/digitalocean/firebolt/message"
+	"github.com/digitalocean/firebolt/node"
 )
 
 // InitMessaging should set up the configured messaging transport, and it MUST ensure that the executor's fbcontext is
diff --git a/executor/message_int_test.go b/executor/message_int_test.go
@@ -9,12 +9,12 @@ import (
 
 	"github.com/stretchr/testify/assert"
 
-	"github.internal.digitalocean.com/observability/firebolt/config"
-	"github.internal.digitalocean.com/observability/firebolt/executor"
-	"github.internal.digitalocean.com/observability/firebolt/fbcontext"
-	"github.internal.digitalocean.com/observability/firebolt/internal"
-	"github.internal.digitalocean.com/observability/firebolt/message"
-	"github.internal.digitalocean.com/observability/firebolt/util"
+	"github.com/digitalocean/firebolt/config"
+	"github.com/digitalocean/firebolt/executor"
+	"github.com/digitalocean/firebolt/fbcontext"
+	"github.com/digitalocean/firebolt/internal"
+	"github.com/digitalocean/firebolt/message"
+	"github.com/digitalocean/firebolt/util"
 )
 
 func sendMessageViaNode(ex *executor.Executor, messageType string, key string, payload string) {
diff --git a/executor/noderegistrar.go b/executor/noderegistrar.go
@@ -3,13 +3,13 @@ package executor
 import (
 	"reflect"
 
-	"github.internal.digitalocean.com/observability/firebolt/node/elasticsearch"
+	"github.com/digitalocean/firebolt/node/elasticsearch"
 
-	"github.internal.digitalocean.com/observability/firebolt"
-	"github.internal.digitalocean.com/observability/firebolt/node"
-	"github.internal.digitalocean.com/observability/firebolt/node/kafkaconsumer"
-	"github.internal.digitalocean.com/observability/firebolt/node/kafkaproducer"
-	"github.internal.digitalocean.com/observability/firebolt/node/syslogparser"
+	"github.com/digitalocean/firebolt"
+	"github.com/digitalocean/firebolt/node"
+	"github.com/digitalocean/firebolt/node/kafkaconsumer"
+	"github.com/digitalocean/firebolt/node/kafkaproducer"
+	"github.com/digitalocean/firebolt/node/syslogparser"
 )
 
 // RegisterBuiltinSourceTypes initializes the node registry with all built-in source types
diff --git a/internal/testnodetypes.go b/internal/testnodetypes.go
@@ -7,13 +7,13 @@ import (
 	"strings"
 	"time"
 
-	"github.internal.digitalocean.com/observability/firebolt/node/elasticsearch"
+	"github.com/digitalocean/firebolt/node/elasticsearch"
 
 	log "github.com/sirupsen/logrus"
 
-	"github.internal.digitalocean.com/observability/firebolt"
-	"github.internal.digitalocean.com/observability/firebolt/fbcontext"
-	"github.internal.digitalocean.com/observability/firebolt/node"
+	"github.com/digitalocean/firebolt"
+	"github.com/digitalocean/firebolt/fbcontext"
+	"github.com/digitalocean/firebolt/node"
 )
 
 var (
diff --git a/inttest/integration_test.go b/inttest/integration_test.go
@@ -8,13 +8,13 @@ import (
 	"testing"
 	"time"
 
-	"github.internal.digitalocean.com/observability/firebolt"
-	"github.internal.digitalocean.com/observability/firebolt/executor"
-	"github.internal.digitalocean.com/observability/firebolt/internal"
-	"github.internal.digitalocean.com/observability/firebolt/node/elasticsearch"
-	"github.internal.digitalocean.com/observability/firebolt/node/kafkaconsumer"
-	"github.internal.digitalocean.com/observability/firebolt/node/kafkaproducer"
-	"github.internal.digitalocean.com/observability/firebolt/util"
+	"github.com/digitalocean/firebolt"
+	"github.com/digitalocean/firebolt/executor"
+	"github.com/digitalocean/firebolt/internal"
+	"github.com/digitalocean/firebolt/node/elasticsearch"
+	"github.com/digitalocean/firebolt/node/kafkaconsumer"
+	"github.com/digitalocean/firebolt/node/kafkaproducer"
+	"github.com/digitalocean/firebolt/util"
 
 	log "github.com/sirupsen/logrus"
 	"github.com/stretchr/testify/assert"
diff --git a/message/kafkamessagesender.go b/message/kafkamessagesender.go
@@ -8,8 +8,8 @@ import (
 	"github.com/confluentinc/confluent-kafka-go/kafka"
 	log "github.com/sirupsen/logrus"
 
-	"github.internal.digitalocean.com/observability/firebolt/config"
-	"github.internal.digitalocean.com/observability/firebolt/node/kafkaproducer"
+	"github.com/digitalocean/firebolt/config"
+	"github.com/digitalocean/firebolt/node/kafkaproducer"
 )
 
 // KafkaMessageSender is a message Sender for Kafka.
diff --git a/message/kakfamessagereceiver.go b/message/kakfamessagereceiver.go
@@ -8,9 +8,9 @@ import (
 	"github.com/confluentinc/confluent-kafka-go/kafka"
 	log "github.com/sirupsen/logrus"
 
-	"github.internal.digitalocean.com/observability/firebolt/config"
-	kafkainterface "github.internal.digitalocean.com/observability/firebolt/kafka"
-	"github.internal.digitalocean.com/observability/firebolt/util"
+	"github.com/digitalocean/firebolt/config"
+	kafkainterface "github.com/digitalocean/firebolt/kafka"
+	"github.com/digitalocean/firebolt/util"
 )
 
 // KafkaMessageReceiver consumes messages from the configured 'messagetopic'.
diff --git a/message/message.go b/message/message.go
@@ -5,7 +5,7 @@ import (
 
 	log "github.com/sirupsen/logrus"
 
-	"github.internal.digitalocean.com/observability/firebolt/config"
+	"github.com/digitalocean/firebolt/config"
 )
 
 // Message is a single message to be delivered to a source or node
diff --git a/metrics/metrics_server_test.go b/metrics/metrics_server_test.go
@@ -6,7 +6,7 @@ import (
 	"testing"
 	"time"
 
-	"github.internal.digitalocean.com/observability/firebolt/metrics"
+	"github.com/digitalocean/firebolt/metrics"
 
 	"github.com/stretchr/testify/assert"
 )
diff --git a/metrics/metrics_test.go b/metrics/metrics_test.go
@@ -3,7 +3,7 @@ package metrics_test
 import (
 	"testing"
 
-	"github.internal.digitalocean.com/observability/firebolt/metrics"
+	"github.com/digitalocean/firebolt/metrics"
 
 	"github.com/stretchr/testify/assert"
 )
diff --git a/node/elasticsearch/connectionfactory_int_test.go b/node/elasticsearch/connectionfactory_int_test.go
@@ -6,7 +6,7 @@ import (
 	"context"
 	"testing"
 
-	"github.internal.digitalocean.com/observability/firebolt/metrics"
+	"github.com/digitalocean/firebolt/metrics"
 
 	"github.com/stretchr/testify/assert"
 )
diff --git a/node/elasticsearch/elastic_index_client.go b/node/elasticsearch/elastic_index_client.go
@@ -7,7 +7,7 @@ import (
 	"strconv"
 	"time"
 
-	"github.internal.digitalocean.com/observability/firebolt"
+	"github.com/digitalocean/firebolt"
 
 	"github.com/olivere/elastic/v7"
 	log "github.com/sirupsen/logrus"
diff --git a/node/elasticsearch/elasticsearch.go b/node/elasticsearch/elasticsearch.go
@@ -6,8 +6,8 @@ import (
 	"math"
 	"time"
 
-	"github.internal.digitalocean.com/observability/firebolt"
-	"github.internal.digitalocean.com/observability/firebolt/fbcontext"
+	"github.com/digitalocean/firebolt"
+	"github.com/digitalocean/firebolt/fbcontext"
 )
 
 // IndexRequest is the event payload type to use when passing data to the elasticsearch node.
diff --git a/node/elasticsearch/elasticsearch_int_test.go b/node/elasticsearch/elasticsearch_int_test.go
@@ -9,9 +9,9 @@ import (
 
 	"github.com/olivere/elastic/v7"
 
-	"github.internal.digitalocean.com/observability/firebolt"
-	"github.internal.digitalocean.com/observability/firebolt/metrics"
-	"github.internal.digitalocean.com/observability/firebolt/util"
+	"github.com/digitalocean/firebolt"
+	"github.com/digitalocean/firebolt/metrics"
+	"github.com/digitalocean/firebolt/util"
 
 	"github.com/stretchr/testify/assert"
 )
diff --git a/node/elasticsearch/elasticsearch_test.go b/node/elasticsearch/elasticsearch_test.go
@@ -8,9 +8,9 @@ import (
 
 	"github.com/stretchr/testify/mock"
 
-	"github.internal.digitalocean.com/observability/firebolt"
-	"github.internal.digitalocean.com/observability/firebolt/fbcontext"
-	"github.internal.digitalocean.com/observability/firebolt/metrics"
+	"github.com/digitalocean/firebolt"
+	"github.com/digitalocean/firebolt/fbcontext"
+	"github.com/digitalocean/firebolt/metrics"
 
 	elastic "github.com/olivere/elastic/v7"
 	"github.com/stretchr/testify/assert"
diff --git a/node/elasticsearch/metrics.go b/node/elasticsearch/metrics.go
@@ -3,7 +3,7 @@ package elasticsearch
 import (
 	"github.com/prometheus/client_golang/prometheus"
 
-	"github.internal.digitalocean.com/observability/firebolt/metrics"
+	"github.com/digitalocean/firebolt/metrics"
 )
 
 // Metrics encapsulates the prometheus metrics produced by the elasticsearch indexer.
diff --git a/node/kafkaconsumer/consumermetrics.go b/node/kafkaconsumer/consumermetrics.go
@@ -9,7 +9,7 @@ import (
 	"github.com/prometheus/client_golang/prometheus"
 	log "github.com/sirupsen/logrus"
 
-	"github.internal.digitalocean.com/observability/firebolt/metrics"
+	"github.com/digitalocean/firebolt/metrics"
 )
 
 // Metrics encapsulates the prometheus collectors used to record metrics about the consumer
diff --git a/node/kafkaconsumer/consumermetrics_test.go b/node/kafkaconsumer/consumermetrics_test.go
@@ -3,11 +3,11 @@ package kafkaconsumer
 import (
 	"testing"
 
-	"github.internal.digitalocean.com/observability/firebolt/util"
+	"github.com/digitalocean/firebolt/util"
 
 	"github.com/stretchr/testify/assert"
 
-	metrics2 "github.internal.digitalocean.com/observability/firebolt/metrics"
+	metrics2 "github.com/digitalocean/firebolt/metrics"
 )
 
 func TestParseStats(t *testing.T) {
diff --git a/node/kafkaconsumer/kafkaconsumer.go b/node/kafkaconsumer/kafkaconsumer.go
@@ -9,15 +9,15 @@ import (
 	"sync"
 	"time"
 
-	"github.internal.digitalocean.com/observability/firebolt"
+	"github.com/digitalocean/firebolt"
 
 	"github.com/confluentinc/confluent-kafka-go/kafka"
 	log "github.com/sirupsen/logrus"
 
-	"github.internal.digitalocean.com/observability/firebolt/fbcontext"
-	kafkainterface "github.internal.digitalocean.com/observability/firebolt/kafka"
-	"github.internal.digitalocean.com/observability/firebolt/metrics"
-	"github.internal.digitalocean.com/observability/firebolt/util"
+	"github.com/digitalocean/firebolt/fbcontext"
+	kafkainterface "github.com/digitalocean/firebolt/kafka"
+	"github.com/digitalocean/firebolt/metrics"
+	"github.com/digitalocean/firebolt/util"
 )
 
 const (
diff --git a/node/kafkaconsumer/kafkaconsumer_int_test.go b/node/kafkaconsumer/kafkaconsumer_int_test.go
@@ -7,15 +7,15 @@ import (
 	"testing"
 	"time"
 
-	"github.internal.digitalocean.com/observability/firebolt/util"
+	"github.com/digitalocean/firebolt/util"
 
-	"github.internal.digitalocean.com/observability/firebolt"
+	"github.com/digitalocean/firebolt"
 
-	"github.internal.digitalocean.com/observability/firebolt/metrics"
+	"github.com/digitalocean/firebolt/metrics"
 
 	"github.com/stretchr/testify/assert"
 
-	"github.internal.digitalocean.com/observability/firebolt/node/kafkaproducer"
+	"github.com/digitalocean/firebolt/node/kafkaproducer"
 )
 
 func TestKafkaConsumer(t *testing.T) {
diff --git a/node/kafkaconsumer/kafkaconsumer_test.go b/node/kafkaconsumer/kafkaconsumer_test.go
@@ -7,13 +7,13 @@ import (
 	"testing"
 	"time"
 
-	"github.internal.digitalocean.com/observability/firebolt"
+	"github.com/digitalocean/firebolt"
 
 	"github.com/confluentinc/confluent-kafka-go/kafka"
 	"github.com/stretchr/testify/assert"
 
-	kafkainterface "github.internal.digitalocean.com/observability/firebolt/kafka"
-	"github.internal.digitalocean.com/observability/firebolt/metrics"
+	kafkainterface "github.com/digitalocean/firebolt/kafka"
+	"github.com/digitalocean/firebolt/metrics"
 )
 
 func createValidConfig() map[string]string {
diff --git a/node/kafkaconsumer/recoveryconsumer.go b/node/kafkaconsumer/recoveryconsumer.go
@@ -7,15 +7,15 @@ import (
 	"sync"
 	"time"
 
-	"github.internal.digitalocean.com/observability/firebolt"
+	"github.com/digitalocean/firebolt"
 
 	"github.com/confluentinc/confluent-kafka-go/kafka"
 	log "github.com/sirupsen/logrus"
 	"golang.org/x/time/rate"
 
-	"github.internal.digitalocean.com/observability/firebolt/fbcontext"
-	kafkainterface "github.internal.digitalocean.com/observability/firebolt/kafka"
-	"github.internal.digitalocean.com/observability/firebolt/util"
+	"github.com/digitalocean/firebolt/fbcontext"
+	kafkainterface "github.com/digitalocean/firebolt/kafka"
+	"github.com/digitalocean/firebolt/util"
 )
 
 const updateRecoveryRequestSeconds = 5
diff --git a/node/kafkaconsumer/recoveryconsumer_int_test.go b/node/kafkaconsumer/recoveryconsumer_int_test.go
diff --git a/node/kafkaconsumer/recoveryconsumer_test.go b/node/kafkaconsumer/recoveryconsumer_test.go
diff --git a/node/kafkaconsumer/recoverytracker.go b/node/kafkaconsumer/recoverytracker.go
diff --git a/node/kafkaconsumer/recoverytracker_test.go b/node/kafkaconsumer/recoverytracker_test.go
diff --git a/node/kafkaproducer/errorproducer.go b/node/kafkaproducer/errorproducer.go
diff --git a/node/kafkaproducer/kafkaproducer.go b/node/kafkaproducer/kafkaproducer.go
diff --git a/node/kafkaproducer/kafkaproducer_test.go b/node/kafkaproducer/kafkaproducer_test.go
diff --git a/node/node.go b/node/node.go
diff --git a/node/node_test.go b/node/node_test.go
diff --git a/node/registry_test.go b/node/registry_test.go
diff --git a/node/source.go b/node/source.go
diff --git a/node/syslogparser/syslogparser.go b/node/syslogparser/syslogparser.go
diff --git a/node/syslogparser/syslogparser_test.go b/node/syslogparser/syslogparser_test.go

Original file line number	Diff line number	Diff line change
`@@ -10,8 +10,8 @@ import (`
`10`	`10`	`log "github.com/sirupsen/logrus"`
`11`	`11`	`"gopkg.in/yaml.v2"`
`12`	`12`
`13`		`- "github.internal.digitalocean.com/observability/firebolt"`
`14`		`- "github.internal.digitalocean.com/observability/firebolt/node"`
	`13`	`+ "github.com/digitalocean/firebolt"`
	`14`	`+ "github.com/digitalocean/firebolt/node"`
`15`	`15`	`)`
`16`	`16`
`17`	`17`	`// Config is the firebolt application configuration, including the configured source and all processing nodes`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@ import (`
`6`	`6`	`"testing"`
`7`	`7`	`"time"`
`8`	`8`
`9`		`- "github.internal.digitalocean.com/observability/firebolt"`
	`9`	`+ "github.com/digitalocean/firebolt"`
`10`	`10`
`11`	`11`	`"github.com/stretchr/testify/assert"`
`12`	`12`	`)`
Original file line number	Diff line number	Diff line change
`@@ -7,8 +7,8 @@ import (`
`7`	`7`
`8`	`8`	`"github.com/stretchr/testify/assert"`
`9`	`9`
`10`		`- "github.internal.digitalocean.com/observability/firebolt/executor"`
`11`		`- "github.internal.digitalocean.com/observability/firebolt/internal"`
	`10`	`+ "github.com/digitalocean/firebolt/executor"`
	`11`	`+ "github.com/digitalocean/firebolt/internal"`
`12`	`12`	`)`
`13`	`13`
`14`	`14`	`func TestNewInvalidConfig(t *testing.T) {`