Correct config override handling

.dockerignore

@@ -0,0 +1,9 @@
+/**
+!/cmd
+!/config
+!/event
+!/internal
+!/lookup
+!/LICENSE
+!/go.*
+!/.env.example

.github/workflows/docker.yaml

@@ -0,0 +1,56 @@
+name: release
+
+on:
+  push:
+    tags:
+      - "v*"
+
+jobs:
+  docker:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v2
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v2
+
+      - name: Check out repo
+        uses: actions/checkout@v3
+        with:
+          fetch-depth: 0
+
+      - name: Cache Docker layers
+        uses: actions/cache@v3
+        with:
+          path: /tmp/.buildx-cache
+          key: ${{ runner.os }}-buildx-${{ github.sha }}
+          restore-keys: |
+            ${{ runner.os }}-buildx-            
+
+      - name: Login to GHCR Docker registry
+        uses: docker/login-action@v1
+        with:
+          registry: ghcr.io
+          username: ${{ github.repository_owner }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Set outputs
+        run: |
+          echo "RELEASE_TAG=${GITHUB_REF#refs/*/}" >> $GITHUB_ENV \
+          && echo "RELEASE_SHORT_COMMIT=$(git rev-parse --short HEAD)" >> $GITHUB_ENV          
+
+      - name: Build and push image
+        uses: docker/build-push-action@v2
+        with:
+          context: ./
+          file: ./Dockerfile
+          platforms: linux/amd64
+          push: true
+          build-args: |
+            BUILD=${{ env.RELEASE_SHORT_COMMIT }}            
+          cache-from: type=local,src=/tmp/.buildx-cache
+          cache-to: type=local,dest=/tmp/.buildx-cache
+          tags: |
+            ghcr.io/grassrootseconomics/sarafu-vise-events:latest
+            ghcr.io/grassrootseconomics/sarafu-vise-events:${{ env.RELEASE_TAG }}            

Dockerfile

