arian/navidrome
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

Remove dependency of deprecated ioutil package

Browse Source
This commit is contained in:
Deluan
2021-07-20 20:00:58 -04:00
parent 774ad65155
commit 8afa2cd833
23 changed files with 77 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files
utils/cache/file_caches_test.go
Vendored
+5 -6
View File
@@ -3,7 +3,6 @@ package cache
import (
"context"
"io"
"io/ioutil"
"os"
"path/filepath"
"strings"
@@ -22,7 +21,7 @@ func callNewFileCache(name, cacheSize, cacheFolder string, maxItems int, getRead
var _ = Describe("File Caches", func() {
BeforeEach(func() {
conf.Server.DataFolder, _ = ioutil.TempDir("", "file_caches")
conf.Server.DataFolder, _ = os.MkdirTemp("", "file_caches")
})
AfterEach(func() {
os.RemoveAll(conf.Server.DataFolder)
@@ -61,13 +60,13 @@ var _ = Describe("File Caches", func() {
Expect(err).To(BeNil())
Expect(s.Cached).To(BeFalse())
Expect(s.Closer).To(BeNil())
Expect(ioutil.ReadAll(s)).To(Equal([]byte("test")))
Expect(io.ReadAll(s)).To(Equal([]byte("test")))
// Second call is a HIT
called = false
s, err = fc.Get(context.TODO(), &testArg{"test"})
Expect(err).To(BeNil())
Expect(ioutil.ReadAll(s)).To(Equal([]byte("test")))
Expect(io.ReadAll(s)).To(Equal([]byte("test")))
Expect(s.Cached).To(BeTrue())
Expect(s.Closer).ToNot(BeNil())
Expect(called).To(BeFalse())
@@ -83,13 +82,13 @@ var _ = Describe("File Caches", func() {
s, err := fc.Get(context.TODO(), &testArg{"test"})
Expect(err).To(BeNil())
Expect(s.Cached).To(BeFalse())
Expect(ioutil.ReadAll(s)).To(Equal([]byte("test")))
Expect(io.ReadAll(s)).To(Equal([]byte("test")))
// Second call is also a MISS
called = false
s, err = fc.Get(context.TODO(), &testArg{"test"})
Expect(err).To(BeNil())
Expect(ioutil.ReadAll(s)).To(Equal([]byte("test")))
Expect(io.ReadAll(s)).To(Equal([]byte("test")))
Expect(s.Cached).To(BeFalse())
Expect(called).To(BeTrue())
})
utils/cache/spread_fs_test.go
Vendored
+2 -3
View File
@@ -1,7 +1,6 @@
package cache
import (
"io/ioutil"
"os"
"path/filepath"
"strings"
@@ -16,7 +15,7 @@ var _ = Describe("Spread FS", func() {
BeforeEach(func() {
var err error
rootDir, _ = ioutil.TempDir("", "spread_fs")
rootDir, _ = os.MkdirTemp("", "spread_fs")
fs, err = NewSpreadFS(rootDir, 0755)
Expect(err).To(BeNil())
})
@@ -54,7 +53,7 @@ var _ = Describe("Spread FS", func() {
var actual []string
err := fs.Reload(func(key string, name string) {
Expect(key).To(Equal(name))
data, err := ioutil.ReadFile(name)
data, err := os.ReadFile(name)
Expect(err).To(BeNil())
actual = append(actual, string(data))
})
utils/cached_http_client.go
+1 -2
View File
@@ -6,7 +6,6 @@ import (
"encoding/base64"
"encoding/json"
"io"
"io/ioutil"
"net/http"
"strings"
"time"
@@ -71,7 +70,7 @@ func (c *CachedHTTPClient) serializeReq(req *http.Request) string {
URL: req.URL.String(),
}
if req.Body != nil {
bodyData, _ := ioutil.ReadAll(req.Body)
bodyData, _ := io.ReadAll(req.Body)
bodyStr := base64.StdEncoding.EncodeToString(bodyData)
data.Body = &bodyStr
}
utils/cached_http_client_test.go
+5 -5
View File
@@ -2,7 +2,7 @@ package utils
import (
"fmt"
"io/ioutil"
"io"
"net/http"
"net/http/httptest"
"time"
@@ -36,7 +36,7 @@ var _ = Describe("CachedHttpClient", func() {
r, _ := http.NewRequest("GET", ts.URL+"?name=doe", nil)
resp, err := chc.Do(r)
Expect(err).To(BeNil())
body, err := ioutil.ReadAll(resp.Body)
body, err := io.ReadAll(resp.Body)
Expect(err).To(BeNil())
Expect(string(body)).To(Equal("Hello, [doe]"))
Expect(requestsReceived).To(Equal(1))
@@ -45,7 +45,7 @@ var _ = Describe("CachedHttpClient", func() {
r, _ = http.NewRequest("GET", ts.URL+"?name=doe", nil)
resp, err = chc.Do(r)
Expect(err).To(BeNil())
body, err = ioutil.ReadAll(resp.Body)
body, err = io.ReadAll(resp.Body)
Expect(err).To(BeNil())
Expect(string(body)).To(Equal("Hello, [doe]"))
Expect(requestsReceived).To(Equal(1))
@@ -54,7 +54,7 @@ var _ = Describe("CachedHttpClient", func() {
r, _ = http.NewRequest("GET", ts.URL, nil)
resp, err = chc.Do(r)
Expect(err).To(BeNil())
body, err = ioutil.ReadAll(resp.Body)
body, err = io.ReadAll(resp.Body)
Expect(err).To(BeNil())
Expect(string(body)).To(Equal("Hello, []"))
Expect(requestsReceived).To(Equal(2))
@@ -64,7 +64,7 @@ var _ = Describe("CachedHttpClient", func() {
r.Header.Add("head", "this is a header")
resp, err = chc.Do(r)
Expect(err).To(BeNil())
body, err = ioutil.ReadAll(resp.Body)
body, err = io.ReadAll(resp.Body)
Expect(err).To(BeNil())
Expect(string(body)).To(Equal("Hello, []"))
Expect(header).To(Equal("this is a header"))
utils/merge_fs_test.go
+4 -4
View File
@@ -1,8 +1,8 @@
package utils_test
import (
"io"
"io/fs"
"io/ioutil"
"os"
"path/filepath"
@@ -16,8 +16,8 @@ var _ = Describe("MergeFS", func() {
var baseDir, overlayDir, mergedDir fs.FS
BeforeEach(func() {
baseName, _ = ioutil.TempDir("", "merge_fs_base_test")
overlayName, _ = ioutil.TempDir("", "merge_fs_overlay_test")
baseName, _ = os.MkdirTemp("", "merge_fs_base_test")
overlayName, _ = os.MkdirTemp("", "merge_fs_overlay_test")
baseDir = os.DirFS(baseName)
overlayDir = os.DirFS(overlayName)
mergedDir = utils.MergeFS{Base: baseDir, Overlay: overlayDir}
@@ -41,7 +41,7 @@ var _ = Describe("MergeFS", func() {
file, err := mergedDir.Open("b.json")
Expect(err).To(BeNil())
content, err := ioutil.ReadAll(file)
content, err := io.ReadAll(file)
Expect(err).To(BeNil())
Expect(string(content)).To(Equal("overridden"))
})