Skip to content

Commit 555f391

Browse files
committed
Remove deprecated ioutil
1 parent 7bfa08b commit 555f391

File tree

3 files changed

+6
-9
lines changed

3 files changed

+6
-9
lines changed

cmd/kubernetes/kubernetes_app_remove.go

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ package kubernetes
33
import (
44
"bytes"
55
"fmt"
6-
"io/ioutil"
76
"os"
87
"os/exec"
98
"strings"
@@ -43,12 +42,12 @@ var kubernetesAppRemoveCmd = &cobra.Command{
4342
}
4443

4544
allApps := strings.Split(args[0], ",")
46-
tmpFile, err := ioutil.TempFile(os.TempDir(), "kubeconfig-")
45+
tmpFile, err := os.CreateTemp(os.TempDir(), "kubeconfig-")
4746
if err != nil {
48-
utility.Error("Cannot create temporary file", err)
47+
utility.Error("Cannot create temporary file: %v", err)
4948
}
5049
if _, err = tmpFile.Write([]byte(kube.KubeConfig)); err != nil {
51-
utility.Error("Failed to write to temporary file", err)
50+
utility.Error("Failed to write to temporary file: %v", err)
5251
}
5352
defer os.Remove(tmpFile.Name())
5453
for _, split := range allApps {

cmd/sshkey/ssh_key_create.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ package sshkey
22

33
import (
44
"fmt"
5-
"io/ioutil"
65
"os"
76

87
"github.com/civo/cli/common"
@@ -27,7 +26,7 @@ var sshKeyCreateCmd = &cobra.Command{
2726
}
2827

2928
// reading the file
30-
data, err := ioutil.ReadFile(keyCreate)
29+
data, err := os.ReadFile(keyCreate)
3130
if err != nil {
3231
utility.Error("Reading the SSH key file failed with %s", err)
3332
os.Exit(1)

utility/kubernetes.go

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

33
import (
44
"fmt"
5-
"io/ioutil"
65
"os"
76
"os/exec"
87
"strings"
@@ -41,7 +40,7 @@ func ObtainKubeConfig(KubeconfigFilename string, civoConfig string, merge bool,
4140

4241
func mergeConfigs(localKubeconfigPath string, k3sconfig []byte, switchContext bool, clusterName string) ([]byte, error) {
4342
// Create a temporary kubeconfig to store the config of the newly create k3s cluster
44-
file, err := ioutil.TempFile(os.TempDir(), "civo-temp-*")
43+
file, err := os.CreateTemp(os.TempDir(), "civo-temp-*")
4544
if err != nil {
4645
return nil, fmt.Errorf("could not generate a temporary file to store the kuebeconfig: %s", err)
4746
}
@@ -119,7 +118,7 @@ func writeConfig(path string, data []byte, suppressMessage bool, mergeConfigs bo
119118
defer file.Close()
120119
}
121120

122-
writeErr := ioutil.WriteFile(path, data, 0600)
121+
writeErr := os.WriteFile(path, data, 0600)
123122
if writeErr != nil {
124123
return writeErr
125124
}

0 commit comments

Comments
 (0)