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/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