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

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 {