diff --git a/config/config.go b/config/config.go index 30fbbef..9c5fd1b 100644 --- a/config/config.go +++ b/config/config.go @@ -4,9 +4,9 @@ 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 ( diff --git a/config/config_test.go b/config/config_test.go index 6c07375..018978f 100644 --- a/config/config_test.go +++ b/config/config_test.go @@ -1,3 +1,4 @@ +//go:build configreport // +build configreport package config @@ -7,7 +8,7 @@ import ( "os" "testing" - "git.defalsify.org/vise.git/logging" + "github.com/grassrootseconomics/go-vise/logging" ) // go test -tags configreport ./config/... ---> run with tag diff --git a/config/reporter.go b/config/reporter.go index c81d2ca..056c233 100644 --- a/config/reporter.go +++ b/config/reporter.go @@ -5,8 +5,8 @@ package config import ( "fmt" - "git.defalsify.org/vise.git/logging" "git.grassecon.net/grassrootseconomics/visedriver/env" + "github.com/grassrootseconomics/go-vise/logging" ) // ConfigValue represents a configuration key-value pair diff --git a/config/reporter_noop.go b/config/reporter_noop.go index 67e4d71..d41833f 100644 --- a/config/reporter_noop.go +++ b/config/reporter_noop.go @@ -3,19 +3,20 @@ package config import ( - "git.defalsify.org/vise.git/logging" + "github.com/grassrootseconomics/go-vise/logging" ) type Config struct{} func NewConfig(logger logging.Vanilla) *Config { - return &Config{} + return &Config{} } -func (c *Config) AddKey(key string, defaultValue string, sensitive bool, validator func(string) error) {} +func (c *Config) AddKey(key string, defaultValue string, sensitive bool, validator func(string) error) { +} func (c *Config) GetValue(key string) (string, error) { - return "", nil + return "", nil } -func (c *Config) Report(level string) {} \ No newline at end of file +func (c *Config) Report(level string) {} diff --git a/doc/data.md b/doc/data.md index 7a41f0c..c8e73f1 100644 --- a/doc/data.md +++ b/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. diff --git a/entry/handlers.go b/entry/handlers.go index 8622e6a..beb32c0 100644 --- a/entry/handlers.go +++ b/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 { diff --git a/go.mod b/go.mod index c6c6084..b29bc08 100644 --- a/go.mod +++ b/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.20250204132233-2bffe532f21e - github.com/jackc/pgx/v5 v5.7.1 + github.com/grassrootseconomics/go-vise v0.4.1 + 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 ) diff --git a/go.sum b/go.sum index bd4f3e1..37a7181 100644 --- a/go.sum +++ b/go.sum @@ -1,5 +1,3 @@ -git.defalsify.org/vise.git v0.2.3-0.20250204132233-2bffe532f21e h1:gtB9OdX6x5gQRM3W824dEurXuuf/YPInqgtv2KAp5Zo= -git.defalsify.org/vise.git v0.2.3-0.20250204132233-2bffe532f21e/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,26 @@ 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/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 +37,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= diff --git a/request/base.go b/request/base.go index 30400c0..6ee7c8d 100644 --- a/request/base.go +++ b/request/base.go @@ -3,13 +3,13 @@ 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 @@ -20,7 +20,7 @@ type BaseRequestHandler struct { rs resource.Resource hn entry.EntryHandler provider storage.StorageProvider - engineFunc EngineFunc + engineFunc EngineFunc } func NewBaseRequestHandler(cfg engine.Config, rs resource.Resource, stateDb db.Db, userdataDb db.Db, rp RequestParser, hn entry.EntryHandler) *BaseRequestHandler { diff --git a/request/http/server.go b/request/http/server.go index 97a2dd8..9c64913 100644 --- a/request/http/server.go +++ b/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 ( diff --git a/request/http/server_test.go b/request/http/server_test.go index 8bfaf8f..9aad0cd 100644 --- a/request/http/server_test.go +++ b/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 diff --git a/request/request.go b/request/request.go index 279d504..59a1e81 100644 --- a/request/request.go +++ b/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 ( diff --git a/storage/db/gdbm/gdbm.go b/storage/db/gdbm/gdbm.go index 4d74a11..14cb5ed 100644 --- a/storage/db/gdbm/gdbm.go +++ b/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 ( diff --git a/storage/storage.go b/storage/storage.go index 391835c..4e87e3c 100644 --- a/storage/storage.go +++ b/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 ( diff --git a/storage/storage_service.go b/storage/storage_service.go index 4f18702..061b2b0 100644 --- a/storage/storage_service.go +++ b/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 { diff --git a/storage/storage_service_test.go b/storage/storage_service_test.go index 37423c6..48c91ca 100644 --- a/storage/storage_service_test.go +++ b/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) { diff --git a/testutil/mocks/httpmocks/request_handler_mock.go b/testutil/mocks/httpmocks/request_handler_mock.go index ee6a9bf..2afe6f7 100644 --- a/testutil/mocks/httpmocks/request_handler_mock.go +++ b/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 diff --git a/testutil/mocks/storage.go b/testutil/mocks/storage.go index 059bc04..dfa8add 100644 --- a/testutil/mocks/storage.go +++ b/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 {