adding additional fix updates

Author: miledxz

internal/mode/static/nginx/runtime/manager.go

@@ -32,16 +32,29 @@ var childProcPathFmt = "/proc/%[1]v/task/%[1]v/children"
 //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . nginxPlusClient
 
 type nginxPlusClient interface {
-	UpdateHTTPServers(upstream string, servers []ngxclient.UpstreamServer) (added []ngxclient.UpstreamServer, deleted []ngxclient.UpstreamServer, updated []ngxclient.UpstreamServer, err error)
+	UpdateHTTPServers(
+		upstream string,
+		servers []ngxclient.UpstreamServer,
+	) (
+		added []ngxclient.UpstreamServer,
+		deleted []ngxclient.UpstreamServer,
+		updated []ngxclient.UpstreamServer,
+		err error,
+	)
 	GetUpstreams() (*ngxclient.Upstreams, error)
 }
 
 //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . ProcessHandler
 
 type ProcessHandler interface {
-	FindMainProcess(ctx context.Context, checkFile CheckFileFunc, readFile ReadFileFunc, timeout time.Duration) (int, error)
+	FindMainProcess(
+		ctx context.Context,
+		checkFile CheckFileFunc,
+		readFile ReadFileFunc,
+		timeout time.Duration,
+	) (int, error)
 	ReadFile(file string) ([]byte, error)
-	Kill(pid int, signum syscall.Signal) error
+	Kill(pid int) error
 	EnsureNginxRunning(ctx context.Context) error
 }
 
@@ -74,11 +87,11 @@ type MetricsCollector interface {
 
 // ManagerImpl implements Manager.
 type ManagerImpl struct {
-	verifyClient     verifyClient
+	processHandler   ProcessHandler
 	metricsCollector MetricsCollector
+	verifyClient     verifyClient
 	ngxPlusClient    nginxPlusClient
 	logger           logr.Logger
-	processHandler   ProcessHandler
 }
 
 // NewManagerImpl creates a new ManagerImpl.
@@ -90,11 +103,11 @@ func NewManagerImpl(
 	verifyClient verifyClient,
 ) *ManagerImpl {
 	return &ManagerImpl{
-		verifyClient:     verifyClient,
+		processHandler:   processHandler,
 		metricsCollector: collector,
+		verifyClient:     verifyClient,
 		ngxPlusClient:    ngxPlusClient,
 		logger:           logger,
-		processHandler:   processHandler,
 	}
 }
 
@@ -119,7 +132,7 @@ func (m *ManagerImpl) Reload(ctx context.Context, configVersion int) error {
 
 	// send HUP signal to the NGINX main process reload configuration
 	// See https://nginx.org/en/docs/control.html
-	if err := m.processHandler.Kill(pid, syscall.SIGHUP); err != nil {
+	if err := m.processHandler.Kill(pid); err != nil {
 		m.metricsCollector.IncReloadErrors()
 		return fmt.Errorf("failed to send the HUP signal to NGINX main: %w", err)
 	}
@@ -227,6 +240,6 @@ func (p *ProcessHandlerImpl) ReadFile(file string) ([]byte, error) {
 	return os.ReadFile(file)
 }
 
-func (p *ProcessHandlerImpl) Kill(pid int, signum syscall.Signal) error {
+func (p *ProcessHandlerImpl) Kill(pid int) error {
 	return syscall.Kill(pid, syscall.SIGHUP)
 }

internal/mode/static/nginx/runtime/manager_test.go

@@ -26,6 +26,7 @@ var _ = Describe("NGINX Runtime Manager", func() {
 	})
 
 	var (
+		err             error
 		manager         runtime.Manager
 		upstreamServers []ngxclient.UpstreamServer
 		ngxPlusClient   *runtimefakes.FakeNginxPlusClient
@@ -67,10 +68,11 @@ var _ = Describe("NGINX Runtime Manager", func() {
 				manager = runtime.NewManagerImpl(ngxPlusClient, metrics, zap.New(), process, verifyClient)
 
 				reload := func() {
-					manager.Reload(context.Background(), 0)
+					err = manager.Reload(context.Background(), 0)
 				}
 
 				Expect(reload).To(Panic())
+				Expect(err).ToNot(HaveOccurred())
 			})
 
 			It("should panic if VerifyClient not enabled", func() {
@@ -79,10 +81,11 @@ var _ = Describe("NGINX Runtime Manager", func() {
 				manager = runtime.NewManagerImpl(ngxPlusClient, metrics, zap.New(), process, verifyClient)
 
 				reload := func() {
-					manager.Reload(context.Background(), 0)
+					err = manager.Reload(context.Background(), 0)
 				}
 
 				Expect(reload).To(Panic())
+				Expect(err).ToNot(HaveOccurred())
 			})
 		})
 	})
@@ -93,7 +96,7 @@ var _ = Describe("NGINX Runtime Manager", func() {
 			manager = runtime.NewManagerImpl(ngxPlusClient, nil, zap.New(), nil, nil)
 		})
 
-		It("sucessfully updates HTTP server upstream", func() {
+		It("successfully updates HTTP server upstream", func() {
 			Expect(manager.UpdateHTTPServers("test", upstreamServers)).To(Succeed())
 		})
 
@@ -113,18 +116,20 @@ var _ = Describe("NGINX Runtime Manager", func() {
 
 		It("should panic when updating HTTP upstream servers", func() {
 			updateServers := func() {
-				manager.UpdateHTTPServers("test", upstreamServers)
+				err = manager.UpdateHTTPServers("test", upstreamServers)
 			}
 
 			Expect(updateServers).To(Panic())
+			Expect(err).ToNot(HaveOccurred())
 		})
 
 		It("should panic when fetching HTTP upstream servers", func() {
 			upstreams := func() {
-				manager.GetUpstreams()
+				_, err = manager.GetUpstreams()
 			}
 
 			Expect(upstreams).To(Panic())
+			Expect(err).ToNot(HaveOccurred())
 		})
 	})
 })

internal/mode/static/nginx/runtime/runtimefakes/fake_process_handler.go

@@ -23,7 +23,13 @@ var noNewWorkersErrFmt = "reload unsuccessful: no new NGINX worker processes sta
 
 type verifyClient interface {
 	GetConfigVersion() (int, error)
-	WaitForCorrectVersion(ctx context.Context, expectedVersion int, childProcFile string, previousChildProcesses []byte, readFile ReadFileFunc) error
+	WaitForCorrectVersion(
+		ctx context.Context,
+		expectedVersion int,
+		childProcFile string,
+		previousChildProcesses []byte,
+		readFile ReadFileFunc,
+	) error
 	EnsureConfigVersion(ctx context.Context, expectedVersion int) error
 }