config/config.go

@@ -3,12 +3,11 @@ package config
 import (
 	"strings"
 
-	"git.defalsify.org/vise.git/logging"
 	"git.grassecon.net/grassrootseconomics/visedriver/env"
 )
 
 var (
-	defaultLanguage = "eng"
+	defaultLanguage		   = "eng"
 	languages []string
 )
 
@@ -22,7 +21,7 @@ func setLanguage() error {
 	defaultLanguage = env.GetEnv("DEFAULT_LANGUAGE", defaultLanguage)
 	languages = strings.Split(env.GetEnv("LANGUAGES", defaultLanguage), ",")
 	haveDefaultLanguage := false
-	for i, v := range languages {
+	for i, v := range(languages) {
 		languages[i] = strings.ReplaceAll(v, " ", "")
 		if languages[i] == defaultLanguage {
 			haveDefaultLanguage = true
@@ -36,6 +35,8 @@ func setLanguage() error {
 	return nil
 }
 
+
+
 func setConn() error {
 	DbConn = env.GetEnv("DB_CONN", "")
 	return nil
@@ -43,25 +44,16 @@ func setConn() error {
 
 // LoadConfig initializes the configuration values after environment variables are loaded.
 func LoadConfig() error {
-	if err := setLanguage(); err != nil {
+	err := setConn()
+	if err != nil {
 		return err
 	}
-	if err := setConn(); err != nil {
+	err = setLanguage()
+	if err != nil {
 		return err
 	}
 	DefaultLanguage = defaultLanguage
 	Languages = languages
 
-
-	// Create and use reporter
-	logger := logging.NewVanilla().WithDomain("config")
-	reporter := NewReporter(logger)
-	
-	reporter.AddValue("CUSTOM_SETTING", func() string {
-		return env.GetEnv("CUSTOM_SETTING", "default")
-	}, false)
-	
-	reporter.Report("INFO")
-	
 	return nil
 }

config/reporter.go

@@ -1,75 +0,0 @@
-//go:build configreport
-
-package config
-
-import (
-    "git.defalsify.org/vise.git/logging"
-    "git.grassecon.net/grassrootseconomics/visedriver/env"
-)
-
-// ConfigValue represents a configuration key-value pair
-type ConfigValue struct {
-    Key          string
-    ValueFunc    func() string
-    Sensitive    bool
-}
-
-// Reporter handles configuration reporting
-type Reporter struct {
-    values []ConfigValue
-    logger logging.Vanilla
-}
-
-func NewReporter(logger logging.Vanilla) *Reporter {
-    return &Reporter{
-        values: defaultConfigValues(),
-        logger: logger,
-    }
-}
-
-func defaultConfigValues() []ConfigValue {
-    return []ConfigValue{
-        {"HOST", func() string { return env.GetEnv("HOST", "127.0.0.1") }, false},
-        {"PORT", func() string { return env.GetEnv("PORT", "7123") }, false},
-        {"AT_ENDPOINT", func() string { return env.GetEnv("AT_ENDPOINT", "/ussd/africastalking") }, false},
-        {"DB_CONN", func() string { return env.GetEnv("DB_CONN", "") }, true},
-        {"DB_TIMEZONE", func() string { return env.GetEnv("DB_TIMEZONE", "") }, false},
-        {"DB_SCHEMA", func() string { return env.GetEnv("DB_SCHEMA", "") }, false},
-        {"CUSTODIAL_URL_BASE", func() string { return env.GetEnv("CUSTODIAL_URL_BASE", "") }, false},
-        {"BEARER_TOKEN", func() string { return env.GetEnv("BEARER_TOKEN", "") }, true},
-        {"DATA_URL_BASE", func() string { return env.GetEnv("DATA_URL_BASE", "") }, false},
-        {"DEFAULT_LANGUAGE", func() string { return env.GetEnv("DEFAULT_LANGUAGE", "eng") }, false},
-        {"LANGUAGES", func() string { return env.GetEnv("LANGUAGES", "eng") }, false},
-    }
-}
-
-func (r *Reporter) AddValue(key string, valueFn func() string, sensitive bool) {
-    r.values = append(r.values, ConfigValue{
-        Key:       key,
-        ValueFunc: valueFn,
-        Sensitive: sensitive,
-    })
-}
-
-// Report outputs all configuration values at the specified log level
-func (r *Reporter) Report(level string) {
-    r.logger.Debugf("Configuration Report:")
-    for _, cv := range r.values {
-        value := cv.ValueFunc()
-        if cv.Sensitive {
-            value = "****"
-        }
-        switch level {
-        case "DEBUG":
-            r.logger.Debugf("%s: %s", cv.Key, value)
-        case "INFO":
-            r.logger.Infof("%s: %s", cv.Key, value)
-        case "WARN":
-            r.logger.Warnf("%s: %s", cv.Key, value)
-        case "ERROR":
-            r.logger.Errorf("%s: %s", cv.Key, value)
-        default:
-            r.logger.Infof("%s: %s", cv.Key, value)
-        }
-    }
-}

config/reporter_noop.go

@@ -1,17 +0,0 @@
-//go:build !configreport
-
-package config
-
-import (
-	"git.defalsify.org/vise.git/logging"
-)
-
-type Reporter struct{}
-
-func NewReporter(logger logging.Vanilla) *Reporter {
-	return &Reporter{}
-}
-
-func (r *Reporter) AddValue(key string, valueFn func() string, sensitive bool) {}
-
-func (r *Reporter) Report(level string) {}

go.mod

@@ -3,25 +3,37 @@ module git.grassecon.net/grassrootseconomics/visedriver
 go 1.23.0
 
 require (
-	git.defalsify.org/vise.git v0.2.3-0.20250114225117-3b5fc85b650b
+	git.defalsify.org/vise.git v0.2.3-0.20250103172917-3e190a44568d
+	github.com/alecthomas/assert/v2 v2.2.2
+	github.com/gofrs/uuid v4.4.0+incompatible
+	github.com/grassrootseconomics/eth-custodial v1.3.0-beta
+	github.com/grassrootseconomics/ussd-data-service v1.2.0-beta
 	github.com/jackc/pgx/v5 v5.7.1
 	github.com/joho/godotenv v1.5.1
+	github.com/peteole/testdata-loader v0.3.0
+	github.com/stretchr/testify v1.9.0
+	golang.org/x/crypto v0.27.0
 )
 
 require (
+	github.com/alecthomas/repr v0.2.0 // indirect
 	github.com/barbashov/iso639-3 v0.0.0-20211020172741-1f4ffb2d8d1c // indirect
 	github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
 	github.com/fxamacker/cbor/v2 v2.4.0 // indirect
 	github.com/graygnuorg/go-gdbm v0.0.0-20220711140707-71387d66dce4 // indirect
+	github.com/hexops/gotextdiff v1.0.3 // indirect
 	github.com/jackc/pgpassfile v1.0.0 // indirect
 	github.com/jackc/pgservicefile v0.0.0-20240606120523-5a60cdf6a761 // indirect
 	github.com/jackc/puddle/v2 v2.2.2 // indirect
+	github.com/kr/text v0.2.0 // indirect
 	github.com/mattn/kinako v0.0.0-20170717041458-332c0a7e205a // indirect
 	github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
-	github.com/stretchr/testify v1.9.0 // indirect
+	github.com/rogpeppe/go-internal v1.13.1 // indirect
+	github.com/stretchr/objx v0.5.2 // indirect
 	github.com/x448/float16 v0.8.4 // indirect
-	golang.org/x/crypto v0.27.0 // indirect
 	golang.org/x/sync v0.8.0 // indirect
+	golang.org/x/sys v0.25.0 // indirect
 	golang.org/x/text v0.18.0 // indirect
 	gopkg.in/leonelquinteros/gotext.v1 v1.3.1 // indirect
+	gopkg.in/yaml.v3 v3.0.1 // indirect
 )

go.sum

@@ -1,14 +1,27 @@
-git.defalsify.org/vise.git v0.2.3-0.20250114225117-3b5fc85b650b h1:rwWXMtNSn7aqhb4p1oVZkCA1vC7pVdohwW61QQM8fUs=
+git.defalsify.org/vise.git v0.2.3-0.20250103172917-3e190a44568d h1:bPAOVZOX4frSGhfOdcj7kc555f8dc9DmMd2YAyC2AMw=
-git.defalsify.org/vise.git v0.2.3-0.20250114225117-3b5fc85b650b/go.mod h1:jyBMe1qTYUz3mmuoC9JQ/TvFeW0vTanCUcPu3H8p4Ck=
+git.defalsify.org/vise.git v0.2.3-0.20250103172917-3e190a44568d/go.mod h1:jyBMe1qTYUz3mmuoC9JQ/TvFeW0vTanCUcPu3H8p4Ck=
+github.com/alecthomas/assert/v2 v2.2.2 h1:Z/iVC0xZfWTaFNE6bA3z07T86hd45Xe2eLt6WVy2bbk=
+github.com/alecthomas/assert/v2 v2.2.2/go.mod h1:pXcQ2Asjp247dahGEmsZ6ru0UVwnkhktn7S0bBDLxvQ=
+github.com/alecthomas/repr v0.2.0 h1:HAzS41CIzNW5syS8Mf9UwXhNH1J9aix/BvDRf1Ml2Yk=
+github.com/alecthomas/repr v0.2.0/go.mod h1:Fr0507jx4eOXV7AlPV6AVZLYrLIuIeSOWtW57eE/O/4=
 github.com/barbashov/iso639-3 v0.0.0-20211020172741-1f4ffb2d8d1c h1:H9Nm+I7Cg/YVPpEV1RzU3Wq2pjamPc/UtHDgItcb7lE=
 github.com/barbashov/iso639-3 v0.0.0-20211020172741-1f4ffb2d8d1c/go.mod h1:rGod7o6KPeJ+hyBpHfhi4v7blx9sf+QsHsA7KAsdN6U=
+github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM=
 github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/fxamacker/cbor/v2 v2.4.0 h1:ri0ArlOR+5XunOP8CRUowT0pSJOwhW098ZCUyskZD88=
 github.com/fxamacker/cbor/v2 v2.4.0/go.mod h1:TA1xS00nchWmaBnEIxPSE5oHLuJBAVvqrtAnWBwBCVo=
+github.com/gofrs/uuid v4.4.0+incompatible h1:3qXRTX8/NbyulANqlc0lchS1gqAVxRgsuW1YrTJupqA=
+github.com/gofrs/uuid v4.4.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM=
+github.com/grassrootseconomics/eth-custodial v1.3.0-beta h1:twrMBhl89GqDUL9PlkzQxMP/6OST1BByrNDj+rqXDmU=
+github.com/grassrootseconomics/eth-custodial v1.3.0-beta/go.mod h1:7uhRcdnJplX4t6GKCEFkbeDhhjlcaGJeJqevbcvGLZo=
+github.com/grassrootseconomics/ussd-data-service v1.2.0-beta h1:fn1gwbWIwHVEBtUC2zi5OqTlfI/5gU1SMk0fgGixIXk=
+github.com/grassrootseconomics/ussd-data-service v1.2.0-beta/go.mod h1:omfI0QtUwIdpu9gMcUqLMCG8O1XWjqJGBx1qUMiGWC0=
 github.com/graygnuorg/go-gdbm v0.0.0-20220711140707-71387d66dce4 h1:U4kkNYryi/qfbBF8gh7Vsbuz+cVmhf5kt6pE9bYYyLo=
 github.com/graygnuorg/go-gdbm v0.0.0-20220711140707-71387d66dce4/go.mod h1:zpZDgZFzeq9s0MIeB1P50NIEWDFFHSFBohI/NbaTD/Y=
+github.com/hexops/gotextdiff v1.0.3 h1:gitA9+qJrrTCsiCl7+kh75nPqQt1cx4ZkudSTLoUqJM=
+github.com/hexops/gotextdiff v1.0.3/go.mod h1:pSWU5MAI3yDq+fZBTazCSJysOMbxWL1BSow5/V2vxeg=
 github.com/jackc/pgpassfile v1.0.0 h1:/6Hmqy13Ss2zCq62VdNG8tM1wchn8zjSGOBJ6icpsIM=
 github.com/jackc/pgpassfile v1.0.0/go.mod h1:CEx0iS5ambNFdcRtxPj5JhEz+xB6uRky5eyVu/W2HEg=
 github.com/jackc/pgservicefile v0.0.0-20240606120523-5a60cdf6a761 h1:iCEnooe7UlwOQYpKFhBabPMi4aNAfoODPEFNiAnClxo=
@@ -19,6 +32,10 @@ github.com/jackc/puddle/v2 v2.2.2 h1:PR8nw+E/1w0GLuRFSmiioY6UooMp6KJv0/61nB7icHo
 github.com/jackc/puddle/v2 v2.2.2/go.mod h1:vriiEXHvEE654aYKXXjOvZM39qJ0q+azkZFrfEOc3H4=
 github.com/joho/godotenv v1.5.1 h1:7eLL/+HRGLY0ldzfGMeQkb7vMd0as4CfYvUVzLqw0N0=
 github.com/joho/godotenv v1.5.1/go.mod h1:f4LDr5Voq0i2e/R5DDNOoa2zzDfwtkZa6DnEwAbqwq4=
+github.com/kr/pretty v0.3.0 h1:WgNl7dwNpEZ6jJ9k1snq4pZsg7DOEN8hP9Xw0Tsjwk0=
+github.com/kr/pretty v0.3.0/go.mod h1:640gp4NfQd8pI5XOwp5fnNeVWj67G7CFk/SaSQn7NBk=
+github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
+github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
 github.com/mattn/kinako v0.0.0-20170717041458-332c0a7e205a h1:0Q3H0YXzMHiciXtRcM+j0jiCe8WKPQHoRgQiRTnfcLY=
 github.com/mattn/kinako v0.0.0-20170717041458-332c0a7e205a/go.mod h1:CdTTBOYzS5E4mWS1N8NWP6AHI19MP0A2B18n3hLzRMk=
 github.com/pashagolub/pgxmock/v4 v4.3.0 h1:DqT7fk0OCK6H0GvqtcMsLpv8cIwWqdxWgfZNLeHCb/s=
@@ -28,7 +45,11 @@ github.com/peteole/testdata-loader v0.3.0/go.mod h1:Mt0ZbRtb56u8SLJpNP+BnQbENljM
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRIccs7FGNTlIRMkT8wgtp5eCXdBlqhYGL6U=
 github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
+github.com/rogpeppe/go-internal v1.13.1 h1:KvO1DLK/DRN07sQ1LQKScxyZJuNnedQ5/wKSR38lUII=
+github.com/rogpeppe/go-internal v1.13.1/go.mod h1:uMEvuHeurkdAXX61udpOXGD/AzZDWNMNyH2VO9fmH0o=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
+github.com/stretchr/objx v0.5.2 h1:xuMeJ0Sdp5ZMRXx/aWO6RZxdr3beISkG5/G/aIRr3pY=
+github.com/stretchr/objx v0.5.2/go.mod h1:FRsXN1f5AsAjCGJKqEizvkpNtU+EGNCLh3NxZ/8L+MA=
 github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
 github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg=
@@ -39,9 +60,15 @@ golang.org/x/crypto v0.27.0 h1:GXm2NjJrPaiv/h1tb2UH8QfgC/hOf/+z0p6PT8o1w7A=
 golang.org/x/crypto v0.27.0/go.mod h1:1Xngt8kV6Dvbssa53Ziq6Eqn0HqbZi5Z6R0ZpwQzt70=
 golang.org/x/sync v0.8.0 h1:3NFvSEYkUoMifnESzZl15y791HH1qU2xm6eCJU5ZPXQ=
 golang.org/x/sync v0.8.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
+golang.org/x/sys v0.25.0 h1:r+8e+loiHxRqhXVl6ML1nO3l1+oFoWbnlu2Ehimmi34=
+golang.org/x/sys v0.25.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/term v0.24.0 h1:Mh5cbb+Zk2hqqXNO7S1iTjEphVL+jb8ZWaqh/g+JWkM=
+golang.org/x/term v0.24.0/go.mod h1:lOBK/LVxemqiMij05LGJ0tzNr8xlmwBRJ81PX6wVLH8=
 golang.org/x/text v0.18.0 h1:XvMDiNzPAl0jr17s6W9lcaIhGUfUORdGCNsuLmPG224=
 golang.org/x/text v0.18.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
+gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=
 gopkg.in/leonelquinteros/gotext.v1 v1.3.1 h1:8d9/fdTG0kn/B7NNGV1BsEyvektXFAbkMsTZS2sFSCc=
 gopkg.in/leonelquinteros/gotext.v1 v1.3.1/go.mod h1:X1WlGDeAFIYsW6GjgMm4VwUwZ2XjI7Zan2InxSUQWrU=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

storage/parse.go

@@ -9,7 +9,6 @@ import (
 const (
 	DBTYPE_NONE = iota
 	DBTYPE_MEM
-	DBTYPE_FS
 	DBTYPE_GDBM
 	DBTYPE_POSTGRES
 )
@@ -55,19 +54,6 @@ func probePostgres(s string) (string, string, bool) {
 }
 
 func probeGdbm(s string) (string, string, bool) {
-	domain := "public"
-	v, err := url.Parse(s)
-	if err != nil {
-		return "", "", false
-	}
-	if v.Scheme != "gdbm" {
-		return "", "", false
-	}
-	s = v.Path
-	return s, domain, true
-}
-
-func probeFs(s string) (string, string, bool) {
 	if !path.IsAbs(s) {
 		return "", "", false
 	}
@@ -75,13 +61,6 @@ func probeFs(s string) (string, string, bool) {
 	return s, "", true
 }
 
-func probeMem(s string) (string, string, bool) {
-	if s != "" {
-		return "", "", false
-	}
-	return "", "", true
-}
-
 func ToConnData(connStr string) (ConnData, error) {
 	var o ConnData
 
@@ -104,18 +83,5 @@ func ToConnData(connStr string) (ConnData, error) {
 		return o, nil
 	}
 
-	v, _, ok = probeFs(connStr)
-	if ok {
-		o.typ = DBTYPE_FS
-		o.str = v
-		return o, nil
-	}
-
-	v, _, ok = probeMem(connStr)
-	if ok {
-		o.typ = DBTYPE_MEM
-		return o, nil
-	}
-
 	return o, fmt.Errorf("invalid connection string: %s", connStr)
 }

storage/storage_service.go

@@ -74,14 +74,6 @@ func (ms *MenuStorageService) getOrCreateDb(ctx context.Context, existingDb db.D
 		}
 		connStr = path.Join(connStr, section)
 		newDb = gdbmstorage.NewThreadGdbmDb()
-	} else if dbTyp == DBTYPE_FS {
-		err = ms.ensureDbDir()
-		if err != nil {
-			return nil, err
-		}
-		newDb = fsdb.NewFsDb().WithBinary()
-	} else if dbTyp == DBTYPE_MEM {
-		logg.WarnCtxf(ctx, "using volatile storage (memdb)")
 	} else {
 		return nil, fmt.Errorf("unsupported connection string: '%s'\n", ms.conn.String())
 	}