fix(storage): mapstructure and json tag colocation

Author: 42atomys

pkg/storage/postgres/postgres.go

@@ -19,9 +19,9 @@ type storage struct {
 // config is the struct contains config for connect client
 // Run is made from internal caller
 type config struct {
-	DatabaseURL valuable.Valuable `json:"databaseUrl"`
-	TableName   string            `json:"tableName"`
-	DataField   string            `json:"dataField"`
+	DatabaseURL valuable.Valuable `mapstructure:"databaseUrl" json:"databaseUrl"`
+	TableName   string            `mapstructure:"tableName" json:"tableName"`
+	DataField   string            `mapstructure:"dataField" json:"dataField"`
 }
 
 // NewStorage is the function for create new Postgres client storage

pkg/storage/rabbitmq/rabbitmq.go

@@ -21,16 +21,16 @@ type storage struct {
 // config is the struct contains config for connect client
 // Run is made from internal caller
 type config struct {
-	DatabaseURL        valuable.Valuable `json:"databaseUrl"`
-	QueueName          string            `json:"queueName"`
-	DefinedContentType string            `json:"contentType"`
-	Durable            bool              `json:"durable"`
-	DeleteWhenUnused   bool              `json:"deleteWhenUnused"`
-	Exclusive          bool              `json:"exclusive"`
-	NoWait             bool              `json:"noWait"`
-	Mandatory          bool              `json:"mandatory"`
-	Immediate          bool              `json:"immediate"`
-	Exchange           string            `json:"exchange"`
+	DatabaseURL        valuable.Valuable `mapstructure:"databaseUrl" json:"databaseUrl"`
+	QueueName          string            `mapstructure:"queueName" json:"queueName"`
+	DefinedContentType string            `mapstructure:"contentType" json:"contentType"`
+	Durable            bool              `mapstructure:"durable" json:"durable"`
+	DeleteWhenUnused   bool              `mapstructure:"deleteWhenUnused" json:"deleteWhenUnused"`
+	Exclusive          bool              `mapstructure:"exclusive" json:"exclusive"`
+	NoWait             bool              `mapstructure:"noWait" json:"noWait"`
+	Mandatory          bool              `mapstructure:"mandatory" json:"mandatory"`
+	Immediate          bool              `mapstructure:"immediate" json:"immediate"`
+	Exchange           string            `mapstructure:"exchange" json:"exchange"`
 }
 
 // ContentType is the function for get content type used to push data in the

pkg/storage/redis/redis.go

@@ -16,12 +16,12 @@ type storage struct {
 }
 
 type config struct {
-	Host     string            `json:"host"`
-	Port     string            `json:"port"`
-	Database int               `json:"database"`
-	Username valuable.Valuable `json:"username"`
-	Password valuable.Valuable `json:"password"`
-	Key      string            `json:"key"`
+	Host     string            `mapstructure:"host" json:"host"`
+	Port     string            `mapstructure:"port" json:"port"`
+	Database int               `mapstructure:"database" json:"database"`
+	Username valuable.Valuable `mapstructure:"username" json:"username"`
+	Password valuable.Valuable `mapstructure:"password" json:"password"`
+	Key      string            `mapstructure:"key" json:"key"`
 }
 
 // NewStorage is the function for create new Redis storage client