Skip to content

Commit

Permalink
fix: added unique uuid to consumer and producers (#23)
Browse files Browse the repository at this point in the history
* fix: added unique uuid to consumer and producers

* fix: updated dependencies and go version

* fix: added the ability to setup the consumer and producer names

* fix: fixed test to reduce the random name generated
  • Loading branch information
shoriwe authored Aug 26, 2023
1 parent 59bdbe4 commit dad04ec
Show file tree
Hide file tree
Showing 4 changed files with 133 additions and 139 deletions.
16 changes: 10 additions & 6 deletions common/connection/connection.go
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package connection

import (
"fmt"
"testing"

"github.com/hidromatologia-v2/models"
Expand All @@ -9,6 +10,7 @@ import (
"github.com/hidromatologia-v2/models/common/random"
"github.com/memphisdev/memphis.go"
redis_v9 "github.com/redis/go-redis/v9"
uuid "github.com/satori/go.uuid"
"github.com/stretchr/testify/assert"
"github.com/wneessen/go-mail"
)
Expand Down Expand Up @@ -37,35 +39,37 @@ const (
)

func DefaultConsumer(t *testing.T) *memphis.Consumer {
return NewConsumer(t, testingStation)
return NewConsumer(t, testingStation, random.String()[:64])
}

func DefaultProducer(t *testing.T) *memphis.Producer {
return NewProducer(t, testingStation)
return NewProducer(t, testingStation, random.String()[:64])
}

func NewConsumer(t *testing.T, station string) *memphis.Consumer {
func NewConsumer(t *testing.T, station, name string) *memphis.Consumer {
conn, cErr := memphis.Connect(
"127.0.0.1",
"root",
memphis.Password("memphis"),
// memphis.ConnectionToken("memphis"),
)
assert.Nil(t, cErr)
c, err := conn.CreateConsumer(station, random.String())
name = fmt.Sprintf("%s-%s", name, uuid.NewV4().String())
c, err := conn.CreateConsumer(station, name)
assert.Nil(t, err)
return c
}

func NewProducer(t *testing.T, station string) *memphis.Producer {
func NewProducer(t *testing.T, station, name string) *memphis.Producer {
conn, cErr := memphis.Connect(
"127.0.0.1",
"root",
memphis.Password("memphis"),
// memphis.ConnectionToken("memphis"),
)
assert.Nil(t, cErr)
prod, err := conn.CreateProducer(station, random.String())
name = fmt.Sprintf("%s-%s", name, uuid.NewV4().String())
prod, err := conn.CreateProducer(station, name)
assert.Nil(t, err)
return prod
}
4 changes: 2 additions & 2 deletions common/connection/connection_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -26,13 +26,13 @@ func TestDefaultProducer(t *testing.T) {
}

func TestNewConsumer(t *testing.T) {
c := NewConsumer(t, random.String())
c := NewConsumer(t, random.String(), random.String()[:64])
assert.NotNil(t, c)
defer c.Destroy()
}

func TestNewProducer(t *testing.T) {
c := NewProducer(t, random.String())
c := NewProducer(t, random.String(), random.String()[:64])
assert.NotNil(t, c)
defer c.Destroy()
}
70 changes: 38 additions & 32 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,26 +1,26 @@
module github.com/hidromatologia-v2/models

go 1.20
go 1.21

require (
github.com/allegro/bigcache/v3 v3.1.0
github.com/biter777/countries v1.6.4
github.com/brianvoe/gofakeit/v6 v6.21.0
github.com/eko/gocache/lib/v4 v4.1.3
github.com/eko/gocache/store/bigcache/v4 v4.1.2
github.com/biter777/countries v1.6.6
github.com/brianvoe/gofakeit/v6 v6.23.2
github.com/eko/gocache/lib/v4 v4.1.4
github.com/eko/gocache/store/bigcache/v4 v4.2.0
github.com/eko/gocache/store/redis/v4 v4.2.0
github.com/glebarez/sqlite v1.8.0
github.com/glebarez/sqlite v1.9.0
github.com/golang-jwt/jwt/v5 v5.0.0
github.com/memphisdev/memphis.go v1.0.1
github.com/redis/go-redis/v9 v9.0.3
github.com/memphisdev/memphis.go v1.1.1
github.com/redis/go-redis/v9 v9.1.0
github.com/satori/go.uuid v1.2.0
github.com/sethvargo/go-envconfig v0.9.0
github.com/stretchr/testify v1.8.2
github.com/wneessen/go-mail v0.3.9
golang.org/x/crypto v0.8.0
golang.org/x/exp v0.0.0-20230420155640-133eef4313cb
gorm.io/driver/postgres v1.5.0
gorm.io/gorm v1.25.0
github.com/stretchr/testify v1.8.4
github.com/wneessen/go-mail v0.4.0
golang.org/x/crypto v0.12.0
golang.org/x/exp v0.0.0-20230817173708-d852ddb80c63
gorm.io/driver/postgres v1.5.2
gorm.io/gorm v1.25.4
)

require (
Expand All @@ -29,39 +29,45 @@ require (
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect
github.com/dustin/go-humanize v1.0.1 // indirect
github.com/glebarez/go-sqlite v1.21.1 // indirect
github.com/glebarez/go-sqlite v1.21.2 // indirect
github.com/gofrs/uuid v4.4.0+incompatible // indirect
github.com/golang/mock v1.6.0 // indirect
github.com/golang/protobuf v1.5.3 // indirect
github.com/google/uuid v1.3.0 // indirect
github.com/google/uuid v1.3.1 // indirect
github.com/graph-gophers/graphql-go v1.5.0 // indirect
github.com/hamba/avro/v2 v2.15.0 // indirect
github.com/jackc/pgpassfile v1.0.0 // indirect
github.com/jackc/pgservicefile v0.0.0-20221227161230-091c0ba34f0a // indirect
github.com/jackc/pgx/v5 v5.3.1 // indirect
github.com/jackc/pgx/v5 v5.4.3 // indirect
github.com/jinzhu/inflection v1.0.0 // indirect
github.com/jinzhu/now v1.1.5 // indirect
github.com/klauspost/compress v1.16.5 // indirect
github.com/mattn/go-isatty v0.0.18 // indirect
github.com/json-iterator/go v1.1.12 // indirect
github.com/klauspost/compress v1.16.7 // indirect
github.com/kr/text v0.2.0 // indirect
github.com/mattn/go-isatty v0.0.19 // indirect
github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
github.com/minio/highwayhash v1.0.2 // indirect
github.com/mitchellh/mapstructure v1.5.0 // indirect
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
github.com/modern-go/reflect2 v1.0.2 // indirect
github.com/nats-io/jwt/v2 v2.4.1 // indirect
github.com/nats-io/nats.go v1.25.0 // indirect
github.com/nats-io/nats.go v1.28.0 // indirect
github.com/nats-io/nkeys v0.4.4 // indirect
github.com/nats-io/nuid v1.0.1 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/prometheus/client_golang v1.15.0 // indirect
github.com/prometheus/client_model v0.3.0 // indirect
github.com/prometheus/common v0.42.0 // indirect
github.com/prometheus/procfs v0.9.0 // indirect
github.com/prometheus/client_golang v1.16.0 // indirect
github.com/prometheus/client_model v0.4.0 // indirect
github.com/prometheus/common v0.44.0 // indirect
github.com/prometheus/procfs v0.11.1 // indirect
github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec // indirect
github.com/santhosh-tekuri/jsonschema/v5 v5.1.0 // indirect
golang.org/x/sys v0.7.0 // indirect
golang.org/x/text v0.9.0 // indirect
github.com/santhosh-tekuri/jsonschema/v5 v5.3.1 // indirect
golang.org/x/sys v0.11.0 // indirect
golang.org/x/text v0.12.0 // indirect
golang.org/x/time v0.3.0 // indirect
google.golang.org/protobuf v1.30.0 // indirect
google.golang.org/protobuf v1.31.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
modernc.org/libc v1.22.4 // indirect
modernc.org/mathutil v1.5.0 // indirect
modernc.org/memory v1.5.0 // indirect
modernc.org/sqlite v1.22.0 // indirect
modernc.org/libc v1.24.1 // indirect
modernc.org/mathutil v1.6.0 // indirect
modernc.org/memory v1.7.1 // indirect
modernc.org/sqlite v1.25.0 // indirect
)
Loading

0 comments on commit dad04ec

Please sign in to comment.