public/grafana
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Handle ioutil deprecations (#53526)

Browse Source 
* replace ioutil.ReadFile -> os.ReadFile

* replace ioutil.ReadAll -> io.ReadAll

* replace ioutil.TempFile -> os.CreateTemp

* replace ioutil.NopCloser -> io.NopCloser

* replace ioutil.WriteFile -> os.WriteFile

* replace ioutil.TempDir -> os.MkdirTemp

* replace ioutil.Discard -> io.Discard
This commit is contained in:
Jo
2022-08-10 15:37:51 +02:00
committed by GitHub
parent 4926767737
commit 062d255124
140 changed files with 462 additions and 492 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/tests/api/alerting/testing.go
+6 -7
View File
@@ -5,7 +5,6 @@ import (
"encoding/json"
"fmt"
"io"
"io/ioutil"
"net/http"
"strings"
"testing"
@@ -55,7 +54,7 @@ func getRequest(t *testing.T, url string, expStatusCode int) *http.Response {
require.NoError(t, resp.Body.Close())
})
if expStatusCode != resp.StatusCode {
b, err := ioutil.ReadAll(resp.Body)
b, err := io.ReadAll(resp.Body)
require.NoError(t, err)
t.Fatal(string(b))
}
@@ -72,7 +71,7 @@ func postRequest(t *testing.T, url string, body string, expStatusCode int) *http
require.NoError(t, resp.Body.Close())
})
if expStatusCode != resp.StatusCode {
b, err := ioutil.ReadAll(resp.Body)
b, err := io.ReadAll(resp.Body)
require.NoError(t, err)
t.Fatal(string(b))
}
@@ -81,7 +80,7 @@ func postRequest(t *testing.T, url string, body string, expStatusCode int) *http
func getBody(t *testing.T, body io.ReadCloser) string {
t.Helper()
b, err := ioutil.ReadAll(body)
b, err := io.ReadAll(body)
require.NoError(t, err)
return string(b)
}
@@ -217,7 +216,7 @@ func (a apiClient) PostRulesGroup(t *testing.T, folder string, group *apimodels.
defer func() {
_ = resp.Body.Close()
}()
b, err := ioutil.ReadAll(resp.Body)
b, err := io.ReadAll(resp.Body)
require.NoError(t, err)
return resp.StatusCode, string(b)
}
@@ -231,7 +230,7 @@ func (a apiClient) GetRulesGroup(t *testing.T, folder string, group string) apim
defer func() {
_ = resp.Body.Close()
}()
b, err := ioutil.ReadAll(resp.Body)
b, err := io.ReadAll(resp.Body)
require.NoError(t, err)
require.Equal(t, http.StatusAccepted, resp.StatusCode)
@@ -249,7 +248,7 @@ func (a apiClient) GetAllRulesGroupInFolder(t *testing.T, folder string) apimode
defer func() {
_ = resp.Body.Close()
}()
b, err := ioutil.ReadAll(resp.Body)
b, err := io.ReadAll(resp.Body)
require.NoError(t, err)
assert.Equal(t, http.StatusAccepted, resp.StatusCode)