Merge pull request #9 from laironacosta/feature/packages

engineerit2014 · web-flow · commit e1f93da2933a · 2021-04-02T20:59:52.000-05:00
Feature/packages
diff --git a/README.md b/README.md
@@ -1,18 +1,39 @@
-# Database: Postgresql, Redis, etc.
-This project shows the implementation of clients for postgresql, Redis and other databases in Golang.  
+# Kit
+Set of common packages used by all or most projects in my repositories.
 
 ## Table of Contents
 
-- [Implementation](#implementation)
+- [Implementation examples](#implementation-examples)
     - [Postgresql](#postgresql)
     - [Redis](#redis)
+- [Testing](#testing)
 
-## Implementation
+## Implementation examples
 
 ### Postgresql 
 
-See the examples already implemented in the folder `/pgdb`.
+See the examples already implemented in the folder `/postgresql`.
 
 ### Redis
 
-See the examples already implemented in the folder `/redisdb`.
+See the examples already implemented in the folder `/redis`.
+
+### Testing
+
+To run the tests simply execute the following command:
+
+```shell
+make test
+```
+
+This will stop any containers defined by the compose file for tests if already running
+and then rebuild the containers using the compose file.
+
+To down the containers simply execute the following command:
+
+```shell
+make test-down
+```
+
+lairon14@gmail.com  
+-- Lairon
diff --git a/go.mod b/go.mod
@@ -1,4 +1,4 @@
-module github.com/Lairon/db-go
+module github.com/laironacosta/kit-go
 
 go 1.16
 
@@ -7,5 +7,4 @@ require (
 	github.com/go-redis/redis/v8 v8.8.0
 	github.com/sirupsen/logrus v1.8.1
 	github.com/stretchr/testify v1.7.0
-	golang.org/x/sys v0.0.0-20210402192133-700132347e07 // indirect
 )
diff --git a/go.sum b/go.sum
@@ -132,9 +132,8 @@ golang.org/x/sys v0.0.0-20200519105757-fe76b779f299/go.mod h1:h1NjWce9XRLGQEsW7w
 golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210112080510-489259a85091/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20210320140829-1e4c9ba3b0c4 h1:EZ2mChiOa8udjfp6rRmswTbtZN/QzUQp4ptM4rnjHvc=
 golang.org/x/sys v0.0.0-20210320140829-1e4c9ba3b0c4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210402192133-700132347e07 h1:4k6HsQjxj6hVMsI2Vf0yKlzt5lXxZsMW1q0zaq2k8zY=
-golang.org/x/sys v0.0.0-20210402192133-700132347e07/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
diff --git a/postgresql/example1/example1.go b/postgresql/example1/example1.go
diff --git a/postgresql/example2/example2.go b/postgresql/example2/example2.go
@@ -1,9 +1,9 @@
 package main
 
 import (
-	"github.com/Lairon/db-go/pgdb"
 	"github.com/go-pg/pg/v10"
 	"github.com/go-pg/pg/v10/orm"
+	pgKit "github.com/laironacosta/kit-go/postgresql"
 	log "github.com/sirupsen/logrus"
 )
 
@@ -33,7 +33,7 @@ func main() {
 
 func NewPgClient() *PgClient {
 	return &PgClient{
-		db: pgdb.NewPgDB(&pg.Options{
+		db: pgKit.NewPgDB(&pg.Options{
 			User:     "root",
 			Password: "root",
 			Database: "db-test",
diff --git a/postgresql/pg.go b/postgresql/pg.go
@@ -1,4 +1,4 @@
-package pgdb
+package postgresql
 
 import (
 	"github.com/go-pg/pg/v10"
diff --git a/postgresql/pg_test.go b/postgresql/pg_test.go
@@ -1,4 +1,4 @@
-package pgdb
+package postgresql
 
 import (
 	"github.com/go-pg/pg/v10"
diff --git a/redis/example1/example1.go b/redis/example1/example1.go
@@ -2,8 +2,8 @@ package main
 
 import (
 	"context"
-	"github.com/Lairon/db-go/redisdb"
 	"github.com/go-redis/redis/v8"
+	redisKit "github.com/laironacosta/kit-go/redis"
 	log "github.com/sirupsen/logrus"
 	"time"
 )
@@ -29,7 +29,7 @@ func main() {
 
 func NewRedisClient() *RedisClient {
 	return &RedisClient{
-		db: redisdb.NewRedisDB(&redis.Options{
+		db: redisKit.NewRedisDB(&redis.Options{
 			Addr:     "redis-test:6379",
 			Password: "", // no password set
 			DB:       0,  // use default DB
diff --git a/redis/redis.go b/redis/redis.go
@@ -1,4 +1,4 @@
-package redisdb
+package redis
 
 import (
 	"context"
diff --git a/redis/redis_test.go b/redis/redis_test.go
@@ -1,4 +1,4 @@
-package redisdb
+package redis
 
 import (
 	"github.com/go-redis/redis/v8"
@@ -7,7 +7,7 @@ import (
 )
 
 var redisOptions = &redis.Options{
-	Addr:     "redis:6379",
+	Addr:     "redis-test:6379",
 	Password: "",
 	DB:       0,
 }

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-module github.com/Lairon/db-go`
	`1`	`+module github.com/laironacosta/kit-go`
`2`	`2`
`3`	`3`	`go 1.16`
`4`	`4`
`@@ -7,5 +7,4 @@ require (`
`7`	`7`	`github.com/go-redis/redis/v8 v8.8.0`
`8`	`8`	`github.com/sirupsen/logrus v1.8.1`
`9`	`9`	`github.com/stretchr/testify v1.7.0`
`10`		`- golang.org/x/sys v0.0.0-20210402192133-700132347e07 // indirect`
`11`	`10`	`)`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package pgdb`
	`1`	`+package postgresql`
`2`	`2`
`3`	`3`	`import (`
`4`	`4`	`"github.com/go-pg/pg/v10"`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package redisdb`
	`1`	`+package redis`
`2`	`2`
`3`	`3`	`import (`
`4`	`4`	`"context"`