Run go fmt

tommysitu · tommysitu · commit dbab8031d146 · 2025-11-12T22:10:38.000Z
diff --git a/core/authentication/jwt_backend.go b/core/authentication/jwt_backend.go
@@ -22,7 +22,7 @@ const (
 	expireOffset = 3600
 )
 
-//Token - container for jwt.Token for encoding
+// Token - container for jwt.Token for encoding
 type Token struct {
 	Token *jwt.Token
 }
diff --git a/core/cmd/hoverfly/main.go b/core/cmd/hoverfly/main.go
@@ -446,7 +446,6 @@ func main() {
 		cfg.Destination = *destination
 	}
 
-
 	if len(responseBodyFilesPath) > 0 {
 		// Ensure file path is absolute and exists in the file system
 		if !filepath.IsAbs(responseBodyFilesPath) {
@@ -463,8 +462,6 @@ func main() {
 		cfg.ResponsesBodyFilesPath = absBasePath
 	}
 
-
-
 	for _, allowedOrigin := range responseBodyFilesAllowedOriginFlags {
 		if !util.IsURL(allowedOrigin) {
 			log.WithFields(log.Fields{"origin": allowedOrigin}).Fatal("Origin is not a valid url")
diff --git a/core/hoverfly_service_test.go b/core/hoverfly_service_test.go
@@ -1525,11 +1525,11 @@ func TestHoverfly_SetMultipleTemplateDataSource(t *testing.T) {
 
 	Expect(unit.templator.TemplateHelper.TemplateDataSource.GetAllDataSources()).ToNot(BeNil())
 
-	csv1, exists1:= unit.templator.TemplateHelper.TemplateDataSource.GetDataSource("test-csv1")
+	csv1, exists1 := unit.templator.TemplateHelper.TemplateDataSource.GetDataSource("test-csv1")
 	Expect(csv1).NotTo(BeNil())
 	Expect(exists1).To(BeTrue())
 
-	csv2, exists2:= unit.templator.TemplateHelper.TemplateDataSource.GetDataSource("test-csv2")
+	csv2, exists2 := unit.templator.TemplateHelper.TemplateDataSource.GetDataSource("test-csv2")
 	Expect(csv2).NotTo(BeNil())
 	Expect(exists2).To(BeTrue())
 
diff --git a/core/journal/journal_test.go b/core/journal/journal_test.go
@@ -82,7 +82,7 @@ func Test_Journal_NewEntryWithMemoryLimit_TruncateBody(t *testing.T) {
 	unit := journal.NewJournal()
 	unit.BodySizeLimit = 15
 
-	request, _ := http.NewRequest("GET", "http://hoverfly.io", io.NopCloser(bytes.NewBufferString("large request body")),)
+	request, _ := http.NewRequest("GET", "http://hoverfly.io", io.NopCloser(bytes.NewBufferString("large request body")))
 
 	nowTime := time.Now()
 
@@ -112,7 +112,6 @@ func Test_Journal_NewEntryWithMemoryLimit_TruncateBody(t *testing.T) {
 	Expect(entries[0].Response.Body).To(Equal("large respon..."))
 }
 
-
 func Test_Journal_UpdateEntry_AddsRemotePostServeActionToJournalEntry(t *testing.T) {
 	RegisterTestingT(t)
 
diff --git a/core/matching/header_matcher_test.go b/core/matching/header_matcher_test.go
@@ -178,7 +178,6 @@ func Test_HeaderMatching(t *testing.T) {
 
 }
 
-
 func Test_HeaderMatching_NotModifyingOriginalRequestHeaders(t *testing.T) {
 	RegisterTestingT(t)
 
diff --git a/core/modes/modes_test.go b/core/modes/modes_test.go
@@ -90,7 +90,7 @@ func Test_ReconstructRequest_ShouldRecompressGzipBody(t *testing.T) {
 		Method:      "POST",
 		Destination: "test-destination.com",
 		Body:        "new request body here",
-		Headers: 	 map[string][]string{"Content-Encoding": {"gzip"}},
+		Headers:     map[string][]string{"Content-Encoding": {"gzip"}},
 	}
 	pair := models.RequestResponsePair{Request: request}
 
diff --git a/core/statik/statik.go b/core/statik/statik.go
diff --git a/core/util/memory_size.go b/core/util/memory_size.go
@@ -50,4 +50,3 @@ func (m *MemorySize) Set(value string) error {
 	*m = MemorySize(size * multiplier)
 	return nil
 }
-
diff --git a/core/util/util.go b/core/util/util.go
@@ -440,7 +440,7 @@ func convertToPlainNotation(scientific string) (string, bool) {
 		return scientific, false
 	}
 
-	return floatVal.Text('f', -1) , true
+	return floatVal.Text('f', -1), true
 }
 
 func xPath(query, toMatch string) string {
@@ -573,7 +573,7 @@ func TruncateStringWithEllipsis(input string, maxSize int) string {
 		return ellipsis
 	}
 
-	if len(input) <= maxSize{
+	if len(input) <= maxSize {
 		return input
 	}
 
@@ -586,4 +586,3 @@ func TruncateStringWithEllipsis(input string, maxSize int) string {
 
 	return truncated + ellipsis
 }
-
diff --git a/core/util/util_test.go b/core/util/util_test.go
@@ -417,7 +417,6 @@ func TestResolveAndValidatePath(t *testing.T) {
 	}
 }
 
-
 func TestTruncateStringWithEllipsis(t *testing.T) {
 
 	tests := []struct {
@@ -484,5 +483,3 @@ func TestTruncateStringWithEllipsis(t *testing.T) {
 		})
 	}
 }
-
-
diff --git a/functional-tests/core/api/middleware_api_v2_test.go b/functional-tests/core/api/middleware_api_v2_test.go
@@ -57,29 +57,28 @@ var _ = Describe("/api/v2/hoverfly/middleware", func() {
 	})
 })
 
-
 var _ = Describe("/api/v2/hoverfly/middleware when disabled", func() {
 
-    var (
-        hoverfly *functional_tests.Hoverfly
-    )
+	var (
+		hoverfly *functional_tests.Hoverfly
+	)
 
-    BeforeEach(func() {
-        hoverfly = functional_tests.NewHoverfly()
-        hoverfly.Start()
-    })
+	BeforeEach(func() {
+		hoverfly = functional_tests.NewHoverfly()
+		hoverfly.Start()
+	})
 
-    AfterEach(func() {
-        hoverfly.Stop()
-    })
+	AfterEach(func() {
+		hoverfly.Stop()
+	})
 
-    Context("PUT", func() {
+	Context("PUT", func() {
 
-        It("Should return 404 when setting middleware", func() {
-            req := sling.New().Put("http://localhost:" + hoverfly.GetAdminPort() + "/api/v2/hoverfly/middleware")
-            req.Body(strings.NewReader(`{"binary":"ruby","script":"puts 'hi'"}`))
-            res := functional_tests.DoRequest(req)
-            Expect(res.StatusCode).To(Equal(404))
-        })
-    })
+		It("Should return 404 when setting middleware", func() {
+			req := sling.New().Put("http://localhost:" + hoverfly.GetAdminPort() + "/api/v2/hoverfly/middleware")
+			req.Body(strings.NewReader(`{"binary":"ruby","script":"puts 'hi'"}`))
+			res := functional_tests.DoRequest(req)
+			Expect(res.StatusCode).To(Equal(404))
+		})
+	})
 })
diff --git a/functional-tests/hoverctl/middleware_test.go b/functional-tests/hoverctl/middleware_test.go
@@ -15,7 +15,7 @@ import (
 var _ = Describe("When I use hoverctl", func() {
 
 	var (
-		hoverfly *functional_tests.Hoverfly
+		hoverfly         *functional_tests.Hoverfly
 		remoteMiddleware *functional_tests.Hoverfly
 	)
 
@@ -152,7 +152,7 @@ var _ = Describe("When I use hoverctl", func() {
 				}
 			}`)
 
-			output := functional_tests.Run(hoverctlBinary, "middleware", "--remote", "http://localhost:" + remoteMiddleware.GetProxyPort())
+			output := functional_tests.Run(hoverctlBinary, "middleware", "--remote", "http://localhost:"+remoteMiddleware.GetProxyPort())
 
 			Expect(output).To(ContainSubstring("Could not set middleware, it may have failed the test"))
 			Expect(output).To(ContainSubstring("Error when communicating with remote middleware: received 404"))
diff --git a/functional-tests/hoverctl/start_test.go b/functional-tests/hoverctl/start_test.go
@@ -333,21 +333,21 @@ var _ = Describe("hoverctl `start`", func() {
 		})
 	})
 
- Context("with enable-middleware-api", func() {
- 		It("enables middleware API when flag is provided", func() {
- 			output := functional_tests.Run(hoverctlBinary, "start", "--enable-middleware-api")
- 			Expect(output).To(ContainSubstring("Hoverfly is now running"))
-
- 			// Attempt to set middleware via Admin API should be allowed (200)
- 			req := sling.New().Put("http://localhost:8888/api/v2/hoverfly/middleware")
- 			// Use a valid echo middleware that reads from STDIN and outputs the JSON payload unchanged
- 			req.Body(strings.NewReader(`{"binary":"ruby", "script":"#!/usr/bin/env ruby\n# encoding: utf-8\nwhile payload = STDIN.gets\nnext unless payload\n\nSTDOUT.puts payload\nend"}`))
- 			res := functional_tests.DoRequest(req)
- 			Expect(res.StatusCode).To(Equal(200))
- 		})
- 	})
-
- 	Context("with pac-file", func() {
+	Context("with enable-middleware-api", func() {
+		It("enables middleware API when flag is provided", func() {
+			output := functional_tests.Run(hoverctlBinary, "start", "--enable-middleware-api")
+			Expect(output).To(ContainSubstring("Hoverfly is now running"))
+
+			// Attempt to set middleware via Admin API should be allowed (200)
+			req := sling.New().Put("http://localhost:8888/api/v2/hoverfly/middleware")
+			// Use a valid echo middleware that reads from STDIN and outputs the JSON payload unchanged
+			req.Body(strings.NewReader(`{"binary":"ruby", "script":"#!/usr/bin/env ruby\n# encoding: utf-8\nwhile payload = STDIN.gets\nnext unless payload\n\nSTDOUT.puts payload\nend"}`))
+			res := functional_tests.DoRequest(req)
+			Expect(res.StatusCode).To(Equal(200))
+		})
+	})
+
+	Context("with pac-file", func() {
 		BeforeEach(func() {
 		})
 
diff --git a/hoverctl/cmd/utils.go b/hoverctl/cmd/utils.go
@@ -55,7 +55,7 @@ func askForInput(value string, sensitive bool) string {
 	reader := bufio.NewReader(os.Stdin)
 
 	for {
-		fmt.Printf( "%s: ", value)
+		fmt.Printf("%s: ", value)
 		if sensitive {
 			responseBytes, err := terminal.ReadPassword(int(os.Stdin.Fd()))
 			handleIfError(err)
diff --git a/hoverctl/wrapper/hoverfly.go b/hoverctl/wrapper/hoverfly.go
@@ -20,18 +20,18 @@ import (
 )
 
 const (
-	v2ApiSimulation      = "/api/v2/simulation"
-	v2ApiMode            = "/api/v2/hoverfly/mode"
-	v2ApiDestination     = "/api/v2/hoverfly/destination"
-	v2ApiState           = "/api/v2/state"
-	v2ApiMiddleware      = "/api/v2/hoverfly/middleware"
-	v2ApiPostServeAction = "/api/v2/hoverfly/post-serve-action"
+	v2ApiSimulation               = "/api/v2/simulation"
+	v2ApiMode                     = "/api/v2/hoverfly/mode"
+	v2ApiDestination              = "/api/v2/hoverfly/destination"
+	v2ApiState                    = "/api/v2/state"
+	v2ApiMiddleware               = "/api/v2/hoverfly/middleware"
+	v2ApiPostServeAction          = "/api/v2/hoverfly/post-serve-action"
 	v2ApiTemplateDataSourceAction = "/api/v2/hoverfly/templating-data-source/csv"
-	v2ApiPac             = "/api/v2/hoverfly/pac"
-	v2ApiCache           = "/api/v2/cache"
-	v2ApiLogs            = "/api/v2/logs"
-	v2ApiHoverfly        = "/api/v2/hoverfly"
-	v2ApiDiff            = "/api/v2/diff"
+	v2ApiPac                      = "/api/v2/hoverfly/pac"
+	v2ApiCache                    = "/api/v2/cache"
+	v2ApiLogs                     = "/api/v2/logs"
+	v2ApiHoverfly                 = "/api/v2/hoverfly"
+	v2ApiDiff                     = "/api/v2/diff"
 
 	v2ApiShutdown = "/api/v2/shutdown"
 	v2ApiHealth   = "/api/health"

Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ const (`
`22`	`22`	`expireOffset = 3600`
`23`	`23`	`)`
`24`	`24`
`25`		`-//Token - container for jwt.Token for encoding`
	`25`	`+// Token - container for jwt.Token for encoding`
`26`	`26`	`type Token struct {`
`27`	`27`	`Token *jwt.Token`
`28`	`28`	`}`
Original file line number	Diff line number	Diff line change
`@@ -446,7 +446,6 @@ func main() {`
`446`	`446`	`cfg.Destination = *destination`
`447`	`447`	`}`
`448`	`448`
`449`		`-`
`450`	`449`	`if len(responseBodyFilesPath) > 0 {`
`451`	`450`	`// Ensure file path is absolute and exists in the file system`
`452`	`451`	`if !filepath.IsAbs(responseBodyFilesPath) {`
`@@ -463,8 +462,6 @@ func main() {`
`463`	`462`	`cfg.ResponsesBodyFilesPath = absBasePath`
`464`	`463`	`}`
`465`	`464`
`466`		`-`
`467`		`-`
`468`	`465`	`for _, allowedOrigin := range responseBodyFilesAllowedOriginFlags {`
`469`	`466`	`if !util.IsURL(allowedOrigin) {`
`470`	`467`	`log.WithFields(log.Fields{"origin": allowedOrigin}).Fatal("Origin is not a valid url")`
Original file line number	Diff line number	Diff line change
`@@ -178,7 +178,6 @@ func Test_HeaderMatching(t *testing.T) {`
`178`	`178`
`179`	`179`	`}`
`180`	`180`
`181`		`-`
`182`	`181`	`func Test_HeaderMatching_NotModifyingOriginalRequestHeaders(t *testing.T) {`
`183`	`182`	`RegisterTestingT(t)`
`184`	`183`
Original file line number	Diff line number	Diff line change
`@@ -90,7 +90,7 @@ func Test_ReconstructRequest_ShouldRecompressGzipBody(t *testing.T) {`
`90`	`90`	`Method: "POST",`
`91`	`91`	`Destination: "test-destination.com",`
`92`	`92`	`Body: "new request body here",`
`93`		`- Headers: map[string][]string{"Content-Encoding": {"gzip"}},`
	`93`	`+ Headers: map[string][]string{"Content-Encoding": {"gzip"}},`
`94`	`94`	`}`
`95`	`95`	`pair := models.RequestResponsePair{Request: request}`
`96`	`96`
Original file line number	Diff line number	Diff line change
`@@ -50,4 +50,3 @@ func (m *MemorySize) Set(value string) error {`
`50`	`50`	`m = MemorySize(size multiplier)`
`51`	`51`	`return nil`
`52`	`52`	`}`
`53`		`-`
Original file line number	Diff line number	Diff line change
`@@ -440,7 +440,7 @@ func convertToPlainNotation(scientific string) (string, bool) {`
`440`	`440`	`return scientific, false`
`441`	`441`	`}`
`442`	`442`
`443`		`- return floatVal.Text('f', -1) , true`
	`443`	`+ return floatVal.Text('f', -1), true`
`444`	`444`	`}`
`445`	`445`
`446`	`446`	`func xPath(query, toMatch string) string {`
`@@ -573,7 +573,7 @@ func TruncateStringWithEllipsis(input string, maxSize int) string {`
`573`	`573`	`return ellipsis`
`574`	`574`	`}`
`575`	`575`
`576`		`- if len(input) <= maxSize{`
	`576`	`+ if len(input) <= maxSize {`
`577`	`577`	`return input`
`578`	`578`	`}`
`579`	`579`
`@@ -586,4 +586,3 @@ func TruncateStringWithEllipsis(input string, maxSize int) string {`
`586`	`586`
`587`	`587`	`return truncated + ellipsis`
`588`	`588`	`}`
`589`		`-`
Original file line number	Diff line number	Diff line change
`@@ -417,7 +417,6 @@ func TestResolveAndValidatePath(t *testing.T) {`
`417`	`417`	`}`
`418`	`418`	`}`
`419`	`419`
`420`		`-`
`421`	`420`	`func TestTruncateStringWithEllipsis(t *testing.T) {`
`422`	`421`
`423`	`422`	`tests := []struct {`
`@@ -484,5 +483,3 @@ func TestTruncateStringWithEllipsis(t *testing.T) {`
`484`	`483`	`})`
`485`	`484`	`}`
`486`	`485`	`}`
`487`		`-`
`488`		`-`