feat(ci): chat service envs

javascriptizer1 · Jun 15, 2024 · cf07cc9 · cf07cc9
1 parent a024c62
commit cf07cc9
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 7 deletions.
diff --git a/.github/workflows/chat.yml b/.github/workflows/chat.yml
@@ -72,14 +72,28 @@ jobs:
           sudo apt-get update
           sudo apt-get install -y gettext
 
+      - name: Create .env file
+        run: |
+          echo "ENV=${{ vars.ENV }}" >> .env
+          echo "MONGO_HOST=${{ vars.MONGO_HOST }}" >> .env
+          echo "MONGO_PORT=${{ vars.MONGO_PORT }}" >> .env
+          echo "MONGO_USER=${{ vars.MONGO_USER }}" >> .env
+          echo "MONGO_PASSWORD=${{ vars.MONGO_PASSWORD }}" >> .env
+          echo "MONGO_DB=${{ vars.MONGO_DB }}" >> .env
+          echo "GRPC_SERVER_HOST=${{ vars.GRPC_SERVER_HOST }}" >> .env
+          echo "GRPC_SERVER_PORT=${{ vars.GRPC_SERVER_PORT }}" >> .env
+          echo "GRPC_SERVER_TIMEOUT=${{ vars.GRPC_SERVER_TIMEOUT }}" >> .env
+          echo "GRPC_AUTH_HOST=${{ vars.GRPC_AUTH_HOST }}" >> .env
+          echo "GRPC_AUTH_PORT=${{ vars.GRPC_AUTH_PORT }}" >> .env
+
       - name: Set up kubectl
         run: |
           mkdir -p $HOME/.kube
           echo "$KUBE_CONFIG" | base64 --decode > $HOME/.kube/config
 
       - name: Substitute environment variables in configmap
         run: |
-          export $(grep -v '^#' $ENV | xargs)
+          export $(cat .env | xargs)
           envsubst < deploy/helm/chat/templates/configmap.yaml > ./configmap.yaml
           mv ./configmap.yaml deploy/helm/chat/templates/configmap.yaml
 

diff --git a/service/chat/.env.example b/service/chat/.env.example
@@ -1,9 +1,5 @@
 ENV=local
 
-HTTP_SERVER_HOST=localhost
-HTTP_SERVER_PORT=8080
-HTTP_SERVER_TIMEOUT=60s
-
 GRPC_SERVER_HOST=localhost
 GRPC_SERVER_PORT=50052
 GRPC_SERVER_TIMEOUT=50s

diff --git a/service/chat/internal/config/config.go b/service/chat/internal/config/config.go
@@ -1,12 +1,12 @@
 package config
 
 import (
+	"log"
 	"net"
 	"strconv"
 	"time"
 
 	"github.com/ilyakaznacheev/cleanenv"
-	"github.com/javascriptizer1/grpc-cli-chat.backend/service/chat/internal/logger"
 	"github.com/joho/godotenv"
 )
 
@@ -48,7 +48,7 @@ func MustLoad() *Config {
 	err := godotenv.Load()
 
 	if err != nil {
-		logger.Fatal("Error loading .env file")
+		log.Printf("Error loading .env file: %v", err)
 	}
 
 	var cfg Config