Fix merge conflicts

Author: NutsaB

test/integration/managementplane/config_apply_test.go

@@ -8,6 +8,7 @@ package managementplane
 import (
 	"context"
 	"fmt"
+	"sort"
 	"testing"
 
 	"github.com/nginx/agent/v3/test/integration/utils"
@@ -18,9 +19,8 @@ import (
 )
 
 const (
-	configApplyErrorMessage = "failed validating config NGINX config test failed exit status 1:" +
-		" nginx: [emerg] unexpected end of file, expecting \";\" or \"}\" in /etc/nginx/nginx.conf:2\nnginx: " +
-		"configuration file /etc/nginx/nginx.conf test failed\n"
+	configApplyErrorMessage = "failed to parse config invalid " +
+		"number of arguments in \"worker_processes\" directive in /etc/nginx/nginx.conf:1"
 )
 
 func TestGrpc_ConfigApply(t *testing.T) {
@@ -46,21 +46,29 @@ func TestGrpc_ConfigApply(t *testing.T) {
 
 	t.Run("Test 2: Valid config", func(t *testing.T) {
 		utils.ClearManagementPlaneResponses(t)
+		newConfigFile := "../../config/nginx/nginx-with-test-location.conf"
+
 		err := utils.MockManagementPlaneGrpcContainer.CopyFileToContainer(
 			ctx,
-			"../../config/nginx/nginx-with-test-location.conf",
+			newConfigFile,
 			fmt.Sprintf("/mock-management-plane-grpc/config/%s/etc/nginx/nginx.conf", nginxInstanceID),
 			0o666,
 		)
 		require.NoError(t, err)
 
 		utils.PerformConfigApply(t, nginxInstanceID)
 
-		responses = utils.GetManagementPlaneResponses(t, 1)
+		responses = utils.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()
+		})
+
 		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) {

test/integration/utils/config_apply_utils.go

@@ -17,9 +17,9 @@ import (
 )
 
 const (
-	RetryCount       = 5
-	RetryWaitTime    = 4 * time.Second
-	RetryMaxWaitTime = 5 * time.Second
+	RetryCount       = 8
+	RetryWaitTime    = 5 * time.Second
+	RetryMaxWaitTime = 6 * time.Second
 )
 
 var MockManagementPlaneAPIAddress string
@@ -41,6 +41,7 @@ func PerformInvalidConfigApply(t *testing.T, nginxInstanceID string) {
 	t.Helper()
 
 	client := resty.New()
+
 	client.SetRetryCount(RetryCount).SetRetryWaitTime(RetryWaitTime).SetRetryMaxWaitTime(RetryMaxWaitTime)
 
 	body := fmt.Sprintf(`{

test/integration/utils/grpc_management_plane_utils.go

@@ -336,107 +336,151 @@ func VerifyUpdateDataPlaneHealth(t *testing.T) {
 	t.Helper()
 
 	client := resty.New()
+
 	client.SetRetryCount(RetryCount).SetRetryWaitTime(RetryWaitTime).SetRetryMaxWaitTime(RetryMaxWaitTime)
+
 	client.AddRetryCondition(
+
 		func(r *resty.Response, err error) bool {
 			return r.StatusCode() == http.StatusNotFound
 		},
 	)
 
 	url := fmt.Sprintf("http://%s/api/v1/health", MockManagementPlaneAPIAddress)
+
 	resp, err := client.R().EnableTrace().Get(url)
+
 	require.NoError(t, err)
+
 	assert.Equal(t, http.StatusOK, resp.StatusCode())
 
 	responseData := resp.Body()
+
 	t.Logf("Response: %s", string(responseData))
+
 	assert.True(t, json.Valid(responseData))
 
 	pb := protojson.UnmarshalOptions{DiscardUnknown: true}
 
 	updateDataPlaneHealthRequest := mpi.UpdateDataPlaneHealthRequest{}
+
 	unmarshalErr := pb.Unmarshal(responseData, &updateDataPlaneHealthRequest)
+
 	require.NoError(t, unmarshalErr)
 
 	t.Logf("UpdateDataPlaneHealthRequest: %v", &updateDataPlaneHealthRequest)
 
 	assert.NotNil(t, &updateDataPlaneHealthRequest)
 
 	// Verify message metadata
+
 	messageMeta := updateDataPlaneHealthRequest.GetMessageMeta()
+
 	assert.NotEmpty(t, messageMeta.GetCorrelationId())
+
 	assert.NotEmpty(t, messageMeta.GetMessageId())
+
 	assert.NotEmpty(t, messageMeta.GetTimestamp())
 
 	healths := updateDataPlaneHealthRequest.GetInstanceHealths()
+
 	assert.Len(t, healths, 1)
 
 	// Verify health metadata
+
 	assert.NotEmpty(t, healths[0].GetInstanceId())
+
 	assert.Equal(t, mpi.InstanceHealth_INSTANCE_HEALTH_STATUS_HEALTHY, healths[0].GetInstanceHealthStatus())
 }
 
 func VerifyUpdateDataPlaneStatus(t *testing.T) {
 	t.Helper()
 
 	client := resty.New()
+
 	client.SetRetryCount(statusRetryCount).SetRetryWaitTime(retryWait).SetRetryMaxWaitTime(retryMaxWait)
 
 	url := fmt.Sprintf("http://%s/api/v1/status", MockManagementPlaneAPIAddress)
+
 	resp, err := client.R().EnableTrace().Get(url)
 
 	require.NoError(t, err)
+
 	assert.Equal(t, http.StatusOK, resp.StatusCode())
 
 	updateDataPlaneStatusRequest := mpi.UpdateDataPlaneStatusRequest{}
 
 	responseData := resp.Body()
+
 	t.Logf("Response: %s", string(responseData))
+
 	assert.True(t, json.Valid(responseData))
 
 	pb := protojson.UnmarshalOptions{DiscardUnknown: true}
+
 	unmarshalErr := pb.Unmarshal(responseData, &updateDataPlaneStatusRequest)
+
 	require.NoError(t, unmarshalErr)
 
 	t.Logf("UpdateDataPlaneStatusRequest: %v", &updateDataPlaneStatusRequest)
 
 	assert.NotNil(t, &updateDataPlaneStatusRequest)
 
 	// Verify message metadata
+
 	messageMeta := updateDataPlaneStatusRequest.GetMessageMeta()
+
 	assert.NotEmpty(t, messageMeta.GetCorrelationId())
+
 	assert.NotEmpty(t, messageMeta.GetMessageId())
+
 	assert.NotEmpty(t, messageMeta.GetTimestamp())
 
 	instances := updateDataPlaneStatusRequest.GetResource().GetInstances()
+
 	sort.Slice(instances, func(i, j int) bool {
 		return instances[i].GetInstanceMeta().GetInstanceType() < instances[j].GetInstanceMeta().GetInstanceType()
 	})
+
 	assert.Len(t, instances, instanceLen)
 
 	// Verify agent instance metadata
+
 	assert.NotEmpty(t, instances[0].GetInstanceMeta().GetInstanceId())
+
 	assert.Equal(t, mpi.InstanceMeta_INSTANCE_TYPE_AGENT, instances[0].GetInstanceMeta().GetInstanceType())
+
 	assert.NotEmpty(t, instances[0].GetInstanceMeta().GetVersion())
 
 	// Verify agent instance configuration
+
 	assert.Empty(t, instances[0].GetInstanceConfig().GetActions())
+
 	assert.NotEmpty(t, instances[0].GetInstanceRuntime().GetProcessId())
+
 	assert.Equal(t, "/usr/bin/nginx-agent", instances[0].GetInstanceRuntime().GetBinaryPath())
+
 	assert.Equal(t, "/etc/nginx-agent/nginx-agent.conf", instances[0].GetInstanceRuntime().GetConfigPath())
 
 	// Verify NGINX instance metadata
+
 	assert.NotEmpty(t, instances[1].GetInstanceMeta().GetInstanceId())
+
 	if os.Getenv("IMAGE_PATH") == "/nginx-plus/agent" {
 		assert.Equal(t, mpi.InstanceMeta_INSTANCE_TYPE_NGINX_PLUS, instances[1].GetInstanceMeta().GetInstanceType())
 	} else {
 		assert.Equal(t, mpi.InstanceMeta_INSTANCE_TYPE_NGINX, instances[1].GetInstanceMeta().GetInstanceType())
 	}
+
 	assert.NotEmpty(t, instances[1].GetInstanceMeta().GetVersion())
 
 	// Verify NGINX instance configuration
+
 	assert.Empty(t, instances[1].GetInstanceConfig().GetActions())
+
 	assert.NotEmpty(t, instances[1].GetInstanceRuntime().GetProcessId())
+
 	assert.Equal(t, "/usr/sbin/nginx", instances[1].GetInstanceRuntime().GetBinaryPath())
+
 	assert.Equal(t, "/etc/nginx/nginx.conf", instances[1].GetInstanceRuntime().GetConfigPath())
 }