complete the CLI for managing mocks

Author: sudorandom

cmd/fauxrpc/cmd_stub.go

@@ -1,24 +1,30 @@
 package main
 
 import (
+	"cmp"
 	"context"
 	"crypto/tls"
+	"encoding/json"
 	"fmt"
+	"log/slog"
 	"net"
 	"net/http"
 	"slices"
+	"strings"
 
 	"connectrpc.com/connect"
 	"github.com/brianvoe/gofakeit/v7"
 	stubsv1 "github.com/sudorandom/fauxrpc/private/proto/gen/stubs/v1"
 	"github.com/sudorandom/fauxrpc/private/proto/gen/stubs/v1/stubsv1connect"
 	"golang.org/x/net/http2"
-	"google.golang.org/protobuf/encoding/protojson"
 )
 
 type StubCmd struct {
-	Add  StubAddCmd  `cmd:"" help:"Adds a new stub response by method or type"`
-	List StubListCmd `cmd:"" help:"List all registered mocks"`
+	Add       StubAddCmd       `cmd:"" help:"Adds a new stub response by method or type"`
+	List      StubListCmd      `cmd:"" help:"List all registered stubs"`
+	Get       StubGetCmd       `cmd:"" help:"Get a registered stub"`
+	Remove    StubRemoveCmd    `cmd:"" help:"Remove a registered stub"`
+	RemoveAll StubRemoveAllCmd `cmd:"" help:"Remove all stubs"`
 }
 
 type StubAddCmd struct {
@@ -32,7 +38,7 @@ func (c *StubAddCmd) Run(globals *Globals) error {
 	client := newStubClient(c.Addr)
 	stubs := []*stubsv1.Stub{}
 	if c.ID == "" {
-		c.ID = gofakeit.LetterN(5)
+		c.ID = gofakeit.AdjectiveDescriptive() + "-" + strings.ReplaceAll(gofakeit.Animal(), " ", "-") + gofakeit.DigitN(3)
 	}
 	stubs = append(stubs, &stubsv1.Stub{
 		Ref: &stubsv1.StubRef{
@@ -42,8 +48,12 @@ func (c *StubAddCmd) Run(globals *Globals) error {
 		Content: &stubsv1.Stub_Json{Json: c.JSON},
 	},
 	)
-	_, err := client.AddStubs(context.Background(), connect.NewRequest(&stubsv1.AddStubsRequest{Stubs: stubs}))
-	return err
+	resp, err := client.AddStubs(context.Background(), connect.NewRequest(&stubsv1.AddStubsRequest{Stubs: stubs}))
+	if err != nil {
+		return err
+	}
+	outputStubs(resp.Msg.GetStubs())
+	return nil
 }
 
 type StubListCmd struct {
@@ -64,31 +74,98 @@ func (c *StubListCmd) Run(globals *Globals) error {
 	}
 
 	for name, ids := range groupedStubs {
-		fmt.Printf("%s (%d)\n", name, len(ids))
+		fmt.Printf("target=%s\n", name)
 		slices.Sort(ids)
+
 		for _, id := range ids {
-			fmt.Printf(" - %s\n", id)
+			fmt.Printf("    id=%s\n", id)
 		}
 	}
 	return err
 }
 
 type StubGetCmd struct {
-	Addr string `short:"a" help:"Address to bind to." default:"http://127.0.0.1:6660"`
+	Addr   string `short:"a" help:"Address to bind to." default:"http://127.0.0.1:6660"`
+	Target string `arg:"" help:"Protobuf method or type" example:"'connectrpc.eliza.v1/Say', 'connectrpc.eliza.v1.IntroduceResponse'"`
+	ID     string `arg:"" help:"ID to give this particular mock response, will be a random string if one isn't given" example:"bad-response"`
 }
 
 func (c *StubGetCmd) Run(globals *Globals) error {
 	client := newStubClient(c.Addr)
-	resp, err := client.ListStubs(context.Background(), connect.NewRequest(&stubsv1.ListStubsRequest{}))
+	resp, err := client.ListStubs(context.Background(), connect.NewRequest(&stubsv1.ListStubsRequest{
+		StubRef: &stubsv1.StubRef{
+			Id:     c.ID,
+			Target: c.Target,
+		},
+	}))
 	if err != nil {
 		return err
 	}
-	jsonBody, err := protojson.MarshalOptions{Indent: "  "}.Marshal(resp.Msg)
+	outputStubs(resp.Msg.GetStubs())
+	return nil
+}
+
+type StubRemoveCmd struct {
+	Addr   string `short:"a" help:"Address to bind to." default:"http://127.0.0.1:6660"`
+	Target string `arg:"" help:"Protobuf method or type" example:"'connectrpc.eliza.v1/Say', 'connectrpc.eliza.v1.IntroduceResponse'"`
+	ID     string `arg:"" help:"ID to give this particular mock response, will be a random string if one isn't given" example:"bad-response"`
+}
+
+func (c *StubRemoveCmd) Run(globals *Globals) error {
+	client := newStubClient(c.Addr)
+	_, err := client.RemoveStubs(context.Background(), connect.NewRequest(&stubsv1.RemoveStubsRequest{
+		StubRefs: []*stubsv1.StubRef{
+			{
+				Id:     c.ID,
+				Target: c.Target,
+			},
+		},
+	}))
 	if err != nil {
 		return err
 	}
-	fmt.Println(string(jsonBody))
-	return err
+	return nil
+}
+
+type StubRemoveAllCmd struct {
+	Addr string `short:"a" help:"Address to bind to." default:"http://127.0.0.1:6660"`
+}
+
+func (c *StubRemoveAllCmd) Run(globals *Globals) error {
+	client := newStubClient(c.Addr)
+	_, err := client.RemoveAllStubs(context.Background(), connect.NewRequest(&stubsv1.RemoveAllStubsRequest{}))
+	if err != nil {
+		return err
+	}
+	return nil
+}
+
+type StubForOutput struct {
+	Ref     *stubsv1.StubRef `json:"ref,omitempty"`
+	Content any              `json:"content,omitempty"`
+}
+
+func outputStubs(stubs []*stubsv1.Stub) {
+	slices.SortFunc(stubs, func(a *stubsv1.Stub, b *stubsv1.Stub) int {
+		return cmp.Compare(a.GetRef().GetId(), b.GetRef().GetId())
+	})
+	for _, stub := range stubs {
+		var v any
+		if err := json.Unmarshal([]byte(stub.GetJson()), &v); err != nil {
+			slog.Error("error marshalling for output", slog.Any("error", err))
+			continue
+		}
+		outputStub := StubForOutput{
+			Ref:     stub.Ref,
+			Content: v,
+		}
+		b, err := json.MarshalIndent(outputStub, "", "  ")
+		if err != nil {
+			slog.Error("error marshalling for output", slog.Any("error", err))
+			continue
+		}
+		fmt.Println(string(b))
+	}
 }
 
 func newStubClient(addr string) stubsv1connect.StubsServiceClient {

private/proto/gen/stubs/v1/stubs_service.pb.go

@@ -15,7 +15,9 @@ message AddStubsRequest {
   repeated stubs.v1.Stub stubs = 1;
 }
 
-message AddStubsResponse {}
+message AddStubsResponse {
+  repeated stubs.v1.Stub stubs = 1;
+}
 
 message RemoveStubsRequest {
   repeated StubRef stub_refs = 1;