feat: Remove NUMARY_ prefix on ledger and update operator (#94)

components/ledger/Taskfile.yaml

@@ -37,8 +37,8 @@ tasks:
         go test {{.TAGS}} {{if eq .VERBOSE "true"}}-v{{end}} -coverpkg {{.PKG}}
         -coverprofile coverage.out -covermode atomic {{.PKG}}
     env:
-      NUMARY_STORAGE_DRIVER: "postgres"
-      NUMARY_STORAGE_POSTGRES_CONN_STRING: "postgresql://ledger:[email protected]/ledger"
+      STORAGE_DRIVER: "postgres"
+      STORAGE_POSTGRES_CONN_STRING: "postgresql://ledger:[email protected]/ledger"
 
   tests:local:
     cmds:
@@ -68,8 +68,8 @@ tasks:
         sed ''/RUN/s//$(printf "\033[34mRUN\033[0m")/''
       - task: print:coverage
     env:
-      NUMARY_STORAGE_DRIVER: "postgres"
-      NUMARY_STORAGE_POSTGRES_CONN_STRING: "postgresql://ledger:[email protected]/ledger"
+      STORAGE_DRIVER: "postgres"
+      STORAGE_POSTGRES_CONN_STRING: "postgresql://ledger:[email protected]/ledger"
 
   print:coverage:
     cmds:
@@ -91,8 +91,8 @@ tasks:
         | tee {{.BENCH_RESULTS_FILE}}
       - benchstat {{.BENCH_RESULTS_FILE}}
     env:
-      NUMARY_STORAGE_DRIVER: "postgres"
-      NUMARY_STORAGE_POSTGRES_CONN_STRING: "postgresql://ledger:[email protected]/ledger"
+      STORAGE_DRIVER: "postgres"
+      STORAGE_POSTGRES_CONN_STRING: "postgresql://ledger:[email protected]/ledger"
 
   bench:cpu:
     cmds:
@@ -187,12 +187,12 @@ tasks:
         vars:
           Platform: "amd64"
           Image: fedora
-          Cmd: "{{.rpm}} numary_*_linux_amd64.rpm"
+          Cmd: "{{.rpm}} *_linux_amd64.rpm"
       - task: goreleaser:test:pkg
         vars:
           Platform: "arm64"
           Image: fedora
-          Cmd: "{{.rpm}} numary_*_linux_arm64.rpm"
+          Cmd: "{{.rpm}} *_linux_arm64.rpm"
 
   goreleaser:test:deb:
     desc: Tests deb packages
@@ -203,12 +203,12 @@ tasks:
         vars:
           Platform: "amd64"
           Image: ubuntu
-          Cmd: "{{.dpkg}} numary_*_linux_amd64.deb"
+          Cmd: "{{.dpkg}} *_linux_amd64.deb"
       - task: goreleaser:test:pkg
         vars:
           Platform: "arm64"
           Image: ubuntu
-          Cmd: "{{.dpkg}} numary_*_linux_arm64.deb"
+          Cmd: "{{.dpkg}} *_linux_arm64.deb"
 
   run:
     cmds:

components/ledger/app.json

@@ -13,12 +13,12 @@
     }
   ],
   "env": {
-    "NUMARY_AUTH_BASIC_ENABLED": {
+    "AUTH_BASIC_ENABLED": {
       "description": "Enable basic auth. (true or false)",
       "required": true,
       "value": "true"
     },
-    "NUMARY_AUTH_BASIC_CREDENTIALS": {
+    "AUTH_BASIC_CREDENTIALS": {
       "description": "HTTP basic auth credentials (<username>:<password>)",
       "required": false
     }

components/ledger/cmd/internal/env.go

@@ -6,14 +6,9 @@ import (
 	"github.com/spf13/viper"
 )
 
-const (
-	envPrefix = "numary"
-)
-
 var EnvVarReplacer = strings.NewReplacer(".", "_", "-", "_")
 
 func BindEnv(v *viper.Viper) {
-	v.SetEnvPrefix(envPrefix)
 	v.SetEnvKeyReplacer(EnvVarReplacer)
 	v.AutomaticEnv()
 }

components/ledger/cmd/internal/utils.go

@@ -1,22 +1,17 @@
 package internal
 
 import (
-	"fmt"
 	"net/http"
 	"os"
 	"strings"
 )
 
-func withPrefix(flag string) string {
-	return strings.ToUpper(fmt.Sprintf("%s_%s", envPrefix, EnvVarReplacer.Replace(flag)))
-}
-
 func setEnvVar(key, value string) func() {
-	prefixedFlag := withPrefix(key)
-	oldEnv := os.Getenv(prefixedFlag)
-	os.Setenv(prefixedFlag, value)
+	flag := strings.ToUpper(EnvVarReplacer.Replace(key))
+	oldEnv := os.Getenv(flag)
+	os.Setenv(flag, value)
 	return func() {
-		os.Setenv(prefixedFlag, oldEnv)
+		os.Setenv(flag, oldEnv)
 	}
 }
 

components/ledger/cmd/root_test.go

@@ -35,7 +35,7 @@ func TestServer(t *testing.T) {
 			name: "default",
 			env: []env{
 				{
-					key:   "NUMARY_STORAGE_DRIVER",
+					key:   "STORAGE_DRIVER",
 					value: "sqlite",
 				},
 			},
@@ -48,11 +48,11 @@ func TestServer(t *testing.T) {
 			name: "pg-with-env-var",
 			env: []env{
 				{
-					key:   "NUMARY_STORAGE_DRIVER",
+					key:   "STORAGE_DRIVER",
 					value: "postgres",
 				},
 				{
-					key:   "NUMARY_STORAGE_POSTGRES_CONN_STRING",
+					key:   "STORAGE_POSTGRES_CONN_STRING",
 					value: db.ConnString(),
 				},
 			},

components/ledger/docker-compose.override.yml

@@ -7,12 +7,12 @@ services:
     working_dir: /src
     environment:
       CGO_ENABLED: 0
-      NUMARY_DEBUG: "true"
-      NUMARY_OTEL_TRACES: "true"
-      NUMARY_OTEL_TRACES_EXPORTER: jaeger
-      NUMARY_OTEL_TRACES_EXPORTER_JAEGER_ENDPOINT: http://jaeger:14268/api/traces
-      NUMARY_OTEL_TRACES_EXPORTER_JAEGER_INSECURE: "true"
-      NUMARY_OTEL_METRICS: "false"
+      DEBUG: "true"
+      OTEL_TRACES: "true"
+      OTEL_TRACES_EXPORTER: jaeger
+      OTEL_TRACES_EXPORTER_JAEGER_ENDPOINT: http://jaeger:14268/api/traces
+      OTEL_TRACES_EXPORTER_JAEGER_INSECURE: "true"
+      OTEL_METRICS: "false"
     depends_on:
       - jaeger
 

components/ledger/docker-compose.yml

@@ -30,9 +30,9 @@ services:
       postgres:
         condition: service_healthy
     environment:
-      NUMARY_STORAGE_DRIVER: "postgres"
-      NUMARY_STORAGE_POSTGRES_CONN_STRING: "postgresql://ledger:ledger@postgres/ledger"
-      NUMARY_SERVER_HTTP_BIND_ADDRESS: "0.0.0.0:3068"
+      STORAGE_DRIVER: "postgres"
+      STORAGE_POSTGRES_CONN_STRING: "postgresql://ledger:ledger@postgres/ledger"
+      SERVER_HTTP_BIND_ADDRESS: "0.0.0.0:3068"
 
   proxy:
     image: caddy:2
@@ -51,4 +51,4 @@ services:
     ports:
       - "3078:3078"
     environment:
-      NUMARY_UI_HTTP_BIND_ADDRESS: "0.0.0.0:3078"
+      UI_HTTP_BIND_ADDRESS: "0.0.0.0:3078"

components/ledger/examples/basic-auth/docker-compose.yml

@@ -21,6 +21,6 @@ services:
     working_dir: /src
     environment:
       CGO_ENABLED: 0
-      NUMARY_DEBUG: "true"
-      NUMARY_AUTH_BASIC_ENABLED: "true"
-      NUMARY_AUTH_BASIC_CREDENTIALS: "user:password"
+      DEBUG: "true"
+      AUTH_BASIC_ENABLED: "true"
+      AUTH_BASIC_CREDENTIALS: "user:password"

components/ledger/examples/jaeger-exporter/docker-compose.yml

@@ -26,8 +26,8 @@ services:
     - "3068:3068/tcp"
     environment:
       CGO_ENABLED: 0
-      NUMARY_DEBUG: "true"
-      NUMARY_OTEL_TRACES: "true"
-      NUMARY_OTEL_TRACES_EXPORTER: jaeger
-      NUMARY_OTEL_TRACES_EXPORTER_JAEGER_ENDPOINT: http://jaeger:14268/api/traces
-      NUMARY_OTEL_SERVICE_NAME: ledger
+      DEBUG: "true"
+      OTEL_TRACES: "true"
+      OTEL_TRACES_EXPORTER: jaeger
+      OTEL_TRACES_EXPORTER_JAEGER_ENDPOINT: http://jaeger:14268/api/traces
+      OTEL_SERVICE_NAME: ledger

components/ledger/examples/multi-node/docker-compose.yml

@@ -28,13 +28,13 @@ services:
     working_dir: /src
     environment:
       CGO_ENABLED: 0
-      NUMARY_DEBUG: "true"
-      NUMARY_LOCK_STRATEGY: redis
-      NUMARY_LOCK_STRATEGY_REDIS_URL: redis://redis:6379
-      NUMARY_LOCK_STRATEGY_REDIS_DURATION: 60s # Default value
-      NUMARY_LOCK_STRATEGY_REDIS_RETRY: 1s # Default value
-      NUMARY_LOCK_STRATEGY_REDIS_TLS_ENABLED: false
-      NUMARY_LOCK_STRATEGY_REDIS_TLS_INSECURE: false
+      DEBUG: "true"
+      LOCK_STRATEGY: redis
+      LOCK_STRATEGY_REDIS_URL: redis://redis:6379
+      LOCK_STRATEGY_REDIS_DURATION: 60s # Default value
+      LOCK_STRATEGY_REDIS_RETRY: 1s # Default value
+      LOCK_STRATEGY_REDIS_TLS_ENABLED: false
+      LOCK_STRATEGY_REDIS_TLS_INSECURE: false
 
   proxy:
     extends:

components/ledger/examples/otlp-exporter/docker-compose.yml

@@ -22,12 +22,12 @@ services:
     working_dir: /src
     environment:
       CGO_ENABLED: 0
-      NUMARY_DEBUG: "true"
-      NUMARY_OTEL_TRACES: "true"
-      NUMARY_OTEL_TRACES_EXPORTER: otlp
-      NUMARY_OTEL_TRACES_EXPORTER_OTLP_ENDPOINT: otlp-exporter:4317
-      NUMARY_OTEL_TRACES_EXPORTER_OTLP_INSECURE: "true"
-      NUMARY_OTEL_METRICS: "true"
-      NUMARY_OTEL_METRICS_EXPORTER: otlp
-      NUMARY_OTEL_METRICS_EXPORTER_OTLP_ENDPOINT: otlp-exporter:4317
-      NUMARY_OTEL_METRICS_EXPORTER_OTLP_INSECURE: "true"
+      DEBUG: "true"
+      OTEL_TRACES: "true"
+      OTEL_TRACES_EXPORTER: otlp
+      OTEL_TRACES_EXPORTER_OTLP_ENDPOINT: otlp-exporter:4317
+      OTEL_TRACES_EXPORTER_OTLP_INSECURE: "true"
+      OTEL_METRICS: "true"
+      OTEL_METRICS_EXPORTER: otlp
+      OTEL_METRICS_EXPORTER_OTLP_ENDPOINT: otlp-exporter:4317
+      OTEL_METRICS_EXPORTER_OTLP_INSECURE: "true"

components/ledger/examples/publisher-http/docker-compose.yml

@@ -24,6 +24,6 @@ services:
     working_dir: /src
     environment:
       CGO_ENABLED: 0
-      NUMARY_DEBUG: "true"
-      NUMARY_PUBLISHER_HTTP_ENABLED: "true"
-      NUMARY_PUBLISHER_TOPIC_MAPPING: "*:http://listener:8080"
+      DEBUG: "true"
+      PUBLISHER_HTTP_ENABLED: "true"
+      PUBLISHER_TOPIC_MAPPING: "*:http://listener:8080"

components/ledger/examples/publisher-kafka/docker-compose.yml

@@ -34,7 +34,7 @@ services:
     working_dir: /src
     environment:
       CGO_ENABLED: 0
-      NUMARY_DEBUG: "true"
-      NUMARY_PUBLISHER_KAFKA_ENABLED: "true"
-      NUMARY_PUBLISHER_KAFKA_BROKER: "kafka:9092"
-      NUMARY_PUBLISHER_TOPIC_MAPPING: "*:default" # Send all to 'default' topic
+      DEBUG: "true"
+      PUBLISHER_KAFKA_ENABLED: "true"
+      PUBLISHER_KAFKA_BROKER: "kafka:9092"
+      PUBLISHER_TOPIC_MAPPING: "*:default" # Send all to 'default' topic

components/ledger/internal/pgtesting/testing.go

@@ -30,7 +30,7 @@ const MaxConnections = 3
 
 func PostgresServer() (*PGServer, error) {
 
-	externalConnectionString := os.Getenv("NUMARY_STORAGE_POSTGRES_CONN_STRING")
+	externalConnectionString := os.Getenv("STORAGE_POSTGRES_CONN_STRING")
 	if externalConnectionString != "" {
 		return &PGServer{
 			url: externalConnectionString,

components/ledger/pkg/api/controllers/transaction_controller_test.go

@@ -1974,7 +1974,7 @@ func TestTooManyClient(t *testing.T) {
 				if ledgertesting.StorageDriverName() != "postgres" {
 					return nil
 				}
-				if os.Getenv("NUMARY_STORAGE_POSTGRES_CONN_STRING") != "" { // Use of external server, ignore this test
+				if os.Getenv("STORAGE_POSTGRES_CONN_STRING") != "" { // Use of external server, ignore this test
 					return nil
 				}
 

components/ledger/pkg/ledgertesting/storage.go

@@ -15,7 +15,7 @@ import (
 )
 
 func StorageDriverName() string {
-	fromEnv := os.Getenv("NUMARY_STORAGE_DRIVER")
+	fromEnv := os.Getenv("STORAGE_DRIVER")
 	if fromEnv != "" {
 		return fromEnv
 	}

components/ledger/pkg/storage/sqlstorage/store_ledger_test.go

@@ -707,7 +707,7 @@ func testGetTransaction(t *testing.T, store *sqlstorage.Store) {
 
 func testTooManyClient(t *testing.T, store *sqlstorage.Store) {
 	// Use of external server, ignore this test
-	if os.Getenv("NUMARY_STORAGE_POSTGRES_CONN_STRING") != "" ||
+	if os.Getenv("STORAGE_POSTGRES_CONN_STRING") != "" ||
 		ledgertesting.StorageDriverName() != "postgres" {
 		return
 	}

components/ledger/sdk/templates/go/Taskfile.yml.mustache

@@ -11,7 +11,7 @@ tasks:
         docker run -d
         --name ledger
         --rm
-        -e NUMARY_SERVER_HTTP_BIND_ADDRESS=0.0.0.0:3068
+        -e SERVER_HTTP_BIND_ADDRESS=0.0.0.0:3068
         -p 3068:3068
         ghcr.io/formancehq/ledger:{{appVersion}}
 

components/ledger/sdk/templates/php/Taskfile.yml.mustache

@@ -11,7 +11,7 @@ tasks:
         docker run -d
         --name ledger
         --rm
-        -e NUMARY_SERVER_HTTP_BIND_ADDRESS=0.0.0.0:3068
+        -e SERVER_HTTP_BIND_ADDRESS=0.0.0.0:3068
         -p 3068:3068
         ghcr.io/formancehq/ledger:{{appVersion}}
 

components/ledger/sdk/templates/python/Taskfile.yml.mustache

@@ -11,7 +11,7 @@ tasks:
         docker run -d
         --name ledger
         --rm
-        -e NUMARY_SERVER_HTTP_BIND_ADDRESS=0.0.0.0:3068
+        -e SERVER_HTTP_BIND_ADDRESS=0.0.0.0:3068
         -p 3068:3068
         ghcr.io/formancehq/ledger:{{appVersion}}
 

components/ledger/sdk/templates/typescript/Taskfile.yml.mustache

@@ -11,7 +11,7 @@ tasks:
         docker run -d
         --name ledger
         --rm
-        -e NUMARY_SERVER_HTTP_BIND_ADDRESS=0.0.0.0:3068
+        -e SERVER_HTTP_BIND_ADDRESS=0.0.0.0:3068
         -p 3068:3068
         ghcr.io/formancehq/ledger:{{appVersion}}