(ignite-3) branch main updated: IGNITE-23089 Node config update command show terminal control symbols (#4299)

[apkhmv]

This is an automated email from the ASF dual-hosted git repository.

apkhmv pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/ignite-3.git


The following commit(s) were added to refs/heads/main by this push:
     new 71631f769b IGNITE-23089 Node config update command show terminal 
control symbols (#4299)
71631f769b is described below

commit 71631f769b53cd3b31f97e94179a36424eab146d
Author: Vadim Pakhnushev <8614891+valep...@users.noreply.github.com>
AuthorDate: Thu Aug 29 14:09:09 2024 +0300

    IGNITE-23089 Node config update command show terminal control symbols 
(#4299)
---
 .../internal/cli/commands/configuration/ItConfigCommandTest.java     | 5 +----
 .../ignite/internal/cli/call/configuration/NodeConfigUpdateCall.java | 3 ++-
 .../ignite/internal/cli/commands/node/config/NodeConfigTest.java     | 5 +----
 3 files changed, 4 insertions(+), 9 deletions(-)

diff --git 
a/modules/cli/src/integrationTest/java/org/apache/ignite/internal/cli/commands/configuration/ItConfigCommandTest.java
 
b/modules/cli/src/integrationTest/java/org/apache/ignite/internal/cli/commands/configuration/ItConfigCommandTest.java
index 5be05ef14f..d929343761 100644
--- 
a/modules/cli/src/integrationTest/java/org/apache/ignite/internal/cli/commands/configuration/ItConfigCommandTest.java
+++ 
b/modules/cli/src/integrationTest/java/org/apache/ignite/internal/cli/commands/configuration/ItConfigCommandTest.java
@@ -18,11 +18,9 @@
 package org.apache.ignite.internal.cli.commands.configuration;
 
 
-import static org.apache.ignite.internal.cli.core.style.AnsiStringSupport.fg;
 import static org.junit.jupiter.api.Assertions.assertAll;
 
 import org.apache.ignite.internal.cli.CliIntegrationTest;
-import org.apache.ignite.internal.cli.core.style.AnsiStringSupport.Color;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 
@@ -79,8 +77,7 @@ class ItConfigCommandTest extends CliIntegrationTest {
         assertAll(
                 this::assertExitCodeIsZero,
                 this::assertErrOutputIsEmpty,
-                () -> assertOutputContains("Node configuration updated. "
-                        + fg(Color.YELLOW).mark("Restart the node to apply 
changes."))
+                () -> assertOutputContains("Node configuration updated. 
Restart the node to apply changes.")
         );
 
         // When read the updated cluster configuration
diff --git 
a/modules/cli/src/main/java/org/apache/ignite/internal/cli/call/configuration/NodeConfigUpdateCall.java
 
b/modules/cli/src/main/java/org/apache/ignite/internal/cli/call/configuration/NodeConfigUpdateCall.java
index 6d5790eb3d..6a9be4c72f 100644
--- 
a/modules/cli/src/main/java/org/apache/ignite/internal/cli/call/configuration/NodeConfigUpdateCall.java
+++ 
b/modules/cli/src/main/java/org/apache/ignite/internal/cli/call/configuration/NodeConfigUpdateCall.java
@@ -17,6 +17,7 @@
 
 package org.apache.ignite.internal.cli.call.configuration;
 
+import static org.apache.ignite.internal.cli.core.style.AnsiStringSupport.ansi;
 import static org.apache.ignite.internal.cli.core.style.AnsiStringSupport.fg;
 
 import jakarta.inject.Singleton;
@@ -55,7 +56,7 @@ public class NodeConfigUpdateCall implements 
Call<NodeConfigUpdateCallInput, Str
             throws ApiException {
         api.updateNodeConfiguration(input.getConfig());
         return DefaultCallOutput.success("Node configuration updated. "
-                + fg(Color.YELLOW).mark("Restart the node to apply changes."));
+                + ansi(fg(Color.YELLOW).mark("Restart the node to apply 
changes.")));
     }
 
     private NodeConfigurationApi createApiClient(NodeConfigUpdateCallInput 
input) {
diff --git 
a/modules/cli/src/test/java/org/apache/ignite/internal/cli/commands/node/config/NodeConfigTest.java
 
b/modules/cli/src/test/java/org/apache/ignite/internal/cli/commands/node/config/NodeConfigTest.java
index 733bf27f96..9ba546a388 100644
--- 
a/modules/cli/src/test/java/org/apache/ignite/internal/cli/commands/node/config/NodeConfigTest.java
+++ 
b/modules/cli/src/test/java/org/apache/ignite/internal/cli/commands/node/config/NodeConfigTest.java
@@ -17,12 +17,10 @@
 
 package org.apache.ignite.internal.cli.commands.node.config;
 
-import static org.apache.ignite.internal.cli.core.style.AnsiStringSupport.fg;
 import static org.mockserver.model.HttpRequest.request;
 import static org.mockserver.model.HttpResponse.response;
 
 import org.apache.ignite.internal.cli.commands.IgniteCliInterfaceTestBase;
-import org.apache.ignite.internal.cli.core.style.AnsiStringSupport.Color;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 
@@ -80,7 +78,6 @@ public class NodeConfigTest extends 
IgniteCliInterfaceTestBase {
 
         execute("node config update --url " + mockUrl + " 
local.baseline.autoAdjust.enabled=true");
 
-        assertSuccessfulOutputIs("Node configuration updated. "
-                + fg(Color.YELLOW).mark("Restart the node to apply changes."));
+        assertSuccessfulOutputIs("Node configuration updated. Restart the node 
to apply changes.");
     }
 }