Fix optionsParser.js typos and boolean value parsing

Author: jiridanek

lib/optionsParser.js

@@ -68,23 +68,23 @@ class ConnectionOptions {
         const argsProcessor = yargs
             .usage('$0 [args]')
             .options({
-                'conn-urls':                    { describe: 'broker adresses and ports for failover conection e.g. "host1:port,host2:port"]', type: 'string'},
-                'conn-use-config-file':         { default: false, describe: 'use configuration file for connection', type: ['boolean', 'string']},
-                'conn-reconnect':               { default: true, describe: 'client reconnect settings', type: ['boolean', 'string']},
+                'conn-urls':                    { describe: 'broker addresses and ports for failover connection e.g. "host1:port,host2:port"]', type: 'string'},
+                'conn-use-config-file':         { default: false, describe: 'use configuration file for connection', type: 'boolean'},
+                'conn-reconnect':               { default: true, describe: 'client reconnect settings', type: 'boolean'},
                 'conn-reconnect-interval':      { describe: 'client reconnect interval (only supported with "custom" reconnect")', type: 'float'},
                 'conn-reconnect-limit':         { describe: 'client reconnect limit (only supported with "custom" reconnect)', type: 'int'},
                 'conn-reconnect-timeout':       { describe: 'client reconnect timeout (only supported with "custom" reconnect)', type: 'int'},
-                'conn-heartbeat':               { deafult: 0, describe: 'heartbeat in second', type: 'uint'},
-                'conn-ssl':                     { default: false, describe: 'enable tls connection', type: ['boolean', 'string']},
+                'conn-heartbeat':               { default: 0, describe: 'heartbeat in second', type: 'uint'},
+                'conn-ssl':                     { default: false, describe: 'enable tls connection', type: 'boolean'},
                 'conn-ssl-certificate':         { describe: 'path to client certificate (PEM format), enables client authentication', type: 'string'},
                 'conn-ssl-private-key':         { describe: 'path to client private key (PEM format), conn-ssl-certificate must be given', type: 'string'},
                 'conn-ssl-password':            { describe: 'client\'s certificate database password', type: 'string' },
                 'conn-ssl-trust-store':         { describe: 'path to client trust store (PEM format), conn-ssl-certificate must be given', type: 'string' },
                 'conn-ssl-verify-peer':         { default: false, describe: 'verifies server certificate, conn-ssl-certificate and trusted db path needs to be specified (PEM format)', type: 'boolean'},
                 'conn-ssl-verify-peer-name':    { default: false, describe: 'verifies connection url against server hostname', type: 'boolean'},
                 'conn-max-frame-size':          { default: undefined, describe: 'defines max frame size for connection', type: 'uint'},
-                'conn-web-socket':              { alias: 'conn-ws', default: false, describe: 'use websocket as transport layer', type: ['boolean', 'string']},
-                'conn-web-socket-protocols':    { alias: 'conn-ws-protocols', describe: 'protocol for ws connection', type: 'array', deafult: ['binary', 'AMQPWSB10', 'amqp']},
+                'conn-web-socket':              { alias: 'conn-ws', default: false, describe: 'use websocket as transport layer', type: 'boolean'},
+                'conn-web-socket-protocols':    { alias: 'conn-ws-protocols', describe: 'protocol for ws connection', type: 'array', default: ['binary', 'AMQPWSB10', 'amqp']},
                 'conn-property':                { describe: 'Sets connection property map item'},
                 'broker':                       { alias: 'b', default: 'localhost:5672', describe: 'address of machine with broker (i.e. admin:admin@broker-address:5672)'},
             })
@@ -445,7 +445,7 @@ class ReceiverOptions extends SenderReceiverOptions {
                 'action':           { default: 'acknowledge', describe: 'action on acquired message', choices: ['acknowledge', 'reject', 'release', 'noack']},
                 'capacity':         { default: 0 ,describe: 'set sender capacity', type: 'uint'},
                 'process-reply-to': { default: false ,describe: 'send message to reply-to address if enabled and message got reply-to address', type: 'boolean'},
-                'recv-listen':      { default: false, describe: 'enable receiver listen (P2P)', type: ['boolean', 'string']},
+                'recv-listen':      { default: false, describe: 'enable receiver listen (P2P)', type: 'boolean'},
                 'recv-listen-port': { default: 5672, describe: 'define port for local listening', type: ['uint']},
                 'reactor-auto-settle-off':  { default: false, describe: 'disable auto settling', type: 'boolean'},
             });

test/optionsParserTest.js

@@ -0,0 +1,52 @@
+/*
+ * Copyright 2023 Red Hat Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+'use strict';
+
+let expect = require('chai').expect;
+let optionsParser = require('../lib/optionsParser');
+
+describe('options parser', () => {
+    describe('parsing --conn-use-config-file', () => {
+        let options = new optionsParser.SenderOptions()
+        it('parse true value', () => {
+            options.parseConnectionOptions(["--conn-use-config-file", "true"]);
+            expect(options.useConfigFile).is.true
+        });
+        it('parse false value', () => {
+            options.parseConnectionOptions(["--conn-use-config-file", "false"]);
+            expect(options.useConfigFile).is.false
+        });
+        it('default to true with no value', () => {
+            options.parseConnectionOptions(["--conn-use-config-file"]);
+            expect(options.useConfigFile).is.true
+        });
+        it('default to false', () => {
+            options.parseConnectionOptions([]);
+            expect(options.useConfigFile).is.false
+        });
+    });
+    describe('parsing --conn-reconnect', () => {
+        let options = new optionsParser.SenderOptions()
+        it('default to true with no value', () => {
+            options.parseConnectionOptions(["--conn-ssl"]);
+            expect(options.reconnect).is.true
+        });
+        it('default to true', () => {
+            options.parseConnectionOptions([]);
+            expect(options.reconnect).is.true
+        });
+    });
+});