DevFW-CICD/ingress-nginx-helm
6
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Update go version, modules and remove ioutil

Browse source
This commit is contained in:
Ricardo Katz 2021-08-06 11:18:17 -03:00
parent 6f0401fc73
commit d226d831bd
31 changed files with 576 additions and 288 deletions
Download patch file Download diff file Expand all files Collapse all files

4
internal/ingress/controller/checker.go
View file

@ -18,8 +18,8 @@ package controller
import (
"fmt"
"io/ioutil"
"net/http"
"os"
"strconv"
"strings"
@ -46,7 +46,7 @@ func (n *NGINXController) Check(_ *http.Request) error {
return errors.Wrap(err, "reading /proc directory")
}
f, err := ioutil.ReadFile(nginx.PID)
f, err := os.ReadFile(nginx.PID)
if err != nil {
return errors.Wrapf(err, "reading %v", nginx.PID)
}

4
internal/ingress/controller/controller_test.go
View file

@ -22,7 +22,7 @@ import (
"crypto/x509/pkix"
"encoding/asn1"
"fmt"
"io/ioutil"
"io"
"os"
"os/exec"
"path/filepath"
@ -123,7 +123,7 @@ func (ntc testNginxTestCommand) Test(cfg string) ([]byte, error) {
return nil, err
}
defer fd.Close()
bytes, err := ioutil.ReadAll(fd)
bytes, err := io.ReadAll(fd)
if err != nil {
ntc.t.Errorf("could not read generated nginx configuration: %v", err.Error())
}

15
internal/ingress/controller/nginx.go
View file

@ -22,7 +22,6 @@ import (
"encoding/json"
"errors"
"fmt"
"io/ioutil"
"net"
"net/http"
"os"
@ -616,12 +615,12 @@ func (n NGINXController) testTemplate(cfg []byte) error {
if len(cfg) == 0 {
return fmt.Errorf("invalid NGINX configuration (empty)")
}
tmpfile, err := ioutil.TempFile("", tempNginxPattern)
tmpfile, err := os.CreateTemp("", tempNginxPattern)
if err != nil {
return err
}
defer tmpfile.Close()
err = ioutil.WriteFile(tmpfile.Name(), cfg, file.ReadWriteByUser)
err = os.WriteFile(tmpfile.Name(), cfg, file.ReadWriteByUser)
if err != nil {
return err
}
@ -666,14 +665,14 @@ func (n *NGINXController) OnUpdate(ingressCfg ingress.Configuration) error {
}
if klog.V(2).Enabled() {
src, _ := ioutil.ReadFile(cfgPath)
src, _ := os.ReadFile(cfgPath)
if !bytes.Equal(src, content) {
tmpfile, err := ioutil.TempFile("", "new-nginx-cfg")
tmpfile, err := os.CreateTemp("", "new-nginx-cfg")
if err != nil {
return err
}
defer tmpfile.Close()
err = ioutil.WriteFile(tmpfile.Name(), content, file.ReadWriteByUser)
err = os.WriteFile(tmpfile.Name(), content, file.ReadWriteByUser)
if err != nil {
return err
}
@ -696,7 +695,7 @@ func (n *NGINXController) OnUpdate(ingressCfg ingress.Configuration) error {
}
}
err = ioutil.WriteFile(cfgPath, content, file.ReadWriteByUser)
err = os.WriteFile(cfgPath, content, file.ReadWriteByUser)
if err != nil {
return err
}
@ -1093,7 +1092,7 @@ func createOpentracingCfg(cfg ngx_config.Configuration) error {
// Expand possible environment variables before writing the configuration to file.
expanded := os.ExpandEnv(tmplBuf.String())
return ioutil.WriteFile("/etc/nginx/opentracing.json", []byte(expanded), file.ReadWriteByUser)
return os.WriteFile("/etc/nginx/opentracing.json", []byte(expanded), file.ReadWriteByUser)
}
func cleanTempNginxCfg() error {

9
internal/ingress/controller/nginx_test.go
View file

@ -19,7 +19,6 @@ package controller
import (
"fmt"
"io"
"io/ioutil"
"net"
"net/http"
"net/http/httptest"
@ -179,7 +178,7 @@ func TestConfigureDynamically(t *testing.T) {
t.Errorf("expected a 'POST' request, got '%s'", r.Method)
}
b, err := ioutil.ReadAll(r.Body)
b, err := io.ReadAll(r.Body)
if err != nil && err != io.EOF {
t.Fatal(err)
}
@ -339,7 +338,7 @@ func TestConfigureCertificates(t *testing.T) {
t.Errorf("expected a 'POST' request, got '%s'", r.Method)
}
b, err := ioutil.ReadAll(r.Body)
b, err := io.ReadAll(r.Body)
if err != nil && err != io.EOF {
t.Fatal(err)
}
@ -478,7 +477,7 @@ func TestCleanTempNginxCfg(t *testing.T) {
t.Fatal(err)
}
tmpfile, err := ioutil.TempFile("", tempNginxPattern)
tmpfile, err := os.CreateTemp("", tempNginxPattern)
if err != nil {
t.Fatal(err)
}
@ -495,7 +494,7 @@ func TestCleanTempNginxCfg(t *testing.T) {
t.Fatal(err)
}
tmpfile, err = ioutil.TempFile("", tempNginxPattern)
tmpfile, err = os.CreateTemp("", tempNginxPattern)
if err != nil {
t.Fatal(err)
}

4
internal/ingress/controller/store/store.go
View file

@ -20,7 +20,7 @@ import (
"context"
"encoding/base64"
"fmt"
"io/ioutil"
"os"
"reflect"
"sort"
"sync"
@ -851,7 +851,7 @@ func (s *k8sStore) writeSSLSessionTicketKey(cmap *corev1.ConfigMap, fileName str
return
}
err = ioutil.WriteFile(fileName, decodedTicket, file.ReadWriteByUser)
err = os.WriteFile(fileName, decodedTicket, file.ReadWriteByUser)
if err != nil {
klog.Errorf("unexpected error writing ssl-session-ticket-key to %s: %v", fileName, err)
return

5
internal/ingress/controller/store/store_test.go
View file

@ -20,7 +20,6 @@ import (
"context"
"encoding/base64"
"fmt"
"io/ioutil"
"os"
"sync"
"sync/atomic"
@ -959,14 +958,14 @@ func TestWriteSSLSessionTicketKey(t *testing.T) {
},
}
f, err := ioutil.TempFile("", "ssl-session-ticket-test")
f, err := os.CreateTemp("", "ssl-session-ticket-test")
if err != nil {
t.Fatal(err)
}
s.writeSSLSessionTicketKey(cmap, f.Name())
content, err := ioutil.ReadFile(f.Name())
content, err := os.ReadFile(f.Name())
if err != nil {
t.Fatal(err)
}

3
internal/ingress/controller/template/template.go
View file

@ -24,7 +24,6 @@ import (
"encoding/json"
"fmt"
"io"
"io/ioutil"
"math/rand" // #nosec
"net"
"net/url"
@ -76,7 +75,7 @@ type Template struct {
//NewTemplate returns a new Template instance or an
//error if the specified template file contains errors
func NewTemplate(file string) (*Template, error) {
data, err := ioutil.ReadFile(file)
data, err := os.ReadFile(file)
if err != nil {
return nil, errors.Wrapf(err, "unexpected error reading template %v", file)
}

9
internal/ingress/controller/template/template_test.go
View file

@ -20,7 +20,6 @@ import (
"bytes"
"encoding/base64"
"fmt"
"io/ioutil"
"net"
"os"
"path"
@ -538,7 +537,7 @@ func TestTemplateWithData(t *testing.T) {
t.Errorf("unexpected error reading json file: %v", err)
}
defer f.Close()
data, err := ioutil.ReadFile(f.Name())
data, err := os.ReadFile(f.Name())
if err != nil {
t.Error("unexpected error reading json file: ", err)
}
@ -582,7 +581,7 @@ func BenchmarkTemplateWithData(b *testing.B) {
b.Errorf("unexpected error reading json file: %v", err)
}
defer f.Close()
data, err := ioutil.ReadFile(f.Name())
data, err := os.ReadFile(f.Name())
if err != nil {
b.Error("unexpected error reading json file: ", err)
}
@ -1657,7 +1656,7 @@ func TestCleanConf(t *testing.T) {
}
actual := &bytes.Buffer{}
{
data, err := ioutil.ReadFile(testDataDir + "/cleanConf.src.conf")
data, err := os.ReadFile(testDataDir + "/cleanConf.src.conf")
if err != nil {
t.Error("unexpected error reading conf file: ", err)
}
@ -1668,7 +1667,7 @@ func TestCleanConf(t *testing.T) {
}
}
expected, err := ioutil.ReadFile(testDataDir + "/cleanConf.expected.conf")
expected, err := os.ReadFile(testDataDir + "/cleanConf.expected.conf")
if err != nil {
t.Error("unexpected error reading conf file: ", err)
}

3
internal/ingress/controller/util.go
View file

@ -18,7 +18,6 @@ package controller
import (
"fmt"
"io/ioutil"
"os"
"os/exec"
"path"
@ -123,7 +122,7 @@ func (nc NginxCommand) Test(cfg string) ([]byte, error) {
// getSysctl returns the value for the specified sysctl setting
func getSysctl(sysctl string) (int, error) {
data, err := ioutil.ReadFile(path.Join("/proc/sys", sysctl))
data, err := os.ReadFile(path.Join("/proc/sys", sysctl))
if err != nil {
return -1, err
}