[GitHub] [ignite-3] PakhomovAlexander commented on a diff in pull request #1991: IGNITE-19077 Apply cutom cluster config on cluster init

["PakhomovAlexander (via GitHub)" <gi...@apache.org>]

PakhomovAlexander commented on code in PR #1991:
URL: https://github.com/apache/ignite-3/pull/1991#discussion_r1180627611


##########
modules/cli/src/integrationTest/java/org/apache/ignite/internal/cli/commands/cluster/init/ItClusterInitTest.java:
##########
@@ -39,13 +39,15 @@ void initClusterWithBasicAuthentication() {
 
         resetOutput();
 
+        String clusterConfigurationFile = ItClusterInitTest.class.getClassLoader()
+                .getResource("cluster-configuration-with-enabled-auth.json")

Review Comment:
   ```suggestion
                   .getResource("cluster-configuration-with-enabled-auth.conf")
   ```



##########
modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/Options.java:
##########
@@ -248,22 +240,16 @@ public static final class Constants {
         /** Unit path option description. */
         public static final String UNIT_PATH_OPTION_DESC = "Path to deployment unit file or directory";
 
-        public static final String AUTHENTICATION_ENABLED_OPTION = "--auth-enabled";
-
-        public static final String AUTHENTICATION_ENABLED_OPTION_SHORT = "-ae";
-
-        public static final String AUTHENTICATION_ENABLED_OPTION_DESC = "Authentication enabled flag";
-
-        public static final String BASIC_AUTHENTICATION_USERNAME_OPTION = "--basic-auth-username";
+        public static final String CLUSTER_CONFIG_OPTION = "--cluster-config";
 
-        public static final String BASIC_AUTHENTICATION_USERNAME_OPTION_SHORT = "-bu";
+        public static final String CLUSTER_CONFIG_OPTION_SHORT = "-cfg";
 
-        public static final String BASIC_AUTHENTICATION_USERNAME_OPTION_DESC = "Username which will be used for basic authentication";
+        public static final String CLUSTER_CONFIG_OPTION_DESC = "Cluster configuration";
 
-        public static final String BASIC_AUTHENTICATION_PASSWORD_OPTION = "--basic-auth-password";
+        public static final String CLUSTER_CONFIG_FILE_OPTION = "--cluster-config-file";
 
-        public static final String BASIC_AUTHENTICATION_PASSWORD_OPTION_SHORT = "-bp";
+        public static final String CLUSTER_CONFIG_FILE_OPTION_SHORT = "-cfg-f";

Review Comment:
   I would like to avoid `-` in short options.



##########
modules/cli/src/test/java/org/apache/ignite/internal/cli/IgniteCliInterfaceTest.java:
##########
@@ -272,10 +277,18 @@ void initSuccess() {
         }
 
         @Test
-        @DisplayName("init --cluster-endpoint-url http://localhost:10300 --meta-storage-node node1ConsistentId --meta-storage-node node2ConsistentId "
-                + "--cmg-node node2ConsistentId --cmg-node node3ConsistentId --cluster-name cluster "
-                + "--auth-enabled --basic-auth-username admin --basic-auth-password password")
-        void initWithAuthenticationSuccess() {
+        @DisplayName(
+                "init --cluster-endpoint-url http://localhost:10300 --meta-storage-node node1ConsistentId --meta-storage-node node2ConsistentId "
+                        + "--cmg-node node2ConsistentId --cmg-node node3ConsistentId --cluster-name cluster "
+                        + "--auth-enabled --basic-auth-username admin --basic-auth-password password")
+        void initWithAuthenticationSuccess() throws IOException {
+
+            String clusterConfigurationFile = IgniteCliInterfaceTest.class.getClassLoader()
+                    .getResource("cluster-configuration-with-enabled-auth.json")

Review Comment:
   ```suggestion
                       .getResource("cluster-configuration-with-enabled-auth.conf")
   ```



-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: notifications-unsubscribe@ignite.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org