fix: address review comments

Author: schthms

core/cmd/hoverfly/main.go

@@ -522,15 +522,6 @@ func main() {
 	hoverfly.Authentication = authBackend
 	hoverfly.HTTP = hv.GetDefaultHoverflyHTTPClient(hoverfly.Cfg.TLSVerification, hoverfly.Cfg.UpstreamProxy)
 
-	if *spy && *captureOnMiss {
-		if err := hoverfly.SetModeWithArguments(v2.ModeView{
-			Mode:      modes.Spy,
-			Arguments: v2.ModeArgumentsView{CaptureOnMiss: true},
-		}); err != nil {
-			log.WithError(err).Fatal("Failed to set spy mode with captureOnMiss")
-		}
-	}
-
 	// if add new user supplied - adding it to database
 	if *addNew || *authEnabled {
 		var err error
@@ -689,6 +680,19 @@ func main() {
 		hoverfly.CacheMatcher.PreloadCache(hoverfly.Simulation)
 	}
 
+	if *captureOnMiss && !*spy {
+		log.Fatal("-capture-on-miss can only be used with -spy mode")
+	}
+
+	if *spy && *captureOnMiss {
+		if err := hoverfly.SetModeWithArguments(v2.ModeView{
+			Mode:      modes.Spy,
+			Arguments: v2.ModeArgumentsView{CaptureOnMiss: true},
+		}); err != nil {
+			log.WithError(err).Fatal("Failed to set spy mode with captureOnMiss")
+		}
+	}
+
 	// start metrics registry flush
 	if *metrics {
 		hoverfly.Counter.Init()

core/modes/spy_mode_test.go

@@ -180,6 +180,8 @@ func Test_SpyMode_OnCacheMiss_WhenCaptureOnMissEnabled_SavesRequestAndResponse(t
 	Expect(stub.savedResponse).ToNot(BeNil())
 	Expect(stub.savedResponse.Status).To(Equal(200))
 	Expect(stub.savedResponse.Body).To(Equal("test"))
+	Expect(stub.savedArguments).ToNot(BeNil())
+	Expect(stub.savedArguments.CaptureOnMiss).To(BeTrue())
 }
 
 func Test_SpyMode_OnCacheMiss_WhenCaptureOnMissDisabled_DoesNotSave(t *testing.T) {

functional-tests/core/ft_modes_test.go

@@ -8,6 +8,7 @@ import (
 	"os"
 	"strings"
 
+	"github.com/SpectoLabs/hoverfly/core/handlers/v2"
 	"github.com/SpectoLabs/hoverfly/functional-tests"
 	"github.com/dghubble/sling"
 	. "github.com/onsi/ginkgo"
@@ -127,6 +128,66 @@ var _ = Describe("Running Hoverfly in various modes", func() {
 				Expect(string(body)).To(Equal("Simulated"))
 			})
 		})
+
+		Context("With capture-on-miss enabled", func() {
+
+			var fakeServer *httptest.Server
+
+			BeforeEach(func() {
+				hoverfly.Start()
+
+				fakeServer = httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+					w.Header().Set("Content-Type", "text/plain")
+					w.Write([]byte("Real response"))
+				}))
+
+				hoverfly.SetModeWithArgs("spy", v2.ModeArgumentsView{CaptureOnMiss: true})
+				hoverfly.ImportSimulation(`{
+				"data": {
+					"pairs": [
+						{
+							"request": {
+								"headers": {
+								  "X-API-TEST": [ { "value": "test", "matcher": "exact" } ]
+								}
+							},
+							"response": {
+								"status": 200,
+								"body": "Simulated"
+							}
+						}
+					]
+				},
+				"meta": { "schemaVersion": "v5" }
+			}`)
+			})
+
+			AfterEach(func() {
+				fakeServer.Close()
+			})
+
+			It("Should save the request/response pair when there is a cache miss", func() {
+				resp := hoverfly.Proxy(sling.New().Get(fakeServer.URL))
+				Expect(resp.StatusCode).To(Equal(http.StatusOK))
+				body, err := ioutil.ReadAll(resp.Body)
+				Expect(err).To(BeNil())
+				Expect(string(body)).To(Equal("Real response"))
+
+				simulation := hoverfly.ExportSimulation()
+				Expect(simulation.RequestResponsePairs).To(HaveLen(2))
+			})
+
+			It("Should not save the request/response pair when there is a cache hit", func() {
+				resp := hoverfly.Proxy(sling.New().Get(fakeServer.URL).Set("X-API-TEST", "test"))
+				Expect(resp.StatusCode).To(Equal(http.StatusOK))
+				body, err := ioutil.ReadAll(resp.Body)
+				Expect(err).To(BeNil())
+				Expect(string(body)).To(Equal("Simulated"))
+
+				simulation := hoverfly.ExportSimulation()
+				Expect(simulation.RequestResponsePairs).To(HaveLen(1))
+			})
+		})
 	})
 
 	Context("When running in synthesise mode", func() {