IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

chore: remove refs to deprecated io/ioutil (#70300)

Browse Source
This commit is contained in:
guangwu 2023-06-22 18:19:23 +08:00 committed by GitHub
parent b2f9a3a222
commit bbe4b0d3de
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
devenv/docker/ha-test-unified-alerting/webhook-listener.go
View File

@ -4,7 +4,7 @@ import (
"encoding/json" "encoding/json"
"flag" "flag"
"fmt" "fmt"
"io/ioutil" "io"
"log" "log"
"net/http" "net/http"
"os" "os"
@ -129,7 +129,7 @@ func main() {
http.HandleFunc("/listen", func(w http.ResponseWriter, r *http.Request) { http.HandleFunc("/listen", func(w http.ResponseWriter, r *http.Request) {
log.Printf("got submission from: %s\n", r.RemoteAddr) log.Printf("got submission from: %s\n", r.RemoteAddr)
b, err := ioutil.ReadAll(r.Body) b, err := io.ReadAll(r.Body)
if err != nil { if err != nil {
log.Println(err) log.Println(err)
w.WriteHeader(http.StatusBadRequest) w.WriteHeader(http.StatusBadRequest)

3
pkg/services/ngalert/sender/notifier_ext.go
View File

@ -12,7 +12,6 @@ import (
"encoding/json" "encoding/json"
"fmt" "fmt"
"io" "io"
"io/ioutil"
"net/http" "net/http"
"sync" "sync"
"time" "time"
@ -184,7 +183,7 @@ func (n *Manager) sendOne(ctx context.Context, c *http.Client, url string, b []b
return err return err
} }
defer func() { defer func() {
io.Copy(ioutil.Discard, resp.Body) io.Copy(io.Discard, resp.Body)
resp.Body.Close() resp.Body.Close()
}() }()