add plus conf file

Author: aphralG

test/integration/grpc_management_plane_api_test.go

@@ -34,9 +34,9 @@ const (
 	configApplyErrorMessage = "failed to parse config invalid " +
 		"number of arguments in \"worker_processes\" directive in /etc/nginx/nginx.conf:1"
 
-	retryCount       = 5
-	retryWaitTime    = 4 * time.Second
-	retryMaxWaitTime = 5 * time.Second
+	retryCount       = 8
+	retryWaitTime    = 5 * time.Second
+	retryMaxWaitTime = 6 * time.Second
 )
 
 var (
@@ -189,6 +189,88 @@ func setupLocalEnvironment(tb testing.TB) {
 	}(tb)
 }
 
+func TestGrpc_Reconnection(t *testing.T) {
+	ctx := context.Background()
+	teardownTest := setupConnectionTest(t, false, false)
+	defer teardownTest(t)
+
+	timeout := 15 * time.Second
+
+	originalID := verifyConnection(t, 2)
+
+	stopErr := mockManagementPlaneGrpcContainer.Stop(ctx, &timeout)
+
+	require.NoError(t, stopErr)
+
+	startErr := mockManagementPlaneGrpcContainer.Start(ctx)
+	require.NoError(t, startErr)
+
+	ipAddress, err := mockManagementPlaneGrpcContainer.Host(ctx)
+	require.NoError(t, err)
+	ports, err := mockManagementPlaneGrpcContainer.Ports(ctx)
+	require.NoError(t, err)
+	mockManagementPlaneAPIAddress = net.JoinHostPort(ipAddress, ports["9093/tcp"][0].HostPort)
+
+	currentID := verifyConnection(t, 2)
+	assert.Equal(t, originalID, currentID)
+}
+
+// Verify that the agent sends a connection request and an update data plane status request
+func TestGrpc_StartUp(t *testing.T) {
+	teardownTest := setupConnectionTest(t, true, false)
+	defer teardownTest(t)
+
+	verifyConnection(t, 2)
+	assert.False(t, t.Failed())
+	verifyUpdateDataPlaneHealth(t)
+}
+
+func TestGrpc_ConfigUpload(t *testing.T) {
+	teardownTest := setupConnectionTest(t, true, false)
+	defer teardownTest(t)
+
+	nginxInstanceID := verifyConnection(t, 2)
+	assert.False(t, t.Failed())
+
+	responses := getManagementPlaneResponses(t, 1)
+
+	assert.Equal(t, mpi.CommandResponse_COMMAND_STATUS_OK, responses[0].GetCommandResponse().GetStatus())
+	assert.Equal(t, "Successfully updated all files", responses[0].GetCommandResponse().GetMessage())
+
+	request := fmt.Sprintf(`{
+	"message_meta": {
+		"message_id": "5d0fa83e-351c-4009-90cd-1f2acce2d184",
+		"correlation_id": "79794c1c-8e91-47c1-a92c-b9a0c3f1a263",
+		"timestamp": "2023-01-15T01:30:15.01Z"
+	},
+	"config_upload_request": {
+      "overview" : {
+        "config_version": {
+          "instance_id": "%s"
+        }
+      }
+	}
+}`, nginxInstanceID)
+
+	t.Logf("Sending config upload request: %s", request)
+
+	client := resty.New()
+	client.SetRetryCount(retryCount).SetRetryWaitTime(retryWaitTime).SetRetryMaxWaitTime(retryMaxWaitTime)
+
+	url := fmt.Sprintf("http://%s/api/v1/requests", mockManagementPlaneAPIAddress)
+	resp, err := client.R().EnableTrace().SetBody(request).Post(url)
+
+	require.NoError(t, err)
+	assert.Equal(t, http.StatusOK, resp.StatusCode())
+
+	responses = getManagementPlaneResponses(t, 2)
+
+	assert.Equal(t, mpi.CommandResponse_COMMAND_STATUS_OK, responses[0].GetCommandResponse().GetStatus())
+	assert.Equal(t, "Successfully updated all files", 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())
+}
+
 func TestGrpc_ConfigApply(t *testing.T) {
 	ctx := context.Background()
 	teardownTest := setupConnectionTest(t, false, false)
@@ -232,15 +314,15 @@ func TestGrpc_ConfigApply(t *testing.T) {
 		responses = getManagementPlaneResponses(t, 2)
 		t.Logf("Config apply responses: %v", responses)
 
-		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()
-			})
-		}
+		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) {
@@ -283,6 +365,67 @@ func TestGrpc_ConfigApply(t *testing.T) {
 	})
 }
 
+func TestGrpc_FileWatcher(t *testing.T) {
+	ctx := context.Background()
+	teardownTest := setupConnectionTest(t, true, false)
+	defer teardownTest(t)
+
+	verifyConnection(t, 2)
+	assert.False(t, t.Failed())
+
+	err := container.CopyFileToContainer(
+		ctx,
+		"../config/nginx/nginx-with-server-block-access-log.conf",
+		"/etc/nginx/nginx.conf",
+		0o666,
+	)
+	require.NoError(t, err)
+
+	responses := getManagementPlaneResponses(t, 2)
+	assert.Equal(t, mpi.CommandResponse_COMMAND_STATUS_OK, responses[0].GetCommandResponse().GetStatus())
+	assert.Equal(t, "Successfully updated all files", 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())
+
+	verifyUpdateDataPlaneStatus(t)
+}
+
+func TestGrpc_DataplaneHealthRequest(t *testing.T) {
+	teardownTest := setupConnectionTest(t, true, false)
+	defer teardownTest(t)
+
+	verifyConnection(t, 2)
+
+	responses := getManagementPlaneResponses(t, 1)
+	assert.Equal(t, mpi.CommandResponse_COMMAND_STATUS_OK, responses[0].GetCommandResponse().GetStatus())
+	assert.Equal(t, "Successfully updated all files", responses[0].GetCommandResponse().GetMessage())
+
+	assert.False(t, t.Failed())
+
+	request := `{
+			"message_meta": {
+				"message_id": "5d0fa83e-351c-4009-90cd-1f2acce2d184",
+				"correlation_id": "79794c1c-8e91-47c1-a92c-b9a0c3f1a263",
+				"timestamp": "2023-01-15T01:30:15.01Z"
+			},
+			"health_request": {}
+		}`
+
+	client := resty.New()
+	client.SetRetryCount(retryCount).SetRetryWaitTime(retryWaitTime).SetRetryMaxWaitTime(retryMaxWaitTime)
+
+	url := fmt.Sprintf("http://%s/api/v1/requests", mockManagementPlaneAPIAddress)
+	resp, err := client.R().EnableTrace().SetBody(request).Post(url)
+
+	require.NoError(t, err)
+	assert.Equal(t, http.StatusOK, resp.StatusCode())
+
+	responses = getManagementPlaneResponses(t, 2)
+
+	assert.Equal(t, mpi.CommandResponse_COMMAND_STATUS_OK, responses[1].GetCommandResponse().GetStatus())
+	assert.Equal(t, "Successfully sent the health status update", responses[1].GetCommandResponse().GetMessage())
+}
+
 func performConfigApply(t *testing.T, nginxInstanceID string) {
 	t.Helper()
 
@@ -488,3 +631,156 @@ func verifyConnection(t *testing.T, instancesLength int) string {
 
 	return nginxInstanceID
 }
+
+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(3).SetRetryWaitTime(50 * time.Millisecond).SetRetryMaxWaitTime(200 * time.Millisecond)
+
+	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, 2)
+
+	// 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())
+}