diff --git a/.gitignore b/.gitignore index 38a452d..99feb3c 100644 --- a/.gitignore +++ b/.gitignore @@ -160,3 +160,4 @@ fabric.properties # End of https://www.toptal.com/developers/gitignore/api/visualstudiocode,goland,go /recover.bolt +main diff --git a/Taskfile.dist.yml b/Taskfile.dist.yml index c96d07c..bac807b 100644 --- a/Taskfile.dist.yml +++ b/Taskfile.dist.yml @@ -3,8 +3,8 @@ version: "3" tasks: update-linter: cmds: - - go get -u penahub.gitlab.yandexcloud.net/devops/linters/golang.git + - go get -u gitea.pena/PenaSide/linters-golang lint: cmds: - task: update-linter - - cmd: golangci-lint run -v -c $(go list -f '{{"{{"}}.Dir{{"}}"}}' -m penahub.gitlab.yandexcloud.net/devops/linters/golang.git)/.golangci.yml + - cmd: golangci-lint run -v -c $(go list -f '{{"{{"}}.Dir{{"}}"}}' -m gitea.pena/PenaSide/linters-golang)/.golangci.yml diff --git a/deployments/staging/docker-compose.yaml b/deployments/staging/docker-compose.yaml index deb6db7..135d54b 100644 --- a/deployments/staging/docker-compose.yaml +++ b/deployments/staging/docker-compose.yaml @@ -8,25 +8,25 @@ services: APP_NAME: 'codeword' CLIENT_HTTP_URL: '0.0.0.0:3000' ADMIN_HTTP_URL: '0.0.0.0:3001' - MONGO_URL: mongodb://auth-service-user:LFYFpTvqtxSzXDJV@10.7.0.6:27017/?authSource=auth + MONGO_URL: mongodb://auth-service-user:LFYFpTvqtxSzXDJV@mongodb.pena:27017/?authSource=auth ENCRYPT_PUBLIC_KEY: "-----BEGIN PUBLIC KEY-----\nMCowBQYDK2VwAyEAEbnIvjIMle4rqVol6K2XUqOxHy1KJoNoZdKJrRUPKL4=\n-----END PUBLIC KEY-----" ENCRYPT_PRIVATE_KEY: "-----BEGIN PRIVATE KEY-----\nMC4CAQAwBQYDK2VwBCIEIKn0BKwF3vZvODgWAnUIwQhd8de5oZhY48gc23EWfrfs\n-----END PRIVATE KEY-----" ENCRYPT_SIGN_SECRET: 'pena-auth-microservice-group' - REDIS_HOST: '10.7.0.6:6379' + REDIS_HOST: 'redis.pena:6379' REDIS_PASSWORD: 'Redalert2' REDIS_DB: 3 API_URL: 'https://api.smtp.bz/v1/smtp/send' MAIL_API_KEY: 'P0YsjUB137upXrr1NiJefHmXVKW1hmBWlpev' MAIL_SENDER: 'noreply@mailing.pena.digital' DEFAULT_REDIRECTION_URL: 'https://shub.pena.digital/' - AUTH_EXCHANGE_URL: 'http://10.7.0.6:59300/auth/exchange' + AUTH_EXCHANGE_URL: 'http://10.7.0.4:59300/auth/exchange' RECOVERY_URL: 'https://shub.pena.digital/codeword/v1.0.0/recover/' JWT_AUDIENCE: 'pena' JWT_ISSUER: 'pena-auth-service' JWT_PUBLIC_KEY: $JWT_PUBLIC_KEY KAFKA_BROKERS: "10.7.0.6:9092" KAFKA_TOPIC_TARIFF: "tariffs" - DISCOUNT_ADDRESS: "10.7.0.6:9001" + DISCOUNT_ADDRESS: "hubstaging.pena:9001" GRPC_HOST: "0.0.0.0" TRASH_LOG_HOST: "10.7.0.5:7113" ports: diff --git a/internal/adapters/client/auth.go b/internal/adapters/client/auth.go index bae154c..38bf73c 100644 --- a/internal/adapters/client/auth.go +++ b/internal/adapters/client/auth.go @@ -2,7 +2,6 @@ package client import ( "encoding/json" - "errors" "fmt" "gitea.pena/PenaSide/codeword/internal/models" "github.com/gofiber/fiber/v2" diff --git a/internal/initialize/config.go b/internal/initialize/config.go index ce8b60e..b93e5f7 100644 --- a/internal/initialize/config.go +++ b/internal/initialize/config.go @@ -3,8 +3,6 @@ package initialize import ( "gitea.pena/PenaSide/common/mongo" "github.com/caarlos0/env/v8" - "github.com/joho/godotenv" - "log" ) type Config struct { @@ -48,9 +46,6 @@ type JWTConfiguration struct { } func LoadConfig() (*Config, error) { - if err := godotenv.Load(); err != nil { - log.Print("No .env file found") - } var config Config if err := env.Parse(&config); err != nil { return nil, err