mirrors/twin-gatus
1
0
Fork 0
mirror of https://github.com/TwiN/gatus.git synced 2024-12-15 17:51:09 +00:00
Code Activity

Merge pull request #211 from Juneezee/deprecate-ioutil

Browse source 
refactor: move from io/ioutil to io and os packages
This commit is contained in:
TwiN 2021-12-03 20:31:31 -05:00 committed by GitHub
commit f89447badc
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
15 changed files with 33 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
alerting/provider/custom/custom.go
View file

@ -3,7 +3,7 @@ package custom
import ( import (
"bytes" "bytes"
"fmt" "fmt"
"io/ioutil" "io"
"net/http" "net/http"
"strings" "strings"
@ -105,7 +105,7 @@ func (provider *AlertProvider) Send(endpoint *core.Endpoint, alert *alert.Alert,
return err return err
} }
if response.StatusCode > 399 { if response.StatusCode > 399 {
body, _ := ioutil.ReadAll(response.Body) body, _ := io.ReadAll(response.Body)
return fmt.Errorf("call to provider alert returned status code %d: %s", response.StatusCode, string(body)) return fmt.Errorf("call to provider alert returned status code %d: %s", response.StatusCode, string(body))
} }
return err return err

10
alerting/provider/custom/custom_test.go
View file

@ -1,7 +1,7 @@
package custom package custom
import ( import (
"io/ioutil" "io"
"net/http" "net/http"
"testing" "testing"
@ -113,7 +113,7 @@ func TestAlertProvider_buildHTTPRequestWhenResolved(t *testing.T) {
if request.URL.String() != ExpectedURL { if request.URL.String() != ExpectedURL {
t.Error("expected URL to be", ExpectedURL, "was", request.URL.String()) t.Error("expected URL to be", ExpectedURL, "was", request.URL.String())
} }
body, _ := ioutil.ReadAll(request.Body) body, _ := io.ReadAll(request.Body)
if string(body) != ExpectedBody { if string(body) != ExpectedBody {
t.Error("expected body to be", ExpectedBody, "was", string(body)) t.Error("expected body to be", ExpectedBody, "was", string(body))
} }
@ -133,7 +133,7 @@ func TestAlertProvider_buildHTTPRequestWhenTriggered(t *testing.T) {
if request.URL.String() != ExpectedURL { if request.URL.String() != ExpectedURL {
t.Error("expected URL to be", ExpectedURL, "was", request.URL.String()) t.Error("expected URL to be", ExpectedURL, "was", request.URL.String())
} }
body, _ := ioutil.ReadAll(request.Body) body, _ := io.ReadAll(request.Body)
if string(body) != ExpectedBody { if string(body) != ExpectedBody {
t.Error("expected body to be", ExpectedBody, "was", string(body)) t.Error("expected body to be", ExpectedBody, "was", string(body))
} }
@ -158,7 +158,7 @@ func TestAlertProvider_buildHTTPRequestWithCustomPlaceholder(t *testing.T) {
if request.URL.String() != ExpectedURL { if request.URL.String() != ExpectedURL {
t.Error("expected URL to be", ExpectedURL, "was", request.URL.String()) t.Error("expected URL to be", ExpectedURL, "was", request.URL.String())
} }
body, _ := ioutil.ReadAll(request.Body) body, _ := io.ReadAll(request.Body)
if string(body) != ExpectedBody { if string(body) != ExpectedBody {
t.Error("expected body to be", ExpectedBody, "was", string(body)) t.Error("expected body to be", ExpectedBody, "was", string(body))
} }
@ -205,7 +205,7 @@ func TestAlertProvider_isBackwardCompatibleWithServiceRename(t *testing.T) {
if request.URL.String() != ExpectedURL { if request.URL.String() != ExpectedURL {
t.Error("expected URL to be", ExpectedURL, "was", request.URL.String()) t.Error("expected URL to be", ExpectedURL, "was", request.URL.String())
} }
body, _ := ioutil.ReadAll(request.Body) body, _ := io.ReadAll(request.Body)
if string(body) != ExpectedBody { if string(body) != ExpectedBody {
t.Error("expected body to be", ExpectedBody, "was", string(body)) t.Error("expected body to be", ExpectedBody, "was", string(body))
} }

4
alerting/provider/discord/discord.go
View file

@ -3,7 +3,7 @@ package discord
import ( import (
"bytes" "bytes"
"fmt" "fmt"
"io/ioutil" "io"
"net/http" "net/http"
"github.com/TwiN/gatus/v3/alerting/alert" "github.com/TwiN/gatus/v3/alerting/alert"
@ -37,7 +37,7 @@ func (provider *AlertProvider) Send(endpoint *core.Endpoint, alert *alert.Alert,
return err return err
} }
if response.StatusCode > 399 { if response.StatusCode > 399 {
body, _ := ioutil.ReadAll(response.Body) body, _ := io.ReadAll(response.Body)
return fmt.Errorf("call to provider alert returned status code %d: %s", response.StatusCode, string(body)) return fmt.Errorf("call to provider alert returned status code %d: %s", response.StatusCode, string(body))
} }
return err return err

4
alerting/provider/mattermost/mattermost.go
View file

@ -3,7 +3,7 @@ package mattermost
import ( import (
"bytes" "bytes"
"fmt" "fmt"
"io/ioutil" "io"
"net/http" "net/http"
"github.com/TwiN/gatus/v3/alerting/alert" "github.com/TwiN/gatus/v3/alerting/alert"
@ -43,7 +43,7 @@ func (provider *AlertProvider) Send(endpoint *core.Endpoint, alert *alert.Alert,
return err return err
} }
if response.StatusCode > 399 { if response.StatusCode > 399 {
body, _ := ioutil.ReadAll(response.Body) body, _ := io.ReadAll(response.Body)
return fmt.Errorf("call to provider alert returned status code %d: %s", response.StatusCode, string(body)) return fmt.Errorf("call to provider alert returned status code %d: %s", response.StatusCode, string(body))
} }
return err return err

4
alerting/provider/messagebird/messagebird.go
View file

@ -3,7 +3,7 @@ package messagebird
import ( import (
"bytes" "bytes"
"fmt" "fmt"
"io/ioutil" "io"
"net/http" "net/http"
"github.com/TwiN/gatus/v3/alerting/alert" "github.com/TwiN/gatus/v3/alerting/alert"
@ -45,7 +45,7 @@ func (provider *AlertProvider) Send(endpoint *core.Endpoint, alert *alert.Alert,
return err return err
} }
if response.StatusCode > 399 { if response.StatusCode > 399 {
body, _ := ioutil.ReadAll(response.Body) body, _ := io.ReadAll(response.Body)
return fmt.Errorf("call to provider alert returned status code %d: %s", response.StatusCode, string(body)) return fmt.Errorf("call to provider alert returned status code %d: %s", response.StatusCode, string(body))
} }
return err return err

6
alerting/provider/pagerduty/pagerduty.go
View file

@ -4,7 +4,7 @@ import (
"bytes" "bytes"
"encoding/json" "encoding/json"
"fmt" "fmt"
"io/ioutil" "io"
"log" "log"
"net/http" "net/http"
@ -64,7 +64,7 @@ func (provider *AlertProvider) Send(endpoint *core.Endpoint, alert *alert.Alert,
return err return err
} }
if response.StatusCode > 399 { if response.StatusCode > 399 {
body, _ := ioutil.ReadAll(response.Body) body, _ := io.ReadAll(response.Body)
return fmt.Errorf("call to provider alert returned status code %d: %s", response.StatusCode, string(body)) return fmt.Errorf("call to provider alert returned status code %d: %s", response.StatusCode, string(body))
} }
if alert.IsSendingOnResolved() { if alert.IsSendingOnResolved() {
@ -73,7 +73,7 @@ func (provider *AlertProvider) Send(endpoint *core.Endpoint, alert *alert.Alert,
alert.ResolveKey = "" alert.ResolveKey = ""
} else { } else {
// We need to retrieve the resolve key from the response // We need to retrieve the resolve key from the response
body, err := ioutil.ReadAll(response.Body) body, err := io.ReadAll(response.Body)
var payload pagerDutyResponsePayload var payload pagerDutyResponsePayload
if err = json.Unmarshal(body, &payload); err != nil { if err = json.Unmarshal(body, &payload); err != nil {
// Silently fail. We don't want to create tons of alerts just because we failed to parse the body. // Silently fail. We don't want to create tons of alerts just because we failed to parse the body.

4
alerting/provider/slack/slack.go
View file

@ -3,7 +3,7 @@ package slack
import ( import (
"bytes" "bytes"
"fmt" "fmt"
"io/ioutil" "io"
"net/http" "net/http"
"github.com/TwiN/gatus/v3/alerting/alert" "github.com/TwiN/gatus/v3/alerting/alert"
@ -37,7 +37,7 @@ func (provider *AlertProvider) Send(endpoint *core.Endpoint, alert *alert.Alert,
return err return err
} }
if response.StatusCode > 399 { if response.StatusCode > 399 {
body, _ := ioutil.ReadAll(response.Body) body, _ := io.ReadAll(response.Body)
return fmt.Errorf("call to provider alert returned status code %d: %s", response.StatusCode, string(body)) return fmt.Errorf("call to provider alert returned status code %d: %s", response.StatusCode, string(body))
} }
return err return err

4
alerting/provider/teams/teams.go
View file

@ -3,7 +3,7 @@ package teams
import ( import (
"bytes" "bytes"
"fmt" "fmt"
"io/ioutil" "io"
"net/http" "net/http"
"github.com/TwiN/gatus/v3/alerting/alert" "github.com/TwiN/gatus/v3/alerting/alert"
@ -37,7 +37,7 @@ func (provider *AlertProvider) Send(endpoint *core.Endpoint, alert *alert.Alert,
return err return err
} }
if response.StatusCode > 399 { if response.StatusCode > 399 {
body, _ := ioutil.ReadAll(response.Body) body, _ := io.ReadAll(response.Body)
return fmt.Errorf("call to provider alert returned status code %d: %s", response.StatusCode, string(body)) return fmt.Errorf("call to provider alert returned status code %d: %s", response.StatusCode, string(body))
} }
return err return err

4
alerting/provider/telegram/telegram.go
View file

@ -3,7 +3,7 @@ package telegram
import ( import (
"bytes" "bytes"
"fmt" "fmt"
"io/ioutil" "io"
"net/http" "net/http"
"github.com/TwiN/gatus/v3/alerting/alert" "github.com/TwiN/gatus/v3/alerting/alert"
@ -38,7 +38,7 @@ func (provider *AlertProvider) Send(endpoint *core.Endpoint, alert *alert.Alert,
return err return err
} }
if response.StatusCode > 399 { if response.StatusCode > 399 {
body, _ := ioutil.ReadAll(response.Body) body, _ := io.ReadAll(response.Body)
return fmt.Errorf("call to provider alert returned status code %d: %s", response.StatusCode, string(body)) return fmt.Errorf("call to provider alert returned status code %d: %s", response.StatusCode, string(body))
} }
return err return err

4
alerting/provider/twilio/twilio.go
View file

@ -4,7 +4,7 @@ import (
"bytes" "bytes"
"encoding/base64" "encoding/base64"
"fmt" "fmt"
"io/ioutil" "io"
"net/http" "net/http"
"net/url" "net/url"
@ -43,7 +43,7 @@ func (provider *AlertProvider) Send(endpoint *core.Endpoint, alert *alert.Alert,
return err return err
} }
if response.StatusCode > 399 { if response.StatusCode > 399 {
body, _ := ioutil.ReadAll(response.Body) body, _ := io.ReadAll(response.Body)
return fmt.Errorf("call to provider alert returned status code %d: %s", response.StatusCode, string(body)) return fmt.Errorf("call to provider alert returned status code %d: %s", response.StatusCode, string(body))
} }
return err return err

3
config/config.go
View file

@ -2,7 +2,6 @@ package config
import ( import (
"errors" "errors"
"io/ioutil"
"log" "log"
"os" "os"
"time" "time"
@ -142,7 +141,7 @@ func LoadDefaultConfiguration() (*Config, error) {
func readConfigurationFile(fileName string) (config *Config, err error) { func readConfigurationFile(fileName string) (config *Config, err error) {
var bytes []byte var bytes []byte
if bytes, err = ioutil.ReadFile(fileName); err == nil { if bytes, err = os.ReadFile(fileName); err == nil {
// file exists, so we'll parse it and return it // file exists, so we'll parse it and return it
return parseAndValidateConfigBytes(bytes) return parseAndValidateConfigBytes(bytes)
} }

3
controller/handler/gzip.go
View file

@ -3,7 +3,6 @@ package handler
import ( import (
"compress/gzip" "compress/gzip"
"io" "io"
"io/ioutil"
"net/http" "net/http"
"strings" "strings"
"sync" "sync"
@ -11,7 +10,7 @@ import (
var gzPool = sync.Pool{ var gzPool = sync.Pool{
New: func() interface{} { New: func() interface{} {
return gzip.NewWriter(ioutil.Discard) return gzip.NewWriter(io.Discard)
}, },
} }

4
core/endpoint.go
View file

@ -5,7 +5,7 @@ import (
"crypto/x509" "crypto/x509"
"encoding/json" "encoding/json"
"errors" "errors"
"io/ioutil" "io"
"net" "net"
"net/http" "net/http"
"net/url" "net/url"
@ -259,7 +259,7 @@ func (endpoint *Endpoint) call(result *Result) {
result.Connected = response.StatusCode > 0 result.Connected = response.StatusCode > 0
// Only read the body if there's a condition that uses the BodyPlaceholder // Only read the body if there's a condition that uses the BodyPlaceholder
if endpoint.needsToReadBody() { if endpoint.needsToReadBody() {
result.body, err = ioutil.ReadAll(response.Body) result.body, err = io.ReadAll(response.Body)
if err != nil { if err != nil {
result.AddError(err.Error()) result.AddError(err.Error())
} }

4
core/endpoint_test.go
View file

@ -1,7 +1,7 @@
package core package core
import ( import (
"io/ioutil" "io"
"strings" "strings"
"testing" "testing"
"time" "time"
@ -245,7 +245,7 @@ func TestEndpoint_buildHTTPRequestWithGraphQLEnabled(t *testing.T) {
if contentType := request.Header.Get(ContentTypeHeader); contentType != "application/json" { if contentType := request.Header.Get(ContentTypeHeader); contentType != "application/json" {
t.Error("request.Header.Content-Type should've been application/json, but was", contentType) t.Error("request.Header.Content-Type should've been application/json, but was", contentType)
} }
body, _ := ioutil.ReadAll(request.Body) body, _ := io.ReadAll(request.Body)
if !strings.HasPrefix(string(body), "{\"query\":") { if !strings.HasPrefix(string(body), "{\"query\":") {
t.Error("request.body should've started with '{\"query\":', but it didn't:", string(body)) t.Error("request.body should've started with '{\"query\":', but it didn't:", string(body))
} }

6
storage/store/memory/memory.go
View file

@ -3,8 +3,8 @@ package memory
import ( import (
"encoding/gob" "encoding/gob"
"io/fs" "io/fs"
"io/ioutil"
"log" "log"
"os"
"sort" "sort"
"strings" "strings"
"sync" "sync"
@ -51,12 +51,12 @@ func NewStore(file string) (*Store, error) {
_, err := store.cache.ReadFromFile(file) _, err := store.cache.ReadFromFile(file)
if err != nil { if err != nil {
// XXX: Remove the block below in v4.0.0 // XXX: Remove the block below in v4.0.0
if data, err2 := ioutil.ReadFile(file); err2 == nil { if data, err2 := os.ReadFile(file); err2 == nil {
isFromOldVersion := strings.Contains(string(data), "*core.ServiceStatus") isFromOldVersion := strings.Contains(string(data), "*core.ServiceStatus")
if isFromOldVersion { if isFromOldVersion {
log.Println("WARNING: Couldn't read file due to recent change in v3.3.0, see https://github.com/TwiN/gatus/issues/191") log.Println("WARNING: Couldn't read file due to recent change in v3.3.0, see https://github.com/TwiN/gatus/issues/191")
log.Println("WARNING: Will automatically rename old file to " + file + ".old and overwrite the current file") log.Println("WARNING: Will automatically rename old file to " + file + ".old and overwrite the current file")
if err = ioutil.WriteFile(file+".old", data, fs.ModePerm); err != nil { if err = os.WriteFile(file+".old", data, fs.ModePerm); err != nil {
log.Println("WARNING: Tried my best to keep the old file, but it wasn't enough. Sorry, your file will be overwritten :(") log.Println("WARNING: Tried my best to keep the old file, but it wasn't enough. Sorry, your file will be overwritten :(")
} }
// Return the store regardless of whether there was an error or not // Return the store regardless of whether there was an error or not