adding small fix update

Author: miledxz

internal/mode/static/manager.go

@@ -4,6 +4,7 @@ import (
 	"context"
 	"errors"
 	"fmt"
+	"os"
 	"time"
 
 	"github.com/go-logr/logr"
@@ -144,7 +145,7 @@ func StartManager(cfg config.Config) error {
 		return fmt.Errorf("cannot clear NGINX configuration folders: %w", err)
 	}
 
-	processHandler := &ngxruntime.NewProcessHandlerImpl{}
+	processHandler := ngxruntime.NewProcessHandlerImpl(os.ReadFile, os.Stat)
 
 	// Ensure NGINX is running before registering metrics & starting the manager.
 	if _, err := processHandler.FindMainProcess(ctx, ngxruntime.PidFileTimeout); err != nil {

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

@@ -21,9 +21,9 @@ import (
 const (
 	// PidFile specifies the location of the PID file for the Nginx process
 	PidFile = "/var/run/nginx/nginx.pid"
-	// pidFileTimeout defines the timeout duration for accessing the PID file
+	// PidFileTimeout defines the timeout duration for accessing the PID file
 	PidFileTimeout = 10000 * time.Millisecond
-	/// NginxReloadTimeout sets the timeout duration for reloading the Nginx configuration
+	// NginxReloadTimeout sets the timeout duration for reloading the Nginx configuration
 	NginxReloadTimeout = 60000 * time.Millisecond
 )
 

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

@@ -3,10 +3,12 @@ package runtime_test
 import (
 	"context"
 	"errors"
+	"fmt"
 	"io/fs"
 	"testing"
 	"time"
 
+	"github.com/nginxinc/nginx-plus-go-client/client"
 	ngxclient "github.com/nginxinc/nginx-plus-go-client/client"
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
@@ -63,6 +65,52 @@ var _ = Describe("NGINX Runtime Manager", func() {
 			Expect(metrics.IncReloadErrorsCallCount()).To(Equal(0))
 		})
 
+		It("Fails to find the main process", func() {
+			process.FindMainProcessReturns(0, fmt.Errorf("failed to find process"))
+
+			err := manager.Reload(context.Background(), 1)
+
+			Expect(err).To(MatchError("failed to find NGINX main process: failed to find process"))
+			Expect(process.ReadFileCallCount()).To(Equal(0))
+			Expect(process.KillCallCount()).To(Equal(0))
+			Expect(verifyClient.WaitForCorrectVersionCallCount()).To(Equal(0))
+		})
+
+		It("Fails to read file", func() {
+			process.FindMainProcessReturns(1234, nil)
+			process.ReadFileReturns(nil, fmt.Errorf("failed to read file"))
+
+			err := manager.Reload(context.Background(), 1)
+
+			Expect(err).To(MatchError("failed to read file"))
+			Expect(process.KillCallCount()).To(Equal(0))
+			Expect(verifyClient.WaitForCorrectVersionCallCount()).To(Equal(0))
+		})
+
+		It("Fails to send kill signal", func() {
+			process.FindMainProcessReturns(1234, nil)
+			process.ReadFileReturns([]byte("child1\nchild2"), nil)
+			process.KillReturns(fmt.Errorf("failed to send kill signal"))
+
+			err := manager.Reload(context.Background(), 1)
+
+			Expect(err).To(MatchError("failed to send the HUP signal to NGINX main: failed to send kill signal"))
+			Expect(metrics.IncReloadErrorsCallCount()).To(Equal(1))
+			Expect(verifyClient.WaitForCorrectVersionCallCount()).To(Equal(0))
+		})
+
+		It("times out waiting for correct version", func() {
+			process.FindMainProcessReturns(1234, nil)
+			process.ReadFileReturns([]byte("child1\nchild2"), nil)
+			process.KillReturns(nil)
+			verifyClient.WaitForCorrectVersionReturns(fmt.Errorf("timeout waiting for correct version"))
+
+			err := manager.Reload(context.Background(), 1)
+
+			Expect(err).To(MatchError("timeout waiting for correct version"))
+			Expect(metrics.IncReloadErrorsCallCount()).To(Equal(1))
+		})
+
 		When("MetricsCollector is nil", func() {
 			It("panics", func() {
 				metrics = nil
@@ -110,6 +158,36 @@ var _ = Describe("NGINX Runtime Manager", func() {
 			Expect(upstreams).To(BeEmpty())
 		})
 
+		It("successfully returns server upstreams", func() {
+			upstreams := client.Upstreams{
+				"upstream1": {
+					Zone: "zone1",
+					Peers: []client.Peer{
+						{ID: 1, Name: "peer1-name"},
+					},
+					Queue:      client.Queue{Size: 10},
+					Keepalives: 5,
+					Zombies:    2,
+				},
+				"upstream2": {
+					Zone: "zone2",
+					Peers: []client.Peer{
+						{ID: 2, Name: "peer2-name"},
+					},
+					Queue:      client.Queue{Size: 20},
+					Keepalives: 3,
+					Zombies:    1,
+				},
+			}
+
+			ngxPlusClient.GetUpstreamsReturns(&upstreams, nil)
+
+			upstreams, err := manager.GetUpstreams()
+
+			Expect(err).NotTo(HaveOccurred())
+			Expect(upstreams).To(Equal(upstreams))
+		})
+
 		It("returns an error when GetUpstreams fails", func() {
 			ngxPlusClient.GetUpstreamsReturns(nil, errors.New("failed to get upstreams"))