Shower

Signed-off-by: Pierre Fenoll <[email protected]>
FuzzyMonkeyCo · Aug 18, 2023 · 781d716 · 781d716
1 parent 339f4e5
commit 781d716
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 15 deletions.
diff --git a/pkg/modeler/interface.go b/pkg/modeler/interface.go
@@ -9,6 +9,7 @@ import (
 	"google.golang.org/protobuf/types/known/structpb"
 
 	"github.com/FuzzyMonkeyCo/monkey/pkg/internal/fm"
+	"github.com/FuzzyMonkeyCo/monkey/pkg/progresser"
 )
 
 var (
@@ -44,8 +45,5 @@ type Interface interface { // TODO models.Modeler
 	Validate(uint32, *structpb.Value) []string
 
 	// NewCaller is called before making each call
-	NewCaller(ctx context.Context, call *fm.Srv_Call, showf ShowFunc) Caller // FIXME: use Shower iface?
+	NewCaller(ctx context.Context, call *fm.Srv_Call, shower progresser.Shower) Caller
 }
-
-// ShowFunc can be used to display informational messages to the tester
-type ShowFunc func(string, ...interface{})
diff --git a/pkg/modeler/openapiv3/caller_http.go b/pkg/modeler/openapiv3/caller_http.go
@@ -20,6 +20,7 @@ import (
 
 	"github.com/FuzzyMonkeyCo/monkey/pkg/internal/fm"
 	"github.com/FuzzyMonkeyCo/monkey/pkg/modeler"
+	"github.com/FuzzyMonkeyCo/monkey/pkg/progresser"
 	"github.com/FuzzyMonkeyCo/monkey/pkg/runtime/ctxvalues"
 )
 
@@ -37,7 +38,7 @@ var (
 )
 
 type tCapHTTP struct {
-	showf               modeler.ShowFunc
+	shower              progresser.Shower
 	buildHTTPRequestErr error
 	doErr               error
 
@@ -83,9 +84,9 @@ type tCapHTTP struct {
 }
 
 // NewCaller creates a single-use modeler.Caller from a modeler.Interface instance.
-func (m *oa3) NewCaller(ctx context.Context, msg *fm.Srv_Call, showf modeler.ShowFunc) modeler.Caller {
+func (m *oa3) NewCaller(ctx context.Context, msg *fm.Srv_Call, shower progresser.Shower) modeler.Caller {
 	m.tcap = &tCapHTTP{
-		showf:    showf,
+		shower:   shower,
 		endpoint: m.vald.Spec.Endpoints[msg.GetEID()].GetJson(),
 	}
 	m.tcap.httpReq, m.tcap.buildHTTPRequestErr = m.buildHTTPRequest(ctx, msg)
@@ -230,7 +231,7 @@ func (c *tCapHTTP) Do(ctx context.Context) {
 		req = []byte(err.Error())
 	}
 	for _, line := range bytes.Split(req, br) {
-		c.showf("> %s", line)
+		c.shower.Printf("> %s\n", line)
 		break
 	}
 
@@ -246,7 +247,7 @@ func (c *tCapHTTP) Do(ctx context.Context) {
 		}
 	}
 	for _, line := range bytes.Split(rep, br) {
-		c.showf("< %s", line)
+		c.shower.Printf("< %s\n", line)
 		break
 	}
 	return

diff --git a/pkg/progresser/interface.go b/pkg/progresser/interface.go
@@ -10,7 +10,7 @@ type Shower interface {
 	Printf(string, ...interface{})
 	// Errorf formats error messages
 	Errorf(string, ...interface{})
-} //FIXME: move ShowFunc here?
+}
 
 // Interface displays calls, resets and checks progression
 type Interface interface {

diff --git a/pkg/runtime/call.go b/pkg/runtime/call.go
@@ -18,13 +18,9 @@ import (
 )
 
 func (rt *Runtime) call(ctx context.Context, msg *fm.Srv_Call, tagsFilter *tags.Filter, maxSteps uint64, maxDuration time.Duration) error {
-	showf := func(format string, s ...interface{}) {
-		rt.progress.Printf(format, s...)
-	}
-
 	log.Printf("[NFO] raw input: %.999v", msg.GetInput())
 	mdl := rt.models[msg.GetModelName()]
-	cllr := mdl.NewCaller(ctx, msg, showf)
+	cllr := mdl.NewCaller(ctx, msg, rt.progress)
 
 	input := cllr.RequestProto()
 	log.Printf("[NFO] call input: %.999v", input)