@@ -0,0 +1,38 @@
+FROM golang:1.23.4-bookworm AS build
+
+ENV CGO_ENABLED=1
+
+ARG BUILDPLATFORM
+ARG TARGETPLATFORM
+ARG BUILD=dev
+
+WORKDIR /build
+COPY . .
+RUN apt-get update && apt-get install -y --no-install-recommends \
+    libgdbm-dev \
+    git \
+    && rm -rf /var/lib/apt/lists/*
+
+WORKDIR /build
+RUN echo "Building on $BUILDPLATFORM, building for $TARGETPLATFORM"
+RUN go mod download
+RUN go build -tags logtrace -o sarafu-vise-events -ldflags="-X main.build=${BUILD} -s -w" cmd/main.go
+
+FROM debian:bookworm-slim
+
+ENV DEBIAN_FRONTEND=noninteractive
+
+RUN apt-get update && apt-get install -y --no-install-recommends \
+    libgdbm-dev \
+    ca-certificates \
+    && apt-get clean \
+    && rm -rf /var/lib/apt/lists/*
+
+WORKDIR /service
+
+COPY --from=build /build/sarafu-vise-events .
+COPY --from=build /build/LICENSE .
+COPY --from=build /build/.env.example .
+RUN mv .env.example .env
+
+CMD ["./sarafu-vise-events"]

cmd/main.go

@@ -9,11 +9,12 @@ import (
 	"syscall"
 
 	"git.defalsify.org/vise.git/logging"
-	"git.grassecon.net/grassrootseconomics/visedriver/storage"
+	sarafuconfig "git.grassecon.net/grassrootseconomics/sarafu-vise/config"
 	"git.grassecon.net/grassrootseconomics/sarafu-vise-events/config"
 	"git.grassecon.net/grassrootseconomics/sarafu-vise-events/event/nats"
 	"git.grassecon.net/grassrootseconomics/sarafu-vise-events/lookup"
 	viseevent "git.grassecon.net/grassrootseconomics/sarafu-vise/handlers/event"
+	"git.grassecon.net/grassrootseconomics/visedriver/storage"
 )
 
 var (
@@ -23,7 +24,7 @@ var (
 func main() {
 	config.LoadConfig()
 
-	override := config.NewOverride()
+	override := sarafuconfig.NewOverride()
 
 	flag.StringVar(override.DbConn, "c", "?", "default connection string (replaces all unspecified strings)")
 	flag.StringVar(override.ResourceConn, "resource", "?", "resource connection string")
@@ -31,8 +32,8 @@ func main() {
 	flag.StringVar(override.StateConn, "state", "?", "state store connection string")
 	flag.Parse()
 
-	config.Apply(&override)
+	sarafuconfig.Apply(override)
-	conns, err := config.GetConns()
+	conns, err := sarafuconfig.GetConns()
 	if err != nil {
 		fmt.Fprintf(os.Stderr, "conn specification error: %v\n", err)
 		os.Exit(1)

config/config.go

@@ -2,7 +2,6 @@ package config
 
 import (
 	viseconfig "git.grassecon.net/grassrootseconomics/visedriver/config"
-	apiconfig "git.grassecon.net/grassrootseconomics/sarafu-api/config"
 	"git.grassecon.net/grassrootseconomics/sarafu-vise/config"
 	"git.grassecon.net/grassrootseconomics/visedriver/env"
 )
@@ -20,11 +19,7 @@ const (
 )
 
 func LoadConfig() error {
-	err := viseconfig.LoadConfig()
+	err := config.LoadConfig()
-	if err != nil {
-		return err
-	}
-	err = apiconfig.LoadConfig()
 	if err != nil {
 		return err
 	}
@@ -36,7 +31,3 @@ func LoadConfig() error {
 func Language() string {
 	return viseconfig.DefaultLanguage
 }
-
-func NewOverride() config.Override {
-	return config.Override{}
-}

event/custodial_registration.go

@@ -1,8 +1,8 @@
 package event
 
 import (
-	geEvent "github.com/grassrootseconomics/eth-tracker/pkg/event"
 	apievent "git.grassecon.net/grassrootseconomics/sarafu-api/event"
+	geEvent "github.com/grassrootseconomics/eth-tracker/pkg/event"
 )
 
 const (

event/custodial_test.go

@@ -4,20 +4,19 @@ import (
 	"context"
 	"testing"
 
+	"git.defalsify.org/vise.git/cache"
 	"git.defalsify.org/vise.git/db"
 	"git.defalsify.org/vise.git/state"
-	"git.defalsify.org/vise.git/cache"
-	"git.grassecon.net/grassrootseconomics/visedriver/testutil/mocks"
-	"git.grassecon.net/grassrootseconomics/sarafu-api/remote/http"
-	"git.grassecon.net/grassrootseconomics/sarafu-vise-events/config"
 	"git.grassecon.net/grassrootseconomics/common/hex"
-	storedb "git.grassecon.net/grassrootseconomics/sarafu-vise/store/db"
 	apievent "git.grassecon.net/grassrootseconomics/sarafu-api/event"
+	"git.grassecon.net/grassrootseconomics/sarafu-api/remote/http"
 	apimocks "git.grassecon.net/grassrootseconomics/sarafu-api/testutil/mocks"
+	"git.grassecon.net/grassrootseconomics/sarafu-vise-events/config"
 	viseevent "git.grassecon.net/grassrootseconomics/sarafu-vise/handlers/event"
+	storedb "git.grassecon.net/grassrootseconomics/sarafu-vise/store/db"
+	"git.grassecon.net/grassrootseconomics/visedriver/testutil/mocks"
 )
 
-
 func TestCustodialRegistration(t *testing.T) {
 	err := config.LoadConfig()
 	if err != nil {

event/nats/nats.go

@@ -5,13 +5,13 @@ import (
 	"encoding/json"
 	"fmt"
 
+	"git.defalsify.org/vise.git/logging"
+	apievent "git.grassecon.net/grassrootseconomics/sarafu-api/event"
+	"git.grassecon.net/grassrootseconomics/sarafu-vise-events/config"
+	"git.grassecon.net/grassrootseconomics/sarafu-vise-events/event"
+	geEvent "github.com/grassrootseconomics/eth-tracker/pkg/event"
 	nats "github.com/nats-io/nats.go"
 	"github.com/nats-io/nats.go/jetstream"
-	geEvent "github.com/grassrootseconomics/eth-tracker/pkg/event"
-	"git.defalsify.org/vise.git/logging"
-	"git.grassecon.net/grassrootseconomics/sarafu-vise-events/event"
-	"git.grassecon.net/grassrootseconomics/sarafu-vise-events/config"
-	apievent "git.grassecon.net/grassrootseconomics/sarafu-api/event"
 )
 
 var (
@@ -43,7 +43,7 @@ func NewNatsSubscription(handler *apievent.EventsHandler) *NatsSubscription {
 // Fails if connection fails or the "Jetstream" consumer cannot be set up.
 //
 // Once connected, it will attempt to reconnect if disconnected.
-func(n *NatsSubscription) Connect(ctx context.Context, connStr string) error {
+func (n *NatsSubscription) Connect(ctx context.Context, connStr string) error {
 	var err error
 
 	// enables set ctx in test, even if the connstr is invalid (js msg handler doesnt take context)
@@ -78,7 +78,7 @@ func(n *NatsSubscription) Connect(ctx context.Context, connStr string) error {
 }
 
 // Close cleanly brings down the nats and jetstream connection.
-func(n *NatsSubscription) Close() error {
+func (n *NatsSubscription) Close() error {
 	n.cctx.Stop()
 	select {
 	case <-n.cctx.Closed():
@@ -88,7 +88,7 @@ func(n *NatsSubscription) Close() error {
 }
 
 // jetstream message handler and acknowledger.
-func(n *NatsSubscription) handleEvent(m jetstream.Msg) {
+func (n *NatsSubscription) handleEvent(m jetstream.Msg) {
 	var ev geEvent.Event
 
 	logg.DebugCtxf(n.ctx, "have msg", "msg", m)

event/nats/nats_test.go

@@ -9,21 +9,21 @@ import (
 	"testing"
 	"time"
 
-	nats "github.com/nats-io/nats.go"
-	"github.com/nats-io/nats.go/jetstream"
-	dataserviceapi "github.com/grassrootseconomics/ussd-data-service/pkg/api"
 	"git.defalsify.org/vise.git/db"
-	"git.grassecon.net/grassrootseconomics/sarafu-vise-events/config"
-	"git.grassecon.net/grassrootseconomics/sarafu-vise/store"
-	storedb "git.grassecon.net/grassrootseconomics/sarafu-vise/store/db"
-	"git.grassecon.net/grassrootseconomics/sarafu-api/models"
-	"git.grassecon.net/grassrootseconomics/sarafu-vise-events/lookup"
 	"git.grassecon.net/grassrootseconomics/common/hex"
+	"git.grassecon.net/grassrootseconomics/sarafu-api/models"
 	apimocks "git.grassecon.net/grassrootseconomics/sarafu-api/testutil/mocks"
+	"git.grassecon.net/grassrootseconomics/sarafu-vise-events/config"
 	"git.grassecon.net/grassrootseconomics/sarafu-vise-events/internal/testutil"
+	"git.grassecon.net/grassrootseconomics/sarafu-vise-events/lookup"
 	"git.grassecon.net/grassrootseconomics/sarafu-vise/handlers/application"
 	viseevent "git.grassecon.net/grassrootseconomics/sarafu-vise/handlers/event"
+	"git.grassecon.net/grassrootseconomics/sarafu-vise/store"
+	storedb "git.grassecon.net/grassrootseconomics/sarafu-vise/store/db"
 	"git.grassecon.net/grassrootseconomics/visedriver/testutil/mocks"
+	dataserviceapi "github.com/grassrootseconomics/ussd-data-service/pkg/api"
+	nats "github.com/nats-io/nats.go"
+	"github.com/nats-io/nats.go/jetstream"
 )
 
 const (
@@ -44,51 +44,51 @@ type testMsg struct {
 	data []byte
 }
 
-func(m *testMsg) Ack() error {
+func (m *testMsg) Ack() error {
 	return nil
 }
 
-func(m *testMsg) Nak() error {
+func (m *testMsg) Nak() error {
 	return nil
 }
 
-func(m *testMsg) NakWithDelay(time.Duration) error {
+func (m *testMsg) NakWithDelay(time.Duration) error {
 	return nil
 }
 
-func(m *testMsg) Data() []byte {
+func (m *testMsg) Data() []byte {
 	return m.data
 }
 
-func(m *testMsg) Reply() string {
+func (m *testMsg) Reply() string {
 	return ""
 }
 
-func(m *testMsg) Subject() string {
+func (m *testMsg) Subject() string {
 	return ""
 }
 
-func(m *testMsg) Term() error {
+func (m *testMsg) Term() error {
 	return nil
 }
 
-func(m *testMsg) TermWithReason(string) error {
+func (m *testMsg) TermWithReason(string) error {
 	return nil
 }
 
-func(m *testMsg) DoubleAck(ctx context.Context) error {
+func (m *testMsg) DoubleAck(ctx context.Context) error {
 	return nil
 }
 
-func(m *testMsg) Headers() nats.Header {
+func (m *testMsg) Headers() nats.Header {
 	return nats.Header{}
 }
 
-func(m *testMsg) InProgress() error {
+func (m *testMsg) InProgress() error {
 	return nil
 }
 
-func(m *testMsg) Metadata() (*jetstream.MsgMetadata, error) {
+func (m *testMsg) Metadata() (*jetstream.MsgMetadata, error) {
 	return nil, nil
 }
 
@@ -182,8 +182,8 @@ func TestHandleMsg(t *testing.T) {
 		t.Fatal(err)
 	}
 	fmts := fmt.Sprintf("%%1.%df", tokenDecimals)
-	expect := fmt.Sprintf(fmts, float64(tokenBalance) / math.Pow(10, tokenDecimals))
+	expect := fmt.Sprintf(fmts, float64(tokenBalance)/math.Pow(10, tokenDecimals))
-	//if !bytes.Equal(v, []byte(strconv.Itoa(tokenBalance))) {
+
 	if !bytes.Equal(v, []byte(expect)) {
 		t.Fatalf("expected '%d', got %s", tokenBalance, v)
 	}
@@ -196,7 +196,6 @@ func TestHandleMsg(t *testing.T) {
 		t.Fatal("no transaction data")
 	}
 
-
 	mh, err := application.NewMenuHandlers(nil, userStore, nil, testutil.ReplaceSeparatorFunc)
 	if err != nil {
 		t.Fatal(err)
@@ -210,14 +209,4 @@ func TestHandleMsg(t *testing.T) {
 	if rrs.Content != expect {
 		t.Fatalf("expected '%v', got '%v'", expect, rrs.Content)
 	}
-//	userDb.SetPrefix(event.DATATYPE_USERSUB)
-//	userDb.SetSession(apimocks.AliceSession)
-//	k := append([]byte("vouchers"), []byte("sym")...)
-//	v, err = userDb.Get(ctx, k)
-//	if err != nil {
-//		t.Fatal(err)
-//	}
-//	if !bytes.Contains(v, []byte(fmt.Sprintf("1:%s", tokenSymbol))) {
-//		t.Fatalf("expected '1:%s', got %s", tokenSymbol, v)
-//	}
 }

event/route.go

@@ -30,7 +30,7 @@ func NewRouter(handler *apievent.EventsHandler) *Router {
 //
 // An error will be returned if no handler can be found, or if the resolved
 // handler fails to successfully execute.
-func(r *Router) Route(ctx context.Context, gev *geEvent.Event) error {
+func (r *Router) Route(ctx context.Context, gev *geEvent.Event) error {
 	logg.DebugCtxf(ctx, "have event", "ev", gev)
 	evCC, ok := asCustodialRegistrationEvent(gev)
 	if ok {

event/token.go

@@ -34,7 +34,6 @@ func formatTransaction(tag string, idx int, item any) string {
 	return ""
 }
 
-
 // waiter to check whether object is available on dependency endpoints.
 func updateWait(ctx context.Context) error {
 	return nil

event/token_test.go

@@ -9,20 +9,20 @@ import (
 	"testing"
 	"time"
 
-	dataserviceapi "github.com/grassrootseconomics/ussd-data-service/pkg/api"
 	"git.defalsify.org/vise.git/db"
-	"git.grassecon.net/grassrootseconomics/sarafu-vise-events/config"
+	"git.grassecon.net/grassrootseconomics/common/hex"
-	"git.grassecon.net/grassrootseconomics/sarafu-vise/handlers/application"
+	apievent "git.grassecon.net/grassrootseconomics/sarafu-api/event"
 	"git.grassecon.net/grassrootseconomics/sarafu-api/models"
+	apimocks "git.grassecon.net/grassrootseconomics/sarafu-api/testutil/mocks"
+	"git.grassecon.net/grassrootseconomics/sarafu-vise-events/config"
+	"git.grassecon.net/grassrootseconomics/sarafu-vise-events/internal/testutil"
+	"git.grassecon.net/grassrootseconomics/sarafu-vise-events/lookup"
+	"git.grassecon.net/grassrootseconomics/sarafu-vise/handlers/application"
+	viseevent "git.grassecon.net/grassrootseconomics/sarafu-vise/handlers/event"
 	"git.grassecon.net/grassrootseconomics/sarafu-vise/store"
 	storedb "git.grassecon.net/grassrootseconomics/sarafu-vise/store/db"
-	"git.grassecon.net/grassrootseconomics/sarafu-vise-events/lookup"
-	"git.grassecon.net/grassrootseconomics/common/hex"
-	"git.grassecon.net/grassrootseconomics/sarafu-vise-events/internal/testutil"
-	apievent "git.grassecon.net/grassrootseconomics/sarafu-api/event"
-	apimocks "git.grassecon.net/grassrootseconomics/sarafu-api/testutil/mocks"
-	viseevent "git.grassecon.net/grassrootseconomics/sarafu-vise/handlers/event"
 	"git.grassecon.net/grassrootseconomics/visedriver/testutil/mocks"
+	dataserviceapi "github.com/grassrootseconomics/ussd-data-service/pkg/api"
 )
 
 const (
@@ -39,7 +39,6 @@ const (
 	bogusSym      = "/-21380u"
 )
 
-
 func TestTokenTransfer(t *testing.T) {
 	err := config.LoadConfig()
 	if err != nil {
@@ -123,7 +122,7 @@ func TestTokenTransfer(t *testing.T) {
 	}
 	//if !bytes.Equal(v, []byte(strconv.Itoa(tokenBalance))) {
 	fmts := fmt.Sprintf("%%1.%df", tokenDecimals)
-	expect := fmt.Sprintf(fmts, float64(tokenBalance) / math.Pow(10, tokenDecimals))
+	expect := fmt.Sprintf(fmts, float64(tokenBalance)/math.Pow(10, tokenDecimals))
 	if !bytes.Equal(v, []byte(expect)) {
 		t.Fatalf("expected '%s', got %s", expect, v)
 	}
@@ -187,7 +186,6 @@ func TestTokenMint(t *testing.T) {
 	}
 	lookup.Api = api
 
-
 	ctx := context.Background()
 	storageService := mocks.NewMemStorageService(ctx)
 	eu := viseevent.NewEventsUpdater(api, storageService)
@@ -232,8 +230,8 @@ func TestTokenMint(t *testing.T) {
 		t.Fatal(err)
 	}
 	fmts := fmt.Sprintf("%%1.%df", tokenDecimals)
-	expect := fmt.Sprintf(fmts, float64(tokenBalance) / math.Pow(10, tokenDecimals))
+	expect := fmt.Sprintf(fmts, float64(tokenBalance)/math.Pow(10, tokenDecimals))
-	//if !bytes.Equal(v, []byte(strconv.Itoa(tokenBalance))) {
+
 	if !bytes.Equal(v, []byte(expect)) {
 		t.Fatalf("expected '%d', got %s", tokenBalance, v)
 	}

go.mod

@@ -6,8 +6,8 @@ require (
 	git.defalsify.org/vise.git v0.2.3-0.20250120121301-10739fb4a8c9
 	git.grassecon.net/grassrootseconomics/common v0.0.0-20250121134736-ba8cbbccea7d
 	git.grassecon.net/grassrootseconomics/sarafu-api v0.0.0-20250121135150-e0b539809805
-	git.grassecon.net/grassrootseconomics/sarafu-vise v0.0.0-20250121142648-4baacb325d2b
+	git.grassecon.net/grassrootseconomics/sarafu-vise v0.0.0-20250124084723-9a094f440f86
-	git.grassecon.net/grassrootseconomics/visedriver v0.8.0-beta.10.0.20250121134912-f7d31e4e8162
+	git.grassecon.net/grassrootseconomics/visedriver v0.8.0-beta.10.0.20250122123424-6749c632b0a2
 	github.com/grassrootseconomics/eth-tracker v1.3.0-rc
 	github.com/grassrootseconomics/ussd-data-service v1.2.0-beta
 	github.com/nats-io/nats.go v1.37.0

go.sum

@@ -4,10 +4,10 @@ git.grassecon.net/grassrootseconomics/common v0.0.0-20250121134736-ba8cbbccea7d
 git.grassecon.net/grassrootseconomics/common v0.0.0-20250121134736-ba8cbbccea7d/go.mod h1:wgQJZGIS6QuNLHqDhcsvehsbn5PvgV7aziRebMnJi60=
 git.grassecon.net/grassrootseconomics/sarafu-api v0.0.0-20250121135150-e0b539809805 h1:deGnqf4YCsbxhXgjFEjYjTUCvciLEmI26T9IysRsQXY=
 git.grassecon.net/grassrootseconomics/sarafu-api v0.0.0-20250121135150-e0b539809805/go.mod h1:9bc3d//Qqm11hz7GYRdQc1Uan+0GJIOpvRBbv8cHMu8=
-git.grassecon.net/grassrootseconomics/sarafu-vise v0.0.0-20250121142648-4baacb325d2b h1:kUQW5cM4Q7TogrUfrxFjdvA/BYCescsAZBtf5teLYrY=
+git.grassecon.net/grassrootseconomics/sarafu-vise v0.0.0-20250124084723-9a094f440f86 h1:wqISfQKU7nJgKVGGMm/b0M46tMRmvkBc+riLOWzd7ss=
-git.grassecon.net/grassrootseconomics/sarafu-vise v0.0.0-20250121142648-4baacb325d2b/go.mod h1:AF6qgkV+OmxamrPcrzZfsRUYTaQMZXBRejRg7dIKej4=
+git.grassecon.net/grassrootseconomics/sarafu-vise v0.0.0-20250124084723-9a094f440f86/go.mod h1:kt/HZVYJZoQLzJtHKSfltZu7+khRUUq5P98PtPpKbUc=
-git.grassecon.net/grassrootseconomics/visedriver v0.8.0-beta.10.0.20250121134912-f7d31e4e8162 h1:NaPbgGQ1Nb+yYF+Qj1LSagpjYeDcSXST8iZwONg4afY=
+git.grassecon.net/grassrootseconomics/visedriver v0.8.0-beta.10.0.20250122123424-6749c632b0a2 h1:ON77G5K0JNuwPb5JT/hRfF6G6+xstlBQgEIEzWydnhg=
-git.grassecon.net/grassrootseconomics/visedriver v0.8.0-beta.10.0.20250121134912-f7d31e4e8162/go.mod h1:pjKp9L/ZsWW3kMB0UoIl1yv9TBIuU33mn9Aghxp7vGk=
+git.grassecon.net/grassrootseconomics/visedriver v0.8.0-beta.10.0.20250122123424-6749c632b0a2/go.mod h1:pjKp9L/ZsWW3kMB0UoIl1yv9TBIuU33mn9Aghxp7vGk=
 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/participle/v2 v2.0.0 h1:Fgrq+MbuSsJwIkw3fEj9h75vDP0Er5JzepJ0/HNHv0g=

lookup/token.go

@@ -1,8 +1,8 @@
 package lookup
 
 import (
-	"git.grassecon.net/grassrootseconomics/sarafu-api/remote/http"
 	"git.grassecon.net/grassrootseconomics/sarafu-api/remote"
+	"git.grassecon.net/grassrootseconomics/sarafu-api/remote/http"
 )
 
 var (