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/api_admin_configuration_test.go
+10 -10
View File
@@ -4,7 +4,7 @@ import (
"bytes"
"encoding/json"
"fmt"
"io/ioutil"
"io"
"net/http"
"testing"
"time"
@@ -62,7 +62,7 @@ func TestAdminConfiguration_SendingToExternalAlertmanagers(t *testing.T) {
{
alertsURL := fmt.Sprintf("http://grafana:password@%s/api/v1/ngalert/admin_config", grafanaListedAddr)
resp := getRequest(t, alertsURL, http.StatusNotFound) // nolint
b, err := ioutil.ReadAll(resp.Body)
b, err := io.ReadAll(resp.Body)
require.NoError(t, err)
var res map[string]interface{}
err = json.Unmarshal(b, &res)
@@ -82,7 +82,7 @@ func TestAdminConfiguration_SendingToExternalAlertmanagers(t *testing.T) {
alertsURL := fmt.Sprintf("http://grafana:password@%s/api/v1/ngalert/admin_config", grafanaListedAddr)
resp := postRequest(t, alertsURL, buf.String(), http.StatusBadRequest) // nolint
b, err := ioutil.ReadAll(resp.Body)
b, err := io.ReadAll(resp.Body)
require.NoError(t, err)
var res map[string]interface{}
err = json.Unmarshal(b, &res)
@@ -103,7 +103,7 @@ func TestAdminConfiguration_SendingToExternalAlertmanagers(t *testing.T) {
alertsURL := fmt.Sprintf("http://grafana:password@%s/api/v1/ngalert/admin_config", grafanaListedAddr)
resp := postRequest(t, alertsURL, buf.String(), http.StatusBadRequest) // nolint
b, err := ioutil.ReadAll(resp.Body)
b, err := io.ReadAll(resp.Body)
require.NoError(t, err)
var res map[string]interface{}
err = json.Unmarshal(b, &res)
@@ -125,7 +125,7 @@ func TestAdminConfiguration_SendingToExternalAlertmanagers(t *testing.T) {
alertsURL := fmt.Sprintf("http://grafana:password@%s/api/v1/ngalert/admin_config", grafanaListedAddr)
resp := postRequest(t, alertsURL, buf.String(), http.StatusCreated) // nolint
b, err := ioutil.ReadAll(resp.Body)
b, err := io.ReadAll(resp.Body)
require.NoError(t, err)
var res map[string]interface{}
err = json.Unmarshal(b, &res)
@@ -137,7 +137,7 @@ func TestAdminConfiguration_SendingToExternalAlertmanagers(t *testing.T) {
{
alertsURL := fmt.Sprintf("http://grafana:password@%s/api/v1/ngalert/admin_config", grafanaListedAddr)
resp := getRequest(t, alertsURL, http.StatusOK) // nolint
b, err := ioutil.ReadAll(resp.Body)
b, err := io.ReadAll(resp.Body)
require.NoError(t, err)
require.JSONEq(t, fmt.Sprintf("{\"alertmanagers\":[\"%s\",\"%s\"], \"alertmanagersChoice\": %q}\n", fakeAM1.URL(), fakeAM2.URL(), ngmodels.ExternalAlertmanagers), string(b))
}
@@ -147,7 +147,7 @@ func TestAdminConfiguration_SendingToExternalAlertmanagers(t *testing.T) {
alertsURL := fmt.Sprintf("http://grafana:password@%s/api/v1/ngalert/alertmanagers", grafanaListedAddr)
require.Eventually(t, func() bool {
resp := getRequest(t, alertsURL, http.StatusOK) // nolint
b, err := ioutil.ReadAll(resp.Body)
b, err := io.ReadAll(resp.Body)
require.NoError(t, err)
var alertmanagers apimodels.GettableAlertmanagers
@@ -227,7 +227,7 @@ func TestAdminConfiguration_SendingToExternalAlertmanagers(t *testing.T) {
alertsURL := fmt.Sprintf("http://admin-42:admin-42@%s/api/v1/ngalert/admin_config", grafanaListedAddr)
resp := postRequest(t, alertsURL, buf.String(), http.StatusCreated) // nolint
b, err := ioutil.ReadAll(resp.Body)
b, err := io.ReadAll(resp.Body)
require.NoError(t, err)
var res map[string]interface{}
err = json.Unmarshal(b, &res)
@@ -239,7 +239,7 @@ func TestAdminConfiguration_SendingToExternalAlertmanagers(t *testing.T) {
{
alertsURL := fmt.Sprintf("http://admin-42:admin-42@%s/api/v1/ngalert/admin_config", grafanaListedAddr)
resp := getRequest(t, alertsURL, http.StatusOK) // nolint
b, err := ioutil.ReadAll(resp.Body)
b, err := io.ReadAll(resp.Body)
require.NoError(t, err)
require.JSONEq(t, fmt.Sprintf("{\"alertmanagers\":[\"%s\"], \"alertmanagersChoice\": %q}\n", fakeAM3.URL(), ngmodels.AllAlertmanagers), string(b))
}
@@ -249,7 +249,7 @@ func TestAdminConfiguration_SendingToExternalAlertmanagers(t *testing.T) {
alertsURL := fmt.Sprintf("http://admin-42:admin-42@%s/api/v1/ngalert/alertmanagers", grafanaListedAddr)
require.Eventually(t, func() bool {
resp := getRequest(t, alertsURL, http.StatusOK) // nolint
b, err := ioutil.ReadAll(resp.Body)
b, err := io.ReadAll(resp.Body)
require.NoError(t, err)
var alertmanagers apimodels.GettableAlertmanagers
pkg/tests/api/alerting/api_alertmanager_configuration_test.go
+2 -2
View File
@@ -3,7 +3,7 @@ package alerting
import (
"encoding/json"
"fmt"
"io/ioutil"
"io"
"net/http"
"regexp"
"testing"
@@ -87,7 +87,7 @@ func TestAlertmanagerConfigurationIsTransactional(t *testing.T) {
}
`
resp := postRequest(t, alertConfigURL, payload, http.StatusBadRequest) // nolint
b, err := ioutil.ReadAll(resp.Body)
b, err := io.ReadAll(resp.Body)
require.NoError(t, err)
var res map[string]interface{}
require.NoError(t, json.Unmarshal(b, &res))
pkg/tests/api/alerting/api_alertmanager_test.go
+28 -28
View File
@@ -5,7 +5,7 @@ import (
"context"
"encoding/json"
"fmt"
"io/ioutil"
"io"
"net/http"
"regexp"
"strings"
@@ -127,7 +127,7 @@ func TestAMConfigAccess(t *testing.T) {
})
require.NoError(t, err)
require.Equal(t, tc.expStatus, resp.StatusCode)
b, err := ioutil.ReadAll(resp.Body)
b, err := io.ReadAll(resp.Body)
require.NoError(t, err)
require.Contains(t, string(b), tc.expBody)
})
@@ -194,7 +194,7 @@ func TestAMConfigAccess(t *testing.T) {
})
require.NoError(t, err)
require.Equal(t, tc.expStatus, resp.StatusCode)
b, err := ioutil.ReadAll(resp.Body)
b, err := io.ReadAll(resp.Body)
if tc.expStatus == http.StatusOK {
re := regexp.MustCompile(`"uid":"([\w|-]+)"`)
b = re.ReplaceAll(b, []byte(`"uid":""`))
@@ -260,7 +260,7 @@ func TestAMConfigAccess(t *testing.T) {
})
require.NoError(t, err)
require.Equal(t, tc.expStatus, resp.StatusCode)
b, err := ioutil.ReadAll(resp.Body)
b, err := io.ReadAll(resp.Body)
require.NoError(t, err)
if tc.expStatus == http.StatusAccepted {
re := regexp.MustCompile(`"id":"([\w|-]+)"`)
@@ -309,7 +309,7 @@ func TestAMConfigAccess(t *testing.T) {
require.Equal(t, tc.expStatus, resp.StatusCode)
require.NoError(t, err)
if tc.expStatus == http.StatusOK {
b, err := ioutil.ReadAll(resp.Body)
b, err := io.ReadAll(resp.Body)
require.NoError(t, err)
blob = b
}
@@ -379,7 +379,7 @@ func TestAMConfigAccess(t *testing.T) {
})
require.NoError(t, err)
require.Equal(t, tc.expStatus, resp.StatusCode)
b, err := ioutil.ReadAll(resp.Body)
b, err := io.ReadAll(resp.Body)
require.NoError(t, err)
if tc.expStatus == http.StatusOK {
unconsumedSilenceIdx++
@@ -410,7 +410,7 @@ func TestAlertAndGroupsQuery(t *testing.T) {
err := resp.Body.Close()
require.NoError(t, err)
})
b, err := ioutil.ReadAll(resp.Body)
b, err := io.ReadAll(resp.Body)
require.NoError(t, err)
require.Equal(t, http.StatusUnauthorized, resp.StatusCode)
require.JSONEq(t, `{"message": "Unauthorized"}`, string(b))
@@ -435,7 +435,7 @@ func TestAlertAndGroupsQuery(t *testing.T) {
err := resp.Body.Close()
require.NoError(t, err)
})
b, err := ioutil.ReadAll(resp.Body)
b, err := io.ReadAll(resp.Body)
require.NoError(t, err)
require.Equal(t, http.StatusUnauthorized, resp.StatusCode)
@@ -454,7 +454,7 @@ func TestAlertAndGroupsQuery(t *testing.T) {
err := resp.Body.Close()
require.NoError(t, err)
})
b, err := ioutil.ReadAll(resp.Body)
b, err := io.ReadAll(resp.Body)
require.NoError(t, err)
require.Equal(t, 200, resp.StatusCode)
require.JSONEq(t, "[]", string(b))
@@ -470,7 +470,7 @@ func TestAlertAndGroupsQuery(t *testing.T) {
err := resp.Body.Close()
require.NoError(t, err)
})
b, err := ioutil.ReadAll(resp.Body)
b, err := io.ReadAll(resp.Body)
require.NoError(t, err)
require.NoError(t, err)
require.Equal(t, 200, resp.StatusCode)
@@ -529,7 +529,7 @@ func TestAlertAndGroupsQuery(t *testing.T) {
err := resp.Body.Close()
require.NoError(t, err)
})
b, err := ioutil.ReadAll(resp.Body)
b, err := io.ReadAll(resp.Body)
require.NoError(t, err)
require.Equal(t, 200, resp.StatusCode)
@@ -704,7 +704,7 @@ func TestDeleteFolderWithRules(t *testing.T) {
err := resp.Body.Close()
require.NoError(t, err)
})
b, err := ioutil.ReadAll(resp.Body)
b, err := io.ReadAll(resp.Body)
require.NoError(t, err)
assert.Equal(t, 200, resp.StatusCode)
@@ -781,7 +781,7 @@ func TestDeleteFolderWithRules(t *testing.T) {
err := resp.Body.Close()
require.NoError(t, err)
})
b, err := ioutil.ReadAll(resp.Body)
b, err := io.ReadAll(resp.Body)
require.NoError(t, err)
require.Equal(t, http.StatusBadRequest, resp.StatusCode)
require.JSONEq(t, `{"message":"folder cannot be deleted: folder contains alert rules"}`, string(b))
@@ -799,7 +799,7 @@ func TestDeleteFolderWithRules(t *testing.T) {
err := resp.Body.Close()
require.NoError(t, err)
})
b, err := ioutil.ReadAll(resp.Body)
b, err := io.ReadAll(resp.Body)
require.NoError(t, err)
require.Equal(t, 200, resp.StatusCode)
require.JSONEq(t, `{"id":1,"message":"Folder default deleted","title":"default"}`, string(b))
@@ -815,7 +815,7 @@ func TestDeleteFolderWithRules(t *testing.T) {
err := resp.Body.Close()
require.NoError(t, err)
})
b, err := ioutil.ReadAll(resp.Body)
b, err := io.ReadAll(resp.Body)
require.NoError(t, err)
assert.Equal(t, 200, resp.StatusCode)
@@ -1155,7 +1155,7 @@ func TestAlertRuleCRUD(t *testing.T) {
err := resp.Body.Close()
require.NoError(t, err)
})
b, err := ioutil.ReadAll(resp.Body)
b, err := io.ReadAll(resp.Body)
require.NoError(t, err)
assert.Equal(t, resp.StatusCode, 202)
@@ -1322,7 +1322,7 @@ func TestAlertRuleCRUD(t *testing.T) {
err := resp.Body.Close()
require.NoError(t, err)
})
b, err := ioutil.ReadAll(resp.Body)
b, err := io.ReadAll(resp.Body)
require.NoError(t, err)
assert.Equal(t, resp.StatusCode, 202)
@@ -1428,7 +1428,7 @@ func TestAlertRuleCRUD(t *testing.T) {
err := resp.Body.Close()
require.NoError(t, err)
})
b, err := ioutil.ReadAll(resp.Body)
b, err := io.ReadAll(resp.Body)
require.NoError(t, err)
assert.Equal(t, resp.StatusCode, 202)
@@ -1500,7 +1500,7 @@ func TestAlertRuleCRUD(t *testing.T) {
err := resp.Body.Close()
require.NoError(t, err)
})
b, err := ioutil.ReadAll(resp.Body)
b, err := io.ReadAll(resp.Body)
require.NoError(t, err)
assert.Equal(t, resp.StatusCode, 202)
@@ -1617,7 +1617,7 @@ func TestAlertRuleCRUD(t *testing.T) {
err := resp.Body.Close()
require.NoError(t, err)
})
b, err := ioutil.ReadAll(resp.Body)
b, err := io.ReadAll(resp.Body)
require.NoError(t, err)
assert.Equal(t, resp.StatusCode, 202)
@@ -1702,7 +1702,7 @@ func TestAlertRuleCRUD(t *testing.T) {
err := resp.Body.Close()
require.NoError(t, err)
})
b, err := ioutil.ReadAll(resp.Body)
b, err := io.ReadAll(resp.Body)
require.NoError(t, err)
assert.Equal(t, resp.StatusCode, 202)
@@ -1774,7 +1774,7 @@ func TestAlertRuleCRUD(t *testing.T) {
err := resp.Body.Close()
require.NoError(t, err)
})
b, err := ioutil.ReadAll(resp.Body)
b, err := io.ReadAll(resp.Body)
require.NoError(t, err)
require.Equal(t, http.StatusAccepted, resp.StatusCode)
@@ -1793,7 +1793,7 @@ func TestAlertRuleCRUD(t *testing.T) {
err := resp.Body.Close()
require.NoError(t, err)
})
b, err := ioutil.ReadAll(resp.Body)
b, err := io.ReadAll(resp.Body)
require.NoError(t, err)
require.Equal(t, http.StatusAccepted, resp.StatusCode)
@@ -1822,7 +1822,7 @@ func TestAlertmanagerStatus(t *testing.T) {
err := resp.Body.Close()
require.NoError(t, err)
})
b, err := ioutil.ReadAll(resp.Body)
b, err := io.ReadAll(resp.Body)
require.NoError(t, err)
require.Equal(t, 200, resp.StatusCode)
require.JSONEq(t, `
@@ -1904,7 +1904,7 @@ func TestQuota(t *testing.T) {
err := resp.Body.Close()
require.NoError(t, err)
})
b, err := ioutil.ReadAll(resp.Body)
b, err := io.ReadAll(resp.Body)
require.NoError(t, err)
assert.Equal(t, resp.StatusCode, 202)
@@ -2022,7 +2022,7 @@ func TestQuota(t *testing.T) {
err := resp.Body.Close()
require.NoError(t, err)
})
b, err := ioutil.ReadAll(resp.Body)
b, err := io.ReadAll(resp.Body)
require.NoError(t, err)
assert.Equal(t, resp.StatusCode, 202)
@@ -2318,7 +2318,7 @@ func TestEval(t *testing.T) {
err := resp.Body.Close()
require.NoError(t, err)
})
b, err := ioutil.ReadAll(resp.Body)
b, err := io.ReadAll(resp.Body)
require.NoError(t, err)
res := Response{}
err = json.Unmarshal(b, &res)
@@ -2501,7 +2501,7 @@ func TestEval(t *testing.T) {
err := resp.Body.Close()
require.NoError(t, err)
})
b, err := ioutil.ReadAll(resp.Body)
b, err := io.ReadAll(resp.Body)
require.NoError(t, err)
res := Response{}
err = json.Unmarshal(b, &res)
pkg/tests/api/alerting/api_available_channel_test.go
+2 -2
View File
@@ -3,7 +3,7 @@ package alerting
import (
"encoding/json"
"fmt"
"io/ioutil"
"io"
"net/http"
"testing"
@@ -40,7 +40,7 @@ func TestAvailableChannels(t *testing.T) {
err := resp.Body.Close()
require.NoError(t, err)
})
b, err := ioutil.ReadAll(resp.Body)
b, err := io.ReadAll(resp.Body)
require.NoError(t, err)
require.Equal(t, 200, resp.StatusCode)
pkg/tests/api/alerting/api_notification_channel_test.go
+11 -12
View File
@@ -7,7 +7,6 @@ import (
"errors"
"fmt"
"io"
"io/ioutil"
"mime/multipart"
"net"
"net/http"
@@ -59,7 +58,7 @@ func TestTestReceivers(t *testing.T) {
require.NoError(t, err)
})
b, err := ioutil.ReadAll(resp.Body)
b, err := io.ReadAll(resp.Body)
require.NoError(t, err)
res := Response{}
err = json.Unmarshal(b, &res)
@@ -110,7 +109,7 @@ func TestTestReceivers(t *testing.T) {
require.NoError(t, err)
})
b, err := ioutil.ReadAll(resp.Body)
b, err := io.ReadAll(resp.Body)
require.NoError(t, err)
var result apimodels.TestReceiversResult
@@ -189,7 +188,7 @@ func TestTestReceivers(t *testing.T) {
require.NoError(t, resp.Body.Close())
})
b, err := ioutil.ReadAll(resp.Body)
b, err := io.ReadAll(resp.Body)
require.NoError(t, err)
var result apimodels.TestReceiversResult
@@ -276,7 +275,7 @@ func TestTestReceivers(t *testing.T) {
})
require.Equal(t, http.StatusRequestTimeout, resp.StatusCode)
b, err := ioutil.ReadAll(resp.Body)
b, err := io.ReadAll(resp.Body)
require.NoError(t, err)
var result apimodels.TestReceiversResult
@@ -375,7 +374,7 @@ func TestTestReceivers(t *testing.T) {
})
require.Equal(t, http.StatusMultiStatus, resp.StatusCode)
b, err := ioutil.ReadAll(resp.Body)
b, err := io.ReadAll(resp.Body)
require.NoError(t, err)
var result apimodels.TestReceiversResult
@@ -478,7 +477,7 @@ func TestTestReceiversAlertCustomization(t *testing.T) {
require.NoError(t, err)
})
b, err := ioutil.ReadAll(resp.Body)
b, err := io.ReadAll(resp.Body)
require.NoError(t, err)
var result apimodels.TestReceiversResult
@@ -568,7 +567,7 @@ func TestTestReceiversAlertCustomization(t *testing.T) {
require.NoError(t, err)
})
b, err := ioutil.ReadAll(resp.Body)
b, err := io.ReadAll(resp.Body)
require.NoError(t, err)
var result apimodels.TestReceiversResult
@@ -655,7 +654,7 @@ func TestTestReceiversAlertCustomization(t *testing.T) {
require.NoError(t, err)
})
b, err := ioutil.ReadAll(resp.Body)
b, err := io.ReadAll(resp.Body)
require.NoError(t, err)
var result apimodels.TestReceiversResult
@@ -752,7 +751,7 @@ func TestNotificationChannels(t *testing.T) {
// There are no notification channel config initially - so it returns the default configuration.
alertsURL := fmt.Sprintf("http://grafana:password@%s/api/alertmanager/grafana/config/api/v1/alerts", grafanaListedAddr)
resp := getRequest(t, alertsURL, http.StatusOK) // nolint
b, err := ioutil.ReadAll(resp.Body)
b, err := io.ReadAll(resp.Body)
require.NoError(t, err)
require.JSONEq(t, defaultAlertmanagerConfigJSON, string(b))
}
@@ -812,14 +811,14 @@ func TestNotificationChannels(t *testing.T) {
err := resp.Body.Close()
require.NoError(t, err)
})
b, err := ioutil.ReadAll(resp.Body)
b, err := io.ReadAll(resp.Body)
require.NoError(t, err)
require.Equal(t, 202, resp.StatusCode)
require.JSONEq(t, `{"message":"configuration deleted; the default is applied"}`, string(b))
alertsURL := fmt.Sprintf("http://grafana:password@%s/api/alertmanager/grafana/config/api/v1/alerts", grafanaListedAddr)
resp = getRequest(t, alertsURL, http.StatusOK) // nolint
b, err = ioutil.ReadAll(resp.Body)
b, err = io.ReadAll(resp.Body)
require.NoError(t, err)
require.JSONEq(t, defaultAlertmanagerConfigJSON, string(b))
}
pkg/tests/api/alerting/api_prometheus_test.go
+17 -17
View File
@@ -5,7 +5,7 @@ import (
"context"
"encoding/json"
"fmt"
"io/ioutil"
"io"
"net/http"
"sort"
"testing"
@@ -74,7 +74,7 @@ func TestPrometheusRules(t *testing.T) {
err := resp.Body.Close()
require.NoError(t, err)
})
b, err := ioutil.ReadAll(resp.Body)
b, err := io.ReadAll(resp.Body)
require.NoError(t, err)
assert.Equal(t, 200, resp.StatusCode)
require.JSONEq(t, `{"status": "success", "data": {"groups": []}}`, string(b))
@@ -149,7 +149,7 @@ func TestPrometheusRules(t *testing.T) {
err := resp.Body.Close()
require.NoError(t, err)
})
b, err := ioutil.ReadAll(resp.Body)
b, err := io.ReadAll(resp.Body)
require.NoError(t, err)
assert.Equal(t, resp.StatusCode, 202)
@@ -203,7 +203,7 @@ func TestPrometheusRules(t *testing.T) {
err := resp.Body.Close()
require.NoError(t, err)
})
b, err := ioutil.ReadAll(resp.Body)
b, err := io.ReadAll(resp.Body)
require.NoError(t, err)
assert.Equal(t, 400, resp.StatusCode)
@@ -222,7 +222,7 @@ func TestPrometheusRules(t *testing.T) {
err := resp.Body.Close()
require.NoError(t, err)
})
b, err := ioutil.ReadAll(resp.Body)
b, err := io.ReadAll(resp.Body)
require.NoError(t, err)
require.Equal(t, 200, resp.StatusCode)
@@ -275,7 +275,7 @@ func TestPrometheusRules(t *testing.T) {
err := resp.Body.Close()
require.NoError(t, err)
})
b, err := ioutil.ReadAll(resp.Body)
b, err := io.ReadAll(resp.Body)
require.NoError(t, err)
require.Equal(t, 200, resp.StatusCode)
require.JSONEq(t, `
@@ -414,7 +414,7 @@ func TestPrometheusRulesFilterByDashboard(t *testing.T) {
err := resp.Body.Close()
require.NoError(t, err)
})
b, err := ioutil.ReadAll(resp.Body)
b, err := io.ReadAll(resp.Body)
require.NoError(t, err)
assert.Equal(t, resp.StatusCode, 202)
@@ -501,7 +501,7 @@ func TestPrometheusRulesFilterByDashboard(t *testing.T) {
err := resp.Body.Close()
require.NoError(t, err)
})
b, err := ioutil.ReadAll(resp.Body)
b, err := io.ReadAll(resp.Body)
require.NoError(t, err)
require.Equal(t, 200, resp.StatusCode)
@@ -518,7 +518,7 @@ func TestPrometheusRulesFilterByDashboard(t *testing.T) {
err := resp.Body.Close()
require.NoError(t, err)
})
b, err := ioutil.ReadAll(resp.Body)
b, err := io.ReadAll(resp.Body)
require.NoError(t, err)
require.Equal(t, 200, resp.StatusCode)
@@ -535,7 +535,7 @@ func TestPrometheusRulesFilterByDashboard(t *testing.T) {
err := resp.Body.Close()
require.NoError(t, err)
})
b, err := ioutil.ReadAll(resp.Body)
b, err := io.ReadAll(resp.Body)
require.NoError(t, err)
require.Equal(t, 200, resp.StatusCode)
@@ -552,7 +552,7 @@ func TestPrometheusRulesFilterByDashboard(t *testing.T) {
err := resp.Body.Close()
require.NoError(t, err)
})
b, err := ioutil.ReadAll(resp.Body)
b, err := io.ReadAll(resp.Body)
require.NoError(t, err)
require.Equal(t, 200, resp.StatusCode)
@@ -569,7 +569,7 @@ func TestPrometheusRulesFilterByDashboard(t *testing.T) {
err := resp.Body.Close()
require.NoError(t, err)
})
b, err := ioutil.ReadAll(resp.Body)
b, err := io.ReadAll(resp.Body)
require.NoError(t, err)
require.Equal(t, 200, resp.StatusCode)
@@ -587,7 +587,7 @@ func TestPrometheusRulesFilterByDashboard(t *testing.T) {
require.NoError(t, err)
})
require.Equal(t, http.StatusBadRequest, resp.StatusCode)
b, err := ioutil.ReadAll(resp.Body)
b, err := io.ReadAll(resp.Body)
require.NoError(t, err)
var res map[string]interface{}
require.NoError(t, json.Unmarshal(b, &res))
@@ -605,7 +605,7 @@ func TestPrometheusRulesFilterByDashboard(t *testing.T) {
require.NoError(t, err)
})
require.Equal(t, http.StatusBadRequest, resp.StatusCode)
b, err := ioutil.ReadAll(resp.Body)
b, err := io.ReadAll(resp.Body)
require.NoError(t, err)
var res map[string]interface{}
require.NoError(t, json.Unmarshal(b, &res))
@@ -657,7 +657,7 @@ func TestPrometheusRulesPermissions(t *testing.T) {
err := resp.Body.Close()
require.NoError(t, err)
})
b, err := ioutil.ReadAll(resp.Body)
b, err := io.ReadAll(resp.Body)
require.NoError(t, err)
require.Equal(t, 200, resp.StatusCode)
@@ -687,7 +687,7 @@ func TestPrometheusRulesPermissions(t *testing.T) {
err := resp.Body.Close()
require.NoError(t, err)
})
b, err := ioutil.ReadAll(resp.Body)
b, err := io.ReadAll(resp.Body)
require.NoError(t, err)
require.Equal(t, 200, resp.StatusCode)
@@ -712,7 +712,7 @@ func TestPrometheusRulesPermissions(t *testing.T) {
err := resp.Body.Close()
require.NoError(t, err)
})
b, err := ioutil.ReadAll(resp.Body)
b, err := io.ReadAll(resp.Body)
require.NoError(t, err)
require.Equal(t, 200, resp.StatusCode)
pkg/tests/api/alerting/api_ruler_test.go
+11 -11
View File
@@ -3,7 +3,7 @@ package alerting
import (
"encoding/json"
"fmt"
"io/ioutil"
"io"
"math/rand"
"net/http"
"testing"
@@ -64,7 +64,7 @@ func TestAlertRulePermissions(t *testing.T) {
err := resp.Body.Close()
require.NoError(t, err)
})
b, err := ioutil.ReadAll(resp.Body)
b, err := io.ReadAll(resp.Body)
require.NoError(t, err)
assert.Equal(t, resp.StatusCode, 200)
@@ -187,7 +187,7 @@ func TestAlertRulePermissions(t *testing.T) {
err := resp.Body.Close()
require.NoError(t, err)
})
b, err = ioutil.ReadAll(resp.Body)
b, err = io.ReadAll(resp.Body)
require.NoError(t, err)
assert.Equal(t, resp.StatusCode, 200)
@@ -261,7 +261,7 @@ func TestAlertRulePermissions(t *testing.T) {
err := resp.Body.Close()
require.NoError(t, err)
})
b, err := ioutil.ReadAll(resp.Body)
b, err := io.ReadAll(resp.Body)
require.NoError(t, err)
assert.Equal(t, resp.StatusCode, 200)
@@ -604,7 +604,7 @@ func TestRulerRulesFilterByDashboard(t *testing.T) {
err := resp.Body.Close()
require.NoError(t, err)
})
b, err := ioutil.ReadAll(resp.Body)
b, err := io.ReadAll(resp.Body)
require.NoError(t, err)
require.Equal(t, 200, resp.StatusCode)
@@ -622,7 +622,7 @@ func TestRulerRulesFilterByDashboard(t *testing.T) {
err := resp.Body.Close()
require.NoError(t, err)
})
b, err := ioutil.ReadAll(resp.Body)
b, err := io.ReadAll(resp.Body)
require.NoError(t, err)
require.Equal(t, 200, resp.StatusCode)
@@ -640,7 +640,7 @@ func TestRulerRulesFilterByDashboard(t *testing.T) {
err := resp.Body.Close()
require.NoError(t, err)
})
b, err := ioutil.ReadAll(resp.Body)
b, err := io.ReadAll(resp.Body)
require.NoError(t, err)
require.Equal(t, 200, resp.StatusCode)
@@ -657,7 +657,7 @@ func TestRulerRulesFilterByDashboard(t *testing.T) {
err := resp.Body.Close()
require.NoError(t, err)
})
b, err := ioutil.ReadAll(resp.Body)
b, err := io.ReadAll(resp.Body)
require.NoError(t, err)
require.Equal(t, 200, resp.StatusCode)
@@ -675,7 +675,7 @@ func TestRulerRulesFilterByDashboard(t *testing.T) {
err := resp.Body.Close()
require.NoError(t, err)
})
b, err := ioutil.ReadAll(resp.Body)
b, err := io.ReadAll(resp.Body)
require.NoError(t, err)
require.Equal(t, 200, resp.StatusCode)
@@ -693,7 +693,7 @@ func TestRulerRulesFilterByDashboard(t *testing.T) {
require.NoError(t, err)
})
require.Equal(t, http.StatusBadRequest, resp.StatusCode)
b, err := ioutil.ReadAll(resp.Body)
b, err := io.ReadAll(resp.Body)
require.NoError(t, err)
var res map[string]interface{}
require.NoError(t, json.Unmarshal(b, &res))
@@ -711,7 +711,7 @@ func TestRulerRulesFilterByDashboard(t *testing.T) {
require.NoError(t, err)
})
require.Equal(t, http.StatusBadRequest, resp.StatusCode)
b, err := ioutil.ReadAll(resp.Body)
b, err := io.ReadAll(resp.Body)
require.NoError(t, err)
var res map[string]interface{}
require.NoError(t, json.Unmarshal(b, &res))
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)
pkg/tests/api/correlations/correlations_create_test.go
+9 -9
View File
@@ -3,7 +3,7 @@ package correlations
import (
"encoding/json"
"fmt"
"io/ioutil"
"io"
"net/http"
"testing"
@@ -64,7 +64,7 @@ func TestIntegrationCreateCorrelation(t *testing.T) {
})
require.Equal(t, http.StatusUnauthorized, res.StatusCode)
responseBody, err := ioutil.ReadAll(res.Body)
responseBody, err := io.ReadAll(res.Body)
require.NoError(t, err)
var response errorResponseBody
@@ -84,7 +84,7 @@ func TestIntegrationCreateCorrelation(t *testing.T) {
})
require.Equal(t, http.StatusForbidden, res.StatusCode)
responseBody, err := ioutil.ReadAll(res.Body)
responseBody, err := io.ReadAll(res.Body)
require.NoError(t, err)
var response errorResponseBody
@@ -104,7 +104,7 @@ func TestIntegrationCreateCorrelation(t *testing.T) {
})
require.Equal(t, http.StatusBadRequest, res.StatusCode)
responseBody, err := ioutil.ReadAll(res.Body)
responseBody, err := io.ReadAll(res.Body)
require.NoError(t, err)
var response errorResponseBody
@@ -126,7 +126,7 @@ func TestIntegrationCreateCorrelation(t *testing.T) {
})
require.Equal(t, http.StatusNotFound, res.StatusCode)
responseBody, err := ioutil.ReadAll(res.Body)
responseBody, err := io.ReadAll(res.Body)
require.NoError(t, err)
var response errorResponseBody
@@ -149,7 +149,7 @@ func TestIntegrationCreateCorrelation(t *testing.T) {
})
require.Equal(t, http.StatusNotFound, res.StatusCode)
responseBody, err := ioutil.ReadAll(res.Body)
responseBody, err := io.ReadAll(res.Body)
require.NoError(t, err)
var response errorResponseBody
@@ -172,7 +172,7 @@ func TestIntegrationCreateCorrelation(t *testing.T) {
})
require.Equal(t, http.StatusForbidden, res.StatusCode)
responseBody, err := ioutil.ReadAll(res.Body)
responseBody, err := io.ReadAll(res.Body)
require.NoError(t, err)
var response errorResponseBody
@@ -195,7 +195,7 @@ func TestIntegrationCreateCorrelation(t *testing.T) {
})
require.Equal(t, http.StatusOK, res.StatusCode)
responseBody, err := ioutil.ReadAll(res.Body)
responseBody, err := io.ReadAll(res.Body)
require.NoError(t, err)
var response correlations.CreateCorrelationResponseBody
@@ -225,7 +225,7 @@ func TestIntegrationCreateCorrelation(t *testing.T) {
})
require.Equal(t, http.StatusOK, res.StatusCode)
responseBody, err := ioutil.ReadAll(res.Body)
responseBody, err := io.ReadAll(res.Body)
require.NoError(t, err)
var response correlations.CreateCorrelationResponseBody
pkg/tests/api/correlations/correlations_delete_test.go
+8 -8
View File
@@ -3,7 +3,7 @@ package correlations
import (
"encoding/json"
"fmt"
"io/ioutil"
"io"
"net/http"
"testing"
@@ -64,7 +64,7 @@ func TestIntegrationDeleteCorrelation(t *testing.T) {
})
require.Equal(t, http.StatusUnauthorized, res.StatusCode)
responseBody, err := ioutil.ReadAll(res.Body)
responseBody, err := io.ReadAll(res.Body)
require.NoError(t, err)
var response errorResponseBody
@@ -83,7 +83,7 @@ func TestIntegrationDeleteCorrelation(t *testing.T) {
})
require.Equal(t, http.StatusForbidden, res.StatusCode)
responseBody, err := ioutil.ReadAll(res.Body)
responseBody, err := io.ReadAll(res.Body)
require.NoError(t, err)
var response errorResponseBody
@@ -103,7 +103,7 @@ func TestIntegrationDeleteCorrelation(t *testing.T) {
require.Equal(t, http.StatusNotFound, res.StatusCode)
responseBody, err := ioutil.ReadAll(res.Body)
responseBody, err := io.ReadAll(res.Body)
require.NoError(t, err)
var response errorResponseBody
@@ -123,7 +123,7 @@ func TestIntegrationDeleteCorrelation(t *testing.T) {
})
require.Equal(t, http.StatusNotFound, res.StatusCode)
responseBody, err := ioutil.ReadAll(res.Body)
responseBody, err := io.ReadAll(res.Body)
require.NoError(t, err)
var response errorResponseBody
@@ -143,7 +143,7 @@ func TestIntegrationDeleteCorrelation(t *testing.T) {
})
require.Equal(t, http.StatusForbidden, res.StatusCode)
responseBody, err := ioutil.ReadAll(res.Body)
responseBody, err := io.ReadAll(res.Body)
require.NoError(t, err)
var response errorResponseBody
@@ -169,7 +169,7 @@ func TestIntegrationDeleteCorrelation(t *testing.T) {
})
require.Equal(t, http.StatusOK, res.StatusCode)
responseBody, err := ioutil.ReadAll(res.Body)
responseBody, err := io.ReadAll(res.Body)
require.NoError(t, err)
var response correlations.CreateCorrelationResponseBody
@@ -201,7 +201,7 @@ func TestIntegrationDeleteCorrelation(t *testing.T) {
})
require.Equal(t, http.StatusOK, res.StatusCode)
responseBody, err := ioutil.ReadAll(res.Body)
responseBody, err := io.ReadAll(res.Body)
require.NoError(t, err)
var response correlations.CreateCorrelationResponseBody
pkg/tests/api/correlations/correlations_update_test.go
+14 -14
View File
@@ -3,7 +3,7 @@ package correlations
import (
"encoding/json"
"fmt"
"io/ioutil"
"io"
"net/http"
"testing"
@@ -65,7 +65,7 @@ func TestIntegrationUpdateCorrelation(t *testing.T) {
})
require.Equal(t, http.StatusUnauthorized, res.StatusCode)
responseBody, err := ioutil.ReadAll(res.Body)
responseBody, err := io.ReadAll(res.Body)
require.NoError(t, err)
var response errorResponseBody
@@ -85,7 +85,7 @@ func TestIntegrationUpdateCorrelation(t *testing.T) {
})
require.Equal(t, http.StatusForbidden, res.StatusCode)
responseBody, err := ioutil.ReadAll(res.Body)
responseBody, err := io.ReadAll(res.Body)
require.NoError(t, err)
var response errorResponseBody
@@ -105,7 +105,7 @@ func TestIntegrationUpdateCorrelation(t *testing.T) {
})
require.Equal(t, http.StatusNotFound, res.StatusCode)
responseBody, err := ioutil.ReadAll(res.Body)
responseBody, err := io.ReadAll(res.Body)
require.NoError(t, err)
var response errorResponseBody
@@ -128,7 +128,7 @@ func TestIntegrationUpdateCorrelation(t *testing.T) {
})
require.Equal(t, http.StatusNotFound, res.StatusCode)
responseBody, err := ioutil.ReadAll(res.Body)
responseBody, err := io.ReadAll(res.Body)
require.NoError(t, err)
var response errorResponseBody
@@ -149,7 +149,7 @@ func TestIntegrationUpdateCorrelation(t *testing.T) {
})
require.Equal(t, http.StatusForbidden, res.StatusCode)
responseBody, err := ioutil.ReadAll(res.Body)
responseBody, err := io.ReadAll(res.Body)
require.NoError(t, err)
var response errorResponseBody
@@ -177,7 +177,7 @@ func TestIntegrationUpdateCorrelation(t *testing.T) {
})
require.Equal(t, http.StatusBadRequest, res.StatusCode)
responseBody, err := ioutil.ReadAll(res.Body)
responseBody, err := io.ReadAll(res.Body)
require.NoError(t, err)
var response errorResponseBody
@@ -196,7 +196,7 @@ func TestIntegrationUpdateCorrelation(t *testing.T) {
})
require.Equal(t, http.StatusBadRequest, res.StatusCode)
responseBody, err = ioutil.ReadAll(res.Body)
responseBody, err = io.ReadAll(res.Body)
require.NoError(t, err)
err = json.Unmarshal(responseBody, &response)
@@ -217,7 +217,7 @@ func TestIntegrationUpdateCorrelation(t *testing.T) {
})
require.Equal(t, http.StatusBadRequest, res.StatusCode)
responseBody, err = ioutil.ReadAll(res.Body)
responseBody, err = io.ReadAll(res.Body)
require.NoError(t, err)
err = json.Unmarshal(responseBody, &response)
@@ -245,7 +245,7 @@ func TestIntegrationUpdateCorrelation(t *testing.T) {
})
require.Equal(t, http.StatusOK, res.StatusCode)
responseBody, err := ioutil.ReadAll(res.Body)
responseBody, err := io.ReadAll(res.Body)
require.NoError(t, err)
var response correlations.UpdateCorrelationResponseBody
@@ -277,7 +277,7 @@ func TestIntegrationUpdateCorrelation(t *testing.T) {
})
require.Equal(t, http.StatusOK, res.StatusCode)
responseBody, err := ioutil.ReadAll(res.Body)
responseBody, err := io.ReadAll(res.Body)
require.NoError(t, err)
var response correlations.UpdateCorrelationResponseBody
@@ -299,7 +299,7 @@ func TestIntegrationUpdateCorrelation(t *testing.T) {
})
require.Equal(t, http.StatusOK, res.StatusCode)
responseBody, err = ioutil.ReadAll(res.Body)
responseBody, err = io.ReadAll(res.Body)
require.NoError(t, err)
err = json.Unmarshal(responseBody, &response)
@@ -320,7 +320,7 @@ func TestIntegrationUpdateCorrelation(t *testing.T) {
})
require.Equal(t, http.StatusOK, res.StatusCode)
responseBody, err = ioutil.ReadAll(res.Body)
responseBody, err = io.ReadAll(res.Body)
require.NoError(t, err)
err = json.Unmarshal(responseBody, &response)
@@ -342,7 +342,7 @@ func TestIntegrationUpdateCorrelation(t *testing.T) {
})
require.Equal(t, http.StatusOK, res.StatusCode)
responseBody, err = ioutil.ReadAll(res.Body)
responseBody, err = io.ReadAll(res.Body)
require.NoError(t, err)
err = json.Unmarshal(responseBody, &response)
pkg/tests/api/dashboards/api_dashboards_test.go
+8 -8
View File
@@ -5,7 +5,7 @@ import (
"context"
"encoding/json"
"fmt"
"io/ioutil"
"io"
"net/http"
"net/url"
"os"
@@ -62,7 +62,7 @@ func TestDashboardQuota(t *testing.T) {
err := resp.Body.Close()
require.NoError(t, err)
})
b, err := ioutil.ReadAll(resp.Body)
b, err := io.ReadAll(resp.Body)
require.NoError(t, err)
dashboardDTO := &plugindashboards.PluginDashboard{}
err = json.Unmarshal(b, dashboardDTO)
@@ -87,7 +87,7 @@ func TestDashboardQuota(t *testing.T) {
err := resp.Body.Close()
require.NoError(t, err)
})
b, err := ioutil.ReadAll(resp.Body)
b, err := io.ReadAll(resp.Body)
require.NoError(t, err)
assert.Equal(t, http.StatusForbidden, resp.StatusCode)
require.JSONEq(t, `{"message":"Quota reached"}`, string(b))
@@ -124,10 +124,10 @@ providers:
path: %s`, provDashboardsDir))
err := os.WriteFile(provDashboardsCfg, blob, 0644)
require.NoError(t, err)
input, err := ioutil.ReadFile(filepath.Join("./home.json"))
input, err := os.ReadFile(filepath.Join("./home.json"))
require.NoError(t, err)
provDashboardFile := filepath.Join(provDashboardsDir, "home.json")
err = ioutil.WriteFile(provDashboardFile, input, 0644)
err = os.WriteFile(provDashboardFile, input, 0644)
require.NoError(t, err)
grafanaListedAddr, store := testinfra.StartGrafana(t, dir, path)
// Create user
@@ -152,7 +152,7 @@ providers:
err := resp.Body.Close()
require.NoError(t, err)
})
b, err := ioutil.ReadAll(resp.Body)
b, err := io.ReadAll(resp.Body)
require.NoError(t, err)
dashboardList := &models.HitList{}
err = json.Unmarshal(b, dashboardList)
@@ -219,7 +219,7 @@ providers:
if tc.expErrReason == "" {
return
}
b, err := ioutil.ReadAll(resp.Body)
b, err := io.ReadAll(resp.Body)
require.NoError(t, err)
dashboardErr := &errorResponseBody{}
err = json.Unmarshal(b, dashboardErr)
@@ -245,7 +245,7 @@ providers:
})
assert.Equal(t, http.StatusBadRequest, resp.StatusCode)
b, err := ioutil.ReadAll(resp.Body)
b, err := io.ReadAll(resp.Body)
require.NoError(t, err)
dashboardErr := &errorResponseBody{}
err = json.Unmarshal(b, dashboardErr)
pkg/tests/api/plugins/api_plugins_test.go
+6 -5
View File
@@ -5,8 +5,9 @@ import (
"context"
"encoding/json"
"fmt"
"io/ioutil"
"io"
"net/http"
"os"
"path/filepath"
"testing"
@@ -86,7 +87,7 @@ func TestPlugins(t *testing.T) {
})
require.NoError(t, err)
require.Equal(t, tc.expStatus, resp.StatusCode)
b, err := ioutil.ReadAll(resp.Body)
b, err := io.ReadAll(resp.Body)
require.NoError(t, err)
expResp := expectedResp(t, tc.expRespPath)
@@ -128,7 +129,7 @@ func makePostRequest(t *testing.T, URL string) (int, map[string]interface{}) {
_ = resp.Body.Close()
fmt.Printf("Failed to close response body err: %s", err)
})
b, err := ioutil.ReadAll(resp.Body)
b, err := io.ReadAll(resp.Body)
require.NoError(t, err)
var body = make(map[string]interface{})
@@ -144,7 +145,7 @@ func grafanaAPIURL(username string, grafanaListedAddr string, path string) strin
func expectedResp(t *testing.T, filename string) string {
//nolint:GOSEC
contents, err := ioutil.ReadFile(filepath.Join("data", filename))
contents, err := os.ReadFile(filepath.Join("data", filename))
if err != nil {
t.Errorf("failed to load %s: %v", filename, err)
}
@@ -153,7 +154,7 @@ func expectedResp(t *testing.T, filename string) string {
}
func updateRespSnapshot(t *testing.T, filename string, body string) {
err := ioutil.WriteFile(filepath.Join("data", filename), []byte(body), 0600)
err := os.WriteFile(filepath.Join("data", filename), []byte(body), 0600)
if err != nil {
t.Errorf("error writing snapshot %s: %v", filename, err)
}