Skip to content

[ME-4546] Replace ioutil with io everywhere (microsoft#258) #6

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

Closed
adrianosela wants to merge 2 commits into from
Closed

[ME-4546] Replace ioutil with io everywhere (microsoft#258) #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6b3e174
replace ioutil with io everywhere (#258)
adrianosela May 9, 2025
d823b28
Merge remote-tracking branch 'upstream/main' into ME-4546-update-from…
adrianosela May 9, 2025
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
16 changes: 8 additions & 8 deletions internal/github.com/swisscom/mssql-always-encrypted/pkg/alwaysencrypted_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
"crypto/x509"
"encoding/pem"
"fmt"
"io/ioutil"
"io"
"os"
"testing"

Expand All @@ -22,15 +22,15 @@ func TestLoadCEKV(t *testing.T) {
certFile, err := os.Open("../test/always-encrypted_pub.pem")
assert.NoError(t, err)

certBytes, err := ioutil.ReadAll(certFile)
certBytes, err := io.ReadAll(certFile)
assert.NoError(t, err)
pemB, _ := pem.Decode(certBytes)
cert, err := x509.ParseCertificate(pemB.Bytes)
assert.NoError(t, err)

cekvFile, err := os.Open("../test/cekv.key")
assert.NoError(t, err)
cekvBytes, err := ioutil.ReadAll(cekvFile)
cekvBytes, err := io.ReadAll(cekvFile)
assert.NoError(t, err)
cekv := LoadCEKV(cekvBytes)
assert.Equal(t, 1, cekv.Version)
Expand All @@ -40,7 +40,7 @@ func TestDecrypt(t *testing.T) {
certFile, err := os.Open("../test/always-encrypted.pem")
assert.NoError(t, err)

certBytes, err := ioutil.ReadAll(certFile)
certBytes, err := io.ReadAll(certFile)
assert.NoError(t, err)
pemB, _ := pem.Decode(certBytes)
privKey, err := x509.ParsePKCS8PrivateKey(pemB.Bytes)
Expand All @@ -50,7 +50,7 @@ func TestDecrypt(t *testing.T) {

cekvFile, err := os.Open("../test/cekv.key")
assert.NoError(t, err)
cekvBytes, err := ioutil.ReadAll(cekvFile)
cekvBytes, err := io.ReadAll(cekvFile)
assert.NoError(t, err)
cekv := LoadCEKV(cekvBytes)
rootKey, err := cekv.Decrypt(rsaPrivKey)
Expand All @@ -62,7 +62,7 @@ func TestDecrypt(t *testing.T) {
columnBytesFile, err := os.Open("../test/column_value.enc")
assert.NoError(t, err)

columnBytes, err := ioutil.ReadAll(columnBytesFile)
columnBytes, err := io.ReadAll(columnBytesFile)
assert.NoError(t, err)

key := keys.NewAeadAes256CbcHmac256(rootKey)
Expand All @@ -81,7 +81,7 @@ func TestDecryptCEK(t *testing.T) {
certFile, err := os.Open("../test/always-encrypted.pem")
assert.NoError(t, err)

certFileBytes, err := ioutil.ReadAll(certFile)
certFileBytes, err := io.ReadAll(certFile)
assert.NoError(t, err)

pemBlock, _ := pem.Decode(certFileBytes)
Expand All @@ -91,7 +91,7 @@ func TestDecryptCEK(t *testing.T) {
cekvFile, err := os.Open("../test/cekv.key")
assert.NoError(t, err)

cekvBytes, err := ioutil.ReadAll(cekvFile)
cekvBytes, err := io.ReadAll(cekvFile)
assert.NoError(t, err)

cekv := LoadCEKV(cekvBytes)
Expand Down
5 changes: 2 additions & 3 deletions mssql_perf_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ import (
"errors"
"fmt"
"io"
"io/ioutil"
"net"
"testing"
)
Expand Down Expand Up @@ -79,7 +78,7 @@ func BenchmarkSelect(b *testing.B) {
if packetType != packLogin7 {
b.Fatal("Client sent non LOGIN request packet type", packetType)
}
_, err = ioutil.ReadAll(tdsBuf)
_, err = io.ReadAll(tdsBuf)
if err != nil {
b.Fatal(err)
}
Expand Down Expand Up @@ -114,7 +113,7 @@ func BenchmarkSelect(b *testing.B) {
b.Log(err)
return
}
_, err = ioutil.ReadAll(tdsBuf)
_, err = io.ReadAll(tdsBuf)
if err != nil {
b.Log(err)
return
Expand Down
3 changes: 1 addition & 2 deletions tds.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ import (
"errors"
"fmt"
"io"
"io/ioutil"
"net"
"os"
"sort"
Expand Down Expand Up @@ -284,7 +283,7 @@ func readPrelogin(r *tdsBuffer) (map[uint8][]byte, error) {
if err != nil {
return nil, err
}
struct_buf, err := ioutil.ReadAll(r)
struct_buf, err := io.ReadAll(r)
if err != nil {
return nil, err
}
Expand Down
3 changes: 1 addition & 2 deletions token.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ import (
"encoding/binary"
"fmt"
"io"
"io/ioutil"
"net"
"strconv"

Expand Down Expand Up @@ -640,7 +639,7 @@ func parseFeatureExtAck(r *tdsBuffer) featureExtAck {
// Skip unprocessed bytes
if length > 0 {
fmt.Printf("Skipping %d bytes\n", length)
io.CopyN(ioutil.Discard, r, int64(length))
io.CopyN(io.Discard, r, int64(length))
}
}

Expand Down
Loading