Sample region argument (#582)

* check two commands for one assignment in CommandLineUtils

Author: sbSteveK

samples/utils/CommandLineUtils.cpp

@@ -154,21 +154,24 @@ namespace Utils
         return commandDefault;
     }
 
-    Aws::Crt::String CommandLineUtils::GetCommandRequired(
-        Aws::Crt::String command,
-        Aws::Crt::String optionalAdditionalMessage)
+    Aws::Crt::String CommandLineUtils::GetCommandRequired(Aws::Crt::String command)
     {
         if (HasCommand(command))
         {
             return GetCommand(command);
         }
         PrintHelp();
         fprintf(stderr, "Missing required argument: --%s\n", command.c_str());
-        if (optionalAdditionalMessage != "")
+        exit(-1);
+    }
+
+    Aws::Crt::String CommandLineUtils::GetCommandRequired(Aws::Crt::String command, Aws::Crt::String commandAlt)
+    {
+        if (HasCommand(commandAlt))
         {
-            fprintf(stderr, "%s\n", optionalAdditionalMessage.c_str());
+            return GetCommand(commandAlt);
         }
-        exit(-1);
+        return GetCommandRequired(command);
     }
 
     void CommandLineUtils::PrintHelp()
@@ -449,7 +452,7 @@ namespace Utils
         {
             returnData.input_ca = cmdUtils.GetCommand(m_cmd_ca_file);
         }
-        returnData.input_signingRegion = cmdUtils.GetCommandRequired(m_cmd_region);
+        returnData.input_signingRegion = cmdUtils.GetCommandRequired(m_cmd_region, m_cmd_signing_region);
         s_populateTopic(&cmdUtils, &returnData);
         returnData.input_message = cmdUtils.GetCommandOrDefault(m_cmd_message, "");
         returnData.input_mode = cmdUtils.GetCommandOrDefault(m_cmd_mode, "both");
@@ -568,9 +571,9 @@ namespace Utils
         s_parseCommonMQTTCommands(&cmdUtils, &returnData);
         returnData.input_clientId =
             cmdUtils.GetCommandOrDefault(m_cmd_client_id, Aws::Crt::String("test-") + Aws::Crt::UUID().ToString());
-        returnData.input_signingRegion = cmdUtils.GetCommandRequired(m_cmd_signing_region);
+        returnData.input_signingRegion = cmdUtils.GetCommandRequired(m_cmd_signing_region, m_cmd_region);
         returnData.input_cognitoEndpoint =
-            "cognito-identity." + cmdUtils.GetCommandRequired(m_cmd_signing_region) + ".amazonaws.com";
+            "cognito-identity." + cmdUtils.GetCommandRequired(m_cmd_signing_region, m_cmd_region) + ".amazonaws.com";
         returnData.input_cognitoIdentity = cmdUtils.GetCommandRequired(m_cmd_cognito_identity);
         if (cmdUtils.HasCommand(m_cmd_proxy_host))
         {
@@ -653,7 +656,7 @@ namespace Utils
         s_parseCommonMQTTCommands(&cmdUtils, &returnData);
         returnData.input_clientId =
             cmdUtils.GetCommandOrDefault(m_cmd_client_id, Aws::Crt::String("test-") + Aws::Crt::UUID().ToString());
-        returnData.input_signingRegion = cmdUtils.GetCommandRequired(m_cmd_signing_region);
+        returnData.input_signingRegion = cmdUtils.GetCommandRequired(m_cmd_signing_region, m_cmd_region);
         if (cmdUtils.HasCommand(m_cmd_proxy_host))
         {
             returnData.input_proxyHost = cmdUtils.GetCommandRequired(m_cmd_proxy_host);
@@ -706,7 +709,7 @@ namespace Utils
         s_parseCommonMQTTCommands(&cmdUtils, &returnData);
         returnData.input_clientId =
             cmdUtils.GetCommandOrDefault(m_cmd_client_id, Aws::Crt::String("test-") + Aws::Crt::UUID().ToString());
-        returnData.input_signingRegion = cmdUtils.GetCommandRequired(m_cmd_signing_region);
+        returnData.input_signingRegion = cmdUtils.GetCommandRequired(m_cmd_signing_region, m_cmd_region);
         if (cmdUtils.HasCommand(m_cmd_proxy_host))
         {
             returnData.input_proxyHost = cmdUtils.GetCommandRequired(m_cmd_proxy_host);
@@ -849,7 +852,7 @@ namespace Utils
         s_addLoggingSendArgumentsStartLogging(argc, argv, api_handle, &cmdUtils);
 
         cmdData returnData = cmdData();
-        returnData.input_signingRegion = cmdUtils.GetCommandRequired(m_cmd_signing_region);
+        returnData.input_signingRegion = cmdUtils.GetCommandRequired(m_cmd_signing_region, m_cmd_region);
         returnData.input_endpoint = "data.tunneling.iot." + returnData.input_signingRegion + ".amazonaws.com";
         returnData.input_accessTokenFile = cmdUtils.GetCommandOrDefault(m_cmd_access_token_file, "");
         returnData.input_accessToken = cmdUtils.GetCommandOrDefault(m_cmd_access_token, "");

samples/utils/CommandLineUtils.h

@@ -124,9 +124,17 @@ namespace Utils
          * @param CommandName The name of the command you want to get the value of
          * @return Aws::Crt::String The value passed into the program at the command name
          */
-        Aws::Crt::String GetCommandRequired(
-            Aws::Crt::String CommandName,
-            Aws::Crt::String OptionalAdditionalMessage = "");
+        Aws::Crt::String GetCommandRequired(Aws::Crt::String CommandName);
+
+        /**
+         * Gets the value of the command passed into the console/terminal if it exists. If it does not exist,
+         * the program will exit with an error message.
+         *
+         * @param CommandName The name of the command you want to get the value of
+         * @param CommandNameAlt The alternate name of the command you want to get the value of
+         * @return Aws::Crt::String The value passed into the program at the command name
+         */
+        Aws::Crt::String GetCommandRequired(Aws::Crt::String CommandName, Aws::Crt::String CommandNameAlt);
 
         /**
          * Prints to the console/terminal all of the commands and their descriptions.