Upgrade to go1.19

openflagr · Aug 26, 2022 · e398efe · e398efe
1 parent ea716e1
commit e398efe
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 10 deletions.
diff --git a/pkg/handler/data_recorder_kafka.go b/pkg/handler/data_recorder_kafka.go
@@ -4,7 +4,7 @@ import (
 	"crypto/tls"
 	"crypto/x509"
 	"fmt"
-	"io/ioutil"
+	"os"
 	"strings"
 	"time"
 
@@ -97,7 +97,7 @@ func createTLSConfiguration(certFile string, keyFile string, caFile string, veri
 			logrus.WithField("TLSConfigurationError", err).Panic(err)
 		}
 
-		caCert, err := ioutil.ReadFile(caFile)
+		caCert, err := os.ReadFile(caFile)
 		if err != nil {
 			logrus.WithField("TLSConfigurationError", err).Panic(err)
 		}

diff --git a/pkg/handler/eval_cache_fetcher.go b/pkg/handler/eval_cache_fetcher.go
@@ -3,8 +3,9 @@ package handler
 import (
 	"encoding/json"
 	"fmt"
-	"io/ioutil"
+	"io"
 	"net/http"
+	"os"
 
 	"github.com/openflagr/flagr/pkg/config"
 	"github.com/openflagr/flagr/pkg/entity"
@@ -96,7 +97,7 @@ type jsonFileFetcher struct {
 }
 
 func (ff *jsonFileFetcher) fetch() ([]entity.Flag, error) {
-	b, err := ioutil.ReadFile(ff.filePath)
+	b, err := os.ReadFile(ff.filePath)
 	if err != nil {
 		return nil, err
 	}
@@ -120,7 +121,7 @@ func (hf *jsonHTTPFetcher) fetch() ([]entity.Flag, error) {
 	}
 	defer res.Body.Close()
 
-	b, err := ioutil.ReadAll(res.Body)
+	b, err := io.ReadAll(res.Body)
 	if err != nil {
 		return nil, err
 	}

diff --git a/pkg/handler/eval_cache_fetcher_test.go b/pkg/handler/eval_cache_fetcher_test.go
@@ -2,9 +2,9 @@ package handler
 
 import (
 	"io"
-	"io/ioutil"
 	"net/http"
 	"net/http/httptest"
+	"os"
 	"testing"
 
 	"github.com/openflagr/flagr/pkg/config"
@@ -30,7 +30,7 @@ func TestJSONFileFetcher(t *testing.T) {
 func TestJSONHTTPFetcher(t *testing.T) {
 	t.Run("happy code path", func(t *testing.T) {
 		h := func(w http.ResponseWriter, r *http.Request) {
-			b, _ := ioutil.ReadFile("./testdata/sample_eval_cache.json")
+			b, _ := os.ReadFile("./testdata/sample_eval_cache.json")
 			io.WriteString(w, string(b))
 		}
 

diff --git a/pkg/handler/export.go b/pkg/handler/export.go
@@ -4,7 +4,6 @@ import (
 	"bytes"
 	"fmt"
 	"io"
-	"io/ioutil"
 	"math/rand"
 	"os"
 	"path"
@@ -51,11 +50,11 @@ var exportSQLiteFile = func(excludeSnapshots *bool) (file io.ReadCloser, done fu
 		return nil, done, err
 	}
 
-	content, err := ioutil.ReadFile(fname)
+	content, err := os.ReadFile(fname)
 	if err != nil {
 		return nil, done, err
 	}
-	file = ioutil.NopCloser(bytes.NewReader(content))
+	file = io.NopCloser(bytes.NewReader(content))
 	return file, done, nil
 }