fix: add mongo uri variable; add rabbit uri variable; 🐛

LerianStudio · Jan 21, 2025 · 5af9415 · 5af9415
1 parent b49825d
commit 5af9415
Show file tree

Hide file tree

Showing 6 changed files with 27 additions and 12 deletions.
diff --git a/components/audit/.env.example b/components/audit/.env.example
@@ -10,6 +10,8 @@ SERVER_ADDRESS=:${SERVER_PORT}
 LOG_LEVEL=debug
 
 # MONGO DB
+#MONGO_URI=mongodb+srv
+MONGO_URI=mongodb
 MONGO_HOST=midaz-mongodb
 MONGO_NAME=audit
 MONGO_USER=midaz
@@ -35,6 +37,7 @@ OTEL_EXPORTER_OTLP_ENDPOINT_PORT=4317
 OTEL_EXPORTER_OTLP_ENDPOINT=midaz-otel-lgtm:${OTEL_EXPORTER_OTLP_ENDPOINT_PORT}
 
 # RABBITMQ
+RABBITMQ_URI=amqp
 RABBITMQ_HOST=midaz-rabbitmq
 RABBITMQ_PORT_HOST=3003
 RABBITMQ_PORT_AMPQ=3004

diff --git a/components/audit/internal/bootstrap/config.go b/components/audit/internal/bootstrap/config.go
@@ -35,11 +35,13 @@ type Config struct {
 	CasdoorOrganizationName string `env:"CASDOOR_ORGANIZATION_NAME"`
 	CasdoorApplicationName  string `env:"CASDOOR_APPLICATION_NAME"`
 	CasdoorModelName        string `env:"CASDOOR_MODEL_NAME"`
+	MongoURI                string `env:"MONGO_URI"`
 	MongoDBHost             string `env:"MONGO_HOST"`
 	MongoDBName             string `env:"MONGO_NAME"`
 	MongoDBUser             string `env:"MONGO_USER"`
 	MongoDBPassword         string `env:"MONGO_PASSWORD"`
 	MongoDBPort             string `env:"MONGO_PORT"`
+	RabbitURI               string `env:"RABBITMQ_URI"`
 	RabbitMQHost            string `env:"RABBITMQ_HOST"`
 	RabbitMQPortHost        string `env:"RABBITMQ_PORT_HOST"`
 	RabbitMQPortAMQP        string `env:"RABBITMQ_PORT_AMPQ"`
@@ -79,8 +81,8 @@ func InitServers() *Service {
 		Logger:           logger,
 	}
 
-	rabbitSource := fmt.Sprintf("amqp://%s:%s@%s:%s",
-		cfg.RabbitMQUser, cfg.RabbitMQPass, cfg.RabbitMQHost, cfg.RabbitMQPortHost)
+	rabbitSource := fmt.Sprintf("%s://%s:%s@%s:%s",
+		cfg.RabbitURI, cfg.RabbitMQUser, cfg.RabbitMQPass, cfg.RabbitMQHost, cfg.RabbitMQPortHost)
 
 	rabbitMQConnection := &mrabbitmq.RabbitMQConnection{
 		ConnectionStringSource: rabbitSource,
@@ -98,8 +100,8 @@ func InitServers() *Service {
 		Logger:   logger,
 	}
 
-	mongoSource := fmt.Sprintf("mongodb://%s:%s@%s:%s",
-		cfg.MongoDBUser, cfg.MongoDBPassword, cfg.MongoDBHost, cfg.MongoDBPort)
+	mongoSource := fmt.Sprintf("%s://%s:%s@%s:%s",
+		cfg.MongoURI, cfg.MongoDBUser, cfg.MongoDBPassword, cfg.MongoDBHost, cfg.MongoDBPort)
 
 	mongoAuditConnection := &mmongo.MongoConnection{
 		ConnectionStringSource: mongoSource,

diff --git a/components/ledger/.env.example b/components/ledger/.env.example
@@ -27,6 +27,8 @@ DB_REPLICA_PASSWORD=lerian
 DB_REPLICA_PORT=5702
 
 # MONGO DB
+#MONGO_URI=mongodb+srv
+MONGO_URI=mongodb
 MONGO_HOST=midaz-mongodb
 MONGO_NAME=ledger
 MONGO_USER=midaz
@@ -61,6 +63,7 @@ OTEL_EXPORTER_OTLP_ENDPOINT_PORT=4317
 OTEL_EXPORTER_OTLP_ENDPOINT=midaz-otel-lgtm:${OTEL_EXPORTER_OTLP_ENDPOINT_PORT}
 
 # RABBITMQ
+RABBITMQ_URI=amqp
 RABBITMQ_HOST=midaz-rabbitmq
 RABBITMQ_PORT_HOST=3003
 RABBITMQ_PORT_AMPQ=3004

diff --git a/components/ledger/internal/bootstrap/config.go b/components/ledger/internal/bootstrap/config.go
@@ -44,6 +44,7 @@ type Config struct {
 	ReplicaDBPassword       string `env:"DB_REPLICA_PASSWORD"`
 	ReplicaDBName           string `env:"DB_REPLICA_NAME"`
 	ReplicaDBPort           string `env:"DB_REPLICA_PORT"`
+	MongoURI                string `env:"MONGO_URI"`
 	MongoDBHost             string `env:"MONGO_HOST"`
 	MongoDBName             string `env:"MONGO_NAME"`
 	MongoDBUser             string `env:"MONGO_USER"`
@@ -56,6 +57,7 @@ type Config struct {
 	CasdoorApplicationName  string `env:"CASDOOR_APPLICATION_NAME"`
 	CasdoorModelName        string `env:"CASDOOR_MODEL_NAME"`
 	JWKAddress              string `env:"CASDOOR_JWK_ADDRESS"`
+	RabbitURI               string `env:"RABBITMQ_URI"`
 	RabbitMQHost            string `env:"RABBITMQ_HOST"`
 	RabbitMQPortHost        string `env:"RABBITMQ_PORT_HOST"`
 	RabbitMQPortAMQP        string `env:"RABBITMQ_PORT_AMPQ"`
@@ -119,17 +121,17 @@ func InitServers() *Service {
 		Logger:                  logger,
 	}
 
-	mongoSource := fmt.Sprintf("mongodb://%s:%s@%s:%s",
-		cfg.MongoDBUser, cfg.MongoDBPassword, cfg.MongoDBHost, cfg.MongoDBPort)
+	mongoSource := fmt.Sprintf("%s://%s:%s@%s:%s",
+		cfg.MongoURI, cfg.MongoDBUser, cfg.MongoDBPassword, cfg.MongoDBHost, cfg.MongoDBPort)
 
 	mongoConnection := &mmongo.MongoConnection{
 		ConnectionStringSource: mongoSource,
 		Database:               cfg.MongoDBName,
 		Logger:                 logger,
 	}
 
-	rabbitSource := fmt.Sprintf("amqp://%s:%s@%s:%s",
-		cfg.RabbitMQUser, cfg.RabbitMQPass, cfg.RabbitMQHost, cfg.RabbitMQPortHost)
+	rabbitSource := fmt.Sprintf("%s://%s:%s@%s:%s",
+		cfg.RabbitURI, cfg.RabbitMQUser, cfg.RabbitMQPass, cfg.RabbitMQHost, cfg.RabbitMQPortHost)
 
 	rabbitMQConnection := &mrabbitmq.RabbitMQConnection{
 		ConnectionStringSource: rabbitSource,

diff --git a/components/transaction/.env.example b/components/transaction/.env.example
@@ -24,6 +24,8 @@ DB_REPLICA_PASSWORD=lerian
 DB_REPLICA_PORT=5702
 
 # MONGO DB
+#MONGO_URI=mongodb+srv
+MONGO_URI=mongodb
 MONGO_HOST=midaz-mongodb
 MONGO_NAME=transaction
 MONGO_USER=midaz
@@ -62,6 +64,7 @@ OTEL_EXPORTER_OTLP_ENDPOINT_PORT=4317
 OTEL_EXPORTER_OTLP_ENDPOINT=midaz-otel-lgtm:${OTEL_EXPORTER_OTLP_ENDPOINT_PORT}
 
 # RABBITMQ
+RABBITMQ_URI=amqp
 RABBITMQ_HOST=midaz-rabbitmq
 RABBITMQ_PORT_HOST=3003
 RABBITMQ_PORT_AMPQ=3004

diff --git a/components/transaction/internal/bootstrap/config.go b/components/transaction/internal/bootstrap/config.go
@@ -41,6 +41,7 @@ type Config struct {
 	ReplicaDBPassword       string `env:"DB_REPLICA_PASSWORD"`
 	ReplicaDBName           string `env:"DB_REPLICA_NAME"`
 	ReplicaDBPort           string `env:"DB_REPLICA_PORT"`
+	MongoURI                string `env:"MONGO_URI"`
 	MongoDBHost             string `env:"MONGO_HOST"`
 	MongoDBName             string `env:"MONGO_NAME"`
 	MongoDBUser             string `env:"MONGO_USER"`
@@ -55,6 +56,7 @@ type Config struct {
 	CasdoorApplicationName  string `env:"CASDOOR_APPLICATION_NAME"`
 	CasdoorModelName        string `env:"CASDOOR_MODEL_NAME"`
 	JWKAddress              string `env:"CASDOOR_JWK_ADDRESS"`
+	RabbitURI               string `env:"RABBITMQ_URI"`
 	RabbitMQHost            string `env:"RABBITMQ_HOST"`
 	RabbitMQPortHost        string `env:"RABBITMQ_PORT_HOST"`
 	RabbitMQPortAMQP        string `env:"RABBITMQ_PORT_AMPQ"`
@@ -116,8 +118,8 @@ func InitServers() *Service {
 		Logger:                  logger,
 	}
 
-	mongoSource := fmt.Sprintf("mongodb://%s:%s@%s:%s/",
-		cfg.MongoDBUser, cfg.MongoDBPassword, cfg.MongoDBHost, cfg.MongoDBPort)
+	mongoSource := fmt.Sprintf("%s://%s:%s@%s:%s/",
+		cfg.MongoURI, cfg.MongoDBUser, cfg.MongoDBPassword, cfg.MongoDBHost, cfg.MongoDBPort)
 
 	mongoConnection := &mmongo.MongoConnection{
 		ConnectionStringSource: mongoSource,
@@ -132,8 +134,8 @@ func InitServers() *Service {
 		Logger: logger,
 	}
 
-	rabbitSource := fmt.Sprintf("amqp://%s:%s@%s:%s",
-		cfg.RabbitMQUser, cfg.RabbitMQPass, cfg.RabbitMQHost, cfg.RabbitMQPortHost)
+	rabbitSource := fmt.Sprintf("%s://%s:%s@%s:%s",
+		cfg.RabbitURI, cfg.RabbitMQUser, cfg.RabbitMQPass, cfg.RabbitMQHost, cfg.RabbitMQPortHost)
 
 	rabbitMQConnection := &mrabbitmq.RabbitMQConnection{
 		ConnectionStringSource: rabbitSource,