Merge pull request #2011 from softlayer/jayasilan-issue1863

slcli search command help/abort message when no option provided

Author: allmightyspiff

SoftLayer/CLI/search.py

@@ -24,6 +24,7 @@
 @click.argument('query', nargs=-1)
 @click.option('--types', is_flag=True, default=False, is_eager=True, help="Display searchable types.")
 @click.option('--advanced', is_flag=True, help="Calls the AdvancedSearh API.")
+@click.help_option('--help', '-h')
 @environment.pass_env
 def cli(env, query, types, advanced):
     """Perform a query against the SoftLayer search database.
@@ -35,6 +36,21 @@ def cli(env, query, types, advanced):
         slcli search _objectType:SoftLayer_Virtual_Guest test.com
         slcli -vvv search _objectType:SoftLayer_Hardware hostname:testibm --advanced
     """
+
+    # Before any Search operation
+    def check_opt(list_opt=None):
+        check = False
+        for input_ in list_opt:
+            if input_ is True:
+                check = True
+                break
+        return check
+
+    list_opt = [query, types, advanced]
+
+    if not check_opt(list_opt):
+        raise click.UsageError('Search query must be provided')
+
     search = SearchManager(env.client)
     # query is in array, so we need to convert it to a normal string for the API
     query = " ".join(query)

tests/CLI/modules/search_tests.py

@@ -17,3 +17,7 @@ def test_find(self):
     def test_find_advanced(self):
         result = self.run_command(['search', 'hardware', '--advanced'])
         self.assert_no_fail(result)
+
+    def test_no_options(self):
+        result = self.run_command(['search'])
+        self.assertEqual(result.exit_code, 2)