Merge remote-tracking branch 'origin/master'

README.md

@@ -3,8 +3,6 @@
 
 PgGat (rat-ta-tat-tat) is a rewrite of [pgcat](github.com/levkk/pgcat) in golang
 
-
-
 the name is inspired by dr. dre:
 
 https://www.youtube.com/watch?v=-DqCc2DJ0sg
@@ -26,6 +24,20 @@ i'll lyk when its done
 | Client authentication          | :white_check_mark: :wrench: | same as them       | MD5 password authentication is supported, SCRAM is on the roadmap; one user is used to connect to Postgres with both SCRAM and MD5 supported.         |
 | Admin database                 | :white_check_mark:          | :white_check_mark: | The admin database, similar to PgBouncer's, allows to query for statistics and reload the configuration.                                              |
 
+
+
+## Config
+
+
+"environmentable  fields" are Username, Password, Host, for server and Name, Password for users
+
+for these fields, if the string you put ENV$SOME_ENV_VAR then the env var value of var SOME_ENV_VAR will be used as that value
+
+
+otherwise, its mostly similar to the original pgcat config. follow the example.
+
+
+
 # original README
 
 PostgreSQL pooler (like PgBouncer) with sharding, load balancing and failover support.

config_data.yml

@@ -55,7 +55,7 @@ pools:
             port: 5432
             role: primary
             username: postgres
-            password: example
+            password: ENV$PGGAT_DB_PASS
   sharded:
     pool_mode: transaction
     default_role: any

go.mod

@@ -9,6 +9,7 @@ require (
 	git.tuxpa.in/a/zlog v1.32.0
 	github.com/BurntSushi/toml v1.2.0
 	github.com/auxten/postgresql-parser v1.0.1
+	github.com/davecgh/go-spew v1.1.1
 	github.com/iancoleman/strcase v0.2.0
 	github.com/looplab/fsm v0.3.0
 	github.com/xdg-go/scram v1.1.1

lib/config/config.go

@@ -3,8 +3,10 @@ package config
 import (
 	"os"
 	"path/filepath"
+	"strings"
 
 	"github.com/BurntSushi/toml"
+	"github.com/davecgh/go-spew/spew"
 	"gopkg.in/yaml.v3"
 )
 
@@ -52,6 +54,31 @@ func Load(path string) (*Global, error) {
 			return nil, err
 		}
 	}
+
+	for _, g := range g.Pools {
+		for _, shard := range g.Shards {
+			for _, srv := range shard.Servers {
+				if strings.HasPrefix(srv.Host, "ENV$") {
+					srv.Host = os.Getenv(strings.TrimPrefix(srv.Host, "ENV$"))
+				}
+				if strings.HasPrefix(srv.Username, "ENV$") {
+					srv.Username = os.Getenv(strings.TrimPrefix(srv.Username, "ENV$"))
+				}
+				if strings.HasPrefix(srv.Password, "ENV$") {
+					srv.Password = os.Getenv(strings.TrimPrefix(srv.Password, "ENV$"))
+				}
+			}
+			for _, srv := range g.Users {
+				if strings.HasPrefix(srv.Name, "ENV$") {
+					srv.Name = os.Getenv(strings.TrimPrefix(srv.Name, "ENV$"))
+				}
+				if strings.HasPrefix(srv.Password, "ENV$") {
+					srv.Password = os.Getenv(strings.TrimPrefix(srv.Password, "ENV$"))
+				}
+			}
+		}
+	}
+	spew.Println(g)
 	return &g, nil
 }