Skip to content

Commit d7e9e5f

Browse files
committed
ubiquity: replace uses of deprecated io/ioutil
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
1 parent 8bd4af2 commit d7e9e5f

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

ubiquity/ubiquity_platform.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import (
99
"crypto/x509"
1010
"encoding/json"
1111
"fmt"
12-
"io/ioutil"
12+
"os"
1313
"path"
1414
"path/filepath"
1515

@@ -93,7 +93,7 @@ func (p *Platform) ParseAndLoad() (ok bool) {
9393
p.KeyAlgoUbiquity = p.keyAlgoUbiquity()
9494
p.KeyStore = map[string]bool{}
9595
if p.KeyStoreFile != "" {
96-
pemBytes, err := ioutil.ReadFile(p.KeyStoreFile)
96+
pemBytes, err := os.ReadFile(p.KeyStoreFile)
9797
if err != nil {
9898
log.Error(err)
9999
return false
@@ -140,7 +140,7 @@ func LoadPlatforms(filename string) error {
140140
relativePath := filepath.Dir(filename)
141141
// Attempt to load root certificate metadata
142142
log.Debug("Loading platform metadata: ", filename)
143-
bytes, err := ioutil.ReadFile(filename)
143+
bytes, err := os.ReadFile(filename)
144144
if err != nil {
145145
return fmt.Errorf("platform metadata failed to load: %v", err)
146146
}

ubiquity/ubiquity_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package ubiquity
33
import (
44
"crypto/x509"
55
"fmt"
6-
"io/ioutil"
6+
"os"
77
"testing"
88
"time"
99

@@ -24,7 +24,7 @@ const (
2424
var rsa1024Cert, rsa2048Cert, rsa3072Cert, rsa4096Cert, ecdsa256Cert, ecdsa384Cert, ecdsa521Cert *x509.Certificate
2525

2626
func readCert(filename string) *x509.Certificate {
27-
bytes, _ := ioutil.ReadFile(filename)
27+
bytes, _ := os.ReadFile(filename)
2828
cert, _ := helpers.ParseCertificatePEM(bytes)
2929
return cert
3030
}

0 commit comments

Comments
 (0)