Skip to content

Commit 2cf971d

Browse files
AkasurdeAkasurde
authored
Replace deprecated ioutils API (#1311)
* replace ioutil.ReadAll with io.ReadAll * replace ioutil.WriteFile with os.WriteFile * replace ioutil.ReadFile with os.ReadFile * replace ioutil.TempDir with os.MkdirTemp Signed-off-by: Abhijeet Kasurde <akasurde@redhat.com>
1 parent 5da8047 commit 2cf971d

33 files changed

Lines changed: 87 additions & 104 deletions

‎client/connector_create.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ package client
33
import (
44
"context"
55
"fmt"
6-
"io/ioutil"
76
"net/url"
7+
"os"
88
"reflect"
99
"strconv"
1010

@@ -24,7 +24,7 @@ import (
2424
)
2525

2626
func (cli *VanClient) ConnectorCreateFromFile(ctx context.Context, secretFile string, options types.ConnectorCreateOptions) (*corev1.Secret, error) {
27-
yaml, err := ioutil.ReadFile(secretFile)
27+
yaml, err := os.ReadFile(secretFile)
2828
if err != nil {
2929
fmt.Println("Could not read connection token", err.Error())
3030
return nil, err

‎client/container/client.go‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ package container
33
import (
44
"errors"
55
"fmt"
6-
"io/ioutil"
76
"os"
87
"path"
98
"strings"
@@ -170,7 +169,7 @@ func (v *Volume) ReadFile(name string) (string, error) {
170169
if err != nil {
171170
return "", err
172171
}
173-
data, err := ioutil.ReadFile(path.Join(vDir.Name(), name))
172+
data, err := os.ReadFile(path.Join(vDir.Name(), name))
174173
if err != nil {
175174
return "", err
176175
}

‎client/gateway.go‎

Lines changed: 18 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ import (
1010
"encoding/hex"
1111
"encoding/json"
1212
"fmt"
13-
"io/ioutil"
1413
"net"
1514
"os"
1615
"os/exec"
@@ -286,23 +285,23 @@ func getConfigHome() string {
286285
}
287286

288287
func getGatewaySiteId(gatewayDir string) (string, error) {
289-
siteId, err := ioutil.ReadFile(gatewayDir + "/config/siteid.txt")
288+
siteId, err := os.ReadFile(gatewayDir + "/config/siteid.txt")
290289
if err != nil {
291290
return "", fmt.Errorf("Failed to read site id: %w", err)
292291
}
293292
return string(siteId), nil
294293
}
295294

296295
func getRouterId(gatewayDir string) (string, error) {
297-
routerId, err := ioutil.ReadFile(gatewayDir + "/config/routerid.txt")
296+
routerId, err := os.ReadFile(gatewayDir + "/config/routerid.txt")
298297
if err != nil {
299298
return "", fmt.Errorf("Failed to read router id: %w", err)
300299
}
301300
return string(routerId), nil
302301
}
303302

304303
func getRouterUrl(gatewayDir string) (string, error) {
305-
url, err := ioutil.ReadFile(gatewayDir + "/config/url.txt")
304+
url, err := os.ReadFile(gatewayDir + "/config/url.txt")
306305
if err != nil {
307306
return "", fmt.Errorf("Failed to read router url: %w", err)
308307
}
@@ -333,9 +332,9 @@ func getRouterVersion(gatewayName string, gatewayType string) (string, error) {
333332
}
334333

335334
func getMachineID() (string, error) {
336-
id, err := ioutil.ReadFile("/var/lib/dbus/machine-id")
335+
id, err := os.ReadFile("/var/lib/dbus/machine-id")
337336
if err != nil {
338-
id, err = ioutil.ReadFile("/etc/machine-id")
337+
id, err = os.ReadFile("/etc/machine-id")
339338
}
340339
if err != nil {
341340
return "", err
@@ -471,12 +470,12 @@ func setupLocalDir(localDir string) error {
471470

472471
func startGatewayUserService(gatewayName, unitDir, localDir string) error {
473472

474-
unitFile, err := ioutil.ReadFile(localDir + "/user/" + gatewayName + ".service")
473+
unitFile, err := os.ReadFile(localDir + "/user/" + gatewayName + ".service")
475474
if err != nil {
476475
return fmt.Errorf("Unable to read service file: %w", err)
477476
}
478477

479-
err = ioutil.WriteFile(unitDir+"/"+gatewayName+".service", unitFile, 0644)
478+
err = os.WriteFile(unitDir+"/"+gatewayName+".service", unitFile, 0644)
480479
if err != nil {
481480
return fmt.Errorf("Unable to write user unit file: %w", err)
482481
}
@@ -548,7 +547,7 @@ func updateLocalGatewayConfig(gatewayDir string, gatewayType string, gatewayConf
548547
qdrConfig := template.Must(template.New("qdrConfig").Parse(mc))
549548
qdrConfig.Execute(&buf, instance)
550549

551-
err = ioutil.WriteFile(gatewayDir+"/config/skrouterd.json", buf.Bytes(), 0644)
550+
err = os.WriteFile(gatewayDir+"/config/skrouterd.json", buf.Bytes(), 0644)
552551
if err != nil {
553552
return fmt.Errorf("Failed to write config file: %w", err)
554553
}
@@ -575,7 +574,7 @@ func (cli *VanClient) setupGatewayConfig(ctx context.Context, gatewayName string
575574
}
576575

577576
for _, cert := range certs {
578-
err = ioutil.WriteFile(gatewayDir+"/skupper-router-certs/conn1-profile/"+cert, secret.Data[cert], 0644)
577+
err = os.WriteFile(gatewayDir+"/skupper-router-certs/conn1-profile/"+cert, secret.Data[cert], 0644)
579578
if err != nil {
580579
return fmt.Errorf("Failed to write cert file: %w", err)
581580
}
@@ -602,14 +601,14 @@ func (cli *VanClient) setupGatewayConfig(ctx context.Context, gatewayName string
602601

603602
// store the url for instance queries
604603
url := fmt.Sprintf("amqp://127.0.0.1:%s", strconv.Itoa(amqpPort))
605-
err = ioutil.WriteFile(gatewayDir+"/config/url.txt", []byte(url), 0644)
604+
err = os.WriteFile(gatewayDir+"/config/url.txt", []byte(url), 0644)
606605
if err != nil {
607606
return fmt.Errorf("Failed to write instance url file: %w", err)
608607
}
609608

610609
// generate a router id and store it for subsequent template updates
611610
routerId := newUUID()
612-
err = ioutil.WriteFile(gatewayDir+"/config/routerid.txt", []byte(routerId), 0644)
611+
err = os.WriteFile(gatewayDir+"/config/routerid.txt", []byte(routerId), 0644)
613612
if err != nil {
614613
return fmt.Errorf("Failed to write instance id file: %w", err)
615614
}
@@ -620,7 +619,7 @@ func (cli *VanClient) setupGatewayConfig(ctx context.Context, gatewayName string
620619
return fmt.Errorf("Failed to retrieve site id: %w", err)
621620
}
622621
if siteConfig != nil {
623-
err = ioutil.WriteFile(gatewayDir+"/config/siteid.txt", []byte(siteConfig.Reference.UID), 0644)
622+
err = os.WriteFile(gatewayDir+"/config/siteid.txt", []byte(siteConfig.Reference.UID), 0644)
624623
if err != nil {
625624
return fmt.Errorf("Failed to write site id file: %w", err)
626625
}
@@ -664,7 +663,7 @@ func (cli *VanClient) setupGatewayConfig(ctx context.Context, gatewayName string
664663
qdrConfig := template.Must(template.New("qdrConfig").Parse(mc))
665664
qdrConfig.Execute(&buf, instance)
666665

667-
err = ioutil.WriteFile(gatewayDir+"/config/skrouterd.json", buf.Bytes(), 0644)
666+
err = os.WriteFile(gatewayDir+"/config/skrouterd.json", buf.Bytes(), 0644)
668667
if err != nil {
669668
return fmt.Errorf("Failed to write config file: %w", err)
670669
}
@@ -693,7 +692,7 @@ func (cli *VanClient) gatewayStartService(ctx context.Context, gatewayName strin
693692
ConfigPath: gatewayDir,
694693
GatewayName: gatewayName,
695694
})
696-
err = ioutil.WriteFile(gatewayDir+"/user/"+gatewayName+".service", []byte(qdrUserUnit), 0644)
695+
err = os.WriteFile(gatewayDir+"/user/"+gatewayName+".service", []byte(qdrUserUnit), 0644)
697696
if err != nil {
698697
return fmt.Errorf("Failed to write unit file: %w", err)
699698
}
@@ -926,7 +925,7 @@ func (cli *VanClient) newGateway(ctx context.Context, gatewayName string, gatewa
926925

927926
if configFile != "" {
928927
// grab the bindings and forwards from the config file
929-
yamlFile, err := ioutil.ReadFile(configFile)
928+
yamlFile, err := os.ReadFile(configFile)
930929
if err != nil {
931930
return "", fmt.Errorf("Failed to read gateway config file: %w", err)
932931
}
@@ -1138,7 +1137,7 @@ func (cli *VanClient) GatewayInit(ctx context.Context, gatewayName string, gatew
11381137
}
11391138

11401139
if configFile != "" && gatewayType != GatewayMockType {
1141-
yamlFile, err := ioutil.ReadFile(configFile)
1140+
yamlFile, err := os.ReadFile(configFile)
11421141
if err != nil {
11431142
return "", fmt.Errorf("Failed to read gateway config file: %w", err)
11441143
}
@@ -2055,7 +2054,7 @@ func (cli *VanClient) GatewayExportConfig(ctx context.Context, targetGatewayName
20552054
return exportFile, fmt.Errorf("Failed to marshal export config: %w", err)
20562055
}
20572056

2058-
err = ioutil.WriteFile(exportFile, mcData, 0644)
2057+
err = os.WriteFile(exportFile, mcData, 0644)
20592058
if err != nil {
20602059
return exportFile, fmt.Errorf("Failed to write export config file: %w", err)
20612060
}
@@ -2071,7 +2070,7 @@ func (cli *VanClient) GatewayGenerateBundle(ctx context.Context, configFile stri
20712070
return "", fmt.Errorf("Skupper is not enabled in namespace '%s'", cli.Namespace)
20722071
}
20732072

2074-
yamlFile, err := ioutil.ReadFile(configFile)
2073+
yamlFile, err := os.ReadFile(configFile)
20752074
if err != nil {
20762075
return "", fmt.Errorf("Failed to read gateway config file: %w", err)
20772076
}

‎client/podman/rest.go‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ import (
55
"crypto/tls"
66
"fmt"
77
"io"
8-
"io/ioutil"
98
"net"
109
"net/http"
1110
"net/url"
@@ -201,7 +200,7 @@ func (r *responseReaderBody) Consume(reader io.Reader, i interface{}) error {
201200
if !ok {
202201
return fmt.Errorf("error parsing body")
203202
}
204-
data, err := ioutil.ReadAll(reader)
203+
data, err := io.ReadAll(reader)
205204
if err != nil {
206205
return fmt.Errorf("error reading response body: %v", err)
207206
}

‎client/router_update.go‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ import (
44
"context"
55
"encoding/json"
66
"fmt"
7-
"io/ioutil"
87
"log"
98
"net"
109
"os"
@@ -910,17 +909,17 @@ func updateGatewayMultiport(ctx context.Context, cli *VanClient) error {
910909
}
911910
// generate a router id and store it for subsequent template updates
912911
routerId := newUUID()
913-
err = ioutil.WriteFile(newGatewayDir+"/config/routerid.txt", []byte(routerId), 0644)
912+
err = os.WriteFile(newGatewayDir+"/config/routerid.txt", []byte(routerId), 0644)
914913
if err != nil {
915914
return err
916915
}
917916
updateFileContent := func(fileName, oldPath, newPath string) error {
918-
content, err := ioutil.ReadFile(fileName)
917+
content, err := os.ReadFile(fileName)
919918
if err != nil {
920919
return err
921920
}
922921
updatedContent := strings.ReplaceAll(string(content), oldPath, newPath)
923-
err = ioutil.WriteFile(fileName, []byte(updatedContent), 0)
922+
err = os.WriteFile(fileName, []byte(updatedContent), 0)
924923
if err != nil {
925924
return err
926925
}

‎client/token_claim_create_test.go‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ package client
33
import (
44
"bytes"
55
"context"
6-
"io/ioutil"
76
"net/url"
87
"os"
98
"strings"
@@ -19,7 +18,7 @@ import (
1918
)
2019

2120
func readSecretFromFile(filename string) (*corev1.Secret, error) {
22-
yaml, err := ioutil.ReadFile(filename)
21+
yaml, err := os.ReadFile(filename)
2322
if err != nil {
2423
return nil, err
2524
}

‎cmd/config-sync/config_sync.go‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ package main
33
import (
44
"context"
55
"fmt"
6-
"io/ioutil"
76
"log"
87
"math"
98
"net/http"
@@ -403,23 +402,23 @@ func (c *ConfigSync) copyCertsFilesToPath(path string, profilename string, secre
403402

404403
_, err = os.Stat(certFile)
405404
if secret.Data["tls.crt"] != nil && os.IsNotExist(err) {
406-
err = ioutil.WriteFile(certFile, secret.Data["tls.crt"], 0777)
405+
err = os.WriteFile(certFile, secret.Data["tls.crt"], 0777)
407406
if err != nil {
408407
return err
409408
}
410409
}
411410

412411
_, err = os.Stat(keyFile)
413412
if secret.Data["tls.key"] != nil && os.IsNotExist(err) {
414-
err = ioutil.WriteFile(keyFile, secret.Data["tls.key"], 0777)
413+
err = os.WriteFile(keyFile, secret.Data["tls.key"], 0777)
415414
if err != nil {
416415
return err
417416
}
418417
}
419418

420419
_, err = os.Stat(caCertFile)
421420
if secret.Data["ca.crt"] != nil && os.IsNotExist(err) {
422-
err = ioutil.WriteFile(caCertFile, secret.Data["ca.crt"], 0777)
421+
err = os.WriteFile(caCertFile, secret.Data["ca.crt"], 0777)
423422
if err != nil {
424423
return err
425424
}

‎cmd/flow-collector/handlers.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ package main
22

33
import (
44
"fmt"
5-
"io/ioutil"
5+
"io"
66
"log"
77
"net/http"
88

@@ -184,7 +184,7 @@ func (c *Controller) promqueryHandler(w http.ResponseWriter, r *http.Request) {
184184
log.Printf("COLLECTOR: Prometheus query error: %s\n", err.Error())
185185
} else {
186186
w.WriteHeader(proxyResp.StatusCode)
187-
data, _ := ioutil.ReadAll(proxyResp.Body)
187+
data, _ := io.ReadAll(proxyResp.Body)
188188
proxyResp.Body.Close()
189189
fmt.Fprintf(w, "%s\n", data)
190190
}
@@ -205,7 +205,7 @@ func (c *Controller) promqueryrangeHandler(w http.ResponseWriter, r *http.Reques
205205
if err != nil {
206206
log.Printf("COLLECTOR: Prometheus query_range error: %s\n", err.Error())
207207
} else {
208-
data, _ := ioutil.ReadAll(proxyResp.Body)
208+
data, _ := io.ReadAll(proxyResp.Body)
209209
proxyResp.Body.Close()
210210
fmt.Fprintf(w, "%s\n", data)
211211
}

‎cmd/flow-collector/main.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import (
77
"errors"
88
"flag"
99
"fmt"
10-
"io/ioutil"
10+
"io"
1111
"log"
1212
"net/http"
1313
"os"
@@ -59,7 +59,7 @@ var shutdownSignals = []os.Signal{os.Interrupt, syscall.SIGTERM}
5959
func getConnectInfo(file string) (connectJson, error) {
6060
cj := connectJson{}
6161

62-
jsonFile, err := ioutil.ReadFile(file)
62+
jsonFile, err := os.ReadFile(file)
6363
if err != nil {
6464
return cj, err
6565
}
@@ -113,7 +113,7 @@ func authenticate(dir string, user string, password string) bool {
113113
}
114114
defer file.Close()
115115

116-
bytes, err := ioutil.ReadAll(file)
116+
bytes, err := io.ReadAll(file)
117117
if err != nil {
118118
log.Printf("COLLECTOR: Failed to authenticate %s: %s", user, err)
119119
return false

‎cmd/service-controller/claim_handler_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import (
44
"bytes"
55
"context"
66
"fmt"
7-
"io/ioutil"
7+
"io"
88
"net/http"
99
"net/http/httptest"
1010
"testing"
@@ -53,7 +53,7 @@ func (server *MockVerifier) addFailedResult(code int, message string) {
5353

5454
func (server *MockVerifier) ServeHTTP(w http.ResponseWriter, r *http.Request) {
5555
if len(server.Results) > server.Current {
56-
body, err := ioutil.ReadAll(r.Body)
56+
body, err := io.ReadAll(r.Body)
5757
if err != nil {
5858
http.Error(w, err.Error(), http.StatusInternalServerError)
5959
} else {

0 commit comments

Comments
 (0)