diff options
| author | KubeEdge Bot <48982446+kubeedge-bot@users.noreply.github.com> | 2023-12-08 12:17:50 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-12-08 12:17:50 +0800 |
| commit | be4dd0f3a3b12b4c04379460894775baa2b3f721 (patch) | |
| tree | a91fc8ff8791c8d1425373a6eb291ea91442e2b4 | |
| parent | Merge pull request #5244 from fisherxu/owner-cl (diff) | |
| parent | replace `io/ioutil` (diff) | |
| download | kubeedge-be4dd0f3a3b12b4c04379460894775baa2b3f721.tar.gz | |
Merge pull request #5276 from cl2017/update_import
Replace deprecated `io/ioutil` function
3 files changed, 6 insertions, 6 deletions
diff --git a/staging/src/github.com/kubeedge/mapper-framework/_template/mapper/data/publish/http/client.go b/staging/src/github.com/kubeedge/mapper-framework/_template/mapper/data/publish/http/client.go index bf9ee213b..78a1948ca 100644 --- a/staging/src/github.com/kubeedge/mapper-framework/_template/mapper/data/publish/http/client.go +++ b/staging/src/github.com/kubeedge/mapper-framework/_template/mapper/data/publish/http/client.go @@ -3,7 +3,7 @@ package http import ( "encoding/json" "fmt" - "io/ioutil" + "io" "net/http" "strconv" "strings" @@ -61,7 +61,7 @@ func (pm *PushMethod) Push(data *common.DataModel) { fmt.Println(err) } defer resp.Body.Close() - body, err := ioutil.ReadAll(resp.Body) + body, err := io.ReadAll(resp.Body) if err != nil { // handle error klog.Errorf("Publish device data by HTTP failed, err = %v", err) diff --git a/staging/src/github.com/kubeedge/mapper-framework/pkg/config/config.go b/staging/src/github.com/kubeedge/mapper-framework/pkg/config/config.go index 3a884316c..da90238ac 100644 --- a/staging/src/github.com/kubeedge/mapper-framework/pkg/config/config.go +++ b/staging/src/github.com/kubeedge/mapper-framework/pkg/config/config.go @@ -17,7 +17,7 @@ limitations under the License. package config import ( - "io/ioutil" + "os" "github.com/spf13/pflag" "gopkg.in/yaml.v2" @@ -61,7 +61,7 @@ func Parse() (c *Config, err error) { } c = &Config{} - cf, err := ioutil.ReadFile(configFile) + cf, err := os.ReadFile(configFile) if err != nil { return nil, err } diff --git a/staging/src/github.com/kubeedge/mapper-framework/pkg/httpserver/server.go b/staging/src/github.com/kubeedge/mapper-framework/pkg/httpserver/server.go index 9cc244186..dd294d78d 100644 --- a/staging/src/github.com/kubeedge/mapper-framework/pkg/httpserver/server.go +++ b/staging/src/github.com/kubeedge/mapper-framework/pkg/httpserver/server.go @@ -4,8 +4,8 @@ import ( "crypto/tls" "crypto/x509" "encoding/json" - "io/ioutil" "net/http" + "os" "time" "github.com/gorilla/mux" @@ -74,7 +74,7 @@ func (rs *RestServer) StartServer() { klog.V(3).Info("mtls communication, please provide client-key and client-cert to access service") // Configure the server to trust TLS client cert issued by your CA. certPool := x509.NewCertPool() - if caCertPEM, err := ioutil.ReadFile(rs.CaCertFilePath); err != nil { + if caCertPEM, err := os.ReadFile(rs.CaCertFilePath); err != nil { klog.Errorf("Error loading ca certificate file: %v", err) return } else if ok := certPool.AppendCertsFromPEM(caCertPEM); !ok { |