From 038d9f3baf9c9fd07d18b4b6c6a317030d3dba3e Mon Sep 17 00:00:00 2001
From: Divyam Ahuja <ahujadiyam@gmail.com>
Date: Mon, 28 Oct 2024 11:14:44 +0530
Subject: [PATCH] Update api-server to use env vars for connecting with grpc
 keygen server

---
 cmd/keygen/main.go            |  2 +-
 internal/api-server/server.go |  3 ++-
 syntax.env                    | 12 +++++++++---
 3 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/cmd/keygen/main.go b/cmd/keygen/main.go
index c7950dc..92ce3c8 100644
--- a/cmd/keygen/main.go
+++ b/cmd/keygen/main.go
@@ -10,7 +10,7 @@ import (
 )
 
 func main() {
-	port, err := strconv.Atoi(env.GetEnv("API_PORT", "8081"))
+	port, err := strconv.Atoi(env.GetEnv("API_PORT", "8080"))
 	if err != nil {
 		log.Fatalf("error listening port: %v, err: %v", port, err)
 	}
diff --git a/internal/api-server/server.go b/internal/api-server/server.go
index 87c97b5..9015196 100644
--- a/internal/api-server/server.go
+++ b/internal/api-server/server.go
@@ -10,6 +10,7 @@ import (
 
 	pb "fastbin/api/keygen"
 
+	"fastbin/internal/pkg/env"
 	paste "fastbin/internal/pkg/paste"
 
 	"github.com/gin-gonic/gin"
@@ -106,7 +107,7 @@ func (as *APIServer) write(gc *gin.Context) {
 }
 
 func (as *APIServer) try_write(data string) (string, error) {
-	grpcServerURL := "localhost:8081"
+	grpcServerURL := env.GetEnv("KEYGEN_HOST", "localhost") + ":" + env.GetEnv("KEYGEN_PORT", "8080")
 	conn, err := grpc.NewClient(grpcServerURL, grpc.WithTransportCredentials(insecure.NewCredentials()))
 	if err != nil {
 		return "", err
diff --git a/syntax.env b/syntax.env
index 3a6963a..7b4c703 100644
--- a/syntax.env
+++ b/syntax.env
@@ -1,7 +1,13 @@
+WEB_PORT=8082
+
 API_PORT=8080
-WEB_PORT=8081
-DB_HOST=localhost
+API_HOST=localhost
+
+KEYGEN_PORT=8081
+KEYGEN_HOST=localhost
+
 DB_PORT=5432
+DB_HOST=localhost
 DB_DATABASE=fastbin
 DB_USERNAME=username
-DB_PASSWORD=password
\ No newline at end of file
+DB_PASSWORD=password