mdebray/tvl-depot
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

chore(ops/besadii): ioutil is deprecated

Browse source 
Change-Id: I6794162cf29fd2e0b0270265ce8ca4923bcc6aa9
Reviewed-on: https://cl.tvl.fyi/c/depot/+/10526
Autosubmit: flokli <flokli@flokli.de>
Tested-by: BuildkiteCI
Reviewed-by: tazjin <tazjin@tvl.su>
This commit is contained in:
Florian Klink 2024-01-03 16:45:04 +02:00 committed by clbot
parent e259a5c42b
commit f17b780035
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
ops/besadii/main.go
View file

@ -19,7 +19,7 @@ import (
"encoding/json" "encoding/json"
"flag" "flag"
"fmt" "fmt"
"io/ioutil" "io"
"log/syslog" "log/syslog"
"net/http" "net/http"
"net/mail" "net/mail"
@ -130,7 +130,7 @@ func loadConfig() (*config, error) {
} }
} }
configJson, err := ioutil.ReadFile(configPath) configJson, err := os.ReadFile(configPath)
if err != nil { if err != nil {
return nil, fmt.Errorf("failed to load besadii config: %w", err) return nil, fmt.Errorf("failed to load besadii config: %w", err)
} }
@ -182,7 +182,7 @@ func linkToChange(cfg *config, changeId, patchset string) string {
// updateGerrit posts a comment on a Gerrit CL to indicate the current build status. // updateGerrit posts a comment on a Gerrit CL to indicate the current build status.
func updateGerrit(cfg *config, review reviewInput, changeId, patchset string) { func updateGerrit(cfg *config, review reviewInput, changeId, patchset string) {
body, _ := json.Marshal(review) body, _ := json.Marshal(review)
reader := ioutil.NopCloser(bytes.NewReader(body)) reader := io.NopCloser(bytes.NewReader(body))
url := fmt.Sprintf("%s/a/changes/%s/revisions/%s/review", cfg.GerritUrl, changeId, patchset) url := fmt.Sprintf("%s/a/changes/%s/revisions/%s/review", cfg.GerritUrl, changeId, patchset)
req, err := http.NewRequest("POST", url, reader) req, err := http.NewRequest("POST", url, reader)
@ -201,7 +201,7 @@ func updateGerrit(cfg *config, review reviewInput, changeId, patchset string) {
defer resp.Body.Close() defer resp.Body.Close()
if resp.StatusCode != http.StatusOK { if resp.StatusCode != http.StatusOK {
respBody, _ := ioutil.ReadAll(resp.Body) respBody, _ := io.ReadAll(resp.Body)
fmt.Fprintf(os.Stderr, "received non-success response from Gerrit: %s (%v)", respBody, resp.Status) fmt.Fprintf(os.Stderr, "received non-success response from Gerrit: %s (%v)", respBody, resp.Status)
} else { } else {
fmt.Printf("Added CI status comment on %s", linkToChange(cfg, changeId, patchset)) fmt.Printf("Added CI status comment on %s", linkToChange(cfg, changeId, patchset))
@ -241,7 +241,7 @@ func triggerBuild(cfg *config, log *syslog.Writer, trigger *buildTrigger) error
} }
body, _ := json.Marshal(build) body, _ := json.Marshal(build)
reader := ioutil.NopCloser(bytes.NewReader(body)) reader := io.NopCloser(bytes.NewReader(body))
bkUrl := fmt.Sprintf("https://api.buildkite.com/v2/organizations/%s/pipelines/%s/builds", cfg.BuildkiteOrg, cfg.BuildkiteProject) bkUrl := fmt.Sprintf("https://api.buildkite.com/v2/organizations/%s/pipelines/%s/builds", cfg.BuildkiteOrg, cfg.BuildkiteProject)
req, err := http.NewRequest("POST", bkUrl, reader) req, err := http.NewRequest("POST", bkUrl, reader)
@ -259,7 +259,7 @@ func triggerBuild(cfg *config, log *syslog.Writer, trigger *buildTrigger) error
} }
defer resp.Body.Close() defer resp.Body.Close()
respBody, err := ioutil.ReadAll(resp.Body) respBody, err := io.ReadAll(resp.Body)
if err != nil { if err != nil {
return fmt.Errorf("failed to read Buildkite response body: %w", err) return fmt.Errorf("failed to read Buildkite response body: %w", err)
} }