.dockerignore

@@ -1,6 +1,5 @@
 /**
 !/cmd/africastalking
-!/cmd/ssh
 !/common
 !/config
 !/initializers

Dockerfile

@@ -19,7 +19,6 @@ WORKDIR /build
 RUN echo "Building on $BUILDPLATFORM, building for $TARGETPLATFORM"
 RUN go mod download
 RUN go build -tags logtrace -o ussd-africastalking -ldflags="-X main.build=${BUILD} -s -w" cmd/africastalking/main.go
-RUN go build -tags logtrace -o ussd-ssh -ldflags="-X main.build=${BUILD} -s -w" cmd/ssh/main.go
 
 FROM debian:bookworm-slim
 
@@ -31,7 +30,6 @@ RUN apt-get clean && rm -rf /var/lib/apt/lists/*
 WORKDIR /service
 
 COPY --from=build /build/ussd-africastalking .
-COPY --from=build /build/ussd-ssh .
 COPY --from=build /build/LICENSE .
 COPY --from=build /build/README.md .
 COPY --from=build /build/services ./services
@@ -39,6 +37,5 @@ COPY --from=build /build/.env.example .
 RUN mv .env.example .env
 
 EXPOSE 7123
-EXPOSE 7122
 
 CMD ["./ussd-africastalking"]

cmd/ssh/main.go

@@ -4,9 +4,9 @@ import (
 	"context"
 	"flag"
 	"fmt"
+	"path"
 	"os"
 	"os/signal"
-	"path"
 	"sync"
 	"syscall"
 
@@ -18,12 +18,10 @@ import (
 )
 
 var (
-	wg        sync.WaitGroup
-	keyStore  db.Db
+	wg sync.WaitGroup
+	keyStore db.Db
 	logg      = logging.NewVanilla()
 	scriptDir = path.Join("services", "registration")
-
-	build = "dev"
 )
 
 func main() {
@@ -78,7 +76,7 @@ func main() {
 		fmt.Fprintf(os.Stderr, "keystore file open error: %v", err)
 		os.Exit(1)
 	}
-	defer func() {
+	defer func () {
 		logg.TraceCtxf(ctx, "shutdown auth key store reached")
 		err = authKeyStore.Close()
 		if err != nil {
@@ -92,14 +90,14 @@ func main() {
 	signal.Notify(cterm, os.Interrupt, syscall.SIGTERM)
 
 	runner := &ssh.SshRunner{
-		Cfg:         cfg,
-		Debug:       engineDebug,
-		FlagFile:    pfp,
-		DbDir:       dbDir,
+		Cfg: cfg,
+		Debug: engineDebug,
+		FlagFile: pfp,
+		DbDir: dbDir,
 		ResourceDir: resourceDir,
-		SrvKeyFile:  sshKeyFile,
-		Host:        host,
-		Port:        port,
+		SrvKeyFile: sshKeyFile,
+		Host: host,
+		Port: port,
 	}
 	go func() {
 		select {
@@ -111,7 +109,7 @@ func main() {
 		if err != nil {
 			logg.ErrorCtxf(ctx, "runner stop error", "err", err)
 		}
-
+		
 	}()
 	runner.Run(ctx, authKeyStore)
 }

devtools/store/main.go

@@ -25,15 +25,6 @@ func init() {
 }
 
 
-func formatItem(k []byte, v []byte) (string, error) {
-	o, err := debug.FromKey(k)
-	if err != nil {
-		return "", err
-	}
-	s := fmt.Sprintf("%vValue: %v\n\n", o, string(v))
-	return s, nil
-}
-
 func main() {
 	config.LoadConfig()
 
@@ -84,12 +75,12 @@ func main() {
 		if k == nil {
 			break
 		}
-		r, err := formatItem(k, v)
+		o, err := debug.FromKey(k)
 		if err != nil {
-			fmt.Fprintf(os.Stderr, "format db item error: %v", err)
+			fmt.Fprintf(os.Stderr, err.Error())
 			os.Exit(1)
 		}
-		fmt.Printf(r)
+		fmt.Printf("%vValue: %v\n\n", o, string(v))
 	}
 
 	err = store.Close()