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

Fix golangci-lint errors (#10196)

Browse source 
* Fix golangci-lint errors

Signed-off-by: z1cheng <imchench@gmail.com>

* Fix dupl errors

Signed-off-by: z1cheng <imchench@gmail.com>

* Fix comments

Signed-off-by: z1cheng <imchench@gmail.com>

* Fix errcheck lint errors

Signed-off-by: z1cheng <imchench@gmail.com>

* Fix assert in e2e test

Signed-off-by: z1cheng <imchench@gmail.com>

* Not interrupt the waitForPodsReady

Signed-off-by: z1cheng <imchench@gmail.com>

* Replace string with constant

Signed-off-by: z1cheng <imchench@gmail.com>

* Fix comments

Signed-off-by: z1cheng <imchench@gmail.com>

* Revert write file permision

Signed-off-by: z1cheng <imchench@gmail.com>

---------

Signed-off-by: z1cheng <imchench@gmail.com>
This commit is contained in:
Chen Chen 2023-08-31 15:36:48 +08:00 • committed by GitHub
parent 46d87d3462
commit b3060bfbd0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
253 changed files with 2434 additions and 2113 deletions
Download patch file Download diff file Expand all files Collapse all files

17
internal/nginx/main.go
View file

@ -62,7 +62,7 @@ var StatusPath = "/nginx_status"
var StreamPort = 10247
// NewGetStatusRequest creates a new GET request to the internal NGINX status server
func NewGetStatusRequest(path string) (int, []byte, error) {
func NewGetStatusRequest(path string) (statusCode int, data []byte, err error) {
url := fmt.Sprintf("http://127.0.0.1:%v%v", StatusPort, path)
client := http.Client{}
@ -72,7 +72,7 @@ func NewGetStatusRequest(path string) (int, []byte, error) {
}
defer res.Body.Close()
data, err := io.ReadAll(res.Body)
data, err = io.ReadAll(res.Body)
if err != nil {
return 0, nil, err
}
@ -81,7 +81,7 @@ func NewGetStatusRequest(path string) (int, []byte, error) {
}
// NewPostStatusRequest creates a new POST request to the internal NGINX status server
func NewPostStatusRequest(path, contentType string, data interface{}) (int, []byte, error) {
func NewPostStatusRequest(path, contentType string, data interface{}) (statusCode int, body []byte, err error) {
url := fmt.Sprintf("http://127.0.0.1:%v%v", StatusPort, path)
buf, err := json.Marshal(data)
@ -96,7 +96,7 @@ func NewPostStatusRequest(path, contentType string, data interface{}) (int, []by
}
defer res.Body.Close()
body, err := io.ReadAll(res.Body)
body, err = io.ReadAll(res.Body)
if err != nil {
return 0, nil, err
}
@ -105,7 +105,7 @@ func NewPostStatusRequest(path, contentType string, data interface{}) (int, []by
}
// GetServerBlock takes an nginx.conf file and a host and tries to find the server block for that host
func GetServerBlock(conf string, host string) (string, error) {
func GetServerBlock(conf, host string) (string, error) {
startMsg := fmt.Sprintf("## start server %v\n", host)
endMsg := fmt.Sprintf("## end server %v", host)
@ -113,7 +113,7 @@ func GetServerBlock(conf string, host string) (string, error) {
if blockStart < 0 {
return "", fmt.Errorf("host %v was not found in the controller's nginx.conf", host)
}
blockStart = blockStart + len(startMsg)
blockStart += len(startMsg)
blockEnd := strings.Index(conf, endMsg)
if blockEnd < 0 {
@ -163,7 +163,10 @@ func Version() string {
// IsRunning returns true if a process with the name 'nginx' is found
func IsRunning() bool {
processes, _ := ps.Processes()
processes, err := ps.Processes()
if err != nil {
klog.ErrorS(err, "unexpected error obtaining process list")
}
for _, p := range processes {
if p.Executable() == "nginx" {
return true

10
internal/nginx/maxmind.go
View file

@ -101,7 +101,7 @@ func DownloadGeoLite2DB(attempts int, period time.Duration) error {
var lastErr error
retries := 0
_ = wait.ExponentialBackoff(defaultRetry, func() (bool, error) {
lastErr = wait.ExponentialBackoff(defaultRetry, func() (bool, error) {
var dlError error
for _, dbName := range strings.Split(MaxmindEditionIDs, ",") {
dlError = downloadDatabase(dbName)
@ -139,8 +139,8 @@ func createURL(mirror, licenseKey, dbName string) string {
}
func downloadDatabase(dbName string) error {
url := createURL(MaxmindMirror, MaxmindLicenseKey, dbName)
req, err := http.NewRequest(http.MethodGet, url, nil)
newURL := createURL(MaxmindMirror, MaxmindLicenseKey, dbName)
req, err := http.NewRequest(http.MethodGet, newURL, http.NoBody)
if err != nil {
return err
}
@ -175,8 +175,7 @@ func downloadDatabase(dbName string) error {
return err
}
switch header.Typeflag {
case tar.TypeReg:
if header.Typeflag == tar.TypeReg {
if !strings.HasSuffix(header.Name, mmdbFile) {
continue
}
@ -186,6 +185,7 @@ func downloadDatabase(dbName string) error {
return err
}
//nolint:gocritic // TODO: will fix it on a followup PR
defer outFile.Close()
if _, err := io.CopyN(outFile, tarReader, header.Size); err != nil {