From ebb89facbdaf01f79b396b60ef96fe3204594ee7 Mon Sep 17 00:00:00 2001
From: Prad Nukala <prad@sonr.io>
Date: Tue, 10 Dec 2024 15:21:08 -0500
Subject: [PATCH] refactor: Modify command flags and environment loading logic
 in cmds.go

---
 cmd/hway/cmds.go | 44 ++++++++++++++++++++++++++++++++------------
 1 file changed, 32 insertions(+), 12 deletions(-)

diff --git a/cmd/hway/cmds.go b/cmd/hway/cmds.go
index aa7d5db01..0b66057db 100644
--- a/cmd/hway/cmds.go
+++ b/cmd/hway/cmds.go
@@ -5,27 +5,47 @@ import (
 	"github.com/spf13/cobra"
 )
 
+var (
+	FlagServePort      int
+	FlagConfigDir      string
+	FlagSqliteFile     string
+	FlagChainId        string
+	FlagIpfsGatewayUrl string
+	FlagSonrApiUrl     string
+	FlagSonrGrpcUrl    string
+	FlagSonrRpcUrl     string
+)
+
 func NewRootCmd() *cobra.Command {
-	return &cobra.Command{
+	cmd := &cobra.Command{
 		Use:   "hway",
 		Short: "Sonr DID gateway",
-
 		Run: func(cmd *cobra.Command, args []string) {
 			cmd.Help()
 		},
 	}
+	cmd.Flags().IntVar(&servePort, "serve-port", FlagServePort, "Port to serve the gateway on")
+	cmd.Flags().StringVar(&configDir, "config-dir", FlagConfigDir, "Directory to store config files")
+	cmd.Flags().StringVar(&sqliteFile, "sqlite-file", FlagSqliteFile, "File to store sqlite database")
+	cmd.Flags().StringVar(&chainId, "chain-id", FlagChainId, "Chain ID")
+	cmd.Flags().StringVar(&ipfsGatewayUrl, "ipfs-gateway-url", FlagIpfsGatewayUrl, "IPFS gateway URL")
+	cmd.Flags().StringVar(&sonrApiUrl, "sonr-api-url", FlagSonrApiUrl, "Sonr API URL")
+	cmd.Flags().StringVar(&sonrGrpcUrl, "sonr-grpc-url", FlagSonrGrpcUrl, "Sonr gRPC URL")
+	return cmd
 }
 
-func getEnvImpl(cmd *cobra.Command) (config.Env, error) {
-	servePort, _ := cmd.Flags().GetInt("serve-port")
-	configDir, _ := cmd.Flags().GetString("config-dir")
-	sqliteFile, _ := cmd.Flags().GetString("sqlite-file")
-	chainId, _ := cmd.Flags().GetString("chain-id")
-	ipfsGatewayUrl, _ := cmd.Flags().GetString("ipfs-gateway-url")
-	sonrApiUrl, _ := cmd.Flags().GetString("sonr-api-url")
-	sonrGrpcUrl, _ := cmd.Flags().GetString("sonr-grpc-url")
-	sonrRpcUrl, _ := cmd.Flags().GetString("sonr-rpc-url")
-	// Load from flags
+func loadEnvImplFromArgs(args []string) (config.Env, error) {
+	var servePort int
+	var configDir string
+	var sqliteFile string
+	var chainId string
+	var ipfsGatewayUrl string
+	var sonrApiUrl string
+	var sonrGrpcUrl string
+	var sonrRpcUrl string
+
+	cmd := NewRootCmd()
+
 	env := config.EnvImpl{
 		ServePort:      servePort,
 		ConfigDir:      configDir,