Merge pull request #26 from gobicycle/develop

deploy fix

.github/workflows/go.yml

@@ -8,7 +8,7 @@ on:
 
 jobs:
   build:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     environment: TESTS
     services:
       postgres:

cmd/processor/main.go

@@ -3,6 +3,7 @@ package main
 import (
 	"context"
 	"errors"
+	"fmt"
 	"github.com/gobicycle/bicycle/api"
 	"github.com/gobicycle/bicycle/blockchain"
 	"github.com/gobicycle/bicycle/config"
@@ -100,7 +101,7 @@ func main() {
 	h := api.NewHandler(dbClient, bcClient, config.Config.APIToken, wallets.Shard, *wallets.TonHotWallet.Address())
 	api.RegisterHandlers(apiMux, h)
 	go func() {
-		err := http.ListenAndServe(config.Config.APIHost, apiMux)
+		err := http.ListenAndServe(fmt.Sprintf(":%d", config.Config.APIPort), apiMux)
 		if err != nil {
 			log.Fatalf("api error: %v", err)
 		}

config/config.go

@@ -41,7 +41,7 @@ var Config = struct {
 	LiteServerKey            string `env:"LITESERVER_KEY,required"`
 	Seed                     string `env:"SEED,required"`
 	DatabaseURI              string `env:"DB_URI,required"`
-	APIHost                  string `env:"API_HOST" envDefault:"0.0.0.0:8081"`
+	APIPort                  int    `env:"API_PORT,required"`
 	APIToken                 string `env:"API_TOKEN,required"`
 	Testnet                  bool   `env:"IS_TESTNET" envDefault:"true"`
 	ColdWalletString         string `env:"COLD_WALLET"`

deploy/db/02_create_readonly_user.sh

@@ -0,0 +1,14 @@
+#!/bin/bash
+
+if [ -z "$POSTGRES_READONLY_PASSWORD" ]; then
+  echo "Environment variable POSTGRES_READONLY_PASSWORD is not set. Exiting."
+  exit 1
+fi
+
+psql -v ON_ERROR_STOP=1 --username "$POSTGRES_USER" --dbname "$POSTGRES_DB" <<-EOSQL
+  CREATE USER pp_readonly WITH PASSWORD '$POSTGRES_READONLY_PASSWORD';
+  GRANT CONNECT ON DATABASE $POSTGRES_DB TO pp_readonly;
+  GRANT USAGE ON SCHEMA payments TO pp_readonly;
+  GRANT SELECT ON ALL TABLES IN SCHEMA payments TO pp_readonly;
+  ALTER DEFAULT PRIVILEGES IN SCHEMA payments GRANT SELECT ON TABLES TO pp_readonly;
+EOSQL

deploy/grafana/main/provisioning/datasources/data_sources.yml

@@ -12,10 +12,10 @@ datasources:
     uid: DS_POSTGRES
     type: postgres
     url: payment_processor_db:5432
-    database: payment_processor
-    user: pp_user
+    database: $POSTGRES_DB
+    user: pp_readonly
     secureJsonData:
-      password: $POSTGRES_PASSWORD
+      password: $POSTGRES_READONLY_PASSWORD
     isDefault: true
     jsonData:
       sslmode: disable # disable/require/verify-ca/verify-full

docker-compose.yml

@@ -6,30 +6,27 @@ services:
     image: postgres:14
     container_name: payment_processor_db
     volumes:
-    - ./deploy/db/01_init.up.sql:/docker-entrypoint-initdb.d/init.sql
+    - ./deploy/db/01_init.up.sql:/docker-entrypoint-initdb.d/01_init.up.sql
+    - ./deploy/db/02_create_readonly_user.sh:/docker-entrypoint-initdb.d/02_create_readonly_user.sh
     - bicycle-postgres:/var/lib/postgresql/data
-    ports:
-      - "5432:5432"
     restart: always
-    env_file:
-      - .env
     environment:
-      POSTGRES_DB: "payment_processor"
-      POSTGRES_USER: "pp_user"
+      POSTGRES_DB: ${POSTGRES_DB}
+      POSTGRES_USER: ${POSTGRES_USER}
       POSTGRES_PASSWORD: ${POSTGRES_PASSWORD}
+      POSTGRES_READONLY_PASSWORD: ${POSTGRES_READONLY_PASSWORD} # For grafana
     networks:
       - p-network
 
   payment-processor:
     image: payment-processor
     container_name: payment_processor
     ports:
-      - "8081:8081"
+      - "127.0.0.1:8081:${API_PORT}"
     restart: unless-stopped
-    env_file:
-      - .env
     environment:
-      DB_URI: "postgres://pp_user:${POSTGRES_PASSWORD}@payment_processor_db:5432/payment_processor"
+      DB_URI: ${DB_URI} # example: "postgres://${POSTGRES_USER}:${POSTGRES_PASSWORD}@payment_processor_db:5432/${POSTGRES_DB}"
+      API_PORT: ${API_PORT}
       API_TOKEN: ${API_TOKEN}
       COLD_WALLET: ${COLD_WALLET}
       JETTONS: ${JETTONS}
@@ -46,17 +43,16 @@ services:
     container_name: payment_grafana
     restart: always
     ports:
-      - '3001:3000'
+      - '127.0.0.1:3001:3000'
     volumes:
       - ./deploy/grafana/main/provisioning/datasources:/etc/grafana/provisioning/datasources
       - ./deploy/grafana/main/provisioning/dashboards:/etc/grafana/provisioning/dashboards
       - ./deploy/grafana/main/dashboards:/etc/dashboards
-    env_file:
-      - .env
     environment:
-      GF_SECURITY_ADMIN_USER: admin
-      GF_SECURITY_ADMIN_PASSWORD: admin
-      POSTGRES_PASSWORD: ${POSTGRES_PASSWORD}
+      GF_SECURITY_ADMIN_USER: admin # TODO: change
+      GF_SECURITY_ADMIN_PASSWORD: admin # TODO: change
+      POSTGRES_DB: ${POSTGRES_DB}
+      POSTGRES_READONLY_PASSWORD: ${POSTGRES_READONLY_PASSWORD}
     networks:
       - p-network
 
@@ -65,23 +61,19 @@ services:
     container_name: payment_rabbitmq
     restart: always
     ports:
-      - '15672:15672'
-      - '5672:5672'
+      - '127.0.0.1:5672:5672'
     networks:
       - p-network
 
   payment-prometheus:
     image: prom/prometheus:latest
     container_name: payment_prometheus
     restart: always
-    ports:
-      - '9090:9090'
     volumes:
       - ./deploy/prometheus/main:/etc/prometheus
     user: "$UID:$GID"
     command:
       - '--config.file=/etc/prometheus/prometheus.yml'
-      - '--web.external-url=http://localhost:9090'
     networks:
       - p-network
 

docker-compose-tests.yml → tests/docker-compose-tests.yml

@@ -11,7 +11,7 @@ services:
       - "5433:5432"
     restart: always
     env_file:
-      - .env
+      - ../.env
     environment:
       POSTGRES_DB: "payment_processor"
       POSTGRES_USER: "pp_user"
@@ -28,7 +28,7 @@ services:
       - "5434:5432"
     restart: always
     env_file:
-      - .env
+      - ../.env
     environment:
       POSTGRES_DB: "payment_processor"
       POSTGRES_USER: "pp_user"
@@ -43,7 +43,7 @@ services:
       - "8082:8081"
     restart: unless-stopped
     env_file:
-      - .env
+      - ../.env
     environment:
       DB_URI: "postgres://pp_user:${POSTGRES_PASSWORD}@payment_processor_db_a:5432/payment_processor"
       API_TOKEN: ${API_TOKEN}
@@ -64,7 +64,7 @@ services:
       - "8083:8081"
     restart: unless-stopped
     env_file:
-      - .env
+      - ../.env
     environment:
       DB_URI: "postgres://pp_user:${POSTGRES_PASSWORD}@payment_processor_db_b:5432/payment_processor"
       API_TOKEN: ${API_TOKEN}
@@ -89,7 +89,7 @@ services:
       - ./deploy/grafana/test/provisioning/dashboards:/etc/grafana/provisioning/dashboards
       - ./deploy/grafana/test/dashboards:/etc/dashboards
     env_file:
-      - .env
+      - ../.env
     environment:
       GF_SECURITY_ADMIN_USER: admin
       GF_SECURITY_ADMIN_PASSWORD: admin
@@ -117,7 +117,7 @@ services:
     container_name: payment_test
     restart: unless-stopped
     env_file:
-      - .env
+      - ../.env
     environment:
       DB_URI: "postgres://pp_user:${POSTGRES_PASSWORD}@payment_processor_db:5432/payment_processor"
       API_TOKEN: ${API_TOKEN}