add plus conf file

Author: aphralG

internal/model/config.go

@@ -6,7 +6,6 @@
 package model
 
 import (
-	"log/slog"
 	"reflect"
 
 	"github.com/nginx/agent/v3/api/grpc/mpi/v1"
@@ -82,54 +81,35 @@ func (ncc *NginxConfigContext) Equal(otherNginxConfigContext *NginxConfigContext
 	if ncc.StubStatus.URL != otherNginxConfigContext.StubStatus.URL || ncc.StubStatus.Listen !=
 		otherNginxConfigContext.StubStatus.Listen || ncc.StubStatus.Location !=
 		otherNginxConfigContext.StubStatus.Location {
-		slog.Info("stub status not equal")
-		slog.Info("URL", "ncc", ncc.StubStatus.URL, "other",
-			otherNginxConfigContext.StubStatus.URL)
-		slog.Info("Listen", "ncc", ncc.StubStatus.Listen, "other",
-			otherNginxConfigContext.StubStatus.Listen)
-		slog.Info("URL", "ncc", ncc.StubStatus.Location, "other",
-			otherNginxConfigContext.StubStatus.Location)
-
 		return false
 	}
 
 	if ncc.PlusAPI.URL != otherNginxConfigContext.PlusAPI.URL || ncc.PlusAPI.Listen !=
 		otherNginxConfigContext.PlusAPI.Listen || ncc.PlusAPI.Location !=
 		otherNginxConfigContext.PlusAPI.Location {
-		slog.Info("plus api not equal")
-
 		return false
 	}
 
 	if ncc.InstanceID != otherNginxConfigContext.InstanceID {
-		slog.Info("id not equal")
-
 		return false
 	}
 
 	if !ncc.areFileEqual(otherNginxConfigContext.Files) {
-		slog.Info("files not equal")
-
 		return false
 	}
 
 	if !reflect.DeepEqual(ncc.AccessLogs, otherNginxConfigContext.AccessLogs) {
-		slog.Info("access logs not equal")
 		return false
 	}
 
 	if !reflect.DeepEqual(ncc.ErrorLogs, otherNginxConfigContext.ErrorLogs) {
-		slog.Info("error logs not equal")
 		return false
 	}
 
 	if !reflect.DeepEqual(ncc.NAPSysLogServers, otherNginxConfigContext.NAPSysLogServers) {
-		slog.Info("nap syslog servers not equal")
 		return false
 	}
 
-	slog.Info("config is equal")
-
 	return true
 }
 

internal/watcher/instance/instance_watcher_service.go

@@ -168,14 +168,12 @@ func (iw *InstanceWatcherService) ReparseConfig(ctx context.Context, instanceID
 			}
 		}
 
-		slog.Info("Send Config Context Update - Reparse config", "instance_id", instanceID)
 		iw.sendNginxConfigContextUpdate(ctx, nginxConfigContext)
