mirrors/maddy
1
0
Fork 0
mirror of https://github.com/foxcpp/maddy.git synced 2025-04-03 05:07:38 +03:00
Code Issues Projects Releases Packages Wiki Activity

chore: remove refs to deprecated io/ioutil

Browse source
This commit is contained in:
guoguangwu 2023-11-16 15:52:52 +08:00
parent 5277b4fa61
commit 8431eae5e5
15 changed files with 35 additions and 44 deletions
Download patch file Download diff file Expand all files Collapse all files

3
framework/buffer/memory.go
View file

@ -20,7 +20,6 @@ package buffer
import (
"io"
"io/ioutil"
)
// MemoryBuffer implements Buffer interface using byte slice.
@ -43,7 +42,7 @@ func (mb MemoryBuffer) Remove() error {
// BufferInMemory is a convenience function which creates MemoryBuffer with
// contents of the passed io.Reader.
func BufferInMemory(r io.Reader) (Buffer, error) {
blob, err := ioutil.ReadAll(r)
blob, err := io.ReadAll(r)
if err != nil {
return nil, err
}

4
framework/config/tls/client.go
View file

@ -22,7 +22,7 @@ import (
"crypto/tls"
"crypto/x509"
"fmt"
"io/ioutil"
"os"
"github.com/foxcpp/maddy/framework/config"
"github.com/foxcpp/maddy/framework/log"
@ -58,7 +58,7 @@ func TLSClientBlock(_ *config.Map, node config.Node) (interface{}, error) {
if len(rootCAPaths) != 0 {
pool := x509.NewCertPool()
for _, path := range rootCAPaths {
blob, err := ioutil.ReadFile(path)
blob, err := os.ReadFile(path)
if err != nil {
return nil, err
}

3
framework/log/log.go
View file

@ -22,7 +22,6 @@ package log
import (
"fmt"
"io"
"io/ioutil"
"os"
"strings"
"time"
@ -199,7 +198,7 @@ func (l Logger) Write(s []byte) (int, error) {
// Write method of returned object will be no-op.
func (l Logger) DebugWriter() io.Writer {
if !l.Debug {
return ioutil.Discard
return io.Discard
}
l.Debug = true
return &l

4
internal/modify/dkim/dkim_test.go
View file

@ -21,7 +21,7 @@ package dkim
import (
"bytes"
"context"
"io/ioutil"
"os"
"path/filepath"
"reflect"
"sort"
@ -106,7 +106,7 @@ func verifyTestMsg(t *testing.T, keysPath string, expectedDomains []string, hdr
domainsMap := make(map[string]bool)
zones := map[string]mockdns.Zone{}
for _, domain := range expectedDomains {
dnsRecord, err := ioutil.ReadFile(filepath.Join(keysPath, domain+".dns"))
dnsRecord, err := os.ReadFile(filepath.Join(keysPath, domain+".dns"))
if err != nil {
t.Fatal(err)
}

3
internal/modify/dkim/keys.go
View file

@ -29,7 +29,6 @@ import (
"encoding/pem"
"fmt"
"io"
"io/ioutil"
"os"
"path/filepath"
)
@ -45,7 +44,7 @@ func (m *Modifier) loadOrGenerateKey(keyPath, newKeyAlgo string) (pkey crypto.Si
}
defer f.Close()
pemBlob, err := ioutil.ReadAll(f)
pemBlob, err := io.ReadAll(f)
if err != nil {
return nil, false, err
}

8
internal/modify/dkim/keys_test.go
View file

@ -22,7 +22,7 @@ import (
"crypto/ed25519"
"crypto/rsa"
"encoding/base64"
"io/ioutil"
"os"
"path/filepath"
"strings"
"testing"
@ -44,7 +44,7 @@ func TestKeyLoad_new(t *testing.T) {
t.Fatal("newKey=false")
}
recordBlob, err := ioutil.ReadFile(filepath.Join(dir, "testkey.dns"))
recordBlob, err := os.ReadFile(filepath.Join(dir, "testkey.dns"))
if err != nil {
t.Fatal(err)
}
@ -82,7 +82,7 @@ func TestKeyLoad_existing_pkcs8(t *testing.T) {
dir := t.TempDir()
if err := ioutil.WriteFile(filepath.Join(dir, "testkey.key"), []byte(pkeyEd25519), 0o600); err != nil {
if err := os.WriteFile(filepath.Join(dir, "testkey.key"), []byte(pkeyEd25519), 0o600); err != nil {
t.Fatal(err)
}
@ -134,7 +134,7 @@ func TestKeyLoad_existing_pkcs1(t *testing.T) {
dir := t.TempDir()
if err := ioutil.WriteFile(filepath.Join(dir, "testkey.key"), []byte(pkeyRSA), 0o600); err != nil {
if err := os.WriteFile(filepath.Join(dir, "testkey.key"), []byte(pkeyRSA), 0o600); err != nil {
t.Fatal(err)
}

9
internal/table/file_test.go
View file

@ -19,7 +19,6 @@ along with this program. If not, see <https://www.gnu.org/licenses/>.
package table
import (
"io/ioutil"
"os"
"reflect"
"testing"
@ -33,7 +32,7 @@ func TestReadFile(t *testing.T) {
test := func(file string, expected map[string][]string) {
t.Helper()
f, err := ioutil.TempFile("", "maddy-tests-")
f, err := os.CreateTemp("", "maddy-tests-")
if err != nil {
t.Fatal(err)
}
@ -88,7 +87,7 @@ func TestFileReload(t *testing.T) {
const file = `cat: dog`
f, err := ioutil.TempFile("", "maddy-tests-")
f, err := os.CreateTemp("", "maddy-tests-")
if err != nil {
t.Fatal(err)
}
@ -139,7 +138,7 @@ func TestFileReload_Broken(t *testing.T) {
const file = `cat: dog`
f, err := ioutil.TempFile("", "maddy-tests-")
f, err := os.CreateTemp("", "maddy-tests-")
if err != nil {
t.Fatal(err)
}
@ -185,7 +184,7 @@ func TestFileReload_Removed(t *testing.T) {
const file = `cat: dog`
f, err := ioutil.TempFile("", "maddy-tests-")
f, err := os.CreateTemp("", "maddy-tests-")
if err != nil {
t.Fatal(err)
}

3
internal/target/queue/queue.go
View file

@ -63,7 +63,6 @@ import (
"errors"
"fmt"
"io"
"io/ioutil"
"math"
"os"
"path/filepath"
@ -640,7 +639,7 @@ func (q *Queue) removeFromDisk(msgMeta *module.MsgMetadata) {
}
func (q *Queue) readDiskQueue() error {
dirInfo, err := ioutil.ReadDir(q.location)
dirInfo, err := os.ReadDir(q.location)
if err != nil {
return err
}

8
internal/target/queue/queue_test.go
View file

@ -24,7 +24,7 @@ import (
"crypto/sha1"
"encoding/hex"
"errors"
"io/ioutil"
"io"
"os"
"path/filepath"
"reflect"
@ -122,7 +122,7 @@ func (utd *unreliableTargetDelivery) Body(ctx context.Context, header textproto.
}
r, _ := body.Open()
utd.msg.Body, _ = ioutil.ReadAll(r)
utd.msg.Body, _ = io.ReadAll(r)
if len(utd.ut.bodyFailures) > utd.ut.passedMessages {
return utd.ut.bodyFailures[utd.ut.passedMessages]
@ -133,7 +133,7 @@ func (utd *unreliableTargetDelivery) Body(ctx context.Context, header textproto.
func (utd *unreliableTargetDeliveryPartial) BodyNonAtomic(ctx context.Context, c module.StatusCollector, header textproto.Header, body buffer.Buffer) {
r, _ := body.Open()
utd.msg.Body, _ = ioutil.ReadAll(r)
utd.msg.Body, _ = io.ReadAll(r)
if len(utd.ut.bodyFailuresPartial) > utd.ut.passedMessages {
for rcpt, err := range utd.ut.bodyFailuresPartial[utd.ut.passedMessages] {
@ -200,7 +200,7 @@ func checkQueueDir(t *testing.T, q *Queue, expectedIDs []string) {
expectedMap[id] = false
}
dir, err := ioutil.ReadDir(q.location)
dir, err := os.ReadDir(q.location)
if err != nil {
t.Fatalf("failed to read queue directory: %v", err)
}

4
internal/testutils/bench_delivery.go
View file

@ -23,7 +23,7 @@ import (
"context"
"crypto/sha1"
"encoding/hex"
"io/ioutil"
"io"
"strconv"
"strings"
"testing"
@ -100,7 +100,7 @@ func RandomMsg(b *testing.B) (module.MsgMetadata, textproto.Header, buffer.Buffe
for i := 0; i < ExtraMessageHeaderFields; i++ {
hdr.Add("AAAAAAAAAAAA-"+strconv.Itoa(i), strings.Repeat("A", ExtraMessageHeaderFieldSize))
}
bodyBlob, _ := ioutil.ReadAll(body)
bodyBlob, _ := io.ReadAll(body)
return module.MsgMetadata{
DontTraceSender: true,

7
internal/testutils/buffer.go
View file

@ -22,7 +22,6 @@ import (
"bufio"
"bytes"
"io"
"io/ioutil"
"strings"
"testing"
@ -38,7 +37,7 @@ func BodyFromStr(t *testing.T, literal string) (textproto.Header, buffer.MemoryB
if err != nil {
t.Fatal(err)
}
body, err := ioutil.ReadAll(bufr)
body, err := io.ReadAll(bufr)
if err != nil {
t.Fatal(err)
}
@ -67,10 +66,10 @@ type FailingBuffer struct {
}
func (fb FailingBuffer) Open() (io.ReadCloser, error) {
r := ioutil.NopCloser(bytes.NewReader(fb.Blob))
r := io.NopCloser(bytes.NewReader(fb.Blob))
if fb.IOError != nil {
return ioutil.NopCloser(&errorReader{r, fb.IOError}), fb.OpenError
return io.NopCloser(&errorReader{r, fb.IOError}), fb.OpenError
}
return r, fb.OpenError

6
internal/testutils/filesystem.go
View file

@ -19,14 +19,14 @@ along with this program. If not, see <https://www.gnu.org/licenses/>.
package testutils
import (
"io/ioutil"
"os"
"testing"
)
// Dir is a wrapper for ioutil.TempDir that
// Dir is a wrapper for os.MkdirTemp that
// fails the test on errors.
func Dir(t *testing.T) string {
dir, err := ioutil.TempDir("", "maddy-tests-")
dir, err := os.MkdirTemp("", "maddy-tests-")
if err != nil {
t.Fatalf("can't create test dir: %v", err)
}

5
internal/testutils/smtp_server.go
View file

@ -22,7 +22,6 @@ import (
"crypto/tls"
"crypto/x509"
"io"
"io/ioutil"
"net"
"reflect"
"sort"
@ -144,7 +143,7 @@ func (s *session) Data(r io.Reader) error {
return s.backend.DataErr
}
b, err := ioutil.ReadAll(r)
b, err := io.ReadAll(r)
if err != nil {
return err
}
@ -161,7 +160,7 @@ func (s *session) LMTPData(r io.Reader, status smtp.StatusCollector) error {
return s.backend.DataErr
}
b, err := ioutil.ReadAll(r)
b, err := io.ReadAll(r)
if err != nil {
return err
}

7
internal/testutils/target.go
View file

@ -24,7 +24,6 @@ import (
"encoding/hex"
"errors"
"io"
"io/ioutil"
"reflect"
"sort"
"testing"
@ -131,7 +130,7 @@ func (dtd *testTargetDeliveryPartial) BodyNonAtomic(ctx context.Context, c modul
}
defer body.Close()
dtd.msg.Body, err = ioutil.ReadAll(body)
dtd.msg.Body, err = io.ReadAll(body)
if err != nil {
for rcpt, err := range dtd.tgt.PartialBodyErr {
c.SetStatus(rcpt, err)
@ -157,11 +156,11 @@ func (dtd *testTargetDelivery) Body(ctx context.Context, header textproto.Header
if dtd.tgt.DiscardMessages {
// Don't bother.
_, err = io.Copy(ioutil.Discard, body)
_, err = io.Copy(io.Discard, body)
return err
}
dtd.msg.Body, err = ioutil.ReadAll(body)
dtd.msg.Body, err = io.ReadAll(body)
return err
}

5
tests/t.go
View file

@ -27,7 +27,6 @@ import (
"bufio"
"flag"
"fmt"
"io/ioutil"
"math/rand"
"net"
"os"
@ -150,7 +149,7 @@ func (t *T) Run(waitListeners int) {
}
// Setup file system, create statedir, runtimedir, write out config.
testDir, err := ioutil.TempDir("", "maddy-tests-")
testDir, err := os.MkdirTemp("", "maddy-tests-")
if err != nil {
t.Fatal("Test configuration failed:", err)
}
@ -182,7 +181,7 @@ func (t *T) Run(waitListeners int) {
configPreable := "state_dir " + filepath.Join(t.testDir, "statedir") + "\n" +
"runtime_dir " + filepath.Join(t.testDir, "runtime") + "\n\n"
err = ioutil.WriteFile(filepath.Join(t.testDir, "maddy.conf"), []byte(configPreable+t.cfg), os.ModePerm)
err = os.WriteFile(filepath.Join(t.testDir, "maddy.conf"), []byte(configPreable+t.cfg), os.ModePerm)
if err != nil {
t.Fatal("Test configuration failed:", err)
}