Additional details in simulator output

cmd/falco/help.go

@@ -98,6 +98,7 @@ Flags:
     -h, --help         : Show this help
     -r, --remote       : Connect with Fastly API
     -request           : Simulate request config
+    -body              : Output response body
     -debug             : Enable debug mode
     --max_backends     : Override max backends limitation
     --max_acls         : Override max acls limitation

cmd/falco/runner.go

@@ -428,6 +428,7 @@ func (r *Runner) Simulate(rslv resolver.Resolver) error {
 		icontext.WithResolver(rslv),
 		icontext.WithMaxBackends(r.config.OverrideMaxBackends),
 		icontext.WithMaxAcls(r.config.OverrideMaxAcls),
+		icontext.WithOutputResponseBody(r.config.Simulator.OutputResponseBody),
 	}
 	if r.snippets != nil {
 		options = append(options, icontext.WithSnippets(r.snippets))

config/config.go

@@ -33,7 +33,8 @@ type SimulatorConfig struct {
 	IncludePaths []string // Copy from root field
 
 	// Override Request configuration
-	OverrideRequest *RequestConfig
+	OverrideRequest    *RequestConfig
+	OutputResponseBody bool `cli:"body" yaml:"output_response_body"`
 }
 
 // Testing configuration
@@ -52,7 +53,7 @@ type Config struct {
 	IncludePaths []string `cli:"I,include_path" yaml:"include_paths"`
 	Transforms   []string `cli:"t,transformer" yaml:"transformers"`
 	Help         bool     `cli:"h,help"`
-	Version      bool     `cli:"V"`
+	Version      bool     `cli:"V,version"`
 	Remote       bool     `cli:"r,remote" yaml:"remote"`
 	Json         bool     `cli:"json"`
 	Request      string   `cli:"request"`

interpreter/context/context.go

@@ -55,6 +55,7 @@ type Context struct {
 	Gotos               map[string]*ast.GotoStatement
 	SubroutineFunctions map[string]*ast.SubroutineDeclaration
 	OriginalHost        string
+	OutputResponseBody  bool
 
 	OverrideMaxBackends int
 	OverrideMaxAcls     int

interpreter/context/option.go

@@ -49,3 +49,9 @@ func WithOverrideHost(host string) Option {
 		c.OriginalHost = host
 	}
 }
+
+func WithOutputResponseBody(o bool) Option {
+	return func(c *Context) {
+		c.OutputResponseBody = o
+	}
+}

interpreter/interpreter.go

@@ -131,7 +131,7 @@ func (i *Interpreter) ProcessInit(r *http.Request) error {
 		i.ctx.OriginalHost = r.Host
 	}
 
-	i.process = process.New()
+	i.process = process.New(i.ctx.OutputResponseBody)
 	i.ctx.Scope = context.InitScope
 	i.vars = variable.NewAllScopeVariables(i.ctx)
 

interpreter/process/flow.go

@@ -12,6 +12,7 @@ type Flow struct {
 	Line            int       `json:"line"`
 	Position        int       `json:"position"`
 	Subroutine      string    `json:"subroutine"`
+	Backend         string    `json:"backend,omitempty"`
 	Request         *HttpFlow `json:"req,omitempty"`
 	BackendRequest  *HttpFlow `json:"bereq,omitempty"`
 	BackendResponse *HttpFlow `json:"beresp,omitempty"`
@@ -29,6 +30,9 @@ func NewFlow(ctx *icontext.Context, sub *ast.SubroutineDeclaration) *Flow {
 		Position:   token.Position,
 		Subroutine: sub.Name.Value,
 	}
+	if ctx.Backend != nil {
+		f.Backend = ctx.Backend.String()
+	}
 	if ctx.Request != nil {
 		f.Request = newFlowRequest(ctx.Request.Clone(c))
 	}

interpreter/process/process.go

@@ -12,6 +12,8 @@ import (
 )
 
 type Process struct {
+	includeBody bool
+
 	Flows     []*Flow
 	Logs      []*Log
 	Restarts  int
@@ -22,11 +24,12 @@ type Process struct {
 	Response  *http.Response
 }
 
-func New() *Process {
+func New(includeBody bool) *Process {
 	return &Process{
-		Flows:     []*Flow{},
-		Logs:      []*Log{},
-		StartTime: time.Now().UnixMicro(),
+		Flows:       []*Flow{},
+		Logs:        []*Log{},
+		StartTime:   time.Now().UnixMicro(),
+		includeBody: includeBody,
 	}
 }
 
@@ -56,6 +59,11 @@ func (p *Process) Finalize(resp *http.Response) ([]byte, error) {
 		}
 	}
 
+	var body string
+	if p.includeBody {
+		body = buf.String()
+	}
+
 	return json.MarshalIndent(struct {
 		Flows          []*Flow `json:"flows"`
 		Logs           []*Log  `json:"logs"`
@@ -68,6 +76,7 @@ func (p *Process) Finalize(resp *http.Response) ([]byte, error) {
 		ClientResponse struct {
 			StatusCode    int               `json:"status_code"`
 			ResponseBytes int               `json:"body_bytes"`
+			ResponseBody  string            `json:"body,omitempty"`
 			Headers       map[string]string `json:"headers"`
 		} `json:"client_response"`
 	}{
@@ -82,10 +91,12 @@ func (p *Process) Finalize(resp *http.Response) ([]byte, error) {
 		ClientResponse: struct {
 			StatusCode    int               `json:"status_code"`
 			ResponseBytes int               `json:"body_bytes"`
+			ResponseBody  string            `json:"body,omitempty"`
 			Headers       map[string]string `json:"headers"`
 		}{
 			StatusCode:    statusCode,
 			ResponseBytes: len(buf.Bytes()),
+			ResponseBody:  body,
 			Headers:       headers,
 		},
 	}, "", "  ")