Nail/fission-src
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor: move from io/ioutil to io and os package (#2236)

Browse Source 
The io/ioutil package has been deprecated as of Go 1.16, see
https://golang.org/doc/go1.16#ioutil. This commit replaces the existing
io/ioutil functions with their new definitions in io and os packages.

Signed-off-by: Eng Zer Jun <engzerjun@gmail.com>
This commit is contained in:
Eng Zer Jun
2021-10-23 17:14:12 +05:30
committed by GitHub
parent e641246866
commit 2f4ec4b2b9
40 changed files with 101 additions and 117 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/builder/builder.go
+1 -2
View File
@@ -21,7 +21,6 @@ import (
"encoding/json"
"fmt"
"io"
"io/ioutil"
"net/http"
"os"
"os/exec"
@@ -98,7 +97,7 @@ func (builder *Builder) Handler(w http.ResponseWriter, r *http.Request) {
}()
// parse request
body, err := ioutil.ReadAll(r.Body)
body, err := io.ReadAll(r.Body)
if err != nil {
e := "error reading request body"
builder.logger.Error(e, zap.Error(err))
pkg/builder/client/client.go
+3 -3
View File
@@ -20,7 +20,7 @@ import (
"bytes"
"context"
"encoding/json"
"io/ioutil"
"io"
"net/http"
"strings"
"time"
@@ -31,7 +31,7 @@ import (
"go.uber.org/zap"
"golang.org/x/net/context/ctxhttp"
builder "github.com/fission/fission/pkg/builder"
"github.com/fission/fission/pkg/builder"
ferror "github.com/fission/fission/pkg/error"
otelUtils "github.com/fission/fission/pkg/utils/otel"
"github.com/fission/fission/pkg/utils/tracing"
@@ -91,7 +91,7 @@ func (c *Client) Build(ctx context.Context, req *builder.PackageBuildRequest) (*
defer resp.Body.Close()
rBody, err := ioutil.ReadAll(resp.Body)
rBody, err := io.ReadAll(resp.Body)
if err != nil {
logger.Error("error reading resp body", zap.Error(err))
return nil, err
pkg/controller/api_test.go
+2 -2
View File
@@ -20,7 +20,7 @@ import (
"context"
"flag"
"fmt"
"io/ioutil"
"io"
"log"
"net/http"
"os"
@@ -396,7 +396,7 @@ func TestMain(m *testing.M) {
}
assert(found, "incorrect response content type")
_, err = ioutil.ReadAll(resp.Body)
_, err = io.ReadAll(resp.Body)
panicIf(err)
os.Exit(m.Run())
pkg/controller/canaryConfigApi.go
+3 -3
View File
@@ -19,7 +19,7 @@ package controller
import (
"encoding/json"
"fmt"
"io/ioutil"
"io"
"net/http"
"github.com/emicklei/go-restful"
@@ -108,7 +108,7 @@ func (a *API) CanaryConfigApiCreate(w http.ResponseWriter, r *http.Request) {
return
}
body, err := ioutil.ReadAll(r.Body)
body, err := io.ReadAll(r.Body)
if err != nil {
a.respondWithError(w, err)
return
@@ -202,7 +202,7 @@ func (a *API) CanaryConfigApiUpdate(w http.ResponseWriter, r *http.Request) {
return
}
body, err := ioutil.ReadAll(r.Body)
body, err := io.ReadAll(r.Body)
if err != nil {
a.respondWithError(w, err)
return
pkg/controller/client/rest/client.go
+1 -2
View File
@@ -20,7 +20,6 @@ import (
"bytes"
"context"
"io"
"io/ioutil"
"net/http"
"strings"
@@ -78,7 +77,7 @@ func (c *RESTClient) Delete(relativeUrl string) error {
defer resp.Body.Close()
if resp.StatusCode != 200 {
body, err := ioutil.ReadAll(resp.Body)
body, err := io.ReadAll(resp.Body)
if err != nil {
return errors.Wrap(err, "error deleting")
} else {
pkg/controller/client/v1/misc.go
+2 -3
View File
@@ -20,7 +20,6 @@ import (
"encoding/json"
"fmt"
"io"
"io/ioutil"
"net/http"
"github.com/pkg/errors"
@@ -88,7 +87,7 @@ func (c *Misc) GetSvcURL(label string) (string, error) {
}
defer resp.Body.Close()
body, err := ioutil.ReadAll(resp.Body)
body, err := io.ReadAll(resp.Body)
if err != nil {
return "", err
}
@@ -105,7 +104,7 @@ func (c *Misc) ServerInfo() (*info.ServerInfo, error) {
}
defer resp.Body.Close()
body, err := ioutil.ReadAll(resp.Body)
body, err := io.ReadAll(resp.Body)
if err != nil {
return nil, err
}
pkg/controller/client/v1/v1.go
+3 -3
View File
@@ -17,7 +17,7 @@ limitations under the License.
package v1
import (
"io/ioutil"
"io"
"net/http"
ferror "github.com/fission/fission/pkg/error"
@@ -87,7 +87,7 @@ func handleResponse(resp *http.Response) ([]byte, error) {
if resp.StatusCode != 200 {
return nil, ferror.MakeErrorFromHTTP(resp)
}
body, err := ioutil.ReadAll(resp.Body)
body, err := io.ReadAll(resp.Body)
return body, err
}
@@ -95,6 +95,6 @@ func handleCreateResponse(resp *http.Response) ([]byte, error) {
if resp.StatusCode != 201 {
return nil, ferror.MakeErrorFromHTTP(resp)
}
body, err := ioutil.ReadAll(resp.Body)
body, err := io.ReadAll(resp.Body)
return body, err
}
pkg/controller/environmentApi.go
+3 -3
View File
@@ -18,7 +18,7 @@ package controller
import (
"encoding/json"
"io/ioutil"
"io"
"net/http"
"github.com/emicklei/go-restful"
@@ -123,7 +123,7 @@ func (a *API) EnvironmentApiList(w http.ResponseWriter, r *http.Request) {
}
func (a *API) EnvironmentApiCreate(w http.ResponseWriter, r *http.Request) {
body, err := ioutil.ReadAll(r.Body)
body, err := io.ReadAll(r.Body)
if err != nil {
a.respondWithError(w, err)
return
@@ -188,7 +188,7 @@ func (a *API) EnvironmentApiUpdate(w http.ResponseWriter, r *http.Request) {
vars := mux.Vars(r)
name := vars["environment"]
body, err := ioutil.ReadAll(r.Body)
body, err := io.ReadAll(r.Body)
if err != nil {
a.respondWithError(w, err)
return
pkg/controller/functionApi.go
+2 -3
View File
@@ -21,7 +21,6 @@ import (
"encoding/json"
"fmt"
"io"
"io/ioutil"
"net/http"
"net/http/httputil"
"net/url"
@@ -134,7 +133,7 @@ func (a *API) FunctionApiList(w http.ResponseWriter, r *http.Request) {
}
func (a *API) FunctionApiCreate(w http.ResponseWriter, r *http.Request) {
body, err := ioutil.ReadAll(r.Body)
body, err := io.ReadAll(r.Body)
if err != nil {
a.respondWithError(w, err)
return
@@ -196,7 +195,7 @@ func (a *API) FunctionApiUpdate(w http.ResponseWriter, r *http.Request) {
vars := mux.Vars(r)
name := vars["function"]
body, err := ioutil.ReadAll(r.Body)
body, err := io.ReadAll(r.Body)
if err != nil {
a.respondWithError(w, err)
return
pkg/controller/httpTriggerApi.go
+3 -3
View File
@@ -20,7 +20,7 @@ import (
"context"
"encoding/json"
"fmt"
"io/ioutil"
"io"
"net/http"
"sort"
@@ -158,7 +158,7 @@ func (a *API) checkHTTPTriggerDuplicates(ctx context.Context, t *fv1.HTTPTrigger
}
func (a *API) HTTPTriggerApiCreate(w http.ResponseWriter, r *http.Request) {
body, err := ioutil.ReadAll(r.Body)
body, err := io.ReadAll(r.Body)
if err != nil {
a.respondWithError(w, err)
return
@@ -228,7 +228,7 @@ func (a *API) HTTPTriggerApiUpdate(w http.ResponseWriter, r *http.Request) {
vars := mux.Vars(r)
name := vars["httpTrigger"]
body, err := ioutil.ReadAll(r.Body)
body, err := io.ReadAll(r.Body)
if err != nil {
a.respondWithError(w, err)
return
pkg/controller/mqTriggerApi.go
+3 -3
View File
@@ -18,7 +18,7 @@ package controller
import (
"encoding/json"
"io/ioutil"
"io"
"net/http"
"github.com/emicklei/go-restful"
@@ -119,7 +119,7 @@ func (a *API) MessageQueueTriggerApiList(w http.ResponseWriter, r *http.Request)
}
func (a *API) MessageQueueTriggerApiCreate(w http.ResponseWriter, r *http.Request) {
body, err := ioutil.ReadAll(r.Body)
body, err := io.ReadAll(r.Body)
if err != nil {
a.respondWithError(w, err)
return
@@ -179,7 +179,7 @@ func (a *API) MessageQueueTriggerApiUpdate(w http.ResponseWriter, r *http.Reques
vars := mux.Vars(r)
name := vars["mqTrigger"]
body, err := ioutil.ReadAll(r.Body)
body, err := io.ReadAll(r.Body)
if err != nil {
a.respondWithError(w, err)
return
pkg/controller/packageApi.go
+3 -3
View File
@@ -19,7 +19,7 @@ package controller
import (
"encoding/json"
"fmt"
"io/ioutil"
"io"
"net/http"
"github.com/dustin/go-humanize"
@@ -121,7 +121,7 @@ func (a *API) PackageApiList(w http.ResponseWriter, r *http.Request) {
}
func (a *API) PackageApiCreate(w http.ResponseWriter, r *http.Request) {
body, err := ioutil.ReadAll(r.Body)
body, err := io.ReadAll(r.Body)
if err != nil {
a.respondWithError(w, err)
return
@@ -203,7 +203,7 @@ func (a *API) PackageApiUpdate(w http.ResponseWriter, r *http.Request) {
vars := mux.Vars(r)
name := vars["package"]
body, err := ioutil.ReadAll(r.Body)
body, err := io.ReadAll(r.Body)
if err != nil {
a.respondWithError(w, err)
return
pkg/controller/timeTriggerApi.go
+3 -3
View File
@@ -18,7 +18,7 @@ package controller
import (
"encoding/json"
"io/ioutil"
"io"
"net/http"
"github.com/emicklei/go-restful"
@@ -121,7 +121,7 @@ func (a *API) TimeTriggerApiList(w http.ResponseWriter, r *http.Request) {
}
func (a *API) TimeTriggerApiCreate(w http.ResponseWriter, r *http.Request) {
body, err := ioutil.ReadAll(r.Body)
body, err := io.ReadAll(r.Body)
if err != nil {
a.respondWithError(w, err)
return
@@ -192,7 +192,7 @@ func (a *API) TimeTriggerApiUpdate(w http.ResponseWriter, r *http.Request) {
vars := mux.Vars(r)
name := vars["timeTrigger"]
body, err := ioutil.ReadAll(r.Body)
body, err := io.ReadAll(r.Body)
if err != nil {
a.respondWithError(w, err)
return
pkg/controller/watchApi.go
+2 -2
View File
@@ -18,7 +18,7 @@ package controller
import (
"encoding/json"
"io/ioutil"
"io"
"net/http"
"github.com/emicklei/go-restful"
@@ -120,7 +120,7 @@ func (a *API) WatchApiList(w http.ResponseWriter, r *http.Request) {
}
func (a *API) WatchApiCreate(w http.ResponseWriter, r *http.Request) {
body, err := ioutil.ReadAll(r.Body)
body, err := io.ReadAll(r.Body)
if err != nil {
a.respondWithError(w, err)
return
pkg/error/httperror.go
+2 -2
View File
@@ -18,7 +18,7 @@ package error
import (
"fmt"
"io/ioutil"
"io"
"net/http"
"strings"
)
@@ -66,7 +66,7 @@ func MakeErrorFromHTTP(resp *http.Response) error {
msg := resp.Status
defer resp.Body.Close()
body, err := ioutil.ReadAll(resp.Body)
body, err := io.ReadAll(resp.Body)
if err == nil && len(body) > 0 {
msg = strings.TrimSpace(string(body))
}
pkg/executor/api.go
+4 -4
View File
@@ -21,7 +21,7 @@ import (
"encoding/json"
"fmt"
"html"
"io/ioutil"
"io"
"net/http"
"strings"
@@ -39,7 +39,7 @@ import (
func (executor *Executor) getServiceForFunctionAPI(w http.ResponseWriter, r *http.Request) {
ctx := r.Context()
body, err := ioutil.ReadAll(r.Body)
body, err := io.ReadAll(r.Body)
if err != nil {
http.Error(w, "Failed to read request", http.StatusInternalServerError)
return
@@ -170,7 +170,7 @@ func (executor *Executor) tapServices(w http.ResponseWriter, r *http.Request) {
ctx := r.Context()
logger := otelUtils.LoggerWithTraceID(ctx, executor.logger)
body, err := ioutil.ReadAll(r.Body)
body, err := io.ReadAll(r.Body)
if err != nil {
logger.Error("failed to read tap service request", zap.Error(err))
http.Error(w, "Failed to read request", http.StatusInternalServerError)
@@ -222,7 +222,7 @@ func (executor *Executor) healthHandler(w http.ResponseWriter, r *http.Request)
func (executor *Executor) unTapService(w http.ResponseWriter, r *http.Request) {
ctx := r.Context()
body, err := ioutil.ReadAll(r.Body)
body, err := io.ReadAll(r.Body)
if err != nil {
http.Error(w, "Failed to read request", http.StatusInternalServerError)
return
pkg/executor/client/client.go
+2 -2
View File
@@ -20,7 +20,7 @@ import (
"bytes"
"context"
"encoding/json"
"io/ioutil"
"io"
"net/http"
"net/url"
"strings"
@@ -95,7 +95,7 @@ func (c *Client) GetServiceForFunction(ctx context.Context, fn *fv1.Function) (s
return "", ferror.MakeErrorFromHTTP(resp)
}
svcName, err := ioutil.ReadAll(resp.Body)
svcName, err := io.ReadAll(resp.Body)
if err != nil {
return "", errors.Wrap(err, "error reading response body from getting service for function")
}
pkg/featureconfig/config.go
+2 -2
View File
@@ -19,7 +19,7 @@ package featureconfig
import (
"encoding/base64"
"fmt"
"io/ioutil"
"os"
"github.com/ghodss/yaml"
)
@@ -27,7 +27,7 @@ import (
// GetFeatureConfig reads the configMap file and unmarshals the config into a feature config struct
func GetFeatureConfig() (*FeatureConfig, error) {
// read the file
b64EncodedContent, err := ioutil.ReadFile(FeatureConfigFile)
b64EncodedContent, err := os.ReadFile(FeatureConfigFile)
if err != nil {
return nil, fmt.Errorf("error reading YAML file %s: %v", FeatureConfigFile, err)
}
pkg/fetcher/client/client.go
+2 -2
View File
@@ -4,7 +4,7 @@ import (
"bytes"
"context"
"encoding/json"
"io/ioutil"
"io"
"net/http"
"strings"
"time"
@@ -94,7 +94,7 @@ func sendRequest(logger *zap.Logger, ctx context.Context, httpClient *http.Clien
if err == nil {
if resp.StatusCode == 200 {
body, err := ioutil.ReadAll(resp.Body)
body, err := io.ReadAll(resp.Body)
if err != nil {
logger.Error("error reading response body", zap.Error(err))
}
pkg/fetcher/fetcher.go
+9 -9
View File
@@ -21,7 +21,7 @@ import (
"context"
"encoding/json"
"fmt"
"io/ioutil"
"io"
"net/http"
"os"
"path/filepath"
@@ -97,12 +97,12 @@ func MakeFetcher(logger *zap.Logger, sharedVolumePath string, sharedSecretPath s
return nil, errors.Wrap(err, "error making the fission / kube client")
}
name, err := ioutil.ReadFile(fv1.PodInfoMount + "/name")
name, err := os.ReadFile(fv1.PodInfoMount + "/name")
if err != nil {
return nil, errors.Wrap(err, "error reading pod name from downward volume")
}
namespace, err := ioutil.ReadFile(fv1.PodInfoMount + "/namespace")
namespace, err := os.ReadFile(fv1.PodInfoMount + "/namespace")
if err != nil {
return nil, errors.Wrap(err, "error reading pod namespace from downward volume")
}
@@ -142,7 +142,7 @@ func verifyChecksum(fileChecksum, checksum *fv1.Checksum) error {
func writeSecretOrConfigMap(dataMap map[string][]byte, dirPath string) error {
for key, val := range dataMap {
writeFilePath := filepath.Join(dirPath, key)
err := ioutil.WriteFile(writeFilePath, val, 0750)
err := os.WriteFile(writeFilePath, val, 0750)
if err != nil {
return errors.Wrapf(err, "Failed to write file %s", writeFilePath)
}
@@ -175,7 +175,7 @@ func (fetcher *Fetcher) FetchHandler(w http.ResponseWriter, r *http.Request) {
}()
// parse request
body, err := ioutil.ReadAll(r.Body)
body, err := io.ReadAll(r.Body)
if err != nil {
logger.Error("error reading request body", zap.Error(err))
http.Error(w, err.Error(), http.StatusInternalServerError)
@@ -226,7 +226,7 @@ func (fetcher *Fetcher) SpecializeHandler(w http.ResponseWriter, r *http.Request
logger := otelUtils.LoggerWithTraceID(ctx, fetcher.logger)
// parse request
body, err := ioutil.ReadAll(r.Body)
body, err := io.ReadAll(r.Body)
if err != nil {
logger.Error("error reading request body", zap.Error(err))
http.Error(w, err.Error(), http.StatusInternalServerError)
@@ -313,7 +313,7 @@ func (fetcher *Fetcher) Fetch(ctx context.Context, pkg *fv1.Package, req Functio
// get package data as literal or by url
if len(archive.Literal) > 0 {
// write pkg.Literal into tmpPath
err := ioutil.WriteFile(tmpPath, archive.Literal, 0600)
err := os.WriteFile(tmpPath, archive.Literal, 0600)
if err != nil {
e := "failed to write file"
logger.Error(e, zap.Error(err), zap.String("location", tmpPath))
@@ -515,7 +515,7 @@ func (fetcher *Fetcher) UploadHandler(w http.ResponseWriter, r *http.Request) {
}()
// parse request
body, err := ioutil.ReadAll(r.Body)
body, err := io.ReadAll(r.Body)
if err != nil {
logger.Error("error reading request body", zap.Error(err))
http.Error(w, err.Error(), http.StatusInternalServerError)
@@ -614,7 +614,7 @@ func (fetcher *Fetcher) archive(src string, dst string) error {
}
if target.IsDir() {
// list all
fs, _ := ioutil.ReadDir(src)
fs, _ := os.ReadDir(src)
for _, f := range fs {
files = append(files, filepath.Join(src, f.Name()))
}
pkg/fission-cli/cmd/function/test.go
+3 -3
View File
@@ -18,7 +18,7 @@ package function
import (
"context"
"io/ioutil"
"io"
"net/http"
"net/url"
"os"
@@ -131,7 +131,7 @@ func (opts *TestSubCommand) do(input cli.Input) error {
}
defer resp.Body.Close()
body, err := ioutil.ReadAll(resp.Body)
body, err := io.ReadAll(resp.Body)
if err != nil {
return errors.Wrap(err, "error reading response from function")
}
@@ -201,7 +201,7 @@ func printPodLogs(client client.Interface, fnMeta *metav1.ObjectMeta) (string, e
}
defer reader.Close()
body, err := ioutil.ReadAll(reader)
body, err := io.ReadAll(reader)
if err != nil {
return "", errors.Wrap(err, "error reading the response body")
}
pkg/fission-cli/cmd/package/util/util.go
+1 -2
View File
@@ -19,7 +19,6 @@ import (
"context"
"fmt"
"io"
"io/ioutil"
"net/http"
"net/url"
"os"
@@ -86,7 +85,7 @@ func UploadArchiveFile(ctx context.Context, client client.Interface, fileName st
}
func GetContents(filePath string) ([]byte, error) {
code, err := ioutil.ReadFile(filePath)
code, err := os.ReadFile(filePath)
if err != nil {
return nil, errors.Wrapf(err, "error reading %v", filePath)
}
pkg/fission-cli/cmd/spec/apply.go
+1 -2
View File
@@ -19,7 +19,6 @@ package spec
import (
"context"
"fmt"
"io/ioutil"
"os"
"path/filepath"
"reflect"
@@ -487,7 +486,7 @@ func localArchiveFromSpec(specDir string, aus *spectypes.ArchiveUploadSpec) (*fv
if len(files) > 1 || !isSingleFile {
// zip up the file list
archiveFile, err := ioutil.TempFile("", fmt.Sprintf("fission-archive-%v", aus.Name))
archiveFile, err := os.CreateTemp("", fmt.Sprintf("fission-archive-%v", aus.Name))
if err != nil {
return nil, err
}
pkg/fission-cli/cmd/spec/init.go
+2 -3
View File
@@ -18,7 +18,6 @@ package spec
import (
"fmt"
"io/ioutil"
"os"
"path/filepath"
@@ -110,7 +109,7 @@ func (opts *InitSubCommand) run(input cli.Input) error {
}
// Add a bit of documentation to the spec dir here
err := ioutil.WriteFile(readme, []byte(SPEC_README), 0644)
err := os.WriteFile(readme, []byte(SPEC_README), 0644)
if err != nil {
return err
}
@@ -138,7 +137,7 @@ func writeDeploymentConfig(file string, dc *spectypes.DeploymentConfig) error {
"# See the README in this directory for background and usage information.\n" +
"# Do not edit the UID below: that will break 'fission spec apply'\n")
err = ioutil.WriteFile(file, append(msg, y...), 0644)
err = os.WriteFile(file, append(msg, y...), 0644)
if err != nil {
return err
}
pkg/fission-cli/cmd/spec/validate.go
+1 -2
View File
@@ -19,7 +19,6 @@ package spec
import (
"bytes"
"fmt"
"io/ioutil"
"os"
"path/filepath"
"strings"
@@ -234,7 +233,7 @@ func ReadSpecs(specDir string) (*FissionResources, error) {
return nil
}
// read
b, err := ioutil.ReadFile(path)
b, err := os.ReadFile(path)
if err != nil {
result = multierror.Append(result, err)
return nil
pkg/fission-cli/cmd/support/resources/resource.go
+2 -2
View File
@@ -18,7 +18,7 @@ package resources
import (
"fmt"
"io/ioutil"
"os"
"path/filepath"
"github.com/ghodss/yaml"
@@ -55,7 +55,7 @@ func writeToFile(file string, obj interface{}) {
// remove the empty byte from string.
file = string(utils.RemoveZeroBytes([]byte(file)))
err = ioutil.WriteFile(file, bs, 0644)
err = os.WriteFile(file, bs, 0644)
if err != nil {
console.Error(fmt.Sprintf("Error writing file %v: %v", file, err))
}
pkg/mqtrigger/messageQueue/azurequeuestorage/asq.go
+2 -2
View File
@@ -20,7 +20,7 @@ import (
"bytes"
"encoding/base64"
"fmt"
"io/ioutil"
"io"
"net/http"
"os"
"regexp"
@@ -354,7 +354,7 @@ func invokeTriggeredFunction(conn AzureStorageConnection, sub *AzureQueueSubscri
}
defer response.Body.Close()
body, err := ioutil.ReadAll(response.Body)
body, err := io.ReadAll(response.Body)
if err != nil {
conn.logger.Error("failed to read response body from function invocation", zap.Error(err), zap.String("function_url", sub.functionURL))
continue
pkg/mqtrigger/messageQueue/azurequeuestorage/asq_test.go
+8 -8
View File
@@ -17,7 +17,7 @@ package azurequeuestorage
import (
"fmt"
"io/ioutil"
"io"
"log"
"net/http"
"os"
@@ -197,7 +197,7 @@ func TestAzureStorageQueuePoisonMessage(t *testing.T) {
).Return(
&http.Response{
StatusCode: http.StatusInternalServerError,
Body: ioutil.NopCloser(strings.NewReader("server error")),
Body: io.NopCloser(strings.NewReader("server error")),
},
nil,
).Once()
@@ -207,7 +207,7 @@ func TestAzureStorageQueuePoisonMessage(t *testing.T) {
).Return(
&http.Response{
StatusCode: http.StatusNotFound,
Body: ioutil.NopCloser(strings.NewReader("not found")),
Body: io.NopCloser(strings.NewReader("not found")),
},
nil,
).Once()
@@ -217,7 +217,7 @@ func TestAzureStorageQueuePoisonMessage(t *testing.T) {
).Return(
&http.Response{
StatusCode: http.StatusBadRequest,
Body: ioutil.NopCloser(strings.NewReader("bad request")),
Body: io.NopCloser(strings.NewReader("bad request")),
},
nil,
).Once()
@@ -227,7 +227,7 @@ func TestAzureStorageQueuePoisonMessage(t *testing.T) {
).Return(
&http.Response{
StatusCode: http.StatusForbidden,
Body: ioutil.NopCloser(strings.NewReader("not authorized")),
Body: io.NopCloser(strings.NewReader("not authorized")),
},
nil,
).Once()
@@ -339,10 +339,10 @@ func TestAzureStorageQueuePoisonMessage(t *testing.T) {
func httpRequestMatcher(t *testing.T, queue string, responseQueue string, retry string, contentType string, functionName string, body string) func(*http.Request) bool {
expectedURL := fmt.Sprintf("%s/fission-function/%s", DummyRouterURL, functionName)
return func(req *http.Request) bool {
requestBody, err := ioutil.ReadAll(req.Body)
requestBody, err := io.ReadAll(req.Body)
require.NoError(t, err)
req.Body = ioutil.NopCloser(strings.NewReader(string(requestBody)))
req.Body = io.NopCloser(strings.NewReader(string(requestBody)))
return queue == req.Header.Get("X-Fission-MQTrigger-Topic") &&
responseQueue == req.Header.Get("X-Fission-MQTrigger-RespTopic") &&
@@ -372,7 +372,7 @@ func runAzureStorageQueueTest(t *testing.T, count int, output bool) {
// Mock a HTTP client that returns http.StatusOK with "output" for the body
httpClient := new(azureHTTPClientMock)
httpClient.bodyHandler = func(res *http.Response) {
res.Body = ioutil.NopCloser(strings.NewReader(FunctionResponse))
res.Body = io.NopCloser(strings.NewReader(FunctionResponse))
}
httpClient.On(
"Do",
pkg/mqtrigger/messageQueue/kafka/kafka.go
+3 -3
View File
@@ -20,14 +20,14 @@ import (
"crypto/tls"
"crypto/x509"
"fmt"
"io/ioutil"
"io"
"net/http"
"os"
"regexp"
"strconv"
"strings"
sarama "github.com/Shopify/sarama"
"github.com/Shopify/sarama"
cluster "github.com/bsm/sarama-cluster"
"github.com/pkg/errors"
"go.uber.org/zap"
@@ -307,7 +307,7 @@ func kafkaMsgHandler(kafka *Kafka, producer sarama.SyncProducer, trigger *fv1.Me
return
}
defer resp.Body.Close()
body, err := ioutil.ReadAll(resp.Body)
body, err := io.ReadAll(resp.Body)
kafka.logger.Debug("got response from function invocation",
zap.String("function_url", url),
pkg/mqtrigger/messageQueue/nats/nats.go
+2 -2
View File
@@ -19,7 +19,7 @@ package nats
import (
"bytes"
"fmt"
"io/ioutil"
"io"
"net/http"
"os"
"strings"
@@ -192,7 +192,7 @@ func msgHandler(nats *Nats, trigger *fv1.MessageQueueTrigger) func(*ns.Msg) {
defer resp.Body.Close()
body, bodyErr := ioutil.ReadAll(resp.Body)
body, bodyErr := io.ReadAll(resp.Body)
if bodyErr != nil {
nats.logger.Error("error reading function invocation response",
zap.Error(err),
pkg/plugin/plugin.go
+1 -2
View File
@@ -22,7 +22,6 @@ import (
"context"
"encoding/json"
"errors"
"io/ioutil"
"os"
"os/exec"
"path"
@@ -108,7 +107,7 @@ func FindAll() map[string]*Metadata {
dirs := strings.Split(os.Getenv("PATH"), ":")
for _, dir := range dirs {
fs, err := ioutil.ReadDir(dir)
fs, err := os.ReadDir(dir)
if err != nil {
continue
}
pkg/plugin/plugin_test.go
+2 -3
View File
@@ -19,7 +19,6 @@ package plugin
import (
"encoding/json"
"fmt"
"io/ioutil"
"os"
"path"
"testing"
@@ -47,7 +46,7 @@ func TestFind(t *testing.T) {
if err != nil {
t.FailNow()
}
err = ioutil.WriteFile(testBinary, []byte(fmt.Sprintf("#!/bin/sh\necho '%v'", string(jsonMd))), os.ModePerm)
err = os.WriteFile(testBinary, []byte(fmt.Sprintf("#!/bin/sh\necho '%v'", string(jsonMd))), os.ModePerm)
if err != nil {
t.FailNow()
}
@@ -89,7 +88,7 @@ func TestExec(t *testing.T) {
if err != nil {
t.FailNow()
}
err = ioutil.WriteFile(testBinary, []byte(fmt.Sprintf("#!/bin/sh\necho '%v'", string(jsonMd))), os.ModePerm)
err = os.WriteFile(testBinary, []byte(fmt.Sprintf("#!/bin/sh\necho '%v'", string(jsonMd))), os.ModePerm)
if err != nil {
t.FailNow()
}
pkg/publisher/webhookPublisher.go
+2 -2
View File
@@ -18,7 +18,7 @@ package publisher
import (
"bytes"
"io/ioutil"
"io"
"net/http"
"strings"
"time"
@@ -112,7 +112,7 @@ func (p *WebhookPublisher) makeHTTPRequest(r *publishRequest) {
fields = append(fields, zap.Error(err), zap.Any("request", r))
} else {
var body []byte
body, err = ioutil.ReadAll(resp.Body)
body, err = io.ReadAll(resp.Body)
if err != nil {
fields = append(fields, zap.Error(err), zap.Any("request", r))
msg = "read response body error"
pkg/router/functionHandler.go
+1 -2
View File
@@ -21,7 +21,6 @@ import (
"context"
"fmt"
"io"
"io/ioutil"
"math/rand"
"net"
"net/http"
@@ -242,7 +241,7 @@ func (roundTripper *RetryingRoundTripper) RoundTrip(req *http.Request) (*http.Re
Proto: req.Proto,
ProtoMajor: req.ProtoMajor,
ProtoMinor: req.ProtoMinor,
Body: ioutil.NopCloser(bytes.NewBufferString(errMsg)),
Body: io.NopCloser(bytes.NewBufferString(errMsg)),
ContentLength: int64(len(errMsg)),
Request: req,
Header: make(http.Header),
pkg/router/util_test.go
+2 -2
View File
@@ -1,7 +1,7 @@
package router
import (
"io/ioutil"
"io"
"log"
"net/http"
)
@@ -17,7 +17,7 @@ func testRequest(targetURL string, expectedResponse string) {
log.Panicf("response status: %v", resp.StatusCode)
}
body, err := ioutil.ReadAll(resp.Body)
body, err := io.ReadAll(resp.Body)
if err != nil {
log.Panic("failed to read response")
}
pkg/storagesvc/client/client.go
+1 -2
View File
@@ -22,7 +22,6 @@ import (
"encoding/json"
"fmt"
"io"
"io/ioutil"
"mime/multipart"
"net/http"
"net/url"
@@ -101,7 +100,7 @@ func (c *Client) Upload(ctx context.Context, filePath string, metadata *map[stri
return "", err
}
defer resp.Body.Close()
body, err := ioutil.ReadAll(resp.Body)
body, err := io.ReadAll(resp.Body)
if err != nil {
return "", err
}
pkg/storagesvc/client/storagesvc_test.go
+8 -9
View File
@@ -21,7 +21,6 @@ import (
"context"
"fmt"
"io"
"io/ioutil"
"log"
"os"
"testing"
@@ -50,7 +49,7 @@ func panicIf(err error) {
}
func MakeTestFile(size int) *os.File {
f, err := ioutil.TempFile("", "storagesvc_test_")
f, err := os.CreateTemp("", "storagesvc_test_")
panicIf(err)
_, err = f.Write(bytes.Repeat([]byte("."), size))
@@ -158,7 +157,7 @@ func TestS3StorageService(t *testing.T) {
panicIf(err)
defer reader.Close()
retThroughMinio, err := ioutil.TempFile("", "storagesvc_verify_minio_")
retThroughMinio, err := os.CreateTemp("", "storagesvc_verify_minio_")
panicIf(err)
defer os.Remove(retThroughMinio.Name())
@@ -170,7 +169,7 @@ func TestS3StorageService(t *testing.T) {
}
// Retrieve file through API
retThroughAPI, err := ioutil.TempFile("", "storagesvc_verify_")
retThroughAPI, err := os.CreateTemp("", "storagesvc_verify_")
panicIf(err)
os.Remove(retThroughAPI.Name())
@@ -179,9 +178,9 @@ func TestS3StorageService(t *testing.T) {
defer os.Remove(retThroughAPI.Name())
// compare contents
contentsMinio, err := ioutil.ReadFile(retThroughMinio.Name())
contentsMinio, err := os.ReadFile(retThroughMinio.Name())
panicIf(err)
contentsAPI, err := ioutil.ReadFile(retThroughAPI.Name())
contentsAPI, err := os.ReadFile(retThroughAPI.Name())
panicIf(err)
if !bytes.Equal(contentsMinio, contentsAPI) {
log.Panic("Contents don't match")
@@ -228,7 +227,7 @@ func TestLocalStorageService(t *testing.T) {
panicIf(err)
// make a temp file for verification
retrievedfile, err := ioutil.TempFile("", "storagesvc_verify_")
retrievedfile, err := os.CreateTemp("", "storagesvc_verify_")
panicIf(err)
os.Remove(retrievedfile.Name())
@@ -238,9 +237,9 @@ func TestLocalStorageService(t *testing.T) {
defer os.Remove(retrievedfile.Name())
// compare contents
contents1, err := ioutil.ReadFile(tmpfile.Name())
contents1, err := os.ReadFile(tmpfile.Name())
panicIf(err)
contents2, err := ioutil.ReadFile(retrievedfile.Name())
contents2, err := os.ReadFile(retrievedfile.Name())
panicIf(err)
if !bytes.Equal(contents1, contents2) {
log.Panic("Contents don't match")
pkg/utils/utils.go
+1 -2
View File
@@ -22,7 +22,6 @@ import (
"encoding/hex"
"fmt"
"io"
"io/ioutil"
"net"
"net/http"
"os"
@@ -65,7 +64,7 @@ func GetTempDir() (string, error) {
return "", err
}
tmpDir := id.String()
dir, err := ioutil.TempDir("", tmpDir)
dir, err := os.MkdirTemp("", tmpDir)
return dir, err
}