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/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)