-

internal/app/app.go

@@ -56,25 +56,25 @@ func Run(ctx context.Context, config initialize.Config, logger *zap.Logger) erro
 		Logger:      logger,
 	})
 
-	amoRepo, err := dal.NewAmoDal(ctx, config.PostgresCredentials)
+	amoRepo, err := dal.NewAmoDal(ctx, config.PostgresURL)
 	if err != nil {
 		logger.Error("error init amo repo in common repo", zap.Error(err))
 		return err
 	}
 
 	socialAithClient := pena_social_auth.NewClient(pena_social_auth.Deps{
-		PenaSocialAuthURL: config.PenaSocialAuthURL,
+		PenaSocialAuthURL: config.PenaSocialAuthMicroserviceURL,
 		Logger:            logger,
-		ReturnURL:         config.ReturnURL,
+		ReturnURL:         config.OauthReturnURL,
 	})
 
 	rateLimiter := limiter.NewRateLimiter(ctx, 6, 1500*time.Millisecond)
 
 	amoClient := amoClient.NewAmoClient(amoClient.AmoDeps{
 		Logger:            logger,
-		RedirectionURL:    config.ReturnURL,
-		IntegrationID:     config.IntegrationID,
-		IntegrationSecret: config.IntegrationSecret,
+		RedirectionURL:    config.OauthReturnURL,
+		IntegrationID:     config.AmoIntegrationID,
+		IntegrationSecret: config.AmoIntegrationSecret,
 		RateLimiter:       rateLimiter,
 	})
 
@@ -94,8 +94,8 @@ func Run(ctx context.Context, config initialize.Config, logger *zap.Logger) erro
 	cntrlDeps := controllers.Deps{
 		Service:     svc,
 		Logger:      logger,
-		Verify:      tools.NewVerify(config.IntegrationSecret, config.IntegrationID),
-		RedirectURL: config.RedirectURL,
+		Verify:      tools.NewVerify(config.AmoIntegrationSecret, config.AmoIntegrationID),
+		RedirectURL: config.QuizIntegrationsRedirectURL,
 	}
 
 	controller := controllers.NewController(cntrlDeps)
