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

4
pkg/util/process/controller.go
View file

@ -16,9 +16,9 @@ limitations under the License.
package process
// ProcessController defines a common interface for a process to be controlled,
// Controller defines a common interface for a process to be controlled,
// like the configurer, the webhook or the proper ingress controller
type ProcessController interface {
type Controller interface {
Start()
Stop() error
}

2
pkg/util/process/sigterm.go
View file

@ -29,7 +29,7 @@ type exiter func(code int)
// HandleSigterm receives a ProcessController interface and deals with
// the graceful shutdown
func HandleSigterm(ngx ProcessController, delay int, exit exiter) {
func HandleSigterm(ngx Controller, delay int, exit exiter) {
signalChan := make(chan os.Signal, 1)
signal.Notify(signalChan, syscall.SIGTERM)
<-signalChan

4
pkg/util/process/sigterm_test.go
View file

@ -43,7 +43,7 @@ func (f *FakeProcess) exiterFunc(code int) {
}
func sendDelayedSignal(delay time.Duration) error {
time.Sleep(delay * time.Second)
time.Sleep(delay)
return syscall.Kill(syscall.Getpid(), syscall.SIGTERM)
}
@ -67,7 +67,7 @@ func TestHandleSigterm(t *testing.T) {
process := &FakeProcess{shouldError: tt.shouldError}
t.Run(tt.name, func(t *testing.T) {
go func() {
err := sendDelayedSignal(2) // Send a signal after 2 seconds
err := sendDelayedSignal(2 * time.Second) // Send a signal after 2 seconds
if err != nil {
t.Errorf("error sending delayed signal: %v", err)
}