Merge pull request #187 from SpectoLabs/develop

Next release

Author: mogronalol

.drone.yml

@@ -40,3 +40,4 @@ static/dist
 # IntelliJ
 .idea
 *.iml
+requests.db

.gitignore

@@ -603,7 +603,7 @@ func (d *Hoverfly) StateHandler(w http.ResponseWriter, r *http.Request, next htt
 	}
 
 	availableModes := map[string]bool{
-		"virtualize": true,
+		"simulate": true,
 		"capture":    true,
 		"modify":     true,
 		"synthesize": true,
@@ -614,7 +614,7 @@ func (d *Hoverfly) StateHandler(w http.ResponseWriter, r *http.Request, next htt
 			log.WithFields(log.Fields{
 				"suppliedMode": sr.Mode,
 			}).Error("Wrong mode found, can't change state")
-			http.Error(w, "Bad mode supplied, available modes: virtualize, capture, modify, synthesize.", 400)
+			http.Error(w, "Bad mode supplied, available modes: simulate, capture, modify, synthesize.", 400)
 			return
 		}
 		log.WithFields(log.Fields{

admin.go

@@ -217,7 +217,7 @@ func TestGetState(t *testing.T) {
 	m := getBoneRouter(*dbClient)
 
 	// setting initial mode
-	dbClient.Cfg.SetMode(VirtualizeMode)
+	dbClient.Cfg.SetMode(SimulateMode)
 
 	req, err := http.NewRequest("GET", "/api/state", nil)
 	testutil.Expect(t, err, nil)
@@ -232,10 +232,10 @@ func TestGetState(t *testing.T) {
 	sr := stateRequest{}
 	err = json.Unmarshal(body, &sr)
 
-	testutil.Expect(t, sr.Mode, VirtualizeMode)
+	testutil.Expect(t, sr.Mode, SimulateMode)
 }
 
-func TestSetVirtualizeState(t *testing.T) {
+func TestSetSimulateState(t *testing.T) {
 	server, dbClient := testTools(200, `{'message': 'here'}`)
 	defer server.Close()
 	defer dbClient.RequestCache.DeleteData()
@@ -246,7 +246,7 @@ func TestSetVirtualizeState(t *testing.T) {
 
 	// preparing to set mode through rest api
 	var resp stateRequest
-	resp.Mode = VirtualizeMode
+	resp.Mode = SimulateMode
 
 	bts, err := json.Marshal(&resp)
 	testutil.Expect(t, err, nil)
@@ -261,7 +261,7 @@ func TestSetVirtualizeState(t *testing.T) {
 	testutil.Expect(t, rec.Code, http.StatusOK)
 
 	// checking mode
-	testutil.Expect(t, dbClient.Cfg.GetMode(), VirtualizeMode)
+	testutil.Expect(t, dbClient.Cfg.GetMode(), SimulateMode)
 }
 
 func TestSetCaptureState(t *testing.T) {
@@ -270,8 +270,8 @@ func TestSetCaptureState(t *testing.T) {
 	defer dbClient.RequestCache.DeleteData()
 	m := getBoneRouter(*dbClient)
 
-	// setting mode to virtualize
-	dbClient.Cfg.SetMode(VirtualizeMode)
+	// setting mode to simulate
+	dbClient.Cfg.SetMode(SimulateMode)
 
 	// preparing to set mode through rest api
 	var resp stateRequest
@@ -299,8 +299,8 @@ func TestSetModifyState(t *testing.T) {
 	defer dbClient.RequestCache.DeleteData()
 	m := getBoneRouter(*dbClient)
 
-	// setting mode to virtualize
-	dbClient.Cfg.SetMode(VirtualizeMode)
+	// setting mode to simulate
+	dbClient.Cfg.SetMode(SimulateMode)
 
 	// preparing to set mode through rest api
 	var resp stateRequest
@@ -328,8 +328,8 @@ func TestSetSynthesizeState(t *testing.T) {
 	defer dbClient.RequestCache.DeleteData()
 	m := getBoneRouter(*dbClient)
 
-	// setting mode to virtualize
-	dbClient.Cfg.SetMode(VirtualizeMode)
+	// setting mode to simulate
+	dbClient.Cfg.SetMode(SimulateMode)
 
 	// preparing to set mode through rest api
 	var resp stateRequest
@@ -357,8 +357,8 @@ func TestSetRandomState(t *testing.T) {
 	defer dbClient.RequestCache.DeleteData()
 	m := getBoneRouter(*dbClient)
 
-	// setting mode to virtualize
-	dbClient.Cfg.SetMode(VirtualizeMode)
+	// setting mode to simulate
+	dbClient.Cfg.SetMode(SimulateMode)
 
 	// preparing to set mode through rest api
 	var resp stateRequest
@@ -377,7 +377,7 @@ func TestSetRandomState(t *testing.T) {
 	testutil.Expect(t, rec.Code, http.StatusBadRequest)
 
 	// checking mode, should not have changed
-	testutil.Expect(t, dbClient.Cfg.GetMode(), VirtualizeMode)
+	testutil.Expect(t, dbClient.Cfg.GetMode(), SimulateMode)
 }
 
 func TestSetNoBody(t *testing.T) {
@@ -386,8 +386,8 @@ func TestSetNoBody(t *testing.T) {
 	defer dbClient.RequestCache.DeleteData()
 	m := getBoneRouter(*dbClient)
 
-	// setting mode to virtualize
-	dbClient.Cfg.SetMode(VirtualizeMode)
+	// setting mode to simulate
+	dbClient.Cfg.SetMode(SimulateMode)
 
 	// setting state
 	req, err := http.NewRequest("POST", "/api/state", nil)
@@ -399,7 +399,7 @@ func TestSetNoBody(t *testing.T) {
 	testutil.Expect(t, rec.Code, http.StatusBadRequest)
 
 	// checking mode, should not have changed
-	testutil.Expect(t, dbClient.Cfg.GetMode(), VirtualizeMode)
+	testutil.Expect(t, dbClient.Cfg.GetMode(), SimulateMode)
 }
 
 func TestStatsHandler(t *testing.T) {
@@ -419,15 +419,15 @@ func TestStatsHandler(t *testing.T) {
 	testutil.Expect(t, rec.Code, http.StatusOK)
 }
 
-func TestStatsHandlerVirtualizeMetrics(t *testing.T) {
-	// test metrics, increases virtualize count by 1 and then checks through stats
+func TestStatsHandlerSimulateMetrics(t *testing.T) {
+	// test metrics, increases simulate count by 1 and then checks through stats
 	// handler whether it is visible through /stats handler
 	server, dbClient := testTools(200, `{'message': 'here'}`)
 	defer server.Close()
 	defer dbClient.RequestCache.DeleteData()
 	m := getBoneRouter(*dbClient)
 
-	dbClient.Counter.Counters[VirtualizeMode].Inc(1)
+	dbClient.Counter.Counters[SimulateMode].Inc(1)
 
 	req, err := http.NewRequest("GET", "/api/stats", nil)
 
@@ -443,7 +443,7 @@ func TestStatsHandlerVirtualizeMetrics(t *testing.T) {
 	sr := statsResponse{}
 	err = json.Unmarshal(body, &sr)
 
-	testutil.Expect(t, int(sr.Stats.Counters[VirtualizeMode]), 1)
+	testutil.Expect(t, int(sr.Stats.Counters[SimulateMode]), 1)
 }
 
 func TestStatsHandlerCaptureMetrics(t *testing.T) {

admin_test.go

@@ -69,7 +69,7 @@ var (
 	addUser      = flag.String("username", "", "username for new user")
 	addPassword  = flag.String("password", "", "password for new user")
 	isAdmin      = flag.Bool("admin", true, "supply '-admin false' to make this non admin user (defaults to 'true') ")
-	authDisabled = flag.Bool("no-auth", false, "disabled authentication, currently it is enabled by default")
+	authEnabled = flag.Bool("auth", false, "enable authentication, currently it is disabled by default")
 
 	generateCA = flag.Bool("generate-ca-cert", false, "generate CA certificate and private key for MITM")
 	certName   = flag.String("cert-name", "hoverfly.proxy", "cert name")
@@ -79,7 +79,7 @@ var (
 
 	tlsVerification = flag.Bool("tls-verification", true, "turn on/off tls verification for outgoing requests (will not try to verify certificates) - defaults to true")
 
-	databasePath = flag.String("db-dir", "", "database location - supply it if you want to provide specific to database (will be created there if it doesn't exist)")
+	databasePath = flag.String("db-path", "", "database location - supply it to provide specific database location (will be created there if it doesn't exist)")
 	database     = flag.String("db", "boltdb", "Persistance storage to use - 'boltdb' or 'memory' which will not write anything to disk")
 )
 
@@ -198,7 +198,7 @@ func main() {
 	cfg.Middleware = *middleware
 
 	// setting default mode
-	mode := hv.VirtualizeMode
+	mode := hv.SimulateMode
 
 	if *capture {
 		mode = hv.CaptureMode
@@ -232,8 +232,8 @@ func main() {
 	cfg.SetMode(mode)
 
 	// disabling authentication if no-auth for auth disabled env variable
-	if !cfg.AuthEnabled || *authDisabled {
-		cfg.AuthEnabled = false
+	if (*authEnabled) {
+		cfg.AuthEnabled = true
 	}
 
 	// disabling tls verification if flag or env variable is set to 'false' (defaults to true)
@@ -319,6 +319,20 @@ func main() {
 		}
 	}
 
+	// importing records if environment variable is set
+	ev := os.Getenv(hv.HoverflyImportRecordsEV)
+	if ev != "" {
+		err := hoverfly.Import(ev)
+		if err != nil {
+			log.WithFields(log.Fields{
+				"error":  err.Error(),
+				"import": ev,
+			}).Fatal("Environment variable for importing was set but failed to import this resource")
+		} else {
+			err = hoverfly.MetadataCache.Set([]byte("import_from_env_variable"), []byte(ev))
+		}
+	}
+
 	// importing stuff
 	if len(importFlags) > 0 {
 		for i, v := range importFlags {

cmd/hoverfly/main.go

@@ -1,6 +1,6 @@
 # Readthedocs client
 
 This small Python script can query readthedocs API for 50 (you can change that) projects and then query them all.
-The main purpose is to showcase hoverfly and how it can capture and then virtualize HTTP(s) traffic.
+The main purpose is to showcase hoverfly and how it can capture and then simulate HTTP(s) traffic.
 
 More information can be found in this blog post: https://www.specto.io/speeding-up-your-slow-dependencies/

examples/clients/readthedocs_query/README.md

@@ -19,8 +19,8 @@ import (
 	"regexp"
 )
 
-// VirtualizeMode - default mode when Hoverfly looks for captured requests to respond
-const VirtualizeMode = "virtualize"
+// SimulateMode - default mode when Hoverfly looks for captured requests to respond
+const SimulateMode = "simulate"
 
 // SynthesizeMode - all requests are sent to middleware to create response
 const SynthesizeMode = "synthesize"
@@ -50,7 +50,7 @@ func GetNewHoverfly(cfg *Configuration, requestCache, metadataCache cache.Cache,
 			TLSClientConfig: &tls.Config{InsecureSkipVerify: cfg.TLSVerification},
 		}},
 		Cfg:     cfg,
-		Counter: metrics.NewModeCounter([]string{VirtualizeMode, SynthesizeMode, ModifyMode, CaptureMode}),
+		Counter: metrics.NewModeCounter([]string{SimulateMode, SynthesizeMode, ModifyMode, CaptureMode}),
 		Hooks:   make(ActionTypeHooks),
 		MIN:     GetNewMinifiers(),
 	}

hoverfly.go

@@ -63,7 +63,7 @@ func TestProcessCaptureRequest(t *testing.T) {
 	testutil.Expect(t, resp.StatusCode, 201)
 }
 
-func TestProcessVirtualizeRequest(t *testing.T) {
+func TestProcessSimulateRequest(t *testing.T) {
 	server, dbClient := testTools(201, `{'message': 'here'}`)
 	defer server.Close()
 	defer dbClient.RequestCache.DeleteData()
@@ -80,7 +80,7 @@ func TestProcessVirtualizeRequest(t *testing.T) {
 	testutil.Expect(t, resp.StatusCode, 201)
 
 	// virtualizing
-	dbClient.Cfg.SetMode(VirtualizeMode)
+	dbClient.Cfg.SetMode(SimulateMode)
 	newReq, newResp := dbClient.processRequest(r)
 
 	testutil.Refute(t, newReq, nil)

hoverfly_test.go

@@ -4,7 +4,7 @@ import (
 	"testing"
 )
 
-func TestVirtualizeInc(t *testing.T) {
+func TestSimulateInc(t *testing.T) {
 	counter := NewModeCounter([]string{"name"})
 
 	counter.Count("name")

metrics/metrics_test.go

@@ -536,7 +536,7 @@ func (d *Hoverfly) getResponse(req *http.Request) *http.Response {
 				"value": string(payloadBts),
 				"key":   key,
 			}).Error("Failed to decode payload")
-			return hoverflyError(req, err, "Failed to virtualize", http.StatusInternalServerError)
+			return hoverflyError(req, err, "Failed to simulate", http.StatusInternalServerError)
 		}
 
 		c := NewConstructor(req, *payload)
@@ -549,7 +549,7 @@ func (d *Hoverfly) getResponse(req *http.Request) *http.Response {
 
 		log.WithFields(log.Fields{
 			"key":         key,
-			"mode":        VirtualizeMode,
+			"mode":        SimulateMode,
 			"middleware":  d.Cfg.Middleware,
 			"path":        req.URL.Path,
 			"rawQuery":    req.URL.RawQuery,