Skip to content

Migrate away from deprecated ioutil #123

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Migrate away from deprecated ioutil #123

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions pkg/bootstrapinplace/bootstrapinplace.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ package bootstrapinplace

import (
"fmt"
"io/ioutil"
"io"
"os"

"github.com/coreos/butane/config"
Expand Down Expand Up @@ -44,7 +44,7 @@ func (i *BootstrapInPlaceCommand) Create() error {
}
defer infile.Close()

dataIn, err := ioutil.ReadAll(infile)
dataIn, err := io.ReadAll(infile)
if err != nil {
fail("Error occurred while trying to read %s: %v\n", infile.Name(), err)
}
Expand Down
5 changes: 3 additions & 2 deletions pkg/start/asset.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,9 @@ package start

import (
"fmt"
"os"

"github.com/openshift/installer/pkg/types"
"io/ioutil"
v1 "k8s.io/api/core/v1"
"sigs.k8s.io/yaml"
)
Expand All @@ -21,7 +22,7 @@ var (
)

func getInstallConfig(file string) (*types.InstallConfig, error) {
data, err := ioutil.ReadFile(file)
data, err := os.ReadFile(file)
if err != nil {
return nil, err
}
Expand Down
17 changes: 8 additions & 9 deletions pkg/start/bootstrap_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ package start

import (
"fmt"
"io/ioutil"
"math/rand"
"net/http"
"net/http/httptest"
Expand Down Expand Up @@ -32,15 +31,15 @@ func createTestServer() (*httptest.Server, string) {
func setUp(t *testing.T) (assetDir, podManifestPath string) {
// Create source directories.
var err error
assetDir, err = ioutil.TempDir("", "assets")
assetDir, err = os.MkdirTemp("", "assets")
if err != nil {
t.Fatal(err)
}
podManifestPath, err = ioutil.TempDir("", "manifests")
podManifestPath, err = os.MkdirTemp("", "manifests")
if err != nil {
t.Fatal(err)
}
bootstrapSecretsDir, err = ioutil.TempDir("", "bootstrap-secrets")
bootstrapSecretsDir, err = os.MkdirTemp("", "bootstrap-secrets")
if err != nil {
t.Fatal(err)
}
Expand All @@ -49,22 +48,22 @@ func setUp(t *testing.T) (assetDir, podManifestPath string) {
if err := os.Mkdir(filepath.Join(assetDir, filepath.Dir(assetPathAdminKubeConfig)), os.FileMode(0755)); err != nil {
t.Fatal(err)
}
if err := ioutil.WriteFile(filepath.Join(assetDir, assetPathAdminKubeConfig), []byte("kubeconfig data"), os.FileMode(0644)); err != nil {
if err := os.WriteFile(filepath.Join(assetDir, assetPathAdminKubeConfig), []byte("kubeconfig data"), os.FileMode(0644)); err != nil {
t.Fatal(err)
}
if err := os.Mkdir(filepath.Join(assetDir, assetPathSecrets), os.FileMode(0755)); err != nil {
t.Fatal(err)
}
for _, secret := range secrets {
if err := ioutil.WriteFile(filepath.Join(assetDir, assetPathSecrets, secret), []byte("secret data"), os.FileMode(0644)); err != nil {
if err := os.WriteFile(filepath.Join(assetDir, assetPathSecrets, secret), []byte("secret data"), os.FileMode(0644)); err != nil {
t.Fatal(err)
}
}
if err := os.Mkdir(filepath.Join(assetDir, assetPathBootstrapManifests), os.FileMode(0755)); err != nil {
t.Fatal(err)
}
for _, manifest := range manifests {
if err := ioutil.WriteFile(filepath.Join(assetDir, assetPathBootstrapManifests, manifest), []byte("manifest data"), os.FileMode(0644)); err != nil {
if err := os.WriteFile(filepath.Join(assetDir, assetPathBootstrapManifests, manifest), []byte("manifest data"), os.FileMode(0644)); err != nil {
t.Fatal(err)
}
}
Expand Down Expand Up @@ -131,7 +130,7 @@ func TestBootstrapControlPlaneNoOverwrite(t *testing.T) {
existingData := []byte("existing data")

// Create a manifest in the destination already.
if err := ioutil.WriteFile(filepath.Join(podManifestPath, existingManifest), existingData, os.FileMode(0644)); err != nil {
if err := os.WriteFile(filepath.Join(podManifestPath, existingManifest), existingData, os.FileMode(0644)); err != nil {
t.Fatal(err)
}

Expand All @@ -152,7 +151,7 @@ func TestBootstrapControlPlaneNoOverwrite(t *testing.T) {
t.Errorf("bcp.Start() failed to copy manifest: %v", manifest)
}
if manifest == existingManifest {
data, err := ioutil.ReadFile(filepath.Join(podManifestPath, manifest))
data, err := os.ReadFile(filepath.Join(podManifestPath, manifest))
if err != nil {
t.Fatal(err)
}
Expand Down