Merge pull request #2793 from Permify/ufuk/configurable-grpc-host

fix: switch HTTP gateway dial to grpc.NewClient and add gRPC host config

Author: ucatbas

internal/config/config.go

@@ -27,6 +27,7 @@ type (
 
 	// Server contains the configurations for both HTTP and gRPC servers.
 	Server struct {
+		Host         string `mapstructure:"host"` // Host for servers
 		HTTP         HTTP   `mapstructure:"http"` // HTTP server configuration
 		GRPC         GRPC   `mapstructure:"grpc"` // gRPC server configuration
 		NameOverride string `mapstructure:"name_override"`
@@ -283,6 +284,7 @@ func DefaultConfig() *Config {
 		AccountID: "",
 		Server: Server{
 			NameOverride: "",
+			Host:         "127.0.0.1",
 			HTTP: HTTP{
 				Enabled: true,
 				Port:    "3476",

internal/servers/server.go

@@ -258,9 +258,7 @@ func (s *Container) Run(
 	// Start the optional HTTP server with CORS and optional TLS configurations.
 	// Connect to the gRPC server and register the HTTP handlers for each service.
 	if srv.HTTP.Enabled {
-		options := []grpc.DialOption{
-			grpc.WithBlock(),
-		}
+		options := []grpc.DialOption{}
 		if srv.GRPC.TLSConfig.Enabled {
 			c, err := credentials.NewClientTLSFromFile(srv.GRPC.TLSConfig.CertPath, srv.NameOverride)
 			if err != nil {
@@ -271,16 +269,14 @@ func (s *Container) Run(
 			options = append(options, grpc.WithTransportCredentials(insecure.NewCredentials()))
 		}
 
-		timeoutCtx, cancel := context.WithTimeout(ctx, 3*time.Second)
-		defer cancel()
-
-		conn, err := grpc.DialContext(timeoutCtx, ":"+srv.GRPC.Port, options...)
+		targetAddr := net.JoinHostPort(srv.Host, srv.GRPC.Port) // gRPC server address
+		conn, err := grpc.NewClient(targetAddr, options...)     // Create gRPC client connection
 		if err != nil {
 			return err
 		}
 		defer func() {
-			if err = conn.Close(); err != nil { // Connection close error
-				slog.Error("Failed to close gRPC connection", slog.Any("error", err)) // Log close error
+			if closeErr := conn.Close(); closeErr != nil { // Connection close error
+				slog.Error("Failed to close gRPC connection", slog.Any("error", closeErr)) // Log close error
 			}
 		}()
 
@@ -344,9 +340,10 @@ func (s *Container) Run(
 			}, // Methods configured
 		}).Handler(mux) // CORS handler created
 
-		httpServer = &http.Server{ // HTTP server configuration
-			Addr:              ":" + srv.HTTP.Port, // Server address
-			Handler:           corsHandler,         // CORS handler
+		httpTargetAddr := net.JoinHostPort(srv.Host, srv.HTTP.Port) // HTTP server address
+		httpServer = &http.Server{                                  // HTTP server configuration
+			Addr:              httpTargetAddr, // Server address
+			Handler:           corsHandler,    // CORS handler
 			ReadHeaderTimeout: 5 * time.Second,
 		}