MAGETWO-36367: Fix Messages in Setup CLI Commands

 - Specify require options
 - Remove the default value of empty string for admin-password

Author: Fred Sung

setup/src/Magento/Setup/Console/Command/AbstractMaintenanceCommand.php

@@ -53,7 +53,7 @@ protected function configure()
                 self::INPUT_KEY_IP,
                 null,
                 InputOption::VALUE_IS_ARRAY | InputOption::VALUE_REQUIRED,
-                'Allowed IP addresses'
+                'Allowed IP addresses (use none to clear allowed IP list)'
             ),
         ];
         $this->setDefinition($options);

setup/src/Magento/Setup/Console/Command/AdminUserCreateCommand.php

@@ -75,11 +75,21 @@ protected function execute(InputInterface $input, OutputInterface $output)
     public function getOptionsList()
     {
         return [
-            new InputOption(AdminAccount::KEY_USER, null, InputOption::VALUE_REQUIRED, 'Admin user'),
-            new InputOption(AdminAccount::KEY_PASSWORD, null, InputOption::VALUE_REQUIRED, 'Admin password', ''),
-            new InputOption(AdminAccount::KEY_EMAIL, null, InputOption::VALUE_REQUIRED, 'Admin email'),
-            new InputOption(AdminAccount::KEY_FIRST_NAME, null, InputOption::VALUE_REQUIRED, 'Admin first name'),
-            new InputOption(AdminAccount::KEY_LAST_NAME, null, InputOption::VALUE_REQUIRED, 'Admin last name'),
+            new InputOption(AdminAccount::KEY_USER, null, InputOption::VALUE_REQUIRED, '(Required) Admin user'),
+            new InputOption(AdminAccount::KEY_PASSWORD, null, InputOption::VALUE_REQUIRED, '(Required) Admin password'),
+            new InputOption(AdminAccount::KEY_EMAIL, null, InputOption::VALUE_REQUIRED, '(Required) Admin email'),
+            new InputOption(
+                AdminAccount::KEY_FIRST_NAME,
+                null,
+                InputOption::VALUE_REQUIRED,
+                '(Required) Admin first name'
+            ),
+            new InputOption(
+                AdminAccount::KEY_LAST_NAME,
+                null,
+                InputOption::VALUE_REQUIRED,
+                '(Required) Admin last name'
+            ),
         ];
     }
 
@@ -97,7 +107,10 @@ public function validate(InputInterface $input)
             ->setLastname($input->getOption(AdminAccount::KEY_LAST_NAME))
             ->setUsername($input->getOption(AdminAccount::KEY_USER))
             ->setEmail($input->getOption(AdminAccount::KEY_EMAIL))
-            ->setPassword($input->getOption(AdminAccount::KEY_PASSWORD));
+            ->setPassword(
+                $input->getOption(AdminAccount::KEY_PASSWORD) === null
+                    ? '' : $input->getOption(AdminAccount::KEY_PASSWORD)
+            );
 
         $validator = new \Magento\Framework\Validator\Object;
         $this->validationRules->addUserInfoRules($validator);