diff --git a/pkg/source/sourceconfig/source_config_test.go b/pkg/source/sourceconfig/source_config_test.go index ad915ec4..f82e1808 100644 --- a/pkg/source/sourceconfig/source_config_test.go +++ b/pkg/source/sourceconfig/source_config_test.go @@ -10,9 +10,10 @@ import ( "os" "testing" + "github.com/stretchr/testify/assert" + config "github.com/snowplow-devops/stream-replicator/config" "github.com/snowplow-devops/stream-replicator/pkg/source/sourceiface" - "github.com/stretchr/testify/assert" ) func TestMain(m *testing.M) { diff --git a/pkg/target/eventhub.go b/pkg/target/eventhub.go index 81e25d44..62a31abf 100644 --- a/pkg/target/eventhub.go +++ b/pkg/target/eventhub.go @@ -16,6 +16,7 @@ import ( "github.com/hashicorp/go-multierror" "github.com/pkg/errors" log "github.com/sirupsen/logrus" + "github.com/snowplow-devops/stream-replicator/pkg/models" ) diff --git a/pkg/target/eventhub_test.go b/pkg/target/eventhub_test.go index e4c21aff..611c5c18 100644 --- a/pkg/target/eventhub_test.go +++ b/pkg/target/eventhub_test.go @@ -17,10 +17,11 @@ import ( eventhub "github.com/Azure/azure-event-hubs-go/v3" "github.com/pkg/errors" - "github.com/snowplow-devops/stream-replicator/pkg/models" - "github.com/snowplow-devops/stream-replicator/pkg/testutil" "github.com/stretchr/testify/assert" "github.com/twinj/uuid" + + "github.com/snowplow-devops/stream-replicator/pkg/models" + "github.com/snowplow-devops/stream-replicator/pkg/testutil" ) var cfg = EventHubConfig{ diff --git a/pkg/target/http.go b/pkg/target/http.go index a655c2d7..69e587fe 100644 --- a/pkg/target/http.go +++ b/pkg/target/http.go @@ -15,12 +15,11 @@ import ( "net/url" "time" - "github.com/snowplow-devops/stream-replicator/pkg/common" - "github.com/hashicorp/go-multierror" "github.com/pkg/errors" log "github.com/sirupsen/logrus" + "github.com/snowplow-devops/stream-replicator/pkg/common" "github.com/snowplow-devops/stream-replicator/pkg/models" ) diff --git a/pkg/target/http_test.go b/pkg/target/http_test.go index c5cb7859..89ead223 100644 --- a/pkg/target/http_test.go +++ b/pkg/target/http_test.go @@ -18,9 +18,10 @@ import ( "sync/atomic" "testing" + "github.com/stretchr/testify/assert" + "github.com/snowplow-devops/stream-replicator/pkg/models" "github.com/snowplow-devops/stream-replicator/pkg/testutil" - "github.com/stretchr/testify/assert" ) func createTestServer(results *[][]byte, waitgroup *sync.WaitGroup) *httptest.Server { diff --git a/pkg/target/kafka.go b/pkg/target/kafka.go index b45206ee..1b3c677d 100644 --- a/pkg/target/kafka.go +++ b/pkg/target/kafka.go @@ -14,14 +14,13 @@ import ( "strings" "time" - "github.com/snowplow-devops/stream-replicator/pkg/common" - "github.com/Shopify/sarama" "github.com/hashicorp/go-multierror" "github.com/pkg/errors" log "github.com/sirupsen/logrus" "github.com/xdg/scram" + "github.com/snowplow-devops/stream-replicator/pkg/common" "github.com/snowplow-devops/stream-replicator/pkg/models" ) diff --git a/pkg/target/kafka_test.go b/pkg/target/kafka_test.go index 28b1a168..9de02a2b 100644 --- a/pkg/target/kafka_test.go +++ b/pkg/target/kafka_test.go @@ -13,6 +13,7 @@ import ( "github.com/Shopify/sarama" "github.com/Shopify/sarama/mocks" log "github.com/sirupsen/logrus" + "github.com/snowplow-devops/stream-replicator/pkg/testutil" "github.com/stretchr/testify/assert" ) diff --git a/pkg/transform/snowplow_enriched_filter.go b/pkg/transform/snowplow_enriched_filter.go index 0efcbe21..3cec9a2c 100644 --- a/pkg/transform/snowplow_enriched_filter.go +++ b/pkg/transform/snowplow_enriched_filter.go @@ -8,16 +8,17 @@ package transform import ( "fmt" - "github.com/dlclark/regexp2" "log" "regexp" "strings" "time" + "github.com/dlclark/regexp2" + "github.com/pkg/errors" + "github.com/snowplow/snowplow-golang-analytics-sdk/analytics" "github.com/snowplow-devops/stream-replicator/pkg/models" - "github.com/snowplow/snowplow-golang-analytics-sdk/analytics" ) func findSpEnrichedFilterValue(queriedField, parsedEventName, eventVer, field string, parsedMessage analytics.ParsedEvent, path []interface{}) ([]interface{}, error) { diff --git a/pkg/transform/snowplow_enriched_filter_test.go b/pkg/transform/snowplow_enriched_filter_test.go index 2e679286..738c5505 100644 --- a/pkg/transform/snowplow_enriched_filter_test.go +++ b/pkg/transform/snowplow_enriched_filter_test.go @@ -9,8 +9,9 @@ package transform import ( "testing" - "github.com/snowplow-devops/stream-replicator/pkg/models" "github.com/stretchr/testify/assert" + + "github.com/snowplow-devops/stream-replicator/pkg/models" ) func TestNewSpEnrichedFilterFunction(t *testing.T) { diff --git a/pkg/transform/snowplow_enriched_set_pk_test.go b/pkg/transform/snowplow_enriched_set_pk_test.go index bd94512a..04988efb 100644 --- a/pkg/transform/snowplow_enriched_set_pk_test.go +++ b/pkg/transform/snowplow_enriched_set_pk_test.go @@ -9,8 +9,9 @@ package transform import ( "testing" - "github.com/snowplow-devops/stream-replicator/pkg/models" "github.com/stretchr/testify/assert" + + "github.com/snowplow-devops/stream-replicator/pkg/models" ) func TestNewSpEnrichedSetPkFunction(t *testing.T) { diff --git a/pkg/transform/snowplow_enriched_to_json_test.go b/pkg/transform/snowplow_enriched_to_json_test.go index e5451302..e037e442 100644 --- a/pkg/transform/snowplow_enriched_to_json_test.go +++ b/pkg/transform/snowplow_enriched_to_json_test.go @@ -9,8 +9,9 @@ package transform import ( "testing" - "github.com/snowplow-devops/stream-replicator/pkg/models" "github.com/stretchr/testify/assert" + + "github.com/snowplow-devops/stream-replicator/pkg/models" ) func TestSpEnrichedToJson(t *testing.T) { diff --git a/pkg/transform/snowplow_enriched_util.go b/pkg/transform/snowplow_enriched_util.go index 6c6468fd..d494c823 100644 --- a/pkg/transform/snowplow_enriched_util.go +++ b/pkg/transform/snowplow_enriched_util.go @@ -9,8 +9,9 @@ package transform import ( "strconv" - "github.com/snowplow-devops/stream-replicator/pkg/models" "github.com/snowplow/snowplow-golang-analytics-sdk/analytics" + + "github.com/snowplow-devops/stream-replicator/pkg/models" ) // IntermediateAsSpEnrichedParsed returns the intermediate state as a ParsedEvent if valid or parses diff --git a/pkg/transform/snowplow_enriched_util_test.go b/pkg/transform/snowplow_enriched_util_test.go index cc27bb88..47ea5469 100644 --- a/pkg/transform/snowplow_enriched_util_test.go +++ b/pkg/transform/snowplow_enriched_util_test.go @@ -10,6 +10,7 @@ import ( "testing" "github.com/snowplow-devops/stream-replicator/pkg/models" + "github.com/stretchr/testify/assert" ) diff --git a/pkg/transform/transform_test.go b/pkg/transform/transform_test.go index 4b378b02..7bec84f7 100644 --- a/pkg/transform/transform_test.go +++ b/pkg/transform/transform_test.go @@ -10,8 +10,9 @@ import ( "testing" "time" - "github.com/snowplow-devops/stream-replicator/pkg/models" "github.com/stretchr/testify/assert" + + "github.com/snowplow-devops/stream-replicator/pkg/models" ) // To test a function which creates a function, we're creating the function then testing that. Not sure if there's a better way? diff --git a/pkg/transform/transform_test_variables.go b/pkg/transform/transform_test_variables.go index 9302f063..6464bd01 100644 --- a/pkg/transform/transform_test_variables.go +++ b/pkg/transform/transform_test_variables.go @@ -7,8 +7,9 @@ package transform import ( - "github.com/snowplow-devops/stream-replicator/pkg/models" "github.com/snowplow/snowplow-golang-analytics-sdk/analytics" + + "github.com/snowplow-devops/stream-replicator/pkg/models" ) var snowplowTsv1 = []byte(`test-data1 pc 2019-05-10 14:40:37.436 2019-05-10 14:40:35.972 2019-05-10 14:40:35.551 unstruct e9234345-f042-46ad-b1aa-424464066a33 py-0.8.2 ssc-0.15.0-googlepubsub beam-enrich-0.2.0-common-0.36.0 user 18.194.133.57 d26822f5-52cc-4292-8f77-14ef6b7a27e2 {"schema":"iglu:com.snowplowanalytics.snowplow/unstruct_event/jsonschema/1-0-0","data":{"schema":"iglu:com.snowplowanalytics.snowplow/add_to_cart/jsonschema/1-0-0","data":{"sku":"item41","quantity":2,"unitPrice":32.4,"currency":"GBP"}}} python-requests/2.21.0 2019-05-10 14:40:35.000 {"schema":"iglu:com.snowplowanalytics.snowplow/contexts/jsonschema/1-0-1","data":[{"schema":"iglu:nl.basjes/yauaa_context/jsonschema/1-0-0","data":{"deviceBrand":"Unknown","deviceName":"Unknown","operatingSystemName":"Unknown","agentVersionMajor":"2","layoutEngineVersionMajor":"??","deviceClass":"Unknown","agentNameVersionMajor":"python-requests 2","operatingSystemClass":"Unknown","layoutEngineName":"Unknown","agentName":"python-requests","agentVersion":"2.21.0","layoutEngineClass":"Unknown","agentNameVersion":"python-requests 2.21.0","operatingSystemVersion":"??","agentClass":"Special","layoutEngineVersion":"??"}}]} 2019-05-10 14:40:35.972 com.snowplowanalytics.snowplow add_to_cart jsonschema 1-0-0 `)