@@ -146,7 +146,7 @@ func Run(ctx context.Context, config initialize.Config, logger *zap.Logger) erro
 	})
 
 	go func() {
-		if err := server.Start(config.HTTPHost + ":" + config.HTTPPort); err != nil {
+		if err := server.Start(config.ClientHttpURL); err != nil {
 			logger.Error("Server startup error", zap.Error(err))
 			cancel()
 		}

internal/initialize/config.go

@@ -7,26 +7,23 @@ import (
 )
 
 type Config struct {
-	AppName             string `env:"APP_NAME" envDefault:"amocrm"`
-	HTTPHost            string `env:"HTTP_HOST" envDefault:"localhost"`
-	HTTPPort            string `env:"HTTP_PORT" envDefault:"8001"`
-	PostgresCredentials string `env:"PG_CRED" envDefault:"host=localhost port=35432 user=squiz password=Redalert2 dbname=squiz sslmode=disable"`
-	KafkaBrokers        string `env:"KAFKA_BROKERS" envDefault:"localhost:9092"`
-	KafkaTopic          string `env:"KAFKA_TOPIC" envDefault:"test-topic"`
-	KafkaGroup          string `env:"KAFKA_GROUP" envDefault:"amoCRM"`
-	RedisAddr           string `env:"REDIS_ADDR" envDefault:"localhost:6379"`
-	RedisPassword       string `env:"REDIS_PASS" envDefault:"admin"`
-	RedisDB             int    `env:"REDIS_DB" envDefault:"2"`
+	ClientHttpURL      string `env:"CLIENT_HTTP_URL" envDefault:"0.0.0.0:8001"`
+	PostgresURL        string `env:"POSTGRES_URL" envDefault:"host=localhost port=5432 user=squiz password=Redalert2 dbname=squiz sslmode=disable"`
+	KafkaBrokers       string `env:"KAFKA_BROKERS" envDefault:"localhost:9092"`
+	KafkaTopicQueueAmo string `env:"KAFKA_TOPIC_QUEUE_AMO" envDefault:"test-topic"`
+	KafkaGroup         string `env:"KAFKA_GROUP" envDefault:"amoCRM"`
+	RedisHost          string `env:"REDIS_HOST" envDefault:"localhost:6379"`
+	RedisPassword      string `env:"REDIS_PASSWORD" envDefault:"admin"`
+	RedisDB            int    `env:"REDIS_DB" envDefault:"2"`
 	// урл в соц аус сервисе для генерации ссылки для авторизации в амо
-	PenaSocialAuthURL string `env:"PENA_SOCIAL_AUTH_URL" envDefault:"http://localhost:8000/amocrm/auth"`
+	PenaSocialAuthMicroserviceURL string `env:"PENA_SOCIAL_AUTH_MICROSERVICE_URL" envDefault:"http://localhost:8000/amocrm/auth"`
 	// урл на который будет возвращен пользователь после авторизации это webhook/create get
-	ReturnURL string `env:"RETURN_URL" envDefault:"https://squiz.pena.digital/squiz/amocrm/oauth"`
+	OauthReturnURL string `env:"OAUTH_RETURN_URL" envDefault:"https://squiz.pena.digital/squiz/amocrm/oauth"`
 	// id интеграции
-	IntegrationID string `env:"INTEGRATION_ID" envDefault:"2dbd6329-9be6-41f2-aa5f-964b9e723e49"`
+	AmoIntegrationID string `env:"AMO_INTEGRATION_ID" envDefault:"2dbd6329-9be6-41f2-aa5f-964b9e723e49"`
 	// секрет интеграции
-	IntegrationSecret string `env:"INTEGRATION_SECRET" envDefault:"tNK3LwL4ovP0OBK4jKDHJ3646PqRJDOKQYgY6P2t6DCuV8LEzDzszTDY0Fhwmzc8"`
-	//AmoStorageURL     string `env:"AMO_STORAGE_URL" envDefault:"https://drive-b.amocrm.ru"`
-	RedirectURL string `env:"REDIRECT_URL" envDefault:"https://squiz.pena.digital/integrations"`
+	AmoIntegrationSecret        string `env:"AMO_INTEGRATION_SECRET" envDefault:"tNK3LwL4ovP0OBK4jKDHJ3646PqRJDOKQYgY6P2t6DCuV8LEzDzszTDY0Fhwmzc8"`
+	QuizIntegrationsRedirectURL string `env:"QUIZ_INTEGRATIONS_REDIRECT_URL" envDefault:"https://squiz.pena.digital/integrations"`
 }
 
 func LoadConfig() (*Config, error) {

internal/initialize/kafka.go

@@ -10,8 +10,8 @@ func KafkaConsumerInit(ctx context.Context, config Config) (*kgo.Client, error)
 	kafkaClient, err := kgo.NewClient(
 		kgo.SeedBrokers(config.KafkaBrokers),
 		kgo.ConsumerGroup(config.KafkaGroup),
-		kgo.DefaultProduceTopic(config.KafkaTopic),
-		kgo.ConsumeTopics(config.KafkaTopic),
+		kgo.DefaultProduceTopic(config.KafkaTopicQueueAmo),
+		kgo.ConsumeTopics(config.KafkaTopicQueueAmo),
 		kgo.ConsumeResetOffset(kgo.NewOffset().AfterMilli(time.Now().UnixMilli())),
 	)
 	if err != nil {

internal/initialize/redis.go

@@ -7,7 +7,7 @@ import (
 
 func Redis(ctx context.Context, cfg Config) (*redis.Client, error) {
 	rdb := redis.NewClient(&redis.Options{
-		Addr:     cfg.RedisAddr,
+		Addr:     cfg.RedisHost,
 		Password: cfg.RedisPassword,
 		DB:       cfg.RedisDB,
 	})