replaced usage of obsolete ioutil functions

programmfabrik · Oct 28, 2024 · 536312f · 536312f
1 parent d341bfd
commit 536312f
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 13 deletions.
diff --git a/api_testsuite.go b/api_testsuite.go
@@ -3,7 +3,7 @@ package main
 import (
 	"encoding/json"
 	"fmt"
-	"io/ioutil"
+	"io"
 	"net/http"
 	"net/url"
 	"os"
@@ -442,7 +442,7 @@ func (ats *Suite) loadManifest() ([]byte, error) {
 	}
 	defer manifestFile.Close()
 
-	manifestTmpl, err := ioutil.ReadAll(manifestFile)
+	manifestTmpl, err := io.ReadAll(manifestFile)
 	if err != nil {
 		return res, fmt.Errorf("error loading manifest (%s): %s", ats.manifestPath, err)
 	}

diff --git a/http_server.go b/http_server.go
@@ -5,7 +5,6 @@ import (
 	"context"
 	"encoding/json"
 	"io"
-	"io/ioutil"
 	"net/http"
 	"net/url"
 	"path/filepath"
@@ -155,7 +154,7 @@ func bounceJSON(w http.ResponseWriter, r *http.Request) {
 		bodyJSON, errorBody any
 	)
 
-	bodyBytes, err = ioutil.ReadAll(r.Body)
+	bodyBytes, err = io.ReadAll(r.Body)
 
 	if utf8.Valid(bodyBytes) {
 		if len(bodyBytes) > 0 {

diff --git a/internal/httpproxy/store.go b/internal/httpproxy/store.go
@@ -3,7 +3,7 @@ package httpproxy
 import (
 	"encoding/json"
 	"fmt"
-	"io/ioutil"
+	"io"
 	"net/http"
 	"net/url"
 	"strconv"
@@ -63,7 +63,7 @@ func (st *store) write(w http.ResponseWriter, r *http.Request) {
 	offset := len(st.Data)
 
 	if r.Body != nil {
-		reqData.Body, err = ioutil.ReadAll(r.Body)
+		reqData.Body, err = io.ReadAll(r.Body)
 		if err != nil {
 			handlerutil.RespondWithErr(w, http.StatusInternalServerError, errors.Errorf("Could not read request body: %s", err))
 			return

diff --git a/pkg/lib/api/request.go b/pkg/lib/api/request.go
@@ -5,7 +5,6 @@ import (
 	"encoding/json"
 	"fmt"
 	"io"
-	"io/ioutil"
 	"net/http"
 	"net/http/httputil"
 	"net/url"
@@ -293,7 +292,7 @@ func (request Request) ToString(curl bool) (res string) {
 			// return r.Replace(curl.String())
 		}
 
-		_, _ = io.Copy(ioutil.Discard, httpRequest.Body)
+		_, _ = io.Copy(io.Discard, httpRequest.Body)
 		_ = httpRequest.Body.Close()
 
 		curl, _ := http2curl.GetCurlCommand(httpRequest)

diff --git a/pkg/lib/api/response.go b/pkg/lib/api/response.go
@@ -7,7 +7,6 @@ import (
 	"encoding/json"
 	"fmt"
 	"io"
-	"io/ioutil"
 	"net/http"
 	"strings"
 	"time"
@@ -102,7 +101,7 @@ func NewResponse(statusCode int,
 	}
 	if body != nil {
 		start := time.Now()
-		res.Body, err = ioutil.ReadAll(body)
+		res.Body, err = io.ReadAll(body)
 		if err != nil {
 			return res, err
 		}

diff --git a/pkg/lib/report/report.go b/pkg/lib/report/report.go
@@ -2,7 +2,7 @@ package report
 
 import (
 	"fmt"
-	"io/ioutil"
+	"os"
 	"sync"
 	"time"
 
@@ -196,7 +196,7 @@ func (r *Report) WriteToFile(reportFile, reportFormat string) error {
 		parsingFunction = ParseJSONResult
 	}
 
-	err := ioutil.WriteFile(reportFile, r.GetTestResult(parsingFunction), 0644)
+	err := os.WriteFile(reportFile, r.GetTestResult(parsingFunction), 0644)
 	if err != nil {
 		logrus.Errorf("Could not save report into file: %s", err)
 		return err

diff --git a/pkg/lib/template/template_loader.go b/pkg/lib/template/template_loader.go
@@ -128,7 +128,7 @@ func (loader *Loader) Render(
 		// 	if err != nil {
 		// 		return nil, err
 		// 	}
-		// 	fileBytes, err := ioutil.ReadAll(file)
+		// 	fileBytes, err := io.ReadAll(file)
 		// 	if err != nil {
 		// 		return nil, err
 		// 	}