-		iw.updateCache(nginxConfigContext)
+		iw.nginxConfigCache[nginxConfigContext.InstanceID] = nginxConfigContext
 		updatesRequired = proto.UpdateNginxInstanceRuntime(instance, nginxConfigContext)
 	}
 
 	if updatesRequired {
-		slog.Info("Instance Update Required")
 		instanceUpdates := InstanceUpdates{}
 		instanceUpdates.UpdatedInstances = append(instanceUpdates.UpdatedInstances, instance)
 		iw.instancesChannel <- InstanceUpdatesMessage{
@@ -185,17 +183,6 @@ func (iw *InstanceWatcherService) ReparseConfig(ctx context.Context, instanceID
 	}
 }
 
-func (iw *InstanceWatcherService) updateCache(nginxConfigContext *model.NginxConfigContext) {
-	iw.nginxConfigCache[nginxConfigContext.InstanceID] = nginxConfigContext
-	slog.Info("Instance Update Cache - New Context", "url", &nginxConfigContext.StubStatus.URL,
-		"location", nginxConfigContext.StubStatus.Location,
-		"listen", nginxConfigContext.StubStatus.Listen)
-	slog.Info("Instance Update Cache - Cache ", "url",
-		iw.nginxConfigCache[nginxConfigContext.InstanceID].StubStatus.URL,
-		"location", iw.nginxConfigCache[nginxConfigContext.InstanceID].StubStatus.Location,
-		"listen", iw.nginxConfigCache[nginxConfigContext.InstanceID].StubStatus.Listen)
-}
-
 func (iw *InstanceWatcherService) checkForUpdates(
 	ctx context.Context,
 ) {
@@ -233,9 +220,8 @@ func (iw *InstanceWatcherService) checkForUpdates(
 					"error", parseErr,
 				)
 			} else {
-				slog.Info("Send Config Context Update - check for updates")
 				iw.sendNginxConfigContextUpdate(newCtx, nginxConfigContext)
-				iw.updateCache(nginxConfigContext)
+				iw.nginxConfigCache[nginxConfigContext.InstanceID] = nginxConfigContext
 				proto.UpdateNginxInstanceRuntime(newInstance, nginxConfigContext)
 				iw.instanceCache[newInstance.GetInstanceMeta().GetInstanceId()] = newInstance
 			}
@@ -255,28 +241,8 @@ func (iw *InstanceWatcherService) sendNginxConfigContextUpdate(
 	ctx context.Context,
 	nginxConfigContext *model.NginxConfigContext,
 ) {
-	if iw.nginxConfigCache[nginxConfigContext.InstanceID] == nil {
-		slog.Info("iw.nginxConfigCache[nginxConfigContext.InstanceID] == nil")
-		slog.DebugContext(
-			ctx,
-			"New NGINX config context",
-			"instance_id", nginxConfigContext.InstanceID,
-			"nginx_config_context", nginxConfigContext,
-		)
-
-		iw.nginxConfigContextChannel <- NginxConfigContextMessage{
-			CorrelationID:      logger.GetCorrelationIDAttr(ctx),
-			NginxConfigContext: nginxConfigContext,
-		}
-	} else if !iw.nginxConfigCache[nginxConfigContext.InstanceID].Equal(nginxConfigContext) {
-		slog.Info("!iw.nginxConfigCache[nginxConfigContext.InstanceID].Equal(nginxConfigContext)")
-		slog.Info("Check Cache - Cache ", "url",
-			iw.nginxConfigCache[nginxConfigContext.InstanceID].StubStatus.URL,
-			"location", iw.nginxConfigCache[nginxConfigContext.InstanceID].StubStatus.Location,
-			"listen", iw.nginxConfigCache[nginxConfigContext.InstanceID].StubStatus.Listen)
-		slog.Info("Check Cache - New Context", "url", nginxConfigContext.StubStatus.URL,
-			"location", nginxConfigContext.StubStatus.Location,
-			"listen", nginxConfigContext.StubStatus.Listen)
+	if iw.nginxConfigCache[nginxConfigContext.InstanceID] == nil ||
+		!iw.nginxConfigCache[nginxConfigContext.InstanceID].Equal(nginxConfigContext) {
 		slog.DebugContext(
 			ctx,
 			"New NGINX config context",

test/integration/grpc_management_plane_api_test.go

@@ -13,6 +13,7 @@ import (
 	"net/http"
 	"os"
 	"slices"
+	"sort"
 	"testing"
 	"time"
 
@@ -230,14 +231,15 @@ func TestGrpc_ConfigApply(t *testing.T) {
 		responses = getManagementPlaneResponses(t, 2)
 		t.Logf("Config apply responses: %v", responses)
 
-		// sort.Slice(responses, func(i, j int) bool {
-		//	return responses[i].GetCommandResponse().GetMessage() < responses[j].GetCommandResponse().GetMessage()
-		// })
+		if len(responses) > 1 {
+			t.Logf("Config apply responses more than 1")
+			sort.Slice(responses, func(i, j int) bool {
+				return responses[i].GetCommandResponse().GetMessage() < responses[j].GetCommandResponse().GetMessage()
+			})
+		}
 
 		assert.Equal(t, mpi.CommandResponse_COMMAND_STATUS_OK, responses[0].GetCommandResponse().GetStatus())
 		assert.Equal(t, "Config apply successful", responses[0].GetCommandResponse().GetMessage())
-		// assert.Equal(t, mpi.CommandResponse_COMMAND_STATUS_OK, responses[1].GetCommandResponse().GetStatus())
-		// assert.Equal(t, "Successfully updated all files", responses[1].GetCommandResponse().GetMessage())
 	})
 
 	t.Run("Test 3: Invalid config", func(t *testing.T) {