Merge pull request #12 from RSS3-Network/feat/use-pg

feat: use pg

.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 {