feat: apply pesticides

byebye cockroaches

.github/workflows/test.yaml

@@ -62,15 +62,13 @@ jobs:
               --mode dev-container \
               --default-log-level=debug
 
-      - name: Start CRDB container
+      - name: Start PSQL container
         run: |
-          docker run -d --name crdb \
-            --network ${{ job.container.network }} --network-alias crdb \
-            -p 8080:8080 -p 26257:26257 \
-            cockroachdb/cockroach:v23.1.8 \
-            start-single-node \
-              --cluster-name=node \
-              --insecure
+          docker run -d --name psql \
+            --network ${{ job.container.network }} --network-alias psql \
+            -p 5432:5432 \
+            -e POSTGRES_PASSWORD=dev \
+            postgres:16-alpine
 
       - name: Setup Go
         uses: actions/setup-go@v3
@@ -82,5 +80,5 @@ jobs:
 
       - name: Stop containers
         run: |
-          docker stop redpanda-0 crdb
-          docker rm redpanda-0 crdb
+          docker stop redpanda-0 psql
+          docker rm redpanda-0 psql

atlas.hcl

@@ -1,4 +1,4 @@
-// read internal/database/dialer/cockroachdb/README.md for more information
+// read internal/database/dialer/postgresql/README.md for more information
 
 data "external_schema" "gorm" {
   program = [
@@ -7,7 +7,7 @@ data "external_schema" "gorm" {
     "-mod=mod",
     "ariga.io/atlas-provider-gorm",
     "load",
-    "--path", "./internal/database/dialer/cockroachdb/table",
+    "--path", "./internal/database/dialer/postgresql/table",
     "--dialect", "postgres"
   ]
 }
@@ -17,14 +17,13 @@ env "dev" {
   // pointing to gorm models to generate schemas
   src = data.external_schema.gorm.url
   // the database which is holding the actual tables
-  url = "postgres://root:@localhost:26257/defaultdb?sslmode=disable&search_path=public"
-#   url = "postgres://postgres:password@localhost:5432/postgres?sslmode=disable"
+  url = "postgres://postgres:dev@localhost:5432/postgres?sslmode=disable"
   // a temporary database for Atlas to do migrations
-  dev = "postgres://root:@localhost:26258/defaultdb?sslmode=disable&search_path=public"
+  dev = "postgres://postgres:mig@localhost:5433/postgres?sslmode=disable"
 #   dev = "docker://postgres/16"
   // location of migration files
   migration {
-    dir = "file://internal/database/dialer/cockroachdb/migration?format=goose"
+    dir = "file://internal/database/dialer/postgresql/migration?format=goose"
   }
   format {
     migrate {

deploy/config.yaml.example

@@ -1,9 +1,9 @@
 environment: development
 
 database:
-  driver: cockroachdb
+  driver: postgresql
   partition: true
-  uri: postgres://root@localhost:26257/defaultdb
+  uri: postgres://postgres:password@localhost:5432/postgres
 
 redis:
   uri: redis://localhost:6379/0

deploy/docker-compose.dev.yml

@@ -1,28 +1,13 @@
 version: "3.9"
 name: pp_dev
 services:
-  # CRDB
-  cockroach:
-    image: cockroachdb/cockroach:v23.1.8
+  # Database
+  postgres:
+    image: postgres:16-alpine
     ports:
-      - "26257:26257"
-    command:
-      - start-single-node
-      - --cluster-name=rss3-gateway
-      - --insecure
-    labels:
-      - "traefik.http.routers.crdb-console.rule=Host(`crdb-console.docker.localhost`)"
-      - "traefik.http.services.crdb-console.loadbalancer.server.port=8080"
-
-#  # CRDB for Atlas' temporary migration use
-#  cockroach2:
-#    image: cockroachdb/cockroach:v23.1.8
-#    ports:
-#      - "26258:26257"
-#    command:
-#      - start-single-node
-#      - --cluster-name=rss3-gateway
-#      - --insecure
+      - "5432:5432"
+    environment:
+      POSTGRES_PASSWORD: dev
 
   # Redis
   redis:

deploy/docker-compose.migration.yml

@@ -1,12 +1,9 @@
 version: "3.9"
 name: pp_mig
 services:
-  # CRDB for Atlas' temporary migration use
-  cockroach2:
-    image: cockroachdb/cockroach:v23.1.8
+  postgres-mig:
+    image: postgres:16-alpine
     ports:
-      - "26258:26257"
-    command:
-      - start-single-node
-      - --cluster-name=rss3-gateway
-      - --insecure
+      - "5433:5432"
+    environment:
+      POSTGRES_PASSWORD: mig

internal/config/config.go

@@ -26,8 +26,8 @@ type File struct {
 }
 
 type Database struct {
-	Driver database.Driver `mapstructure:"driver" validate:"required" default:"cockroachdb"`
-	URI    string          `mapstructure:"uri" validate:"required" default:"postgres://root@localhost:26257/defaultdb"`
+	Driver database.Driver `mapstructure:"driver" validate:"required" default:"postgresql"`
+	URI    string          `mapstructure:"uri" validate:"required" default:"postgres://postgres:password@localhost:5432/postgres"`
 }
 
 type Redis struct {

internal/database/dialer/dialer.go

@@ -6,13 +6,13 @@ import (
 
 	"github.com/rss3-network/payment-processor/internal/config"
 	"github.com/rss3-network/payment-processor/internal/database"
-	"github.com/rss3-network/payment-processor/internal/database/dialer/cockroachdb"
+	"github.com/rss3-network/payment-processor/internal/database/dialer/postgresql"
 )
 
 func Dial(ctx context.Context, config *config.Database) (database.Client, error) {
 	switch config.Driver {
-	case database.DriverCockroachDB:
-		return cockroachdb.Dial(ctx, config.URI)
+	case database.DriverPostgreSQL:
+		return postgresql.Dial(ctx, config.URI)
 	default:
 		return nil, fmt.Errorf("unsupported driver: %s", config.Driver)
 	}

internal/database/dialer/cockroachdb/client.go → internal/database/dialer/postgresql/client.go

@@ -1,4 +1,4 @@
-package cockroachdb
+package postgresql
 
 import (
 	"context"
@@ -8,7 +8,7 @@ import (
 
 	"github.com/pressly/goose/v3"
 	"github.com/rss3-network/payment-processor/internal/database"
-	"github.com/rss3-network/payment-processor/internal/database/dialer/cockroachdb/table"
+	"github.com/rss3-network/payment-processor/internal/database/dialer/postgresql/table"
 	"go.uber.org/zap"
 	"gorm.io/driver/postgres"
 	"gorm.io/gorm"

internal/database/dialer/cockroachdb/client_billing.go → internal/database/dialer/postgresql/client_billing.go

@@ -1,4 +1,4 @@
-package cockroachdb
+package postgresql
 
 import (
 	"context"
@@ -8,7 +8,7 @@ import (
 	"time"
 
 	"github.com/ethereum/go-ethereum/common"
-	"github.com/rss3-network/payment-processor/internal/database/dialer/cockroachdb/table"
+	"github.com/rss3-network/payment-processor/internal/database/dialer/postgresql/table"
 	"github.com/rss3-network/payment-processor/schema"
 	"go.uber.org/zap"
 	"gorm.io/gorm"

internal/database/dialer/cockroachdb/client_checkpoint.go → internal/database/dialer/postgresql/client_checkpoint.go

@@ -1,10 +1,10 @@
-package cockroachdb
+package postgresql
 
 import (
 	"context"
 	"fmt"
 
-	"github.com/rss3-network/payment-processor/internal/database/dialer/cockroachdb/table"
+	"github.com/rss3-network/payment-processor/internal/database/dialer/postgresql/table"
 	"github.com/rss3-network/payment-processor/schema"
 	"gorm.io/gorm/clause"
 )

internal/database/dialer/cockroachdb/client_gateway.go → internal/database/dialer/postgresql/client_gateway.go

@@ -1,10 +1,10 @@
-package cockroachdb
+package postgresql
 
 import (
 	"context"
 
 	"github.com/ethereum/go-ethereum/common"
-	"github.com/rss3-network/payment-processor/internal/database/dialer/cockroachdb/table"
+	"github.com/rss3-network/payment-processor/internal/database/dialer/postgresql/table"
 	"gorm.io/gorm"
 )
 

internal/database/dialer/cockroachdb/client_node_request_rewards.go → internal/database/dialer/postgresql/client_node_request_rewards.go

@@ -1,4 +1,4 @@
-package cockroachdb
+package postgresql
 
 import (
 	"context"
@@ -7,7 +7,7 @@ import (
 	"math/big"
 
 	"github.com/ethereum/go-ethereum/common"
-	"github.com/rss3-network/payment-processor/internal/database/dialer/cockroachdb/table"
+	"github.com/rss3-network/payment-processor/internal/database/dialer/postgresql/table"
 	"github.com/rss3-network/payment-processor/schema"
 	"github.com/shopspring/decimal"
 	"go.uber.org/zap"

internal/database/driver.go

@@ -3,7 +3,6 @@ package database
 type Driver string
 
 const (
-	DriverCockroachDB Driver = "cockroachdb"
-	DriverPostgreSQL  Driver = "postgresql"
-	DriverMySQL       Driver = "mysql"
+	DriverPostgreSQL Driver = "postgresql"
+	DriverMySQL      Driver = "mysql"
 )

internal/service/hub/gateway_test.go

@@ -29,7 +29,7 @@ import (
 	"github.com/rss3-network/payment-processor/internal/config"
 	"github.com/rss3-network/payment-processor/internal/database"
 	"github.com/rss3-network/payment-processor/internal/database/dialer"
-	"github.com/rss3-network/payment-processor/internal/database/dialer/cockroachdb/table"
+	"github.com/rss3-network/payment-processor/internal/database/dialer/postgresql/table"
 	"github.com/rss3-network/payment-processor/internal/service/hub/handlers"
 	jwtImpl "github.com/rss3-network/payment-processor/internal/service/hub/jwt"
 	"github.com/rss3-network/payment-processor/internal/service/hub/model"
@@ -67,8 +67,8 @@ const (
 func init() {
 	// Prepare databaseClient
 	dbc, err := dialer.Dial(context.Background(), &config.Database{
-		Driver: database.DriverCockroachDB,
-		URI:    "postgres://root@localhost:26257/defaultdb",
+		Driver: database.DriverPostgreSQL,
+		URI:    "postgres://postgres:dev@localhost:5432/postgres",
 	})
 	if err != nil {
 		log.Panic(err)

internal/service/hub/handlers/history.go

@@ -5,7 +5,7 @@ import (
 	"net/http"
 
 	"github.com/labstack/echo/v4"
-	"github.com/rss3-network/payment-processor/internal/database/dialer/cockroachdb/table"
+	"github.com/rss3-network/payment-processor/internal/database/dialer/postgresql/table"
 	"github.com/rss3-network/payment-processor/internal/service/hub/gen/oapi"
 	"github.com/rss3-network/payment-processor/internal/service/hub/model"
 	"github.com/rss3-network/payment-processor/internal/service/hub/utils"

internal/service/hub/handlers/withdraw.go

@@ -5,7 +5,7 @@ import (
 	"net/http"
 
 	"github.com/labstack/echo/v4"
-	"github.com/rss3-network/payment-processor/internal/database/dialer/cockroachdb/table"
+	"github.com/rss3-network/payment-processor/internal/database/dialer/postgresql/table"
 	"github.com/rss3-network/payment-processor/internal/service/hub/gen/oapi"
 	"github.com/rss3-network/payment-processor/internal/service/hub/model"
 	"github.com/rss3-network/payment-processor/internal/service/hub/utils"

internal/service/hub/model/account.go

@@ -7,7 +7,7 @@ import (
 
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/rss3-network/gateway-common/control"
-	"github.com/rss3-network/payment-processor/internal/database/dialer/cockroachdb/table"
+	"github.com/rss3-network/payment-processor/internal/database/dialer/postgresql/table"
 	"github.com/rss3-network/payment-processor/schema"
 	"gorm.io/gorm"
 )

internal/service/hub/model/key.go

@@ -9,7 +9,7 @@ import (
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/google/uuid"
 	"github.com/rss3-network/gateway-common/control"
-	"github.com/rss3-network/payment-processor/internal/database/dialer/cockroachdb/table"
+	"github.com/rss3-network/payment-processor/internal/database/dialer/postgresql/table"
 	"gorm.io/gorm"
 )
 

internal/service/hub/processors/access_log.go

@@ -7,7 +7,7 @@ import (
 	"strconv"
 
 	"github.com/rss3-network/gateway-common/accesslog"
-	"github.com/rss3-network/payment-processor/internal/database/dialer/cockroachdb/table"
+	"github.com/rss3-network/payment-processor/internal/database/dialer/postgresql/table"
 	"github.com/rss3-network/payment-processor/internal/service/hub/model"
 	"go.uber.org/zap"
 )