Merge branch 'global-arg-metadata'

* global-arg-metadata:
  Merge in global arg metadata with arg_metadata

Author: jamesls

awsshell/autocomplete.py

@@ -25,6 +25,10 @@ def __init__(self, index_data, match_fuzzy=True):
         self.cmd_path = [self._current_name]
         self.match_fuzzy = match_fuzzy
 
+    @property
+    def global_arg_metadata(self):
+        return self._index[self._root_name]['argument_metadata']
+
     @property
     def arg_metadata(self):
         # Returns the required arguments for the current level.

awsshell/shellcomplete.py

@@ -78,6 +78,7 @@ def _convert_to_prompt_completions(self, low_level_completions,
         # prompt_toolkit.  We also try to enhance the metadata of the
         # completion by including docs and marking required fields.
         arg_meta = self._completer.arg_metadata
+        arg_meta.update(self._completer.global_arg_metadata)
         word_before_cursor = ''
         if text_before_cursor.strip():
             word_before_cursor = text_before_cursor.strip().split()[-1]

tests/unit/test_autocomplete.py

@@ -5,6 +5,7 @@
 def index_data():
     return {
         'aws': {
+            'argument_metadata': {},
             'arguments': [],
             'commands': [],
             'children': {},
@@ -370,3 +371,12 @@ def test_can_handle_autocomplete_empty_string_twice(index_data):
     completer = AWSCLIModelCompleter(index_data)
     assert completer.autocomplete('') == []
     assert completer.autocomplete('') == []
+
+
+def test_global_arg_metadata_property(index_data):
+    index_data['aws']['argument_metadata'] = {
+        '--global1': {},
+        '--global2': {},
+    }
+    completer = AWSCLIModelCompleter(index_data)
+    assert '--global1' in completer.global_arg_metadata