update to use opts struct to pass name

hooksie1 · Aug 22, 2024 · e7df90d · e7df90d
1 parent bf543c9
commit e7df90d
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 5 deletions.
diff --git a/cmd/database.go b/cmd/database.go
@@ -24,7 +24,11 @@ func init() {
 }
 
 func database(cmd *cobra.Command, args []string) error {
-	nc, err := newNatsConnection("piggy-client")
+	opts := natsOpts{
+		name:   "piggy-client",
+		prefix: viper.GetString("inbox_prefix"),
+	}
+	nc, err := newNatsConnection(opts)
 	if err != nil {
 		return err
 	}

diff --git a/cmd/nats.go b/cmd/nats.go
@@ -9,8 +9,17 @@ import (
 	"github.com/spf13/viper"
 )
 
-func newNatsConnection(name string) (*nats.Conn, error) {
-	opts := []nats.Option{nats.Name(name), nats.CustomInboxPrefix(viper.GetString("inbox_prefix"))}
+type natsOpts struct {
+	name   string
+	prefix string
+}
+
+func newNatsConnection(connOpts natsOpts) (*nats.Conn, error) {
+	opts := []nats.Option{nats.Name(connOpts.name)}
+
+	if connOpts.prefix != "" {
+		opts = append(opts, nats.CustomInboxPrefix(connOpts.prefix))
+	}
 
 	_, ok := os.LookupEnv("USER")
 

diff --git a/cmd/secrets.go b/cmd/secrets.go
@@ -32,7 +32,11 @@ func getSubject(verb string, id string) string {
 }
 
 func secrets(cmd *cobra.Command, args []string) error {
-	nc, err := newNatsConnection("piggy-client")
+	opts := natsOpts{
+		name:   "piggy-client",
+		prefix: viper.GetString("inbox_prefix"),
+	}
+	nc, err := newNatsConnection(opts)
 	if err != nil {
 		return err
 	}

diff --git a/cmd/start.go b/cmd/start.go
@@ -32,7 +32,11 @@ func start(cmd *cobra.Command, args []string) error {
 		Description: "Secrets storage for NATS",
 	}
 
-	nc, err := newNatsConnection("piggybank-server")
+	opts := natsOpts{
+		name: "piggybank-server",
+	}
+
+	nc, err := newNatsConnection(opts)
 	if err != nil {
 		return err
 	}