Docker/portainer
Docker/portainer
1
0
Fork 0
mirror of https://github.com/portainer/portainer.git synced 2025-07-24 15:59:41 +02:00
Code Issues Releases Activity

fix(code): replace calls to ioutil EE-4425 (#7878)

Browse source
This commit is contained in:
andres-portainer 2022-10-17 15:29:12 -03:00 • committed by GitHub
parent 69f498c431
commit 5488389278
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
48 changed files with 109 additions and 112 deletions
Download patch file Download diff file Expand all files Collapse all files

8
api/http/proxy/factory/docker/build.go
View file

@ -4,7 +4,7 @@ import (
"bytes"
"encoding/json"
"errors"
"io/ioutil"
"io"
"mime"
"net/http"
@ -37,7 +37,7 @@ func buildOperation(request *http.Request) error {
var buffer []byte
switch mediaType {
case "":
body, err := ioutil.ReadAll(request.Body)
body, err := io.ReadAll(request.Body)
if err != nil {
return err
}
@ -81,7 +81,7 @@ func buildOperation(request *http.Request) error {
log.Info().Str("filename", hdr.Filename).Int64("size", hdr.Size).Msg("upload the file to build image")
content, err := ioutil.ReadAll(f)
content, err := io.ReadAll(f)
if err != nil {
return err
}
@ -105,7 +105,7 @@ func buildOperation(request *http.Request) error {
return nil
}
request.Body = ioutil.NopCloser(bytes.NewReader(buffer))
request.Body = io.NopCloser(bytes.NewReader(buffer))
request.ContentLength = int64(len(buffer))
request.Header.Set("Content-Type", "application/x-tar")

6
api/http/proxy/factory/docker/containers.go
View file

@ -5,7 +5,7 @@ import (
"context"
"encoding/json"
"errors"
"io/ioutil"
"io"
"net/http"
"strings"
@ -190,7 +190,7 @@ func (transport *Transport) decorateContainerCreationOperation(request *http.Req
return nil, err
}
body, err := ioutil.ReadAll(request.Body)
body, err := io.ReadAll(request.Body)
if err != nil {
return nil, err
}
@ -229,7 +229,7 @@ func (transport *Transport) decorateContainerCreationOperation(request *http.Req
}
}
request.Body = ioutil.NopCloser(bytes.NewBuffer(body))
request.Body = io.NopCloser(bytes.NewBuffer(body))
}
response, err := transport.executeDockerRequest(request)

6
api/http/proxy/factory/docker/services.go
View file

@ -5,7 +5,7 @@ import (
"context"
"encoding/json"
"errors"
"io/ioutil"
"io"
"net/http"
"github.com/docker/docker/api/types"
@ -116,7 +116,7 @@ func (transport *Transport) decorateServiceCreationOperation(request *http.Reque
return nil, err
}
body, err := ioutil.ReadAll(request.Body)
body, err := io.ReadAll(request.Body)
if err != nil {
return nil, err
}
@ -135,7 +135,7 @@ func (transport *Transport) decorateServiceCreationOperation(request *http.Reque
}
}
request.Body = ioutil.NopCloser(bytes.NewBuffer(body))
request.Body = io.NopCloser(bytes.NewBuffer(body))
}
return transport.replaceRegistryAuthenticationHeader(request)

4
api/http/proxy/factory/docker/transport.go
View file

@ -6,7 +6,7 @@ import (
"encoding/json"
"errors"
"fmt"
"io/ioutil"
"io"
"net/http"
"path"
"regexp"
@ -197,7 +197,7 @@ func (transport *Transport) proxyAgentRequest(r *http.Request) (*http.Response,
r.Method = http.MethodPost
r.Body = ioutil.NopCloser(bytes.NewReader(newBody))
r.Body = io.NopCloser(bytes.NewReader(newBody))
r.ContentLength = int64(len(newBody))
}

4
api/http/proxy/factory/kubernetes/token.go
View file

@ -1,7 +1,7 @@
package kubernetes
import (
"io/ioutil"
"os"
portainer "github.com/portainer/portainer/api"
"github.com/portainer/portainer/api/dataservices"
@ -28,7 +28,7 @@ func NewTokenManager(kubecli portainer.KubeClient, dataStore dataservices.DataSt
}
if setLocalAdminToken {
token, err := ioutil.ReadFile(defaultServiceAccountTokenFile)
token, err := os.ReadFile(defaultServiceAccountTokenFile)
if err != nil {
return nil, err
}

4
api/http/proxy/factory/kubernetes/transport.go
View file

@ -4,7 +4,7 @@ import (
"bytes"
"encoding/json"
"fmt"
"io/ioutil"
"io"
"net/http"
"path"
"regexp"
@ -189,7 +189,7 @@ func decorateAgentDockerHubRequest(r *http.Request, dataStore dataservices.DataS
}
r.Method = http.MethodPost
r.Body = ioutil.NopCloser(bytes.NewReader(newBody))
r.Body = io.NopCloser(bytes.NewReader(newBody))
r.ContentLength = int64(len(newBody))
return nil

3
api/http/proxy/factory/utils/json.go
View file

@ -6,7 +6,6 @@ import (
"errors"
"fmt"
"io"
"io/ioutil"
"mime"
"gopkg.in/yaml.v3"
@ -50,7 +49,7 @@ func getBody(body io.ReadCloser, contentType string, isGzip bool) (interface{},
defer reader.Close()
bodyBytes, err := ioutil.ReadAll(reader)
bodyBytes, err := io.ReadAll(reader)
if err != nil {
return nil, err
}

4
api/http/proxy/factory/utils/request.go
View file

@ -2,7 +2,7 @@ package utils
import (
"bytes"
"io/ioutil"
"io"
"net/http"
"strconv"
)
@ -25,7 +25,7 @@ func RewriteRequest(request *http.Request, newData interface{}) error {
return err
}
body := ioutil.NopCloser(bytes.NewReader(data))
body := io.NopCloser(bytes.NewReader(data))
request.Body = body
request.ContentLength = int64(len(data))

4
api/http/proxy/factory/utils/response.go
View file

@ -3,7 +3,7 @@ package utils
import (
"bytes"
"fmt"
"io/ioutil"
"io"
"net/http"
"strconv"
@ -82,7 +82,7 @@ func RewriteResponse(response *http.Response, newResponseData interface{}, statu
return err
}
body := ioutil.NopCloser(bytes.NewReader(data))
body := io.NopCloser(bytes.NewReader(data))
response.StatusCode = statusCode
response.Body = body