From 8d6a2c34d94b143eb18baf614f17d0d1133645ee Mon Sep 17 00:00:00 2001 From: pasha1coil Date: Tue, 25 Feb 2025 11:14:51 +0300 Subject: [PATCH] optimize cfg --- internal/app/app.go | 6 +++--- internal/initialize/clients.go | 10 ++++----- internal/initialize/config.go | 38 +++++++++++++++------------------- internal/initialize/minio.go | 4 ++-- 4 files changed, 26 insertions(+), 32 deletions(-) diff --git a/internal/app/app.go b/internal/app/app.go index 1564437..1427fa0 100644 --- a/internal/app/app.go +++ b/internal/app/app.go @@ -90,15 +90,15 @@ func New(ctx context.Context, cfg initialize.Config, build Build) error { mailSender := senders2.NewMailLeadSender(clients.MailClient) leadSenders := []senders2.LeadSender{mailSender /* , tgSender */} - pgdal, err := dal.New(ctx, cfg.PostgresCredentials, minioClient) + pgdal, err := dal.New(ctx, cfg.PostgresURL, minioClient) if err != nil { zapLogger.Error("failed init postgres", zap.Error(err)) return err } kafkaWorker, err := privilegewc2.NewKafkaConsumerWorker(privilegewc2.Config{ - KafkaBroker: cfg.KafkaBroker, - KafkaTopic: cfg.KafkaTopic, + KafkaBroker: cfg.KafkaBrokers, + KafkaTopic: cfg.KafkaTopicTariff, ServiceKey: cfg.ServiceName, TickerInterval: time.Second * 10, ErrChan: errChan, diff --git a/internal/initialize/clients.go b/internal/initialize/clients.go index 2fcef27..47bbf31 100644 --- a/internal/initialize/clients.go +++ b/internal/initialize/clients.go @@ -14,15 +14,13 @@ type Clients struct { func NewClients(cfg Config, logger *zap.Logger) *Clients { return &Clients{ MailClient: clients.NewSmtpClient(clients.Deps{ - SmtpHost: cfg.SmtpHost, - SmtpPort: cfg.SmtpPort, - SmtpSender: cfg.SmtpSender, - ApiKey: cfg.SmtpApiKey, - SmtpApiUrl: cfg.SmtpApiUrl, + SmtpSender: cfg.Sender, + ApiKey: cfg.ApiKey, + SmtpApiUrl: cfg.ApiUrl, }), CustomerClient: customer_clients.NewCustomersClient(customer_clients.CustomersClientDeps{ Logger: logger, - CustomerServiceHost: cfg.CustomerServiceAddress, + CustomerServiceHost: cfg.CustomerMicroserviceRPCURL, }), } } diff --git a/internal/initialize/config.go b/internal/initialize/config.go index 20da092..94d5c2e 100644 --- a/internal/initialize/config.go +++ b/internal/initialize/config.go @@ -7,27 +7,23 @@ import ( ) type Config struct { - ServiceName string `env:"SERVICE_NAME" envDefault:"squiz"` - KafkaBroker string `env:"KAFKA_BROKER" envDefault:"localhost:6379"` - KafkaTopic string `env:"KAFKA_TOPIC" envDefault:"test-topic"` - LoggerProdMode bool `env:"IS_PROD_LOG" envDefault:"false"` - IsProd bool `env:"IS_PROD" envDefault:"false"` - MinioEP string `env:"MINIO_EP" envDefault:"localhost:3002"` - MinioAK string `env:"MINIO_AK" envDefault:"minio"` - MinioSK string `env:"MINIO_SK" envDefault:"miniostorage"` - PostgresCredentials string `env:"PG_CRED" envDefault:"host=localhost port=35432 user=squiz password=Redalert2 dbname=squiz sslmode=disable"` - RedisHost string `env:"REDIS_HOST" envDefault:"localhost:6379"` - RedisPassword string `env:"REDIS_PASSWORD" envDefault:"admin"` - RedisDB uint64 `env:"REDIS_DB" envDefault:"2"` - SmtpHost string `env:"SMTP_HOST" envDefault:"connect.mailclient.bz"` - SmtpPort string `env:"SMTP_PORT" envDefault:"587"` - SmtpSender string `env:"SMTP_SENDER" envDefault:"noreply@mailing.pena.digital"` - SmtpUsername string `env:"SMTP_USERNAME" envDefault:"kotilion.95@gmail.com"` - SmtpPassword string `env:"SMTP_PASSWORD" envDefault:"vWwbCSg4bf0p"` - SmtpApiKey string `env:"SMTP_API_KEY" envDefault:"P0YsjUB137upXrr1NiJefHmXVKW1hmBWlpev"` - SmtpApiUrl string `env:"SMTP_API_URL" envDefault:"https://api.smtp.bz/v1/smtp/send"` - CustomerServiceAddress string `env:"CUSTOMER_SERVICE_ADDRESS" envDefault:"localhost:9001"` - TgToken string `env:"TG_TOKEN"` + ServiceName string `env:"SERVICE_NAME" envDefault:"squiz"` + KafkaBrokers string `env:"KAFKA_BROKERS" envDefault:"localhost:6379"` + KafkaTopicTariff string `env:"KAFKA_TOPIC_TARIFF" envDefault:"test-topic"` + LoggerProdMode bool `env:"IS_PROD_LOG" envDefault:"false"` + IsProd bool `env:"IS_PROD" envDefault:"false"` + S3Endpoint string `env:"S3_ENDPOINT" envDefault:"localhost:3002"` + S3AccessKey string `env:"S3_ACCESS_KEY" envDefault:"minio"` + S3SecretKey string `env:"S3_SECRET_KEY" envDefault:"miniostorage"` + PostgresURL string `env:"POSTGRES_URL" envDefault:"host=localhost port=5432 user=squiz password=Redalert2 dbname=squiz sslmode=disable"` + RedisHost string `env:"REDIS_HOST"` + RedisPassword string `env:"REDIS_PASSWORD"` + RedisDB uint64 `env:"REDIS_DB"` + Sender string `env:"MAIL_SENDER" envDefault:"noreply@mailing.pena.digital"` + ApiKey string `env:"MAIL_API_KEY" envDefault:"P0YsjUB137upXrr1NiJefHmXVKW1hmBWlpev"` + ApiUrl string `env:"API_URL" envDefault:"https://api.smtp.bz/v1/smtp/send"` + CustomerMicroserviceRPCURL string `env:"CUSTOMER_MICROSERVICE_RPC_URL" envDefault:"localhost:9001"` + TelegramToken string `env:"TELEGRAM_TOKEN"` } func LoadConfig() (*Config, error) { diff --git a/internal/initialize/minio.go b/internal/initialize/minio.go index 49cea81..c5d2a4f 100644 --- a/internal/initialize/minio.go +++ b/internal/initialize/minio.go @@ -6,8 +6,8 @@ import ( ) func NewMinio(cfg Config) (*minio.Client, error) { - minioClient, err := minio.New(cfg.MinioEP, &minio.Options{ - Creds: credentials.NewStaticV4(cfg.MinioAK, cfg.MinioSK, ""), + minioClient, err := minio.New(cfg.S3Endpoint, &minio.Options{ + Creds: credentials.NewStaticV4(cfg.S3AccessKey, cfg.S3SecretKey, ""), Secure: cfg.IsProd, }) if err != nil {