Skip to content

Commit

Permalink
Rename org from thebeatapp to beatlabs (#56)
Browse files Browse the repository at this point in the history
  • Loading branch information
dbaltas authored and Sotirios Mantziaris committed May 29, 2019
1 parent 09c9de7 commit 40115b3
Show file tree
Hide file tree
Showing 53 changed files with 140 additions and 138 deletions.
2 changes: 1 addition & 1 deletion .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
Expand Up @@ -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"
-->
Expand Down
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
@@ -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)

Expand Down Expand Up @@ -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
Expand Down
10 changes: 5 additions & 5 deletions async/amqp/amqp.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 (
Expand Down
2 changes: 1 addition & 1 deletion async/amqp/amqp_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
2 changes: 1 addition & 1 deletion async/amqp/option.go
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
8 changes: 4 additions & 4 deletions async/async.go
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
4 changes: 2 additions & 2 deletions async/async_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
4 changes: 2 additions & 2 deletions async/component.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion async/component_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
10 changes: 5 additions & 5 deletions async/kafka/kafka.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions async/kafka/kafka_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
2 changes: 1 addition & 1 deletion async/kafka/option.go
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
4 changes: 2 additions & 2 deletions async/option.go
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
12 changes: 6 additions & 6 deletions cmd/patron/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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)
Expand All @@ -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)
Expand All @@ -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)")
Expand Down Expand Up @@ -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 }}
Expand Down
2 changes: 1 addition & 1 deletion doc.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
14 changes: 7 additions & 7 deletions examples/first/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down
10 changes: 5 additions & 5 deletions examples/fourth/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 (
Expand Down
16 changes: 8 additions & 8 deletions examples/second/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 (
Expand Down
14 changes: 7 additions & 7 deletions examples/third/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 (
Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
module github.com/thebeatapp/patron
module github.com/beatlabs/patron

require (
github.com/Shopify/sarama v1.21.0
Expand Down
4 changes: 2 additions & 2 deletions info/info.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
2 changes: 1 addition & 1 deletion log/log.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package log
import (
"context"

"github.com/thebeatapp/patron/errors"
"github.com/beatlabs/patron/errors"
)

// The Level type definition.
Expand Down
2 changes: 1 addition & 1 deletion log/zerolog/factory.go
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion log/zerolog/factory_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
2 changes: 1 addition & 1 deletion log/zerolog/logger.go
Original file line number Diff line number Diff line change
Expand Up @@ -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{
Expand Down
Loading

0 comments on commit 40115b3

Please sign in to comment.