github/multus-cni
1
0
Fork 1
mirror of https://github.com/k8snetworkplumbingwg/multus-cni.git synced 2025-09-24 19:07:54 +00:00
Code Issues Projects Releases Wiki Activity

remove io/ioutil for advanced golang (#951)

Browse Source 
Signed-off-by: yanggang <gang.yang@daocloud.io>

Signed-off-by: yanggang <gang.yang@daocloud.io>
This commit is contained in:
yanggang
2022-11-09 23:18:54 +08:00
committed by GitHub
parent 77e0150afe
commit 4f91106f29
20 changed files with 45 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/server/api/api.go
View File

@@ -18,7 +18,7 @@ import (
"bytes"
"encoding/json"
"fmt"
"io/ioutil"
"io"
"net"
"net/http"
"strings"
@@ -54,7 +54,7 @@ func DoCNI(url string, req interface{}, socketPath string) ([]byte, error) {
}
defer resp.Body.Close()
body, err := ioutil.ReadAll(resp.Body)
body, err := io.ReadAll(resp.Body)
if err != nil {
return nil, fmt.Errorf("failed to read CNI result: %v", err)
}

4
pkg/server/config/generator.go
View File

@@ -18,7 +18,7 @@ import (
"encoding/json"
"errors"
"fmt"
"io/ioutil"
"os"
"path/filepath"
"sort"
"strings"
@@ -331,7 +331,7 @@ func findMasterPlugin(cniConfigDirPath string, remainingTries int) (string, erro
return "", fmt.Errorf("could not find a plugin configuration in %s", cniConfigDirPath)
}
var cniPluginConfigs []string
files, err := ioutil.ReadDir(cniConfigDirPath)
files, err := os.ReadDir(cniConfigDirPath)
if err != nil {
return "", fmt.Errorf("error when listing the CNI plugin configurations: %w", err)
}

3
pkg/server/config/generator_test.go
View File

@@ -17,7 +17,6 @@ package config
import (
"encoding/json"
"fmt"
"io/ioutil"
"os"
"testing"
@@ -64,7 +63,7 @@ var _ = Describe("Configuration Generator", func() {
var err error
BeforeEach(func() {
tmpDir, err = ioutil.TempDir("", "multus_tmp")
tmpDir, err = os.MkdirTemp("", "multus_tmp")
Expect(err).NotTo(HaveOccurred())
})

10
pkg/server/config/manager.go
View File

@@ -17,7 +17,7 @@ package config
import (
"encoding/json"
"fmt"
"io/ioutil"
"os"
"github.com/fsnotify/fsnotify"
@@ -64,7 +64,7 @@ func NewManagerWithExplicitPrimaryCNIPlugin(config MultusConf, multusAutoconfigD
// overrideCNIVersion overrides cniVersion in cniConfigFile, it should be used only in kind case
func overrideCNIVersion(cniConfigFile string, multusCNIVersion string) error {
masterCNIConfigData, err := ioutil.ReadFile(cniConfigFile)
masterCNIConfigData, err := os.ReadFile(cniConfigFile)
if err != nil {
return fmt.Errorf("failed to read cni config %s: %v", cniConfigFile, err)
}
@@ -80,7 +80,7 @@ func overrideCNIVersion(cniConfigFile string, multusCNIVersion string) error {
return fmt.Errorf("couldn't update cluster network config: %v", err)
}
err = ioutil.WriteFile(cniConfigFile, configBytes, 0644)
err = os.WriteFile(cniConfigFile, configBytes, 0644)
if err != nil {
return fmt.Errorf("couldn't update cluster network config: %v", err)
}
@@ -214,7 +214,7 @@ func (m Manager) MonitorPluginConfiguration(shutDown <-chan struct{}, done chan<
// PersistMultusConfig persists the provided configuration to the disc, with
// Read / Write permissions. The output file path is `<multus auto config dir>/00-multus.conf`
func (m Manager) PersistMultusConfig(config string) error {
return ioutil.WriteFile(m.multusConfigFilePath, []byte(config), UserRWPermission)
return os.WriteFile(m.multusConfigFilePath, []byte(config), UserRWPermission)
}
func getPrimaryCNIPluginName(multusAutoconfigDir string) (string, error) {
@@ -254,7 +254,7 @@ func shouldRegenerateConfig(event fsnotify.Event) bool {
}
func primaryCNIData(masterCNIPluginPath string) (interface{}, error) {
masterCNIConfigData, err := ioutil.ReadFile(masterCNIPluginPath)
masterCNIConfigData, err := os.ReadFile(masterCNIPluginPath)
if err != nil {
return nil, fmt.Errorf("failed to read the cluster primary CNI config %s: %w", masterCNIPluginPath, err)
}

15
pkg/server/config/manager_test.go
View File

@@ -17,7 +17,6 @@ package config
import (
"encoding/json"
"fmt"
"io/ioutil"
"os"
"time"
@@ -45,12 +44,12 @@ var _ = Describe("Configuration Manager", func() {
BeforeEach(func() {
var err error
multusConfigDir, err = ioutil.TempDir("", "multus-config")
multusConfigDir, err = os.MkdirTemp("", "multus-config")
Expect(err).ToNot(HaveOccurred())
Expect(os.MkdirAll(multusConfigDir, 0755)).To(Succeed())
defaultCniConfig = fmt.Sprintf("%s/%s", multusConfigDir, primaryCNIPluginName)
Expect(ioutil.WriteFile(defaultCniConfig, []byte(primaryCNIPluginTemplate), UserRWPermission)).To(Succeed())
Expect(os.WriteFile(defaultCniConfig, []byte(primaryCNIPluginTemplate), UserRWPermission)).To(Succeed())
multusConf, _ := NewMultusConfig(
primaryCNIName,
@@ -73,7 +72,7 @@ var _ = Describe("Configuration Manager", func() {
It("Check overrideCNIVersion is worked", func() {
err := overrideCNIVersion(defaultCniConfig, "1.1.1")
Expect(err).NotTo(HaveOccurred())
raw, err := ioutil.ReadFile(defaultCniConfig)
raw, err := os.ReadFile(defaultCniConfig)
Expect(err).NotTo(HaveOccurred())
var jsonConfig map[string]interface{}
@@ -111,11 +110,11 @@ var _ = Describe("Configuration Manager", func() {
}
`
// update the CNI config to update the master config
Expect(ioutil.WriteFile(defaultCniConfig, []byte(updatedCNIConfig), UserRWPermission)).To(Succeed())
Expect(os.WriteFile(defaultCniConfig, []byte(updatedCNIConfig), UserRWPermission)).To(Succeed())
// wait for a while to get fsnotify event
time.Sleep(100 * time.Millisecond)
file, err := ioutil.ReadFile(configManager.multusConfigFilePath)
file, err := os.ReadFile(configManager.multusConfigFilePath)
Expect(err).NotTo(HaveOccurred())
Expect(string(file)).To(Equal(config))
@@ -156,12 +155,12 @@ var _ = Describe("Configuration Manager with mismatched cniVersion", func() {
It("test cni version incompatibility", func() {
var err error
multusConfigDir, err = ioutil.TempDir("", "multus-config")
multusConfigDir, err = os.MkdirTemp("", "multus-config")
Expect(err).ToNot(HaveOccurred())
Expect(os.MkdirAll(multusConfigDir, 0755)).To(Succeed())
defaultCniConfig = fmt.Sprintf("%s/%s", multusConfigDir, primaryCNIPluginName)
Expect(ioutil.WriteFile(defaultCniConfig, []byte(primaryCNIPluginTemplate), UserRWPermission)).To(Succeed())
Expect(os.WriteFile(defaultCniConfig, []byte(primaryCNIPluginTemplate), UserRWPermission)).To(Succeed())
multusConf, _ := NewMultusConfig(
primaryCNIName,

6
pkg/server/server.go
View File

@@ -18,7 +18,7 @@ import (
"bytes"
"encoding/json"
"fmt"
"io/ioutil"
"io"
"net"
"net/http"
"os"
@@ -220,7 +220,7 @@ func newCNIServer(rundir string, kubeClient *k8s.ClientInfo, exec invoke.Exec, s
func (s *Server) handleCNIRequest(r *http.Request) ([]byte, error) {
var cr api.Request
b, err := ioutil.ReadAll(r.Body)
b, err := io.ReadAll(r.Body)
if err != nil {
return nil, err
}
@@ -247,7 +247,7 @@ func (s *Server) handleCNIRequest(r *http.Request) ([]byte, error) {
func (s *Server) handleDelegateRequest(r *http.Request) ([]byte, error) {
var cr api.Request
b, err := ioutil.ReadAll(r.Body)
b, err := io.ReadAll(r.Body)
if err != nil {
return nil, err
}

3
pkg/server/thick_cni_test.go
View File

@@ -17,7 +17,6 @@ package server
import (
"context"
"fmt"
"io/ioutil"
"os"
. "github.com/onsi/ginkgo"
@@ -68,7 +67,7 @@ var _ = Describe(suiteName, func() {
BeforeEach(func() {
var err error
thickPluginRunDir, err = ioutil.TempDir("", thickCNISocketDirPath)
thickPluginRunDir, err = os.MkdirTemp("", thickCNISocketDirPath)
Expect(err).ToNot(HaveOccurred())
})