From 017b758bf4d495212a55db3de61b2d95ab104e53 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Willy=20Rom=C3=A3o?= <willyr.goncalves@gmail.com>
Date: Wed, 25 Oct 2023 17:41:17 +0100
Subject: [PATCH] fix: move client logic to a function that always return
 (#262)

This commit fixes a bug in the `main()` that runs `defer client.Kill()` but use `os.Exit()` to finish the program; defer is just executed when a function returns. Because of that, the plugin was never closed.

To fix it, I moved the client logic to a separate function that always returns and let the `os.Exit()` for the `main()`. It will guarantee that we will always call the `defer client.Kill()`.
---
 examples/grpc/main.go | 31 ++++++++++++++++++-------------
 1 file changed, 18 insertions(+), 13 deletions(-)

diff --git a/examples/grpc/main.go b/examples/grpc/main.go
index 7506a52b..e69c0654 100644
--- a/examples/grpc/main.go
+++ b/examples/grpc/main.go
@@ -14,10 +14,7 @@ import (
 	"github.com/hashicorp/go-plugin/examples/grpc/shared"
 )
 
-func main() {
-	// We don't want to see the plugin logs.
-	log.SetOutput(ioutil.Discard)
-
+func run() error {
 	// We're a host. Start by launching the plugin process.
 	client := plugin.NewClient(&plugin.ClientConfig{
 		HandshakeConfig: shared.Handshake,
@@ -31,15 +28,13 @@ func main() {
 	// Connect via RPC
 	rpcClient, err := client.Client()
 	if err != nil {
-		fmt.Println("Error:", err.Error())
-		os.Exit(1)
+		return err
 	}
 
 	// Request the plugin
 	raw, err := rpcClient.Dispense("kv_grpc")
 	if err != nil {
-		fmt.Println("Error:", err.Error())
-		os.Exit(1)
+		return err
 	}
 
 	// We should have a KV store now! This feels like a normal interface
@@ -50,8 +45,7 @@ func main() {
 	case "get":
 		result, err := kv.Get(os.Args[1])
 		if err != nil {
-			fmt.Println("Error:", err.Error())
-			os.Exit(1)
+			return err
 		}
 
 		fmt.Println(string(result))
@@ -59,13 +53,24 @@ func main() {
 	case "put":
 		err := kv.Put(os.Args[1], []byte(os.Args[2]))
 		if err != nil {
-			fmt.Println("Error:", err.Error())
-			os.Exit(1)
+			return err
 		}
 
 	default:
-		fmt.Printf("Please only use 'get' or 'put', given: %q", os.Args[0])
+		return fmt.Errorf("Please only use 'get' or 'put', given: %q", os.Args[0])
+	}
+
+	return nil
+}
+
+func main() {
+	// We don't want to see the plugin logs.
+	log.SetOutput(ioutil.Discard)
+
+	if err := run(); err != nil {
+		fmt.Printf("error: %+v\n", err)
 		os.Exit(1)
 	}
+
 	os.Exit(0)
 }