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

2
test/e2e/framework/httpexpect/match.go
View file

@ -23,7 +23,7 @@ type Match struct {
names map[string]int
}
func makeMatch(chain chain, submatches []string, names []string) *Match {
func makeMatch(chain chain, submatches, names []string) *Match {
if submatches == nil {
submatches = []string{}
}

17
test/e2e/framework/httpexpect/object.go
View file

@ -23,6 +23,8 @@ import (
"github.com/yudai/gojsondiff/formatter"
)
const unavailableMsg = " (unavailable)"
// Object provides methods to inspect attached map[string]interface{} object
// (Go representation of JSON object).
type Object struct {
@ -81,20 +83,21 @@ func diffValues(expected, actual interface{}) string {
var diff gojsondiff.Diff
if ve, ok := expected.(map[string]interface{}); ok {
switch ve := expected.(type) {
case map[string]interface{}:
if va, ok := actual.(map[string]interface{}); ok {
diff = differ.CompareObjects(ve, va)
} else {
return " (unavailable)"
return unavailableMsg
}
} else if ve, ok := expected.([]interface{}); ok {
case []interface{}:
if va, ok := actual.([]interface{}); ok {
diff = differ.CompareArrays(ve, va)
} else {
return " (unavailable)"
return unavailableMsg
}
} else {
return " (unavailable)"
default:
return unavailableMsg
}
config := formatter.AsciiFormatterConfig{
@ -104,7 +107,7 @@ func diffValues(expected, actual interface{}) string {
str, err := f.Format(diff)
if err != nil {
return " (unavailable)"
return unavailableMsg
}
return "--- expected\n+++ actual\n" + str

3
test/e2e/framework/httpexpect/request.go
View file

@ -65,7 +65,7 @@ func (h *HTTPRequest) DoRequest(method, rpath string) *HTTPRequest {
var request *http.Request
uri.Path = path.Join(uri.Path, rpath)
if request, err = http.NewRequest(method, uri.String(), nil); err != nil {
if request, err = http.NewRequest(method, uri.String(), http.NoBody); err != nil {
h.chain.fail(err.Error())
}
@ -110,6 +110,7 @@ func (h *HTTPRequest) Expect() *HTTPResponse {
if err != nil {
h.chain.fail(err.Error())
}
defer response.Body.Close()
h.HTTPResponse.Response = response // set the HTTP response