Fix code issue in hoverfly

Author: tommysitu

core/action/action.go

@@ -4,7 +4,6 @@ import (
 	"bytes"
 	"encoding/json"
 	"errors"
-	"io/ioutil"
 	"net/http"
 	"net/url"
 	"os"
@@ -60,7 +59,7 @@ func setScript(action *Action, scriptContent string) error {
 	tempDir := path.Join(os.TempDir(), "hoverfly")
 	os.Mkdir(tempDir, 0777)
 
-	newScript, err := ioutil.TempFile(tempDir, "hoverfly_")
+	newScript, err := os.CreateTemp(tempDir, "hoverfly_")
 	if err != nil {
 		return err
 	}
@@ -91,7 +90,7 @@ func (action *Action) GetScript() (string, error) {
 	if action.Script == nil {
 		return "", nil
 	}
-	contents, err := ioutil.ReadFile(action.Script.Name())
+	contents, err := os.ReadFile(action.Script.Name())
 	if err != nil {
 		return "", err
 	}

core/authentication/jwt_backend_test.go

@@ -27,8 +27,8 @@ func TestAuthenticate(t *testing.T) {
 	ab.AddUser(username, passw, true)
 	jwtBackend := authentication.InitJWTAuthenticationBackend(ab, []byte("verysecret"), 100)
 	user := &backends.User{
-		Username: string(username),
-		Password: string(passw),
+		Username: username,
+		Password: passw,
 		UUID:     "uuid_here",
 		IsAdmin:  true}
 

core/benchmark_test.go

@@ -6,8 +6,8 @@ import (
 	"fmt"
 	"github.com/SpectoLabs/hoverfly/core/handlers/v2"
 	. "github.com/onsi/gomega"
-	"io/ioutil"
 	"net/http"
+	"os"
 	"testing"
 	"time"
 )
@@ -21,7 +21,7 @@ func BenchmarkPutSimulationAPI(b *testing.B) {
 		Mode:      "simulate",
 	})
 
-	data, _ := ioutil.ReadFile("../testdata/large_file.json")
+	data, _ := os.ReadFile("../testdata/large_file.json")
 
 	adminApi := AdminApi{}
 
@@ -156,7 +156,7 @@ func BenchmarkProcessRequest(b *testing.B) {
 	}
 }`), &templated)
 
-	bytes, _ := ioutil.ReadFile("../testdata/large_response_body.json")
+	bytes, _ := os.ReadFile("../testdata/large_response_body.json")
 	largeResponse := v2.SimulationViewV5{}
 	_ = json.Unmarshal(bytes, &largeResponse)
 

core/cache/boltdb_cache.go

@@ -12,7 +12,7 @@ import (
 func NewBoltDBCache(db *bolt.DB, bucket []byte) *BoltCache {
 	return &BoltCache{
 		DS:            db,
-		CurrentBucket: []byte(bucket),
+		CurrentBucket: bucket,
 	}
 }
 

core/cache/memory_cache.go

@@ -41,7 +41,7 @@ func (c *InMemoryCache) GetAllValues() (values [][]byte, err error) {
 	values = make([][]byte, len(c.elements), len(c.elements))
 	index := 0
 	for _, v := range c.elements {
-		values[index] = []byte(v)
+		values[index] = v
 		index++
 	}
 	c.RUnlock()

core/cache/memory_cache_test.go

@@ -188,7 +188,7 @@ func Test_InMemoryCache_DeleteKey(t *testing.T) {
 	unit.Set(expectedKey1, expectedValue1)
 	unit.Set(expectedKey2, expectedValue2)
 
-	unit.Delete([]byte(expectedKey1))
+	unit.Delete(expectedKey1)
 
 	value, err := unit.Get(expectedKey1)
 	Expect(err).ToNot(BeNil())

core/cmd/hoverfly/main.go

@@ -25,7 +25,6 @@ import (
 	"flag"
 	"fmt"
 	"io"
-	"io/ioutil"
 	"os"
 	"path/filepath"
 	"strconv"
@@ -576,7 +575,7 @@ func main() {
 						delayInMs = 1000
 					}
 
-					if fileContents, err := ioutil.ReadFile(splitPostServeAction[2]); err == nil {
+					if fileContents, err := os.ReadFile(splitPostServeAction[2]); err == nil {
 						err = hoverfly.SetLocalPostServeAction(splitPostServeAction[0], splitPostServeAction[1], string(fileContents), delayInMs)
 						if err != nil {
 							log.WithFields(log.Fields{
@@ -615,7 +614,7 @@ func main() {
 
 				splitTemplateDataSource := strings.Split(v, " ")
 				if len(splitTemplateDataSource) == 2 {
-					if fileContents, err := ioutil.ReadFile(splitTemplateDataSource[1]); err == nil {
+					if fileContents, err := os.ReadFile(splitTemplateDataSource[1]); err == nil {
 						err = hoverfly.SetCsvDataSource(splitTemplateDataSource[0], string(fileContents))
 						if err != nil {
 							log.WithFields(log.Fields{
@@ -677,7 +676,7 @@ func main() {
 	cfg.Webserver = *webserver
 
 	if *pacFile != "" {
-		pacFileContent, err := ioutil.ReadFile(*pacFile)
+		pacFileContent, err := os.ReadFile(*pacFile)
 		if err != nil {
 			log.WithFields(log.Fields{"error": err.Error(), "pacFile": *pacFile}).
 				Fatal("Failed to import pac file")

core/cors/cors.go

@@ -2,7 +2,7 @@ package cors
 
 import (
 	"bytes"
-	"io/ioutil"
+	"io"
 	"net/http"
 	"strconv"
 )
@@ -55,7 +55,7 @@ func (c *Configs) InterceptPreflightRequest(r *http.Request) *http.Response {
 	resp.StatusCode = http.StatusOK
 	buf := bytes.NewBufferString("")
 	resp.ContentLength = 0
-	resp.Body = ioutil.NopCloser(buf)
+	resp.Body = io.NopCloser(buf)
 	return resp
 }
 

core/cors/cors_test.go

@@ -2,7 +2,7 @@ package cors
 
 import (
 	. "github.com/onsi/gomega"
-	"io/ioutil"
+	"io"
 	"net/http"
 	"testing"
 )
@@ -25,7 +25,7 @@ func Test_InterceptPreflightRequest_ReturnSuccessResponseWithDefaultHeaders(t *t
 	Expect(resp.Header.Get("Access-Control-Max-Age")).To(Equal("1800"))
 	Expect(resp.Header.Get("Access-Control-Allow-Credentials")).To(Equal("true"))
 	Expect(resp.Header.Get("Access-Control-Allow-Headers")).To(Equal("Content-Type,Origin,Accept,Authorization,Content-Length,X-Requested-With"))
-	responseBody, err := ioutil.ReadAll(resp.Body)
+	responseBody, err := io.ReadAll(resp.Body)
 	Expect(string(responseBody)).To(Equal(""))
 }
 

core/handlers/handlers.go

@@ -3,7 +3,7 @@ package handlers
 import (
 	"encoding/json"
 	"errors"
-	"io/ioutil"
+	"io"
 	"net/http"
 	"time"
 
@@ -28,7 +28,7 @@ type AdminHandler interface {
 func ReadFromRequest(request *http.Request, v interface{}) error {
 	defer request.Body.Close()
 
-	body, _ := ioutil.ReadAll(request.Body)
+	body, _ := io.ReadAll(request.Body)
 
 	err := json.Unmarshal(body, &v)
 	if err != nil {
@@ -123,7 +123,7 @@ func NewWebsocket(handler WebSocketHandler, w http.ResponseWriter, r *http.Reque
 			"message": string(p),
 		}).Debug("Got message...")
 
-		for _ = range time.Tick(1 * time.Second) {
+		for range time.Tick(1 * time.Second) {
 
 			updateBytes, err := handler()