PenaSide/customer
3
0
Fork 0
generated from PenaSide/GolangTemplate
Code Issues 1 Pull Requests 1 Actions Packages Projects Releases Wiki Activity

update cfg after codeconv

Browse Source
This commit is contained in:
Pasha 2024-12-06 15:40:21 +03:00
parent 3640fdd415
commit 2dea2c21b9
11 changed files with 164 additions and 164 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
cmd/validator/main.go
View File

@ -28,17 +28,17 @@ func main() {
} }
urls := []string{ urls := []string{
config.AuthServiceURL, config.AuthMicroserviceURL,
config.HubadminServiceURL, config.HubadminMicroserviceURL,
config.CurrencyServiceURL, config.CurrencyMicroserviceURL,
config.DiscountServiceGRPCURL, config.DiscountMicroserviceGRPC,
config.CodewordServiceGRPCURL, config.CodewordMicroserviceGRPC,
config.PaymentServiceGRPCURL, config.PaymentMicroserviceGRPC,
config.VerificationServiceURL, config.VerificationMicroservice,
config.TemplategenServiceURL, config.TemplategenMicroserviceURL,
config.TrashLogHost, config.TrashLogHost,
config.AdminURL, config.AdminURL,
config.ExternalCfg.MailClientCfg.ApiUrl, config.ExternalCfg.MailClientCfg.ApiURL,
} }
if err = validateURLs(urls); err != nil { if err = validateURLs(urls); err != nil {
log.Fatalf("error validating urls: %v", err) log.Fatalf("error validating urls: %v", err)
@ -72,16 +72,16 @@ func loadConfig() (*models.Config, error) {
config := models.Config{ config := models.Config{
ExternalCfg: models.ExternalCfg{ ExternalCfg: models.ExternalCfg{
JwtCfg: models.JWTConfiguration{ JwtCfg: models.JWTConfiguration{
JwtPublicKey: os.Getenv("JWT_PUBLIC_KEY"), PublicKey: os.Getenv("JWT_PUBLIC_KEY"),
JwtAudience: os.Getenv("JWT_AUDIENCE"), Audience: os.Getenv("JWT_AUDIENCE"),
JwtIssuer: os.Getenv("JWT_ISSUER"), Issuer: os.Getenv("JWT_ISSUER"),
}, },
Database: mongo.Configuration{ Database: mongo.Configuration{
URL: os.Getenv("MONGO_URL"), URL: os.Getenv("MONGO_URL"),
DatabaseName: os.Getenv("MONGO_DB_NAME"), DatabaseName: os.Getenv("MONGO_DB_NAME"),
}, },
MailClientCfg: models.MailClientCfg{ MailClientCfg: models.MailClientCfg{
ApiUrl: os.Getenv("API_URL"), ApiURL: os.Getenv("API_URL"),
Sender: os.Getenv("MAIL_SENDER"), Sender: os.Getenv("MAIL_SENDER"),
ApiKey: os.Getenv("MAIL_API_KEY"), ApiKey: os.Getenv("MAIL_API_KEY"),
MailAddress: os.Getenv("MAIL_ADDRESS"), MailAddress: os.Getenv("MAIL_ADDRESS"),
@ -91,25 +91,25 @@ func loadConfig() (*models.Config, error) {
PubKey: os.Getenv("ENCRYPT_PUBLIC_KEY"), PubKey: os.Getenv("ENCRYPT_PUBLIC_KEY"),
}, },
}, },
ClientHttpURL: os.Getenv("CLIENT_HTTP_URL"), ClientHttpURL: os.Getenv("CLIENT_HTTP_URL"),
AdminHttpURL: os.Getenv("ADMIN_HTTP_URL"), AdminHttpURL: os.Getenv("ADMIN_HTTP_URL"),
GrpcURL: os.Getenv("GRPC_URL"), GrpcURL: os.Getenv("GRPC_URL"),
GrpcDomain: os.Getenv("GRPC_DOMAIN"), GrpcDomain: os.Getenv("GRPC_DOMAIN"),
KafkaBrokers: strings.Split(os.Getenv("KAFKA_BROKERS"), ","), KafkaBrokers: strings.Split(os.Getenv("KAFKA_BROKERS"), ","),
KafkaTopicTariff: os.Getenv("KAFKA_TOPIC_TARIFF"), KafkaTopicTariff: os.Getenv("KAFKA_TOPIC_TARIFF"),
AuthServiceURL: os.Getenv("AUTH_SERVICE_URL"), AuthMicroserviceURL: os.Getenv("AUTH_MICROSERVICE_URL"),
HubadminServiceURL: os.Getenv("HUBADMIN_SERVICE_URL"), HubadminMicroserviceURL: os.Getenv("HUBADMIN_MICROSERVICE_URL"),
CurrencyServiceURL: os.Getenv("CURRENCY_SERVICE_URL"), CurrencyMicroserviceURL: os.Getenv("CURRENCY_MICROSERVICE_URL"),
DiscountServiceGRPCURL: os.Getenv("DISCOUNT_SERVICE_GRPC_URL"), DiscountMicroserviceGRPC: os.Getenv("DISCOUNT_MICROSERVICE_GRPC_URL"),
PaymentServiceGRPCURL: os.Getenv("PAYMENT_SERVICE_GRPC_URL"), PaymentMicroserviceGRPC: os.Getenv("PAYMENT_MICROSERVICE_GRPC_URL"),
VerificationServiceURL: os.Getenv("VERIFICATION_SERVICE_URL"), VerificationMicroservice: os.Getenv("VERIFICATION_MICROSERVICE_URL"),
TemplategenServiceURL: os.Getenv("TEMPLATEGEN_SERVICE_URL"), TemplategenMicroserviceURL: os.Getenv("TEMPLATEGEN_MICROSERVICE_URL"),
CodewordServiceGRPCURL: os.Getenv("CODEWORD_SERVICE_GRPC_URL"), CodewordMicroserviceGRPC: os.Getenv("CODEWORD_MICROSERVICE_GRPC_URL"),
TrashLogHost: os.Getenv("TRASH_LOG_HOST"), TrashLogHost: os.Getenv("TRASH_LOG_HOST"),
NotificationBotToken: os.Getenv("NOTIFICATION_BOT_TOKEN"), NotificationBotToken: os.Getenv("TELEGRAM_TOKEN"),
NotificationRsPayChannel: envToInt64(os.Getenv("NOTIFICATION_RS_PAY_CHANNEL")), NotificationRsPayChannel: envToInt64(os.Getenv("TELEGRAM_RS_PAY_CHANNEL_ID")),
NotificationChannel: envToInt64(os.Getenv("NOTIFICATION_CHANNEL")), NotificationChannel: envToInt64(os.Getenv("TELEGRAM_NOTIFICATION_CHANNEL_ID")),
AdminURL: os.Getenv("ADMIN_FRONT_URL"), AdminURL: os.Getenv("ADMIN_FRONT_URL"),
} }
return &config, nil return &config, nil
@ -174,7 +174,7 @@ func validateMail(cfg models.MailClientCfg) error {
return fmt.Errorf("mail address is empty") return fmt.Errorf("mail address is empty")
} }
if cfg.ApiUrl == "" { if cfg.ApiURL == "" {
return fmt.Errorf("mail api url is empty") return fmt.Errorf("mail api url is empty")
} }

76
cmd/validator/main_test.go
View File

@ -20,7 +20,7 @@ func TestValidateTG(t *testing.T) {
func TestValidateMail(t *testing.T) { func TestValidateMail(t *testing.T) {
err := validateMail(models.MailClientCfg{ err := validateMail(models.MailClientCfg{
ApiUrl: "https://api.smtp.bz/v1/smtp/send", ApiURL: "https://api.smtp.bz/v1/smtp/send",
Sender: "noreply@mailing.pena.digital", Sender: "noreply@mailing.pena.digital",
ApiKey: "P0YsjUB137upXrr1NiJefHmXVKW1hmBWlpev", ApiKey: "P0YsjUB137upXrr1NiJefHmXVKW1hmBWlpev",
MailAddress: "sells@pena.digital", MailAddress: "sells@pena.digital",
@ -86,34 +86,34 @@ func generateRSAKeys(bitSize int) (privateKey string, publicKey string, err erro
func TestLoadConfig(t *testing.T) { func TestLoadConfig(t *testing.T) {
envVars := map[string]string{ envVars := map[string]string{
"JWT_ISSUER": "pena-auth-service", "JWT_ISSUER": "pena-auth-service",
"JWT_AUDIENCE": "pena", "JWT_AUDIENCE": "pena",
"JWT_PUBLIC_KEY": "-----BEGIN PUBLIC KEY-----\nMIGeMA0GCSqGSIb3DQEBAQUAA4GMADCBiAKBgHgnvr7O2tiApjJfid1orFnIGm69\n80fZp+Lpbjo+NC/0whMFga2Biw5b1G2Q/B2u0tpO1Fs/E8z7Lv1nYfr5jx2S8x6B\ndA4TS2kB9Kf0wn0+7wSlyikHoKhbtzwXHZl17GsyEi6wHnsqNBSauyIWhpha8i+Y\n+3GyaOY536H47qyXAgMBAAE=\n-----END PUBLIC KEY-----", "JWT_PUBLIC_KEY": "-----BEGIN PUBLIC KEY-----\nMIGeMA0GCSqGSIb3DQEBAQUAA4GMADCBiAKBgHgnvr7O2tiApjJfid1orFnIGm69\n80fZp+Lpbjo+NC/0whMFga2Biw5b1G2Q/B2u0tpO1Fs/E8z7Lv1nYfr5jx2S8x6B\ndA4TS2kB9Kf0wn0+7wSlyikHoKhbtzwXHZl17GsyEi6wHnsqNBSauyIWhpha8i+Y\n+3GyaOY536H47qyXAgMBAAE=\n-----END PUBLIC KEY-----",
"CLIENT_HTTP_URL": "0.0.0.0:8080", "CLIENT_HTTP_URL": "0.0.0.0:8080",
"ADMIN_HTTP_URL": "0.0.0.0:8081", "ADMIN_HTTP_URL": "0.0.0.0:8081",
"GRPC_URL": "0.0.0.0:9001", "GRPC_URL": "0.0.0.0:9001",
"GRPC_DOMAIN": "customer-service:9000", "GRPC_DOMAIN": "customer-service:9000",
"MONGO_URL": "mongodb://test:test@localhost:27020/", "MONGO_URL": "mongodb://test:test@localhost:27020/",
"MONGO_DB_NAME": "admin", "MONGO_DB_NAME": "admin",
"KAFKA_BROKERS": "localhost:9092", "KAFKA_BROKERS": "localhost:9092",
"KAFKA_TOPIC_TARIFF": "test-topic", "KAFKA_TOPIC_TARIFF": "test-topic",
"AUTH_SERVICE_URL": "http://localhost:8000/user", "AUTH_MICROSERVICE_URL": "http://localhost:8000/user",
"HUBADMIN_SERVICE_URL": "http://localhost:8001/tariff", "HUBADMIN_MICROSERVICE_URL": "http://localhost:8001/tariff",
"CURRENCY_SERVICE_URL": "http://cbrfworker-service:8000/change", "CURRENCY_MICROSERVICE_URL": "http://cbrfworker-service:8000/change",
"DISCOUNT_SERVICE_GRPC_URL": "localhost:9040", "DISCOUNT_MICROSERVICE_GRPC_URL": "localhost:9040",
"PAYMENT_SERVICE_GRPC_URL": "treasurer-service:9085", "PAYMENT_MICROSERVICE_GRPC_URL": "treasurer-service:9085",
"VERIFICATION_SERVICE_URL": "http://10.8.0.8:7035/verification", "VERIFICATION_MICROSERVICE_URL": "http://10.8.0.8:7035/verification",
"TEMPLATEGEN_SERVICE_URL": "10.6.0.17", "TEMPLATEGEN_MICROSERVICE_URL": "10.6.0.17",
"CODEWORD_SERVICE_GRPC_URL": "http://localhost:8000/user", "CODEWORD_MICROSERVICE_GRPC_URL": "http://localhost:8000/user",
"TRASH_LOG_HOST": "localhost:7113", "TRASH_LOG_HOST": "localhost:7113",
"API_URL": "https://api.smtp.bz/v1/smtp/send", "API_URL": "https://api.smtp.bz/v1/smtp/send",
"MAIL_SENDER": "noreply@mailing.pena.digital", "MAIL_SENDER": "noreply@mailing.pena.digital",
"MAIL_API_KEY": "P0YsjUB137upXrr1NiJefHmXVKW1hmBWlpev", "MAIL_API_KEY": "P0YsjUB137upXrr1NiJefHmXVKW1hmBWlpev",
"MAIL_ADDRESS": "mail@mail.com", "MAIL_ADDRESS": "mail@mail.com",
"NOTIFICATION_BOT_TOKEN": "7127966184:AAG1steOCH4wDvHRe9QcsXJPS4dWRyRYsqg", "TELEGRAM_TOKEN": "7127966184:AAG1steOCH4wDvHRe9QcsXJPS4dWRyRYsqg",
"NOTIFICATION_CHANNEL": "-1002177203276", "TELEGRAM_NOTIFICATION_CHANNEL_ID": "-1002177203276",
"NOTIFICATION_RS_PAY_CHANNEL": "-1002177203276", "TELEGRAM_RS_PAY_CHANNEL_ID": "-1002177203276",
"ADMIN_FRONT_URL": "https://admin-front.ru", "ADMIN_FRONT_URL": "https://admin-front.ru",
} }
priveKey, pubKey, err := generateRSAKeys(2048) priveKey, pubKey, err := generateRSAKeys(2048)
@ -135,17 +135,17 @@ func TestLoadConfig(t *testing.T) {
} }
urls := []string{ urls := []string{
cfg.AuthServiceURL, cfg.AuthMicroserviceURL,
cfg.HubadminServiceURL, cfg.HubadminMicroserviceURL,
cfg.CurrencyServiceURL, cfg.CurrencyMicroserviceURL,
cfg.DiscountServiceGRPCURL, cfg.DiscountMicroserviceGRPC,
cfg.CodewordServiceGRPCURL, cfg.CodewordMicroserviceGRPC,
cfg.PaymentServiceGRPCURL, cfg.PaymentMicroserviceGRPC,
cfg.VerificationServiceURL, cfg.VerificationMicroservice,
cfg.TemplategenServiceURL, cfg.TemplategenMicroserviceURL,
cfg.TrashLogHost, cfg.TrashLogHost,
cfg.AdminURL, cfg.AdminURL,
cfg.ExternalCfg.MailClientCfg.ApiUrl, cfg.ExternalCfg.MailClientCfg.ApiURL,
} }
if err = validateURLs(urls); err != nil { if err = validateURLs(urls); err != nil {
assert.NoError(t, err) assert.NoError(t, err)

20
deployments/staging/docker-compose.yaml
View File

@ -22,20 +22,20 @@ services:
- MONGO_URL = TODO - MONGO_URL = TODO
- MONGO_DB_NAME=customer - MONGO_DB_NAME=customer
# - MONGO_AUTH=customer # - MONGO_AUTH=customer
- NOTIFICATION_RS_PAY_CHANNEL=-1002338593104 - TELEGRAM_RS_PAY_CHANNEL_ID=-1002338593104
- KAFKA_BROKERS=10.8.0.6:9092 - KAFKA_BROKERS=10.8.0.6:9092
- KAFKA_TOPIC_TARIFF=tariffs - KAFKA_TOPIC_TARIFF=tariffs
- AUTH_SERVICE_URL=http://10.8.0.6:59300 - AUTH_MICROSERVICE_URL=http://10.8.0.6:59300
- HUBADMIN_SERVICE_URL=http://10.8.0.6:59303 - HUBADMIN_MICROSERVICE_URL=http://10.8.0.6:59303
- CURRENCY_SERVICE_URL=http://10.8.0.6:3131 - CURRENCY_MICROSERVICE_URL=http://10.8.0.6:3131
- DISCOUNT_SERVICE_GRPC_URL=10.8.0.6:9001 - DISCOUNT_MICROSERVICE_GRPC_URL=10.8.0.6:9001
- PAYMENT_SERVICE_GRPC_URL=10.8.0.6:9085 - PAYMENT_MICROSERVICE_GRPC_URL=10.8.0.6:9085
- VERIFICATION_SERVICE_URL=http://10.8.0.6:7036 - VERIFICATION_MICROSERVICE_URL=http://10.8.0.6:7036
- TEMPLATEGEN_SERVICE_URL=http://10.6.0.17 - TEMPLATEGEN_MICROSERVICE_URL=http://10.6.0.17
- API_URL=https://api.smtp.bz/v1/smtp/send - API_URL=https://api.smtp.bz/v1/smtp/send
- CODEWORD_SERVICE_GRPC_URL=10.8.0.6:59665 - CODEWORD_MICROSERVICE_GRPC_URL=10.8.0.6:59665
- MAIL_SENDER=noreply@mailing.pena.digital - MAIL_SENDER=noreply@mailing.pena.digital
- MAIL_API_KEY=P0YsjUB137upXrr1NiJefHmXVKW1hmBWlpev - MAIL_API_KEY=P0YsjUB137upXrr1NiJefHmXVKW1hmBWlpev
- MAIL_ADDRESS=sells@pena.digital - MAIL_ADDRESS=sells@pena.digital
@ -47,7 +47,7 @@ services:
- ENCRYPT_PRIVATE_KEY=$USER_PRIVATEKEY - ENCRYPT_PRIVATE_KEY=$USER_PRIVATEKEY
- ADMIN_FRONT_URL=https://sadmin.pena - ADMIN_FRONT_URL=https://sadmin.pena
- TRASH_LOG_HOST=10.8.0.15:7113 - TRASH_LOG_HOST=10.8.0.15:7113
- NOTIFICATION_BOT_TOKEN=6112841016:AAH2nO1c6mqfMewBvHwdXCDp5PCclOuc99s - TELEGRAM_TOKEN=6112841016:AAH2nO1c6mqfMewBvHwdXCDp5PCclOuc99s
ports: ports:
- 10.8.0.6:8067:8065 - 10.8.0.6:8067:8065
- 10.8.0.6:8070:8066 - 10.8.0.6:8070:8066

16
internal/app/app.go
View File

@ -117,15 +117,15 @@ func Run(config *models.Config, logger *zap.Logger, build Build) (appErr error)
clients := initialize.NewClients(initialize.ClientsDeps{ clients := initialize.NewClients(initialize.ClientsDeps{
Logger: logger, Logger: logger,
AuthURL: config.AuthServiceURL, AuthURL: config.AuthMicroserviceURL,
HubadminURL: config.HubadminServiceURL, HubadminURL: config.HubadminMicroserviceURL,
CurrencyURL: config.CurrencyServiceURL, CurrencyURL: config.CurrencyMicroserviceURL,
DiscountServiceURL: config.DiscountServiceGRPCURL, DiscountServiceURL: config.DiscountMicroserviceGRPC,
PaymentServiceURL: config.PaymentServiceGRPCURL, PaymentServiceURL: config.PaymentMicroserviceGRPC,
VerificationURL: config.VerificationServiceURL, VerificationURL: config.VerificationMicroservice,
TemplategenURL: config.TemplategenServiceURL, TemplategenURL: config.TemplategenMicroserviceURL,
MailClient: config.ExternalCfg.MailClientCfg, MailClient: config.ExternalCfg.MailClientCfg,
CodewordServiceHost: config.CodewordServiceGRPCURL, CodewordServiceHost: config.CodewordMicroserviceGRPC,
Notifier: notificationBot, Notifier: notificationBot,
NotificationRsPayChannel: config.NotificationRsPayChannel, NotificationRsPayChannel: config.NotificationRsPayChannel,
}) })

60
internal/initialize/config_test.go
View File

@ -55,27 +55,27 @@ func setDefaultTestingENV(t *testing.T) *models.Config {
defaultCurrencyURL := "http://www.currency.ru/change" defaultCurrencyURL := "http://www.currency.ru/change"
defaultConfiguration := models.Config{ defaultConfiguration := models.Config{
ClientHttpURL: "localhost:8080", ClientHttpURL: "localhost:8080",
AdminHttpURL: "localhost:8081", AdminHttpURL: "localhost:8081",
GrpcURL: "localhost:8081", GrpcURL: "localhost:8081",
GrpcDomain: "domain", GrpcDomain: "domain",
AuthServiceURL: defaultAuthURL, AuthMicroserviceURL: defaultAuthURL,
KafkaTopicTariff: "topic", KafkaTopicTariff: "topic",
KafkaBrokers: []string{"localhost:8080", "localhost:8081"}, KafkaBrokers: []string{"localhost:8080", "localhost:8081"},
HubadminServiceURL: defaultHubAdminURL, HubadminMicroserviceURL: defaultHubAdminURL,
CurrencyServiceURL: defaultCurrencyURL, CurrencyMicroserviceURL: defaultCurrencyURL,
DiscountServiceGRPCURL: "domen", DiscountMicroserviceGRPC: "domen",
PaymentServiceGRPCURL: "domen", PaymentMicroserviceGRPC: "domen",
VerificationServiceURL: "domen", VerificationMicroservice: "domen",
TemplategenServiceURL: "domen", TemplategenMicroserviceURL: "domen",
ExternalCfg: models.ExternalCfg{ ExternalCfg: models.ExternalCfg{
JwtCfg: models.JWTConfiguration{ JwtCfg: models.JWTConfiguration{
JwtPrivateKey: "jwt private key", PrivateKey: "jwt private key",
JwtPublicKey: "jwt public key", PublicKey: "jwt public key",
JwtIssuer: "issuer", Issuer: "issuer",
JwtAudience: "audience", Audience: "audience",
Algorithm: *jwt.SigningMethodRS256, Algorithm: *jwt.SigningMethodRS256,
ExpiresIn: 15 * time.Minute, ExpiresIn: 15 * time.Minute,
}, },
Database: mongo.Configuration{ Database: mongo.Configuration{
URL: "mongodb://test:test@localhost:27020/", URL: "mongodb://test:test@localhost:27020/",
@ -87,21 +87,21 @@ func setDefaultTestingENV(t *testing.T) *models.Config {
t.Setenv("GRPC_URL", defaultConfiguration.GrpcURL) t.Setenv("GRPC_URL", defaultConfiguration.GrpcURL)
t.Setenv("GRPC_DOMAIN", defaultConfiguration.GrpcDomain) t.Setenv("GRPC_DOMAIN", defaultConfiguration.GrpcDomain)
t.Setenv("JWT_PUBLIC_KEY", defaultConfiguration.ExternalCfg.JwtCfg.JwtPublicKey) t.Setenv("JWT_PUBLIC_KEY", defaultConfiguration.ExternalCfg.JwtCfg.PublicKey)
t.Setenv("JWT_PRIVATE_KEY", defaultConfiguration.ExternalCfg.JwtCfg.JwtPrivateKey) t.Setenv("JWT_PRIVATE_KEY", defaultConfiguration.ExternalCfg.JwtCfg.PrivateKey)
t.Setenv("JWT_ISSUER", defaultConfiguration.ExternalCfg.JwtCfg.JwtIssuer) t.Setenv("JWT_ISSUER", defaultConfiguration.ExternalCfg.JwtCfg.Issuer)
t.Setenv("JWT_AUDIENCE", defaultConfiguration.ExternalCfg.JwtCfg.JwtAudience) t.Setenv("JWT_AUDIENCE", defaultConfiguration.ExternalCfg.JwtCfg.Audience)
t.Setenv("KAFKA_BROKERS", "localhost:8080,localhost:8081") t.Setenv("KAFKA_BROKERS", "localhost:8080,localhost:8081")
t.Setenv("KAFKA_TOPIC_TARIFF", defaultConfiguration.KafkaTopicTariff) t.Setenv("KAFKA_TOPIC_TARIFF", defaultConfiguration.KafkaTopicTariff)
t.Setenv("AUTH_SERVICE_URL", defaultConfiguration.AuthServiceURL) t.Setenv("AUTH_MICROSERVICE_URL", defaultConfiguration.AuthMicroserviceURL)
t.Setenv("HUBADMIN_SERVICE_URL", defaultConfiguration.HubadminServiceURL) t.Setenv("HUBADMIN_MICROSERVICE_URL", defaultConfiguration.HubadminMicroserviceURL)
t.Setenv("CURRENCY_SERVICE_URL", defaultConfiguration.CurrencyServiceURL) t.Setenv("CURRENCY_MICROSERVICE_URL", defaultConfiguration.CurrencyMicroserviceURL)
t.Setenv("DISCOUNT_SERVICE_GRPC_URL", defaultConfiguration.DiscountServiceGRPCURL) t.Setenv("DISCOUNT_MICROSERVICE_GRPC_URL", defaultConfiguration.DiscountMicroserviceGRPC)
t.Setenv("PAYMENT_SERVICE_GRPC_URL", defaultConfiguration.PaymentServiceGRPCURL) t.Setenv("PAYMENT_MICROSERVICE_GRPC_URL", defaultConfiguration.PaymentMicroserviceGRPC)
t.Setenv("VERIFICATION_SERVICE_URL", defaultConfiguration.VerificationServiceURL) t.Setenv("VERIFICATION_MICROSERVICE_URL", defaultConfiguration.VerificationMicroservice)
t.Setenv("TEMPLATEGEN_SERVICE_URL", defaultConfiguration.TemplategenServiceURL) t.Setenv("TEMPLATEGEN_MICROSERVICE_URL", defaultConfiguration.TemplategenMicroserviceURL)
t.Setenv("MONGO_URL", defaultConfiguration.ExternalCfg.Database.URL) t.Setenv("MONGO_URL", defaultConfiguration.ExternalCfg.Database.URL)
t.Setenv("MONGO_DB_NAME", defaultConfiguration.ExternalCfg.Database.DatabaseName) t.Setenv("MONGO_DB_NAME", defaultConfiguration.ExternalCfg.Database.DatabaseName)

2
internal/interface/client/mail.go
View File

@ -24,7 +24,7 @@ func NewMailClient(deps models.MailClientCfg, logger *zap.Logger) *MailClient {
deps.FiberClient = fiber.AcquireClient() deps.FiberClient = fiber.AcquireClient()
} }
return &MailClient{ return &MailClient{
apiUrl: deps.ApiUrl, apiUrl: deps.ApiURL,
sender: deps.Sender, sender: deps.Sender,
apiKey: deps.ApiKey, apiKey: deps.ApiKey,
fiberClient: deps.FiberClient, fiberClient: deps.FiberClient,

54
internal/models/config.go
View File

@ -9,26 +9,26 @@ import (
) )
type Config struct { type Config struct {
ClientHttpURL string `env:"CLIENT_HTTP_URL,default=localhost:8080"` ClientHttpURL string `env:"CLIENT_HTTP_URL,default=localhost:8080"`
AdminHttpURL string `env:"ADMIN_HTTP_URL,default=localhost:8081"` AdminHttpURL string `env:"ADMIN_HTTP_URL,default=localhost:8081"`
GrpcURL string `env:"GRPC_URL,default=localhost:8081"` GrpcURL string `env:"GRPC_URL,default=localhost:8081"`
GrpcDomain string `env:"GRPC_DOMAIN,default=https://domen.ru"` GrpcDomain string `env:"GRPC_DOMAIN,default=https://domen.ru"`
AuthServiceURL string `env:"AUTH_SERVICE_URL,required"` // http://10.8.0.6:59300/user AuthMicroserviceURL string `env:"AUTH_MICROSERVICE_URL,required"` // http://10.8.0.6:59300/user
HubadminServiceURL string `env:"HUBADMIN_SERVICE_URL,required"` // http://10.8.0.6:59303/tariff HubadminMicroserviceURL string `env:"HUBADMIN_MICROSERVICE_URL,required"` // http://10.8.0.6:59303/tariff
CurrencyServiceURL string `env:"CURRENCY_SERVICE_URL,required"` // http://10.8.0.6:3131/change CurrencyMicroserviceURL string `env:"CURRENCY_MICROSERVICE_URL,required"` // http://10.8.0.6:3131/change
DiscountServiceGRPCURL string `env:"DISCOUNT_SERVICE_GRPC_URL,required"` DiscountMicroserviceGRPC string `env:"DISCOUNT_MICROSERVICE_GRPC_URL,required"`
CodewordServiceGRPCURL string `env:"CODEWORD_SERVICE_GRPC_URL,required"` CodewordMicroserviceGRPC string `env:"CODEWORD_MICROSERVICE_GRPC_URL,required"`
PaymentServiceGRPCURL string `env:"PAYMENT_SERVICE_GRPC_URL,required"` PaymentMicroserviceGRPC string `env:"PAYMENT_MICROSERVICE_GRPC_URL,required"`
VerificationServiceURL string `env:"VERIFICATION_SERVICE_URL,required"` // http://10.8.0.6:7036/verification VerificationMicroservice string `env:"VERIFICATION_MICROSERVICE_URL,required"` // http://10.8.0.6:7036/verification
TemplategenServiceURL string `env:"TEMPLATEGEN_SERVICE_URL,required"` // http://10.6.0.17/generator/service TemplategenMicroserviceURL string `env:"TEMPLATEGEN_MICROSERVICE_URL,required"` // http://10.6.0.17/generator/service
KafkaTopicTariff string `json:"topic" env:"KAFKA_TOPIC_TARIFF,required"` KafkaTopicTariff string `json:"topic" env:"KAFKA_TOPIC_TARIFF,required"`
KafkaBrokers []string `json:"brokers" env:"KAFKA_BROKERS,required"` KafkaBrokers []string `json:"brokers" env:"KAFKA_BROKERS,required"`
TrashLogHost string `env:"TRASH_LOG_HOST"` TrashLogHost string `env:"TRASH_LOG_HOST"`
NotificationBotToken string `env:"NOTIFICATION_BOT_TOKEN"` NotificationBotToken string `env:"TELEGRAM_TOKEN"`
NotificationChannel int64 `env:"NOTIFICATION_CHANNEL"` NotificationChannel int64 `env:"TELEGRAM_NOTIFICATION_CHANNEL_ID"`
AdminURL string `env:"ADMIN_FRONT_URL"` AdminURL string `env:"ADMIN_FRONT_URL"`
NotificationRsPayChannel int64 `env:"NOTIFICATION_RS_PAY_CHANNEL"` NotificationRsPayChannel int64 `env:"TELEGRAM_RS_PAY_CHANNEL_ID"`
ExternalCfg ExternalCfg ExternalCfg ExternalCfg
} }
type ExternalCfg struct { type ExternalCfg struct {
@ -39,7 +39,7 @@ type ExternalCfg struct {
} }
type MailClientCfg struct { type MailClientCfg struct {
ApiUrl string `env:"API_URL,required"` ApiURL string `env:"API_URL,required"`
Sender string `env:"MAIL_SENDER,required"` Sender string `env:"MAIL_SENDER,required"`
ApiKey string `env:"MAIL_API_KEY,required"` ApiKey string `env:"MAIL_API_KEY,required"`
FiberClient *fiber.Client FiberClient *fiber.Client
@ -47,12 +47,12 @@ type MailClientCfg struct {
} }
type JWTConfiguration struct { type JWTConfiguration struct {
JwtPrivateKey string `env:"JWT_PRIVATE_KEY"` PrivateKey string `env:"JWT_PRIVATE_KEY"`
JwtPublicKey string `env:"JWT_PUBLIC_KEY,required"` PublicKey string `env:"JWT_PUBLIC_KEY,required"`
JwtIssuer string `env:"JWT_ISSUER,required"` Issuer string `env:"JWT_ISSUER,required"`
JwtAudience string `env:"JWT_AUDIENCE,required"` Audience string `env:"JWT_AUDIENCE,required"`
Algorithm jwt.SigningMethodRSA Algorithm jwt.SigningMethodRSA
ExpiresIn time.Duration ExpiresIn time.Duration
} }
const mongoVersion uint32 = 1 const mongoVersion uint32 = 1

8
internal/utils/jwt.go
View File

@ -20,12 +20,12 @@ type JWT struct {
func NewJWT(configuration *models.JWTConfiguration) *JWT { func NewJWT(configuration *models.JWTConfiguration) *JWT {
return &JWT{ return &JWT{
privateKey: []byte(configuration.JwtPrivateKey), privateKey: []byte(configuration.PrivateKey),
publicKey: []byte(configuration.JwtPublicKey), publicKey: []byte(configuration.PublicKey),
algorithm: &configuration.Algorithm, algorithm: &configuration.Algorithm,
expiresIn: configuration.ExpiresIn, expiresIn: configuration.ExpiresIn,
issuer: configuration.JwtIssuer, issuer: configuration.Issuer,
audience: configuration.JwtAudience, audience: configuration.Audience,
} }
} }

12
internal/utils/jwt_test.go
View File

@ -93,12 +93,12 @@ func TestJWT(t *testing.T) {
privateKey = strings.Replace(privateKey, "\t", "", -1) privateKey = strings.Replace(privateKey, "\t", "", -1)
jwt := utils.NewJWT(&models.JWTConfiguration{ jwt := utils.NewJWT(&models.JWTConfiguration{
JwtPrivateKey: privateKey, PrivateKey: privateKey,
JwtPublicKey: publicKey, PublicKey: publicKey,
Algorithm: *jwt.SigningMethodRS256, Algorithm: *jwt.SigningMethodRS256,
ExpiresIn: 15 * time.Minute, ExpiresIn: 15 * time.Minute,
JwtIssuer: "issuer1", Issuer: "issuer1",
JwtAudience: "audience1", Audience: "audience1",
}) })
t.Run("Успешная генерация токена", func(t *testing.T) { t.Run("Успешная генерация токена", func(t *testing.T) {

12
tests/helpers/jwt.go
View File

@ -33,11 +33,11 @@ func InitializeJWT() *utils.JWT {
-----END RSA PRIVATE KEY-----`, "\t", "", -1) -----END RSA PRIVATE KEY-----`, "\t", "", -1)
return utils.NewJWT(&models.JWTConfiguration{ return utils.NewJWT(&models.JWTConfiguration{
JwtPrivateKey: privateKey, PrivateKey: privateKey,
JwtPublicKey: publicKey, PublicKey: publicKey,
JwtAudience: "pena", Audience: "pena",
JwtIssuer: "pena-auth-service", Issuer: "pena-auth-service",
Algorithm: *jwt.SigningMethodRS256, Algorithm: *jwt.SigningMethodRS256,
ExpiresIn: 15 * time.Minute, ExpiresIn: 15 * time.Minute,
}) })
} }

2
tests/integration/mail_test.go
View File

@ -14,7 +14,7 @@ func TestSendMessage(t *testing.T) {
apiKey := "P0YsjUB137upXrr1NiJefHmXVKW1hmBWlpev" apiKey := "P0YsjUB137upXrr1NiJefHmXVKW1hmBWlpev"
mailClient := client.NewMailClient(models.MailClientCfg{ mailClient := client.NewMailClient(models.MailClientCfg{
ApiUrl: "https://api.smtp.bz/v1/smtp/send", ApiURL: "https://api.smtp.bz/v1/smtp/send",
Sender: sender, Sender: sender,
ApiKey: apiKey, ApiKey: apiKey,
FiberClient: fiber.AcquireClient(), FiberClient: fiber.AcquireClient(),