From 40115b32ca34dc683da1650b8f8ed5b9884a8708 Mon Sep 17 00:00:00 2001 From: Dimitris Baltas Date: Wed, 29 May 2019 13:51:35 +0300 Subject: [PATCH] Rename org from thebeatapp to beatlabs (#56) --- .circleci/config.yml | 2 +- .github/PULL_REQUEST_TEMPLATE.md | 4 ++-- README.md | 8 ++++---- async/amqp/amqp.go | 10 +++++----- async/amqp/amqp_test.go | 2 +- async/amqp/option.go | 2 +- async/async.go | 8 ++++---- async/async_test.go | 4 ++-- async/component.go | 4 ++-- async/component_test.go | 2 +- async/kafka/kafka.go | 10 +++++----- async/kafka/kafka_test.go | 6 +++--- async/kafka/option.go | 2 +- async/option.go | 4 ++-- cmd/patron/main.go | 12 ++++++------ doc.go | 2 +- examples/first/main.go | 14 +++++++------- examples/fourth/main.go | 10 +++++----- examples/second/main.go | 16 ++++++++-------- examples/third/main.go | 14 +++++++------- go.mod | 2 +- info/info.go | 4 ++-- log/log.go | 2 +- log/zerolog/factory.go | 2 +- log/zerolog/factory_test.go | 2 +- log/zerolog/logger.go | 2 +- log/zerolog/logger_test.go | 2 +- option.go | 8 ++++---- option_test.go | 3 ++- service.go | 12 ++++++------ service_test.go | 4 ++-- sync/http/component.go | 2 +- sync/http/component_test.go | 2 +- sync/http/handler.go | 12 ++++++------ sync/http/handler_test.go | 10 +++++----- sync/http/info.go | 6 +++--- sync/http/info_test.go | 6 +++--- sync/http/middleware.go | 8 ++++---- sync/http/middleware_test.go | 3 ++- sync/http/option.go | 2 +- sync/http/route.go | 4 ++-- sync/sync.go | 2 +- sync/sync_test.go | 2 +- trace/amqp/amqp.go | 8 ++++---- trace/amqp/option.go | 2 +- trace/http/http.go | 4 ++-- trace/http/http_test.go | 4 ++-- trace/http/option.go | 4 ++-- trace/kafka/kafka.go | 6 +++--- trace/kafka/kafka_test.go | 2 +- trace/kafka/option.go | 4 ++-- trace/sql/sql.go | 2 +- trace/trace.go | 4 ++-- 53 files changed, 140 insertions(+), 138 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 76c0e3de3..1ec8b88ad 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -14,7 +14,7 @@ jobs: - run: name: Running with test coverage and send to codecov command: | - export CODECOV_TOKEN="90085daa-03f9-4ada-82e4-c24c50706e6f" + export CODECOV_TOKEN="b10270e6-8609-4707-88f1-57c904378989" go get -u github.com/jstemmer/go-junit-report mkdir -p $TEST_RESULTS trap "go-junit-report <${TEST_RESULTS}/go-test.out > ${TEST_RESULTS}/go-test-report.xml" EXIT diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index fc7e28a5f..2596451cc 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -4,9 +4,9 @@ Thanks for taking precious time for making a PR. Before creating a pull request, please make sure: - Your PR solves one problem for which a issue exist and a solution has been discussed - You have read the guide for contributing - - See https://github.com/thebeatapp/patron/blob/master/CONTRIBUTING.md + - See https://github.com/beatlabs/patron/blob/master/CONTRIBUTING.md - You signed all your commits (otherwise we won't be able to merge the PR) - - See https://github.com/thebeatapp/patron/blob/master/CONTRIBUTING.md#sign-your-work + - See https://github.com/beatlabs/patron/blob/master/CONTRIBUTING.md#sign-your-work - You added unit tests for the new functionality - You mention in the PR description which issue it is addressing, e.g. "Resolves #123" --> diff --git a/README.md b/README.md index 28ba40ae8..bbc3a7b5b 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# patron [![CircleCI](https://circleci.com/gh/thebeatapp/patron.svg?style=svg)](https://circleci.com/gh/thebeatapp/patron) [![codecov](https://codecov.io/gh/thebeatapp/patron/branch/master/graph/badge.svg)](https://codecov.io/gh/thebeatapp/patron) [![Go Report Card](https://goreportcard.com/badge/github.com/thebeatapp/patron)](https://goreportcard.com/report/github.com/thebeatapp/patron) [![GoDoc](https://godoc.org/github.com/thebeatapp/patron?status.svg)](https://godoc.org/github.com/thebeatapp/patron) ![GitHub release](https://img.shields.io/github/release/thebeatapp/patron.svg) +# patron [![CircleCI](https://circleci.com/gh/beatlabs/patron.svg?style=svg)](https://circleci.com/gh/beatlabs/patron) [![codecov](https://codecov.io/gh/beatlabs/patron/branch/master/graph/badge.svg)](https://codecov.io/gh/beatlabs/patron) [![Go Report Card](https://goreportcard.com/badge/github.com/beatlabs/patron)](https://goreportcard.com/report/github.com/beatlabs/patron) [![GoDoc](https://godoc.org/github.com/beatlabs/patron?status.svg)](https://godoc.org/github.com/beatlabs/patron) ![GitHub release](https://img.shields.io/github/release/beatlabs/patron.svg) Patron is a framework for creating microservices, originally created by Sotiris Mantzaris (https://github.com/mantzas). This fork is maintained by Beat Engineering (https://thebeat.co) @@ -59,13 +59,13 @@ The framework supplies a cli in order to simplify repository generation with the The latest version can be installed with ```go -go get github.com/thebeatapp/patron/cmd/patron +go get github.com/beatlabs/patron/cmd/patron ``` -The below is an example of a service created with the cli that has a module name `github.com/thebeatapp/test` and will be created in the test folder in the current directory. +The below is an example of a service created with the cli that has a module name `github.com/beatlabs/test` and will be created in the test folder in the current directory. ```go -patron -m "github.com/thebeatapp/test" -p "test" +patron -m "github.com/beatlabs/test" -p "test" ``` ## Service diff --git a/async/amqp/amqp.go b/async/amqp/amqp.go index 4977c9556..66ee30969 100644 --- a/async/amqp/amqp.go +++ b/async/amqp/amqp.go @@ -8,14 +8,14 @@ import ( "strings" "time" + "github.com/beatlabs/patron/async" + "github.com/beatlabs/patron/encoding" + "github.com/beatlabs/patron/errors" + "github.com/beatlabs/patron/log" + "github.com/beatlabs/patron/trace" "github.com/google/uuid" opentracing "github.com/opentracing/opentracing-go" "github.com/streadway/amqp" - "github.com/thebeatapp/patron/async" - "github.com/thebeatapp/patron/encoding" - "github.com/thebeatapp/patron/errors" - "github.com/thebeatapp/patron/log" - "github.com/thebeatapp/patron/trace" ) var ( diff --git a/async/amqp/amqp_test.go b/async/amqp/amqp_test.go index 192490eef..b53c391f9 100644 --- a/async/amqp/amqp_test.go +++ b/async/amqp/amqp_test.go @@ -4,11 +4,11 @@ import ( "context" "testing" + "github.com/beatlabs/patron/encoding/json" "github.com/opentracing/opentracing-go" "github.com/opentracing/opentracing-go/mocktracer" "github.com/streadway/amqp" "github.com/stretchr/testify/assert" - "github.com/thebeatapp/patron/encoding/json" ) func Test_message(t *testing.T) { diff --git a/async/amqp/option.go b/async/amqp/option.go index 1b99e405d..fa604509a 100644 --- a/async/amqp/option.go +++ b/async/amqp/option.go @@ -4,8 +4,8 @@ import ( "net" "time" + "github.com/beatlabs/patron/errors" "github.com/streadway/amqp" - "github.com/thebeatapp/patron/errors" ) // OptionFunc definition for configuring the consumer in a functional way. diff --git a/async/async.go b/async/async.go index a12caf433..8f42d56a2 100644 --- a/async/async.go +++ b/async/async.go @@ -3,10 +3,10 @@ package async import ( "context" - "github.com/thebeatapp/patron/encoding" - "github.com/thebeatapp/patron/encoding/json" - "github.com/thebeatapp/patron/encoding/protobuf" - "github.com/thebeatapp/patron/errors" + "github.com/beatlabs/patron/encoding" + "github.com/beatlabs/patron/encoding/json" + "github.com/beatlabs/patron/encoding/protobuf" + "github.com/beatlabs/patron/errors" ) // ProcessorFunc definition of a async processor. diff --git a/async/async_test.go b/async/async_test.go index 00ee4a16b..148dfbd31 100644 --- a/async/async_test.go +++ b/async/async_test.go @@ -3,9 +3,9 @@ package async import ( "testing" + "github.com/beatlabs/patron/encoding/json" + "github.com/beatlabs/patron/encoding/protobuf" "github.com/stretchr/testify/assert" - "github.com/thebeatapp/patron/encoding/json" - "github.com/thebeatapp/patron/encoding/protobuf" ) func TestDetermineDecoder(t *testing.T) { diff --git a/async/component.go b/async/component.go index 1d7339053..5a74ec3a3 100644 --- a/async/component.go +++ b/async/component.go @@ -4,9 +4,9 @@ import ( "context" "time" + "github.com/beatlabs/patron/errors" + "github.com/beatlabs/patron/log" "github.com/prometheus/client_golang/prometheus" - "github.com/thebeatapp/patron/errors" - "github.com/thebeatapp/patron/log" ) var consumerErrors *prometheus.CounterVec diff --git a/async/component_test.go b/async/component_test.go index 1b6bc4564..c5265df28 100644 --- a/async/component_test.go +++ b/async/component_test.go @@ -5,8 +5,8 @@ import ( "testing" "time" + "github.com/beatlabs/patron/errors" "github.com/stretchr/testify/assert" - "github.com/thebeatapp/patron/errors" ) func TestNew(t *testing.T) { diff --git a/async/kafka/kafka.go b/async/kafka/kafka.go index 6c82fe4a6..1db922947 100644 --- a/async/kafka/kafka.go +++ b/async/kafka/kafka.go @@ -8,14 +8,14 @@ import ( "strings" "github.com/Shopify/sarama" + "github.com/beatlabs/patron/async" + "github.com/beatlabs/patron/encoding" + "github.com/beatlabs/patron/errors" + "github.com/beatlabs/patron/log" + "github.com/beatlabs/patron/trace" "github.com/google/uuid" opentracing "github.com/opentracing/opentracing-go" "github.com/prometheus/client_golang/prometheus" - "github.com/thebeatapp/patron/async" - "github.com/thebeatapp/patron/encoding" - "github.com/thebeatapp/patron/errors" - "github.com/thebeatapp/patron/log" - "github.com/thebeatapp/patron/trace" ) var topicPartitionOffsetDiff *prometheus.GaugeVec diff --git a/async/kafka/kafka_test.go b/async/kafka/kafka_test.go index 44ca57f8c..819d81f38 100644 --- a/async/kafka/kafka_test.go +++ b/async/kafka/kafka_test.go @@ -2,16 +2,16 @@ package kafka import ( "context" - "github.com/thebeatapp/patron/async" + "github.com/beatlabs/patron/async" "testing" "time" "github.com/Shopify/sarama" + "github.com/beatlabs/patron/encoding" + "github.com/beatlabs/patron/encoding/json" "github.com/opentracing/opentracing-go" "github.com/opentracing/opentracing-go/mocktracer" "github.com/stretchr/testify/assert" - "github.com/thebeatapp/patron/encoding" - "github.com/thebeatapp/patron/encoding/json" ) func TestNew(t *testing.T) { diff --git a/async/kafka/option.go b/async/kafka/option.go index 012b4ca17..de0a0e403 100644 --- a/async/kafka/option.go +++ b/async/kafka/option.go @@ -4,7 +4,7 @@ import ( "time" "github.com/Shopify/sarama" - "github.com/thebeatapp/patron/errors" + "github.com/beatlabs/patron/errors" ) // OptionFunc definition for configuring the consumer in a functional way. diff --git a/async/option.go b/async/option.go index 98ee1f037..f7a61266e 100644 --- a/async/option.go +++ b/async/option.go @@ -3,8 +3,8 @@ package async import ( "time" - "github.com/thebeatapp/patron/errors" - "github.com/thebeatapp/patron/log" + "github.com/beatlabs/patron/errors" + "github.com/beatlabs/patron/log" ) // FailStrategy type definition. diff --git a/cmd/patron/main.go b/cmd/patron/main.go index b7cacaf91..f263ed836 100644 --- a/cmd/patron/main.go +++ b/cmd/patron/main.go @@ -28,7 +28,7 @@ type genData struct { var patronPackages = map[string]component{ "http": component{ - Import: "\"github.com/thebeatapp/patron/sync\"\n\tsync_http \"github.com/thebeatapp/patron/sync/http\"\n\t\"context\"\n\t\"net/http\"", + Import: "\"github.com/beatlabs/patron/sync\"\n\tsync_http \"github.com/beatlabs/patron/sync/http\"\n\t\"context\"\n\t\"net/http\"", Code: `// Set up HTTP routes routes := make([]sync_http.Route, 0) // Append a GET route @@ -39,7 +39,7 @@ var patronPackages = map[string]component{ oo = append(oo, patron.Routes(routes))`, }, "kafka": component{ - Import: "\"github.com/thebeatapp/patron/async\"\n\t\"github.com/thebeatapp/patron/async/kafka\"", + Import: "\"github.com/beatlabs/patron/async\"\n\t\"github.com/beatlabs/patron/async/kafka\"", Code: `kafkaCf, err := kafka.New(name, "json.Type", "TOPIC", []string{"BROKER"}) if err != nil { log.Fatalf("failed to create kafka consumer factory: %v", err) @@ -53,7 +53,7 @@ var patronPackages = map[string]component{ oo = append(oo, patron.Components(kafkaCmp))`, }, "amqp": component{ - Import: "\"github.com/thebeatapp/patron/async\"\n\t\"github.com/thebeatapp/patron/async/amqp\"", + Import: "\"github.com/beatlabs/patron/async\"\n\t\"github.com/beatlabs/patron/async/amqp\"", Code: `amqpCf, err := amqp.New("URL", "QUEUE", "EXCHANGE") if err != nil { log.Fatalf("failed to create amqp consumer factory: %v", err) @@ -69,7 +69,7 @@ var patronPackages = map[string]component{ } func main() { - module := flag.String("m", "", `define the module name ("github.com/thebeatapp/patron")`) + module := flag.String("m", "", `define the module name ("github.com/beatlabs/patron")`) path := flag.String("p", "", "define the project folder (defaults to current)") vendor := flag.Bool("d", true, "define vendoring behavior (default true)") packages := flag.String("r", "", "define additional packages comma separated (kafka,amqp,http)") @@ -296,8 +296,8 @@ import ( "fmt" "os" - "github.com/thebeatapp/patron" - "github.com/thebeatapp/patron/log" + "github.com/beatlabs/patron" + "github.com/beatlabs/patron/log" {{ range .Components -}} {{- .Import }} {{ end }} diff --git a/doc.go b/doc.go index df8643639..2aafc42e6 100644 --- a/doc.go +++ b/doc.go @@ -23,6 +23,6 @@ Patron provides abstractions for the following functionality of the framework: - configuration management Patron provides same defaults for making the usage as simple as possible. -For more details please check out github repository https://github.com/thebeatapp/patron. +For more details please check out github repository https://github.com/beatlabs/patron. */ package patron diff --git a/examples/first/main.go b/examples/first/main.go index af834348a..f04b3d5d8 100644 --- a/examples/first/main.go +++ b/examples/first/main.go @@ -8,14 +8,14 @@ import ( "os" "time" + "github.com/beatlabs/patron" + "github.com/beatlabs/patron/encoding/protobuf" + "github.com/beatlabs/patron/examples" + "github.com/beatlabs/patron/log" + "github.com/beatlabs/patron/sync" + patronhttp "github.com/beatlabs/patron/sync/http" + tracehttp "github.com/beatlabs/patron/trace/http" "github.com/pkg/errors" - "github.com/thebeatapp/patron" - "github.com/thebeatapp/patron/encoding/protobuf" - "github.com/thebeatapp/patron/examples" - "github.com/thebeatapp/patron/log" - "github.com/thebeatapp/patron/sync" - patronhttp "github.com/thebeatapp/patron/sync/http" - tracehttp "github.com/thebeatapp/patron/trace/http" ) func init() { diff --git a/examples/fourth/main.go b/examples/fourth/main.go index 814626f41..28db74b97 100644 --- a/examples/fourth/main.go +++ b/examples/fourth/main.go @@ -5,11 +5,11 @@ import ( "os" "time" - "github.com/thebeatapp/patron" - "github.com/thebeatapp/patron/async" - "github.com/thebeatapp/patron/async/amqp" - "github.com/thebeatapp/patron/examples" - "github.com/thebeatapp/patron/log" + "github.com/beatlabs/patron" + "github.com/beatlabs/patron/async" + "github.com/beatlabs/patron/async/amqp" + "github.com/beatlabs/patron/examples" + "github.com/beatlabs/patron/log" ) const ( diff --git a/examples/second/main.go b/examples/second/main.go index 3d8b990b3..c932e0905 100644 --- a/examples/second/main.go +++ b/examples/second/main.go @@ -7,15 +7,15 @@ import ( "os" "time" + "github.com/beatlabs/patron" + "github.com/beatlabs/patron/examples" + "github.com/beatlabs/patron/log" + "github.com/beatlabs/patron/sync" + patronhttp "github.com/beatlabs/patron/sync/http" + "github.com/beatlabs/patron/sync/http/auth/apikey" + tracehttp "github.com/beatlabs/patron/trace/http" + "github.com/beatlabs/patron/trace/kafka" "github.com/pkg/errors" - "github.com/thebeatapp/patron" - "github.com/thebeatapp/patron/examples" - "github.com/thebeatapp/patron/log" - "github.com/thebeatapp/patron/sync" - patronhttp "github.com/thebeatapp/patron/sync/http" - "github.com/thebeatapp/patron/sync/http/auth/apikey" - tracehttp "github.com/thebeatapp/patron/trace/http" - "github.com/thebeatapp/patron/trace/kafka" ) const ( diff --git a/examples/third/main.go b/examples/third/main.go index 3b6d1c008..e0304d503 100644 --- a/examples/third/main.go +++ b/examples/third/main.go @@ -5,13 +5,13 @@ import ( "os" "time" - "github.com/thebeatapp/patron" - "github.com/thebeatapp/patron/async" - "github.com/thebeatapp/patron/async/kafka" - "github.com/thebeatapp/patron/encoding/json" - "github.com/thebeatapp/patron/examples" - "github.com/thebeatapp/patron/log" - "github.com/thebeatapp/patron/trace/amqp" + "github.com/beatlabs/patron" + "github.com/beatlabs/patron/async" + "github.com/beatlabs/patron/async/kafka" + "github.com/beatlabs/patron/encoding/json" + "github.com/beatlabs/patron/examples" + "github.com/beatlabs/patron/log" + "github.com/beatlabs/patron/trace/amqp" ) const ( diff --git a/go.mod b/go.mod index 8556e4de5..8308523d1 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/thebeatapp/patron +module github.com/beatlabs/patron require ( github.com/Shopify/sarama v1.21.0 diff --git a/info/info.go b/info/info.go index 1b9451d37..5ac7ce041 100644 --- a/info/info.go +++ b/info/info.go @@ -5,8 +5,8 @@ import ( "io/ioutil" "sync" - "github.com/thebeatapp/patron/encoding/json" - "github.com/thebeatapp/patron/errors" + "github.com/beatlabs/patron/encoding/json" + "github.com/beatlabs/patron/errors" blackfriday "gopkg.in/russross/blackfriday.v2" ) diff --git a/log/log.go b/log/log.go index 4efd73236..71b9090b8 100644 --- a/log/log.go +++ b/log/log.go @@ -3,7 +3,7 @@ package log import ( "context" - "github.com/thebeatapp/patron/errors" + "github.com/beatlabs/patron/errors" ) // The Level type definition. diff --git a/log/zerolog/factory.go b/log/zerolog/factory.go index 26325b75c..9216bd7f2 100644 --- a/log/zerolog/factory.go +++ b/log/zerolog/factory.go @@ -8,8 +8,8 @@ import ( "runtime" "time" + "github.com/beatlabs/patron/log" "github.com/rs/zerolog" - "github.com/thebeatapp/patron/log" ) // Create creates a zerolog factory with default settings. diff --git a/log/zerolog/factory_test.go b/log/zerolog/factory_test.go index 0f60f22be..bc1ef5b54 100644 --- a/log/zerolog/factory_test.go +++ b/log/zerolog/factory_test.go @@ -4,8 +4,8 @@ import ( "testing" "time" + "github.com/beatlabs/patron/log" "github.com/stretchr/testify/assert" - "github.com/thebeatapp/patron/log" ) func TestDefaultFactory(t *testing.T) { diff --git a/log/zerolog/logger.go b/log/zerolog/logger.go index 641d81903..cdeddc432 100644 --- a/log/zerolog/logger.go +++ b/log/zerolog/logger.go @@ -3,8 +3,8 @@ package zerolog import ( "fmt" + "github.com/beatlabs/patron/log" "github.com/rs/zerolog" - "github.com/thebeatapp/patron/log" ) var levelMap = map[log.Level]zerolog.Level{ diff --git a/log/zerolog/logger_test.go b/log/zerolog/logger_test.go index f437f6586..ac7232f84 100644 --- a/log/zerolog/logger_test.go +++ b/log/zerolog/logger_test.go @@ -4,9 +4,9 @@ import ( "bytes" "testing" + "github.com/beatlabs/patron/log" "github.com/rs/zerolog" "github.com/stretchr/testify/assert" - "github.com/thebeatapp/patron/log" ) var f = map[string]interface{}{"key": "value"} diff --git a/option.go b/option.go index dc715f9c5..008f51673 100644 --- a/option.go +++ b/option.go @@ -1,10 +1,10 @@ package patron import ( - "github.com/thebeatapp/patron/errors" - "github.com/thebeatapp/patron/info" - "github.com/thebeatapp/patron/log" - "github.com/thebeatapp/patron/sync/http" + "github.com/beatlabs/patron/errors" + "github.com/beatlabs/patron/info" + "github.com/beatlabs/patron/log" + "github.com/beatlabs/patron/sync/http" ) // OptionFunc definition for configuring the service in a functional way. diff --git a/option_test.go b/option_test.go index 266a65487..5cdbe658f 100644 --- a/option_test.go +++ b/option_test.go @@ -5,7 +5,8 @@ import ( "testing" "github.com/stretchr/testify/assert" - phttp "github.com/thebeatapp/patron/sync/http" + + phttp "github.com/beatlabs/patron/sync/http" ) func middleware(h http.Handler) http.Handler { diff --git a/service.go b/service.go index b750e9b6e..34a377aff 100644 --- a/service.go +++ b/service.go @@ -8,12 +8,12 @@ import ( "sync" "syscall" - "github.com/thebeatapp/patron/errors" - "github.com/thebeatapp/patron/info" - "github.com/thebeatapp/patron/log" - "github.com/thebeatapp/patron/log/zerolog" - "github.com/thebeatapp/patron/sync/http" - "github.com/thebeatapp/patron/trace" + "github.com/beatlabs/patron/errors" + "github.com/beatlabs/patron/info" + "github.com/beatlabs/patron/log" + "github.com/beatlabs/patron/log/zerolog" + "github.com/beatlabs/patron/sync/http" + "github.com/beatlabs/patron/trace" jaeger "github.com/uber/jaeger-client-go" ) diff --git a/service_test.go b/service_test.go index beab8c5fb..46dbe878d 100644 --- a/service_test.go +++ b/service_test.go @@ -8,9 +8,9 @@ import ( "strconv" "testing" + "github.com/beatlabs/patron/errors" + phttp "github.com/beatlabs/patron/sync/http" "github.com/stretchr/testify/assert" - "github.com/thebeatapp/patron/errors" - phttp "github.com/thebeatapp/patron/sync/http" ) func TestNewServer(t *testing.T) { diff --git a/sync/http/component.go b/sync/http/component.go index 2beb7ee64..f112e6861 100644 --- a/sync/http/component.go +++ b/sync/http/component.go @@ -7,8 +7,8 @@ import ( "sync" "time" + "github.com/beatlabs/patron/log" "github.com/julienschmidt/httprouter" - "github.com/thebeatapp/patron/log" ) const ( diff --git a/sync/http/component_test.go b/sync/http/component_test.go index 84c52033e..1e9b7d771 100644 --- a/sync/http/component_test.go +++ b/sync/http/component_test.go @@ -5,8 +5,8 @@ import ( "testing" "time" + "github.com/beatlabs/patron/errors" "github.com/stretchr/testify/assert" - "github.com/thebeatapp/patron/errors" ) func ErrorOption() OptionFunc { diff --git a/sync/http/handler.go b/sync/http/handler.go index fea6b32be..41291311b 100644 --- a/sync/http/handler.go +++ b/sync/http/handler.go @@ -4,14 +4,14 @@ import ( "net/http" "strings" + "github.com/beatlabs/patron/encoding" + "github.com/beatlabs/patron/encoding/json" + "github.com/beatlabs/patron/encoding/protobuf" + "github.com/beatlabs/patron/errors" + "github.com/beatlabs/patron/log" + "github.com/beatlabs/patron/sync" "github.com/google/uuid" "github.com/julienschmidt/httprouter" - "github.com/thebeatapp/patron/encoding" - "github.com/thebeatapp/patron/encoding/json" - "github.com/thebeatapp/patron/encoding/protobuf" - "github.com/thebeatapp/patron/errors" - "github.com/thebeatapp/patron/log" - "github.com/thebeatapp/patron/sync" ) func handler(hnd sync.ProcessorFunc) http.HandlerFunc { diff --git a/sync/http/handler_test.go b/sync/http/handler_test.go index c751e276a..9b0f8f119 100644 --- a/sync/http/handler_test.go +++ b/sync/http/handler_test.go @@ -6,14 +6,14 @@ import ( "net/http/httptest" "testing" + "github.com/beatlabs/patron/encoding" + "github.com/beatlabs/patron/encoding/json" + "github.com/beatlabs/patron/encoding/protobuf" + "github.com/beatlabs/patron/errors" + "github.com/beatlabs/patron/sync" "github.com/julienschmidt/httprouter" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/thebeatapp/patron/encoding" - "github.com/thebeatapp/patron/encoding/json" - "github.com/thebeatapp/patron/encoding/protobuf" - "github.com/thebeatapp/patron/errors" - "github.com/thebeatapp/patron/sync" ) func Test_extractFields(t *testing.T) { diff --git a/sync/http/info.go b/sync/http/info.go index 886a973b3..dd61ade0a 100644 --- a/sync/http/info.go +++ b/sync/http/info.go @@ -3,10 +3,10 @@ package http import ( "net/http" + "github.com/beatlabs/patron/encoding" + "github.com/beatlabs/patron/encoding/json" + "github.com/beatlabs/patron/info" "github.com/prometheus/client_golang/prometheus" - "github.com/thebeatapp/patron/encoding" - "github.com/thebeatapp/patron/encoding/json" - "github.com/thebeatapp/patron/info" ) func infoHandler(w http.ResponseWriter, r *http.Request) { diff --git a/sync/http/info_test.go b/sync/http/info_test.go index c434d23d0..84346ec74 100644 --- a/sync/http/info_test.go +++ b/sync/http/info_test.go @@ -6,10 +6,10 @@ import ( "net/http/httptest" "testing" + "github.com/beatlabs/patron/encoding" + "github.com/beatlabs/patron/encoding/json" + "github.com/beatlabs/patron/info" "github.com/stretchr/testify/assert" - "github.com/thebeatapp/patron/encoding" - "github.com/thebeatapp/patron/encoding/json" - "github.com/thebeatapp/patron/info" ) func Test_Route(t *testing.T) { diff --git a/sync/http/middleware.go b/sync/http/middleware.go index c55a8b3f7..b0c8ca22a 100644 --- a/sync/http/middleware.go +++ b/sync/http/middleware.go @@ -3,10 +3,10 @@ package http import ( "net/http" - "github.com/thebeatapp/patron/errors" - "github.com/thebeatapp/patron/log" - "github.com/thebeatapp/patron/sync/http/auth" - "github.com/thebeatapp/patron/trace" + "github.com/beatlabs/patron/errors" + "github.com/beatlabs/patron/log" + "github.com/beatlabs/patron/sync/http/auth" + "github.com/beatlabs/patron/trace" ) type responseWriter struct { diff --git a/sync/http/middleware_test.go b/sync/http/middleware_test.go index dec27d015..46dd4d66e 100644 --- a/sync/http/middleware_test.go +++ b/sync/http/middleware_test.go @@ -6,7 +6,8 @@ import ( "testing" "github.com/stretchr/testify/assert" - "github.com/thebeatapp/patron/errors" + + "github.com/beatlabs/patron/errors" ) // A middleware generator that tags resp for assertions diff --git a/sync/http/option.go b/sync/http/option.go index e4a44ccb1..92dff8ea1 100644 --- a/sync/http/option.go +++ b/sync/http/option.go @@ -3,7 +3,7 @@ package http import ( "time" - "github.com/thebeatapp/patron/errors" + "github.com/beatlabs/patron/errors" ) // OptionFunc defines a option func for the HTTP component. diff --git a/sync/http/route.go b/sync/http/route.go index c672d7c14..f4a042983 100644 --- a/sync/http/route.go +++ b/sync/http/route.go @@ -3,8 +3,8 @@ package http import ( "net/http" - "github.com/thebeatapp/patron/sync" - "github.com/thebeatapp/patron/sync/http/auth" + "github.com/beatlabs/patron/sync" + "github.com/beatlabs/patron/sync/http/auth" ) // Route definition of a HTTP route. diff --git a/sync/sync.go b/sync/sync.go index 0e812b069..d397f9df7 100644 --- a/sync/sync.go +++ b/sync/sync.go @@ -4,7 +4,7 @@ import ( "context" "io" - "github.com/thebeatapp/patron/encoding" + "github.com/beatlabs/patron/encoding" ) // Request definition of the sync request model. diff --git a/sync/sync_test.go b/sync/sync_test.go index 92683ba66..86f4c14ff 100644 --- a/sync/sync_test.go +++ b/sync/sync_test.go @@ -4,8 +4,8 @@ import ( "bytes" "testing" + "github.com/beatlabs/patron/encoding/json" "github.com/stretchr/testify/assert" - "github.com/thebeatapp/patron/encoding/json" ) func TestNewRequest(t *testing.T) { diff --git a/trace/amqp/amqp.go b/trace/amqp/amqp.go index c47d8c15b..077385df0 100644 --- a/trace/amqp/amqp.go +++ b/trace/amqp/amqp.go @@ -5,13 +5,13 @@ import ( "net" "time" + "github.com/beatlabs/patron/encoding/json" + "github.com/beatlabs/patron/encoding/protobuf" + "github.com/beatlabs/patron/errors" + "github.com/beatlabs/patron/trace" opentracing "github.com/opentracing/opentracing-go" "github.com/opentracing/opentracing-go/ext" "github.com/streadway/amqp" - "github.com/thebeatapp/patron/encoding/json" - "github.com/thebeatapp/patron/encoding/protobuf" - "github.com/thebeatapp/patron/errors" - "github.com/thebeatapp/patron/trace" ) // Message abstraction for publishing. diff --git a/trace/amqp/option.go b/trace/amqp/option.go index 6b41d4b93..f6d580600 100644 --- a/trace/amqp/option.go +++ b/trace/amqp/option.go @@ -4,8 +4,8 @@ import ( "net" "time" + "github.com/beatlabs/patron/errors" "github.com/streadway/amqp" - "github.com/thebeatapp/patron/errors" ) // OptionFunc definition for configuring the publisher in a functional way. diff --git a/trace/http/http.go b/trace/http/http.go index b1e9cd82e..9edfdfe42 100644 --- a/trace/http/http.go +++ b/trace/http/http.go @@ -5,11 +5,11 @@ import ( "net/http" "time" + "github.com/beatlabs/patron/reliability/circuitbreaker" + "github.com/beatlabs/patron/trace" "github.com/opentracing-contrib/go-stdlib/nethttp" opentracing "github.com/opentracing/opentracing-go" "github.com/opentracing/opentracing-go/ext" - "github.com/thebeatapp/patron/reliability/circuitbreaker" - "github.com/thebeatapp/patron/trace" ) // Client interface of a HTTP client. diff --git a/trace/http/http_test.go b/trace/http/http_test.go index 32e14e15f..da8f30edd 100644 --- a/trace/http/http_test.go +++ b/trace/http/http_test.go @@ -8,11 +8,11 @@ import ( "testing" "time" + "github.com/beatlabs/patron/reliability/circuitbreaker" + "github.com/beatlabs/patron/trace" opentracing "github.com/opentracing/opentracing-go" "github.com/opentracing/opentracing-go/mocktracer" "github.com/stretchr/testify/assert" - "github.com/thebeatapp/patron/reliability/circuitbreaker" - "github.com/thebeatapp/patron/trace" ) func TestTracedClient_Do(t *testing.T) { diff --git a/trace/http/option.go b/trace/http/option.go index 2241b6d45..795694e95 100644 --- a/trace/http/option.go +++ b/trace/http/option.go @@ -3,8 +3,8 @@ package http import ( "time" - "github.com/thebeatapp/patron/errors" - "github.com/thebeatapp/patron/reliability/circuitbreaker" + "github.com/beatlabs/patron/errors" + "github.com/beatlabs/patron/reliability/circuitbreaker" ) // OptionFunc definition for configuring the client in a functional way. diff --git a/trace/kafka/kafka.go b/trace/kafka/kafka.go index d4413aaa4..3a199eb1b 100644 --- a/trace/kafka/kafka.go +++ b/trace/kafka/kafka.go @@ -4,11 +4,11 @@ import ( "context" "github.com/Shopify/sarama" + "github.com/beatlabs/patron/encoding/json" + "github.com/beatlabs/patron/errors" + "github.com/beatlabs/patron/trace" opentracing "github.com/opentracing/opentracing-go" "github.com/opentracing/opentracing-go/ext" - "github.com/thebeatapp/patron/encoding/json" - "github.com/thebeatapp/patron/errors" - "github.com/thebeatapp/patron/trace" ) // Message abstraction of a Kafka message. diff --git a/trace/kafka/kafka_test.go b/trace/kafka/kafka_test.go index 3feb21476..838674275 100644 --- a/trace/kafka/kafka_test.go +++ b/trace/kafka/kafka_test.go @@ -5,8 +5,8 @@ import ( "testing" "github.com/Shopify/sarama" + "github.com/beatlabs/patron/trace" "github.com/stretchr/testify/assert" - "github.com/thebeatapp/patron/trace" jaeger "github.com/uber/jaeger-client-go" ) diff --git a/trace/kafka/option.go b/trace/kafka/option.go index 988c5155a..f20297ec1 100644 --- a/trace/kafka/option.go +++ b/trace/kafka/option.go @@ -4,8 +4,8 @@ import ( "time" "github.com/Shopify/sarama" - "github.com/thebeatapp/patron/errors" - "github.com/thebeatapp/patron/log" + "github.com/beatlabs/patron/errors" + "github.com/beatlabs/patron/log" ) // OptionFunc definition for configuring the async producer in a functional way. diff --git a/trace/sql/sql.go b/trace/sql/sql.go index 2856bf0c3..1e5508f1e 100644 --- a/trace/sql/sql.go +++ b/trace/sql/sql.go @@ -6,8 +6,8 @@ import ( "database/sql/driver" "time" + "github.com/beatlabs/patron/trace" "github.com/opentracing/opentracing-go" - "github.com/thebeatapp/patron/trace" ) type connInfo struct { diff --git a/trace/trace.go b/trace/trace.go index 690aa66d5..9a53680b9 100644 --- a/trace/trace.go +++ b/trace/trace.go @@ -6,10 +6,10 @@ import ( "net/http" "time" + "github.com/beatlabs/patron/errors" + "github.com/beatlabs/patron/log" opentracing "github.com/opentracing/opentracing-go" "github.com/opentracing/opentracing-go/ext" - "github.com/thebeatapp/patron/errors" - "github.com/thebeatapp/patron/log" "github.com/uber/jaeger-client-go/config" "github.com/uber/jaeger-client-go/rpcmetrics" "github.com/uber/jaeger-lib/metrics/prometheus"