refactor(cmd): migrate CLI commands from gRPC to ConnectRPC clients

cmd/client.go

@@ -1,63 +1,38 @@
 package cmd
 
 import (
-	"context"
+	"fmt"
+	"net/http"
+	"strings"
 	"time"
 
-	"google.golang.org/grpc/credentials"
-	"google.golang.org/grpc/credentials/insecure"
-
-	frontierv1beta1 "github.com/raystack/frontier/proto/v1beta1"
+	frontierv1beta1connect "github.com/raystack/frontier/proto/v1beta1/frontierv1beta1connect"
 	"github.com/spf13/cobra"
-	"google.golang.org/grpc"
 )
 
-func createConnection(ctx context.Context, host string, caCertFile string) (*grpc.ClientConn, error) {
-	creds := insecure.NewCredentials()
-	if caCertFile != "" {
-		tlsCreds, err := credentials.NewClientTLSFromFile(caCertFile, "")
-		if err != nil {
-			return nil, err
-		}
-		creds = tlsCreds
-	}
-	opts := []grpc.DialOption{
-		grpc.WithTransportCredentials(creds),
-		grpc.WithBlock(),
-	}
-	return grpc.DialContext(ctx, host, opts...)
+var httpClient = &http.Client{
+	Timeout: 30 * time.Second,
 }
 
-func createClient(ctx context.Context, host string) (frontierv1beta1.FrontierServiceClient, func(), error) {
-	dialTimeoutCtx, dialCancel := context.WithTimeout(ctx, time.Second*2)
-	conn, err := createConnection(dialTimeoutCtx, host, "")
-	if err != nil {
-		dialCancel()
-		return nil, nil, err
-	}
-	cancel := func() {
-		dialCancel()
-		conn.Close()
+func createClient(host string) (frontierv1beta1connect.FrontierServiceClient, error) {
+	if host == "" {
+		return nil, ErrClientConfigHostNotFound
 	}
-
-	client := frontierv1beta1.NewFrontierServiceClient(conn)
-	return client, cancel, nil
+	return frontierv1beta1connect.NewFrontierServiceClient(httpClient, ensureHTTPScheme(host)), nil
 }
 
-func createAdminClient(ctx context.Context, host string) (frontierv1beta1.AdminServiceClient, func(), error) {
-	dialTimeoutCtx, dialCancel := context.WithTimeout(ctx, time.Second*2)
-	conn, err := createConnection(dialTimeoutCtx, host, "")
-	if err != nil {
-		dialCancel()
-		return nil, nil, err
-	}
-	cancel := func() {
-		dialCancel()
-		conn.Close()
+func createAdminClient(host string) (frontierv1beta1connect.AdminServiceClient, error) {
+	if host == "" {
+		return nil, ErrClientConfigHostNotFound
 	}
+	return frontierv1beta1connect.NewAdminServiceClient(httpClient, ensureHTTPScheme(host)), nil
+}
 
-	client := frontierv1beta1.NewAdminServiceClient(conn)
-	return client, cancel, nil
+func ensureHTTPScheme(host string) string {
+	if strings.HasPrefix(host, "http://") || strings.HasPrefix(host, "https://") {
+		return host
+	}
+	return fmt.Sprintf("https://%s", host)
 }
 
 func isClientCLI(cmd *cobra.Command) bool {

cmd/context.go

@@ -1,19 +1,30 @@
 package cmd
 
 import (
-	"context"
+	"fmt"
 	"strings"
 
-	"google.golang.org/grpc/metadata"
+	"connectrpc.com/connect"
 )
 
-func setCtxHeader(ctx context.Context, header string) context.Context {
-	s := strings.Split(header, ":")
-	key := s[0]
-	val := s[1]
-
-	md := metadata.New(map[string]string{key: val})
-	ctx = metadata.NewOutgoingContext(ctx, md)
+// newRequest creates a connect.Request and sets a header from a "key:value" string.
+func newRequest[T any](msg *T, header string) (*connect.Request[T], error) {
+	req := connect.NewRequest(msg)
+	if header != "" {
+		k, v, err := parseHeader(header)
+		if err != nil {
+			return nil, err
+		}
+		req.Header().Set(k, v)
+	}
+	return req, nil
+}
 
-	return ctx
+// parseHeader splits a "key:value" header string into key and value.
+func parseHeader(header string) (string, string, error) {
+	parts := strings.SplitN(header, ":", 2)
+	if len(parts) != 2 {
+		return "", "", fmt.Errorf("invalid header format %q: expected key:value", header)
+	}
+	return parts[0], parts[1], nil
 }

cmd/group.go

@@ -4,6 +4,7 @@ import (
 	"fmt"
 	"os"
 
+	"connectrpc.com/connect"
 	"github.com/MakeNowJust/heredoc"
 	"github.com/raystack/frontier/pkg/file"
 	frontierv1beta1 "github.com/raystack/frontier/proto/v1beta1"
@@ -68,21 +69,24 @@ func createGroupCommand(cliConfig *Config) *cli.Command {
 				return err
 			}
 
-			client, cancel, err := createClient(cmd.Context(), cliConfig.Host)
+			client, err := createClient(cliConfig.Host)
 			if err != nil {
 				return err
 			}
-			defer cancel()
 
-			res, err := client.CreateGroup(setCtxHeader(cmd.Context(), header), &frontierv1beta1.CreateGroupRequest{
+			req, err := newRequest(&frontierv1beta1.CreateGroupRequest{
 				Body: &reqBody,
-			})
+			}, header)
+			if err != nil {
+				return err
+			}
+			res, err := client.CreateGroup(cmd.Context(), req)
 			if err != nil {
 				return err
 			}
 
 			spinner.Stop()
-			fmt.Printf("successfully created group %s with id %s\n", res.GetGroup().GetName(), res.GetGroup().GetId())
+			fmt.Printf("successfully created group %s with id %s\n", res.Msg.GetGroup().GetName(), res.Msg.GetGroup().GetId())
 			return nil
 		},
 	}
@@ -122,17 +126,16 @@ func editGroupCommand(cliConfig *Config) *cli.Command {
 				return err
 			}
 
-			client, cancel, err := createClient(cmd.Context(), cliConfig.Host)
+			client, err := createClient(cliConfig.Host)
 			if err != nil {
 				return err
 			}
-			defer cancel()
 
 			groupID := args[0]
-			_, err = client.UpdateGroup(cmd.Context(), &frontierv1beta1.UpdateGroupRequest{
+			_, err = client.UpdateGroup(cmd.Context(), connect.NewRequest(&frontierv1beta1.UpdateGroupRequest{
 				Id:   groupID,
 				Body: &reqBody,
-			})
+			}))
 			if err != nil {
 				return err
 			}
@@ -166,25 +169,24 @@ func viewGroupCommand(cliConfig *Config) *cli.Command {
 			spinner := printer.Spin("")
 			defer spinner.Stop()
 
-			client, cancel, err := createClient(cmd.Context(), cliConfig.Host)
+			client, err := createClient(cliConfig.Host)
 			if err != nil {
 				return err
 			}
-			defer cancel()
 
 			orgID := args[0]
 			groupID := args[1]
-			res, err := client.GetGroup(cmd.Context(), &frontierv1beta1.GetGroupRequest{
+			res, err := client.GetGroup(cmd.Context(), connect.NewRequest(&frontierv1beta1.GetGroupRequest{
 				Id:    groupID,
 				OrgId: orgID,
-			})
+			}))
 			if err != nil {
 				return err
 			}
 
 			report := [][]string{}
 
-			group := res.GetGroup()
+			group := res.Msg.GetGroup()
 
 			spinner.Stop()
 
@@ -237,21 +239,20 @@ func listGroupCommand(cliConfig *Config) *cli.Command {
 			spinner := printer.Spin("")
 			defer spinner.Stop()
 
-			client, cancel, err := createClient(cmd.Context(), cliConfig.Host)
+			client, err := createClient(cliConfig.Host)
 			if err != nil {
 				return err
 			}
-			defer cancel()
 
-			res, err := client.ListOrganizationGroups(cmd.Context(), &frontierv1beta1.ListOrganizationGroupsRequest{
+			res, err := client.ListOrganizationGroups(cmd.Context(), connect.NewRequest(&frontierv1beta1.ListOrganizationGroupsRequest{
 				OrgId: args[0],
-			})
+			}))
 			if err != nil {
 				return err
 			}
 
 			report := [][]string{}
-			groups := res.GetGroups()
+			groups := res.Msg.GetGroups()
 
 			spinner.Stop()
 

cmd/group_test.go

@@ -2,7 +2,6 @@ package cmd_test
 
 import (
 	"bytes"
-	"context"
 	"errors"
 	"testing"
 
@@ -21,6 +20,7 @@ func TestClientGroup(t *testing.T) {
 			subCommands []string
 			want        string
 			err         error
+			wantErr     bool
 		}{
 			{
 				name:        "`group` list only should throw error host not found",
@@ -29,10 +29,10 @@ func TestClientGroup(t *testing.T) {
 				err:         cmd.ErrClientConfigHostNotFound,
 			},
 			{
-				name:        "`group` list with host flag should pass",
+				name:        "`group` list with host flag should return error",
 				want:        "",
 				subCommands: []string{"list", orgID, "-h", "test"},
-				err:         context.DeadlineExceeded,
+				wantErr:     true,
 			},
 			{
 				name:        "`group` create only should throw error host not found",
@@ -65,10 +65,10 @@ func TestClientGroup(t *testing.T) {
 				err:         cmd.ErrClientConfigHostNotFound,
 			},
 			{
-				name:        "`group` view with host flag should pass",
+				name:        "`group` view with host flag should return error",
 				want:        "",
 				subCommands: []string{"view", orgID, "123", "-h", "test"},
-				err:         context.DeadlineExceeded,
+				wantErr:     true,
 			},
 		}
 		for _, tt := range tests {
@@ -84,7 +84,11 @@ func TestClientGroup(t *testing.T) {
 				err := cli.Execute()
 				got := buf.String()
 
-				assert.Equal(t, tt.err, err)
+				if tt.wantErr {
+					assert.Error(t, err)
+				} else {
+					assert.Equal(t, tt.err, err)
+				}
 				assert.Equal(t, tt.want, got)
 			})
 		}

cmd/namespace.go

@@ -4,6 +4,7 @@ import (
 	"fmt"
 	"os"
 
+	"connectrpc.com/connect"
 	"github.com/MakeNowJust/heredoc"
 	frontierv1beta1 "github.com/raystack/frontier/proto/v1beta1"
 	"github.com/raystack/salt/cli/printer"
@@ -51,23 +52,22 @@ func viewNamespaceCommand(cliConfig *Config) *cli.Command {
 			spinner := printer.Spin("")
 			defer spinner.Stop()
 
-			client, cancel, err := createClient(cmd.Context(), cliConfig.Host)
+			client, err := createClient(cliConfig.Host)
 			if err != nil {
 				return err
 			}
-			defer cancel()
 
 			namespaceID := args[0]
-			res, err := client.GetNamespace(cmd.Context(), &frontierv1beta1.GetNamespaceRequest{
+			res, err := client.GetNamespace(cmd.Context(), connect.NewRequest(&frontierv1beta1.GetNamespaceRequest{
 				Id: namespaceID,
-			})
+			}))
 			if err != nil {
 				return err
 			}
 
 			report := [][]string{}
 
-			namespace := res.GetNamespace()
+			namespace := res.Msg.GetNamespace()
 
 			spinner.Stop()
 
@@ -80,8 +80,6 @@ func viewNamespaceCommand(cliConfig *Config) *cli.Command {
 			})
 			printer.Table(os.Stdout, report)
 
-			spinner.Stop()
-
 			return nil
 		},
 	}
@@ -104,19 +102,18 @@ func listNamespaceCommand(cliConfig *Config) *cli.Command {
 			spinner := printer.Spin("")
 			defer spinner.Stop()
 
-			client, cancel, err := createClient(cmd.Context(), cliConfig.Host)
+			client, err := createClient(cliConfig.Host)
 			if err != nil {
 				return err
 			}
-			defer cancel()
 
-			res, err := client.ListNamespaces(cmd.Context(), &frontierv1beta1.ListNamespacesRequest{})
+			res, err := client.ListNamespaces(cmd.Context(), connect.NewRequest(&frontierv1beta1.ListNamespacesRequest{}))
 			if err != nil {
 				return err
 			}
 
 			report := [][]string{}
-			namespaces := res.GetNamespaces()
+			namespaces := res.Msg.GetNamespaces()
 
 			spinner.Stop()