deps: update

Reviewed-on: #7

config/config.go

@@ -1,11 +1,12 @@
 package config
 
 import (
+	"strconv"
 	"strings"
 
-	"git.defalsify.org/vise.git/logging"
 	"git.grassecon.net/grassrootseconomics/visedriver/env"
 	"git.grassecon.net/grassrootseconomics/visedriver/storage"
+	"github.com/grassrootseconomics/go-vise/logging"
 )
 
 var (
@@ -23,6 +24,7 @@ var (
 	userDbConn         string
 	userDbConnMode     storage.DbMode
 	Languages          []string
+	configManager      *Config
 )
 
 type Override struct {
@@ -134,6 +136,17 @@ func GetConns() (storage.Conns, error) {
 
 // LoadConfig initializes the configuration values after environment variables are loaded.
 func LoadConfig() error {
+	configManager = NewConfig(logg)
+
+	// Add configuration keys with validation
+	configManager.AddKey("HOST", "127.0.0.1", false, nil)
+	configManager.AddKey("PORT", "7123", false, func(v string) error {
+		_, err := strconv.Atoi(v)
+		return err
+	})
+	configManager.AddKey("DB_CONN", "", true, nil)
+	// ... add other keys ?  or is enough :/ ...
+
 	err := setConn()
 	if err != nil {
 		return err
@@ -145,5 +158,7 @@ func LoadConfig() error {
 	DefaultLanguage = defaultLanguage
 	Languages = languages
 
+	// Report configuration
+	configManager.Report("INFO")
 	return nil
 }

config/config_test.go

@@ -0,0 +1,64 @@
+//go:build configreport
+// +build configreport
+
+package config
+
+import (
+	"fmt"
+	"os"
+	"testing"
+
+	"github.com/grassrootseconomics/go-vise/logging"
+)
+
+// go test -tags configreport ./config/...   ---> run with tag
+func TestConfig(t *testing.T) {
+	logger := logging.NewVanilla().WithDomain("test")
+	cfg := NewConfig(logger)
+
+	t.Run("Default Values", func(t *testing.T) {
+		cfg.AddKey("TEST_KEY", "default", false, nil)
+		value, err := cfg.GetValue("TEST_KEY")
+		t.Logf("Got value: %q, error: %v", value, err)
+		if err != nil {
+			t.Errorf("unexpected error: %v", err)
+		}
+		if value != "default" {
+			t.Errorf("expected 'default', got '%s'", value)
+		}
+	})
+
+	t.Run("Environment Override", func(t *testing.T) {
+		os.Setenv("TEST_ENV_KEY", "override")
+		defer os.Unsetenv("TEST_ENV_KEY")
+
+		cfg.AddKey("TEST_ENV_KEY", "default", false, nil)
+		value, err := cfg.GetValue("TEST_ENV_KEY")
+		t.Logf("Got value: %q, error: %v", value, err)
+		if err != nil {
+			t.Errorf("unexpected error: %v", err)
+		}
+		if value != "override" {
+			t.Errorf("expected 'override', got '%s'", value)
+		}
+	})
+
+	t.Run("Validation", func(t *testing.T) {
+		validator := func(v string) error {
+			if v != "valid" {
+				return fmt.Errorf("invalid value")
+			}
+			return nil
+		}
+
+		cfg.AddKey("VALIDATED_KEY", "valid", false, validator)
+		os.Setenv("VALIDATED_KEY", "invalid")
+		defer os.Unsetenv("VALIDATED_KEY")
+
+		value, err := cfg.GetValue("VALIDATED_KEY")
+		t.Logf("Got value: %q, error: %v", value, err)
+		if err == nil {
+			t.Error("expected validation error, got nil")
+		}
+	})
+}

config/reporter.go

@@ -0,0 +1,95 @@
+//go:build configreport
+
+package config
+
+import (
+	"fmt"
+
+	"git.grassecon.net/grassrootseconomics/visedriver/env"
+	"github.com/grassrootseconomics/go-vise/logging"
+)
+
+// ConfigValue represents a configuration key-value pair
+type ConfigValue struct {
+	Key       string
+	Default   string
+	Validator func(string) error
+	Sensitive bool
+}
+
+// Config handles configuration management and reporting
+type Config struct {
+	values map[string]ConfigValue
+	logger logging.Vanilla
+}
+
+func NewConfig(logger logging.Vanilla) *Config {
+	return &Config{
+		values: make(map[string]ConfigValue),
+		logger: logger,
+	}
+}
+
+// AddKey registers a new configuration key with optional validation
+func (c *Config) AddKey(key string, defaultValue string, sensitive bool, validator func(string) error) {
+	c.values[key] = ConfigValue{
+		Key:       key,
+		Default:   defaultValue,
+		Validator: validator,
+		Sensitive: sensitive,
+	}
+}
+
+// GetValue returns the value for a given key, applying environment override if present
+func (c *Config) GetValue(key string) (string, error) {
+	// Find config value by key
+	var cv ConfigValue
+	for _, v := range c.values {
+		if v.Key == key {
+			cv = v
+			break
+		}
+	}
+
+	if cv.Key == "" {
+		return "", fmt.Errorf("configuration key not found: %s", key)
+	}
+
+	// Get value from environment or default
+	value := env.GetEnv(key, cv.Default)
+
+	// Validate if validator exists
+	if cv.Validator != nil && cv.Validator(value) != nil {
+		return "", fmt.Errorf("invalid value for key %s", key)
+	}
+
+	return value, nil
+}
+
+// Report outputs all configuration values at the specified log level
+func (c *Config) Report(level string) {
+	for _, cv := range c.values {
+		value, err := c.GetValue(cv.Key)
+		if err != nil {
+			c.logger.Errorf("Error getting value for %s: %v", cv.Key, err)
+			continue
+		}
+
+		if cv.Sensitive {
+			value = "****"
+		}
+
+		switch level {
+		case "DEBUG":
+			c.logger.Debugf("config set", cv.Key, value)
+		case "INFO":
+			c.logger.Infof("config set", cv.Key, value)
+		case "WARN":
+			c.logger.Warnf("config set", cv.Key, value)
+		case "ERROR":
+			c.logger.Errorf("config set", cv.Key, value)
+		default:
+			c.logger.Infof("config set", cv.Key, value)
+		}
+	}
+}

config/reporter_noop.go

@@ -0,0 +1,22 @@
+//go:build !configreport
+
+package config
+
+import (
+	"github.com/grassrootseconomics/go-vise/logging"
+)
+
+type Config struct{}
+
+func NewConfig(logger logging.Vanilla) *Config {
+	return &Config{}
+}
+
+func (c *Config) AddKey(key string, defaultValue string, sensitive bool, validator func(string) error) {
+}
+
+func (c *Config) GetValue(key string) (string, error) {
+	return "", nil
+}
+
+func (c *Config) Report(level string) {}

doc/data.md

@@ -4,15 +4,19 @@
 
 This document describes component versions:
 
-* `urdt-ussd` `v0.5.0-beta`
-* `go-vise` `v0.2.2`
-
+- `urdt-ussd` `v0.5.0-beta`
+- `go-vise` `v0.2.2`
 
 ## User profile data
 
-All user profile items are stored under keys matching the user's session id, prefixed with the 8-bit value `git.defalsify.org/vise.git/db.DATATYPE_USERDATA` (32), and followed with a 16-big big-endian value subprefix.
+All user profile items are stored under keys matching the user's session id,
+prefixed with the 8-bit value
+`github.com/grassrootseconomics/go-vise/db.DATATYPE_USERDATA` (32), and followed
+with a 16-big big-endian value subprefix.
 
-For example, given the sessionId `+254123` and the key `git.grassecon.net/urdt-ussd/common.DATA_PUBLIC_KEY` (2) will be stored under the key:
+For example, given the sessionId `+254123` and the key
+`git.grassecon.net/urdt-ussd/common.DATA_PUBLIC_KEY` (2) will be stored under
+the key:
 
 ```
 0x322b3235343132330002
@@ -23,6 +27,9 @@ prefix   sessionid       subprefix
 
 ### Sub-prefixes
 
-All sub-prefixes are defined as constants in the `git.grassecon.net/urdt-ussd/common` package. The constant names have the prefix `DATA_`
+All sub-prefixes are defined as constants in the
+`git.grassecon.net/urdt-ussd/common` package. The constant names have the prefix
+`DATA_`
 
-Please refer to inline godoc documentation for the `git.grassecon.net/urdt-ussd/common` package for details on each data item.
+Please refer to inline godoc documentation for the
+`git.grassecon.net/urdt-ussd/common` package for details on each data item.

entry/handlers.go

@@ -3,8 +3,8 @@ package entry
 import (
 	"context"
 
-	"git.defalsify.org/vise.git/persist"
-	"git.defalsify.org/vise.git/resource"
+	"github.com/grassrootseconomics/go-vise/persist"
+	"github.com/grassrootseconomics/go-vise/resource"
 )
 
 type EntryHandler interface {

go.mod

@@ -1,10 +1,12 @@
 module git.grassecon.net/grassrootseconomics/visedriver
 
-go 1.23.0
+go 1.24
+
+toolchain go1.24.2
 
 require (
-	git.defalsify.org/vise.git v0.2.3-0.20250120121301-10739fb4a8c9
-	github.com/jackc/pgx/v5 v5.7.1
+	github.com/grassrootseconomics/go-vise v0.4.2
+	github.com/jackc/pgx/v5 v5.7.4
 	github.com/joho/godotenv v1.5.1
 )
 
@@ -20,8 +22,8 @@ require (
 	github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
 	github.com/stretchr/testify v1.9.0 // 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/text v0.18.0 // indirect
+	golang.org/x/crypto v0.38.0 // indirect
+	golang.org/x/sync v0.14.0 // indirect
+	golang.org/x/text v0.25.0 // indirect
 	gopkg.in/leonelquinteros/gotext.v1 v1.3.1 // indirect
 )

go.sum

@@ -1,5 +1,3 @@
-git.defalsify.org/vise.git v0.2.3-0.20250120121301-10739fb4a8c9 h1:sPcqXQcywxA8W3W+9qQncLPmsrgqTIlec7vmD4/7vyA=
-git.defalsify.org/vise.git v0.2.3-0.20250120121301-10739fb4a8c9/go.mod h1:jyBMe1qTYUz3mmuoC9JQ/TvFeW0vTanCUcPu3H8p4Ck=
 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/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
@@ -7,22 +5,28 @@ github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1
 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/grassrootseconomics/go-vise v0.4.1 h1:g26jvYnsWaTns60ZHdltGcsL9cjWqvYZwUZ2FWVKOGo=
+github.com/grassrootseconomics/go-vise v0.4.1/go.mod h1:tt3/Swp9F9PdhSDBDvwuI1GZRrCg32kWXWzyATIpTO4=
+github.com/grassrootseconomics/go-vise v0.4.2 h1:6c6ncOCvvXOGWBtMRhuDDLvhsUb+wn11zW6NuCmlFXY=
+github.com/grassrootseconomics/go-vise v0.4.2/go.mod h1:tt3/Swp9F9PdhSDBDvwuI1GZRrCg32kWXWzyATIpTO4=
 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/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=
 github.com/jackc/pgservicefile v0.0.0-20240606120523-5a60cdf6a761/go.mod h1:5TJZWKEWniPve33vlWYSoGYefn3gLQRzjfDlhSJ9ZKM=
-github.com/jackc/pgx/v5 v5.7.1 h1:x7SYsPBYDkHDksogeSmZZ5xzThcTgRz++I5E+ePFUcs=
-github.com/jackc/pgx/v5 v5.7.1/go.mod h1:e7O26IywZZ+naJtWWos6i6fvWK+29etgITqrqHLfoZA=
+github.com/jackc/pgx/v5 v5.7.4 h1:9wKznZrhWa2QiHL+NjTSPP6yjl3451BX3imWDnokYlg=
+github.com/jackc/pgx/v5 v5.7.4/go.mod h1:ncY89UGWxg82EykZUwSpUKEfccBGGYq1xjrOpsbsfGQ=
 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/lmittmann/tint v1.0.7 h1:D/0OqWZ0YOGZ6AyC+5Y2kD8PBEzBk6rFHVSfOqCkF9Y=
+github.com/lmittmann/tint v1.0.7/go.mod h1:HIS3gSy7qNwGCj+5oRjAutErFBl4BzdQP6cJZ0NfMwE=
 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=
-github.com/pashagolub/pgxmock/v4 v4.3.0/go.mod h1:9VoVHXwS3XR/yPtKGzwQvwZX1kzGB9sM8SviDcHDa3A=
+github.com/pashagolub/pgxmock/v4 v4.7.0 h1:de2ORuFYyjwOQR7NBm57+321RnZxpYiuUjsmqRiqgh8=
+github.com/pashagolub/pgxmock/v4 v4.7.0/go.mod h1:9L57pC193h2aKRHVyiiE817avasIPZnPwPlw3JczWvM=
 github.com/peteole/testdata-loader v0.3.0 h1:8jckE9KcyNHgyv/VPoaljvKZE0Rqr8+dPVYH6rfNr9I=
 github.com/peteole/testdata-loader v0.3.0/go.mod h1:Mt0ZbRtb56u8SLJpNP+BnQbENljMorYBpqlvt3cS83U=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
@@ -35,12 +39,12 @@ github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsT
 github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
 github.com/x448/float16 v0.8.4 h1:qLwI1I70+NjRFUR3zs1JPUCgaCXSh3SW62uAKT1mSBM=
 github.com/x448/float16 v0.8.4/go.mod h1:14CWIYCyZA/cWjXOioeEpHeN/83MdbZDRQHoFcYsOfg=
-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/text v0.18.0 h1:XvMDiNzPAl0jr17s6W9lcaIhGUfUORdGCNsuLmPG224=
-golang.org/x/text v0.18.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY=
+golang.org/x/crypto v0.38.0 h1:jt+WWG8IZlBnVbomuhg2Mdq0+BBQaHbtqHEFEigjUV8=
+golang.org/x/crypto v0.38.0/go.mod h1:MvrbAqul58NNYPKnOra203SB9vpuZW0e+RRZV+Ggqjw=
+golang.org/x/sync v0.14.0 h1:woo0S4Yywslg6hp4eUFjTVOyKt0RookbpAHG4c1HmhQ=
+golang.org/x/sync v0.14.0/go.mod h1:1dzgHSNfp02xaA81J2MS99Qcpr2w7fw1gpm99rleRqA=
+golang.org/x/text v0.25.0 h1:qVyWApTSYLk/drJRO5mDlNYskwQznZmkpV2c8q9zls4=
+golang.org/x/text v0.25.0/go.mod h1:WEdwpYrmk1qmdHvhkSTNPm3app7v4rsT8F2UD6+VHIA=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/leonelquinteros/gotext.v1 v1.3.1 h1:8d9/fdTG0kn/B7NNGV1BsEyvektXFAbkMsTZS2sFSCc=
 gopkg.in/leonelquinteros/gotext.v1 v1.3.1/go.mod h1:X1WlGDeAFIYsW6GjgMm4VwUwZ2XjI7Zan2InxSUQWrU=

request/base.go

@@ -3,32 +3,41 @@ package request
 import (
 	"context"
 
-	"git.defalsify.org/vise.git/db"
-	"git.defalsify.org/vise.git/engine"
-	"git.defalsify.org/vise.git/persist"
-	"git.defalsify.org/vise.git/resource"
 	"git.grassecon.net/grassrootseconomics/visedriver/entry"
 	"git.grassecon.net/grassrootseconomics/visedriver/errors"
 	"git.grassecon.net/grassrootseconomics/visedriver/storage"
+	"github.com/grassrootseconomics/go-vise/db"
+	"github.com/grassrootseconomics/go-vise/engine"
+	"github.com/grassrootseconomics/go-vise/persist"
+	"github.com/grassrootseconomics/go-vise/resource"
 )
 
+type EngineFunc func(engine.Config, resource.Resource, *persist.Persister) engine.Engine
+
 type BaseRequestHandler struct {
 	cfgTemplate engine.Config
 	rp          RequestParser
 	rs          resource.Resource
 	hn          entry.EntryHandler
 	provider    storage.StorageProvider
+	engineFunc  EngineFunc
 }
 
-// func NewBaseRequestHandler(cfg engine.Config, rs resource.Resource, stateDb db.Db, userdataDb db.Db, rp request.RequestParser, hn *handlers.Handlers) *BaseRequestHandler {
 func NewBaseRequestHandler(cfg engine.Config, rs resource.Resource, stateDb db.Db, userdataDb db.Db, rp RequestParser, hn entry.EntryHandler) *BaseRequestHandler {
-	return &BaseRequestHandler{
+	h := &BaseRequestHandler{
 		cfgTemplate: cfg,
 		rs:          rs,
 		hn:          hn,
 		rp:          rp,
 		provider:    storage.NewSimpleStorageProvider(stateDb, userdataDb),
 	}
+	h.engineFunc = h.getDefaultEngine
+	return h
+}
+
+func (f *BaseRequestHandler) WithEngineFunc(fn EngineFunc) *BaseRequestHandler {
+	f.engineFunc = fn
+	return f
 }
 
 func (f *BaseRequestHandler) Shutdown(ctx context.Context) {
@@ -39,15 +48,22 @@ func (f *BaseRequestHandler) Shutdown(ctx context.Context) {
 }
 
 func (f *BaseRequestHandler) GetEngine(cfg engine.Config, rs resource.Resource, pr *persist.Persister) engine.Engine {
+	return f.engineFunc(cfg, rs, pr)
+}
+
+func (f *BaseRequestHandler) getDefaultEngine(cfg engine.Config, rs resource.Resource, pr *persist.Persister) engine.Engine {
 	en := engine.NewEngine(cfg, rs)
 	en = en.WithPersister(pr)
+	en = en.WithFirst(f.hn.Init)
+	if f.cfgTemplate.EngineDebug {
+		en = en.WithDebug(nil)
+	}
 	return en
 }
 
 func (f *BaseRequestHandler) Process(rqs RequestSession) (RequestSession, error) {
 	var r bool
 	var err error
-	var ok bool
 
 	logg.InfoCtxf(rqs.Ctx, "new request", "data", rqs)
 
@@ -57,27 +73,12 @@ func (f *BaseRequestHandler) Process(rqs RequestSession) (RequestSession, error)
 		return rqs, errors.ErrStorage
 	}
 
-	//f.hn = f.hn.WithPersister(rqs.Storage.Persister)
 	f.hn.SetPersister(rqs.Storage.Persister)
 	defer func() {
 		f.hn.Exit()
 	}()
-	eni := f.GetEngine(rqs.Config, f.rs, rqs.Storage.Persister)
-	en, ok := eni.(*engine.DefaultEngine)
-	if !ok {
-		perr := f.provider.Put(rqs.Ctx, rqs.Config.SessionId, rqs.Storage)
-		rqs.Storage = nil
-		if perr != nil {
-			logg.ErrorCtxf(rqs.Ctx, "", "storage put error", perr)
-		}
-		return rqs, errors.ErrEngineType
-	}
-	en = en.WithFirst(f.hn.Init)
-	if rqs.Config.EngineDebug {
-		en = en.WithDebug(nil)
-	}
-	rqs.Engine = en
 
+	rqs.Engine = f.GetEngine(rqs.Config, f.rs, rqs.Storage.Persister)
 	r, err = rqs.Engine.Exec(rqs.Ctx, rqs.Input)
 	if err != nil {
 		perr := f.provider.Put(rqs.Ctx, rqs.Config.SessionId, rqs.Storage)

request/http/server.go

@@ -4,9 +4,9 @@ import (
 	"net/http"
 	"strconv"
 
-	"git.defalsify.org/vise.git/logging"
 	"git.grassecon.net/grassrootseconomics/visedriver/errors"
 	"git.grassecon.net/grassrootseconomics/visedriver/request"
+	"github.com/grassrootseconomics/go-vise/logging"
 )
 
 var (

request/http/server_test.go

@@ -8,10 +8,10 @@ import (
 	"net/http/httptest"
 	"testing"
 
-	"git.defalsify.org/vise.git/engine"
 	viseerrors "git.grassecon.net/grassrootseconomics/visedriver/errors"
 	"git.grassecon.net/grassrootseconomics/visedriver/request"
 	"git.grassecon.net/grassrootseconomics/visedriver/testutil/mocks/httpmocks"
+	"github.com/grassrootseconomics/go-vise/engine"
 )
 
 // invalidRequestType is a custom type to test invalid request scenarios

request/request.go

@@ -4,11 +4,11 @@ import (
 	"context"
 	"io"
 
-	"git.defalsify.org/vise.git/engine"
-	"git.defalsify.org/vise.git/logging"
-	"git.defalsify.org/vise.git/persist"
-	"git.defalsify.org/vise.git/resource"
 	"git.grassecon.net/grassrootseconomics/visedriver/storage"
+	"github.com/grassrootseconomics/go-vise/engine"
+	"github.com/grassrootseconomics/go-vise/logging"
+	"github.com/grassrootseconomics/go-vise/persist"
+	"github.com/grassrootseconomics/go-vise/resource"
 )
 
 var (

storage/db/gdbm/gdbm.go

@@ -3,10 +3,10 @@ package storage
 import (
 	"context"
 
-	"git.defalsify.org/vise.git/db"
-	gdbmdb "git.defalsify.org/vise.git/db/gdbm"
-	"git.defalsify.org/vise.git/lang"
-	"git.defalsify.org/vise.git/logging"
+	"github.com/grassrootseconomics/go-vise/db"
+	gdbmdb "github.com/grassrootseconomics/go-vise/db/gdbm"
+	"github.com/grassrootseconomics/go-vise/lang"
+	"github.com/grassrootseconomics/go-vise/logging"
 )
 
 var (

storage/storage.go

@@ -3,8 +3,8 @@ package storage
 import (
 	"context"
 
-	"git.defalsify.org/vise.git/db"
-	"git.defalsify.org/vise.git/persist"
+	"github.com/grassrootseconomics/go-vise/db"
+	"github.com/grassrootseconomics/go-vise/persist"
 )
 
 const (

storage/storage_service.go

@@ -5,17 +5,15 @@ import (
 	"errors"
 	"fmt"
 	"os"
-	"path"
 
-	"git.defalsify.org/vise.git/db"
-	fsdb "git.defalsify.org/vise.git/db/fs"
-	memdb "git.defalsify.org/vise.git/db/mem"
-	"git.defalsify.org/vise.git/db/postgres"
-	"git.defalsify.org/vise.git/lang"
-	"git.defalsify.org/vise.git/logging"
-	"git.defalsify.org/vise.git/persist"
-	"git.defalsify.org/vise.git/resource"
-	gdbmstorage "git.grassecon.net/grassrootseconomics/visedriver/storage/db/gdbm"
+	"github.com/grassrootseconomics/go-vise/db"
+	fsdb "github.com/grassrootseconomics/go-vise/db/fs"
+	memdb "github.com/grassrootseconomics/go-vise/db/mem"
+	"github.com/grassrootseconomics/go-vise/db/postgres"
+	"github.com/grassrootseconomics/go-vise/lang"
+	"github.com/grassrootseconomics/go-vise/logging"
+	"github.com/grassrootseconomics/go-vise/persist"
+	"github.com/grassrootseconomics/go-vise/resource"
 	"github.com/jackc/pgx/v5/pgxpool"
 )
 
@@ -94,13 +92,6 @@ func (ms *MenuStorageService) getOrCreateDb(ctx context.Context, section string,
 			return nil, err
 		}
 		newDb = postgres.NewPgDb().WithSchema(connData.Domain())
-	} else if dbTyp == DBTYPE_GDBM {
-		err = ms.ensureDbDir(connStr)
-		if err != nil {
-			return nil, err
-		}
-		connStr = path.Join(connStr, section)
-		newDb = gdbmstorage.NewThreadGdbmDb()
 	} else if dbTyp == DBTYPE_FS {
 		err = ms.ensureDbDir(connStr)
 		if err != nil {

storage/storage_service_test.go

@@ -5,7 +5,7 @@ import (
 	"os"
 	"testing"
 
-	fsdb "git.defalsify.org/vise.git/db/fs"
+	fsdb "github.com/grassrootseconomics/go-vise/db/fs"
 )
 
 func TestMenuStorageServiceOneSet(t *testing.T) {

testutil/mocks/httpmocks/request_handler_mock.go

@@ -3,10 +3,10 @@ package httpmocks
 import (
 	"context"
 
-	"git.defalsify.org/vise.git/engine"
-	"git.defalsify.org/vise.git/persist"
-	"git.defalsify.org/vise.git/resource"
 	"git.grassecon.net/grassrootseconomics/visedriver/request"
+	"github.com/grassrootseconomics/go-vise/engine"
+	"github.com/grassrootseconomics/go-vise/persist"
+	"github.com/grassrootseconomics/go-vise/resource"
 )
 
 // MockRequestHandler implements request.RequestHandler interface for testing

testutil/mocks/storage.go

@@ -3,10 +3,10 @@ package mocks
 import (
 	"context"
 
-	"git.defalsify.org/vise.git/db"
-	memdb "git.defalsify.org/vise.git/db/mem"
-	"git.defalsify.org/vise.git/persist"
-	"git.defalsify.org/vise.git/resource"
+	"github.com/grassrootseconomics/go-vise/db"
+	memdb "github.com/grassrootseconomics/go-vise/db/mem"
+	"github.com/grassrootseconomics/go-vise/persist"
+	"github.com/grassrootseconomics/go-vise/resource"
 )
 
 type MemStorageService struct {