Support default in addition to defaults

onelogin_aws_cli/cli.py

@@ -21,13 +21,18 @@ def _load_config(parser, config_file: ConfigurationFile, args=sys.argv[1:]):
 
  config_section = config_file.section(cli_args.config_name)
 
- if config_section is None:
+ if config_section is None and cli_args.config_name:
  sys.exit(
  "Configuration '{}' not defined. "
  "Please run 'onelogin-aws-login -c'".format(
  cli_args.config_name
  )
  )
+ elif config_section is None:
+ sys.exit(
+ "No default configuration section found. "
+ "Please run 'onelogin-aws-login -c"
+ )
 
  return config_section, cli_args
 

onelogin_aws_cli/configuration.py

@@ -7,32 +7,49 @@
 class ConfigurationFile(configparser.ConfigParser):
  """Represents a configuration ini file on disk"""
 
+ DEFAULTS = dict(save_password=False)
+
  def __init__(self, config_file=None):
  super().__init__(default_section='defaults')
 
- self['defaults'] = dict(save_password=False)
+ self[self.default_section] = dict(self.DEFAULTS)
 
  self.file = config_file
 
  if self.file is not None:
  self.load()
 
+ @property
+ def has_defaults(self) -> bool:
+ """True if the defaults section has settings beyond our defaults"""
+ return len(self.defaults()) > len(self.DEFAULTS)
+
  @property
  def is_initialised(self) -> bool:
- """True if there is at least one section"""
+ """True if there is at least one section or a defaults section"""
  return len(
  self.sections()
- ) > 0
+ ) > 0 or self.has_defaults
 
  def load(self):
  self.read_file(self.file)
-
- def initialise(self, config_name='default'):
+ # For backwards compatibility, we check if they have a default
+ # section instead of a defaults section and do a little switcheroo as
+ # needed.
+ if self.has_section('default') and not self.has_defaults:
+ print("It looks like you're using a the deprecated 'default' "
+ "section.\nConsider renaming the section to 'defaults'.")
+ self.default_section = 'default'
+
+ def initialise(self, config_name=None):
  """
  Prompt the user for configurations, and save them to the
  onelogin-aws-cli config file
  """
  print("Configure Onelogin and AWS\n\n")
+ if not config_name:
+ config_name = self.default_section
+
  config_section = self.section(config_name)
 
  config_section['base_uri'] = user_choice(
@@ -68,7 +85,10 @@ def section(self, section_name: str):
  :param section_name: Name of the section in the config file
  :return:
  """
- if not self.has_section(section_name):
+ if not section_name:
+ section_name = self.default_section
+ if section_name != self.default_section and \
+ not self.has_section(section_name):
  self.add_section(section_name)
  return Section(section_name, self)
 

onelogin_aws_cli/tests/test_configurationFile.py

@@ -60,6 +60,16 @@ def test_can_save_password_username_inherit_false(self):
 [profile_test]""")
  self.assertTrue(cfg.section("profile_test").can_save_password)
 
+ def test_can_save_password_username_defaults_false(self):
+ cfg = self._helper_build_config("""[defaults]
+save_password = false""")
+ self.assertFalse(cfg.section(None).can_save_password)
+
+ def test_can_save_password_username_defaults_true(self):
+ cfg = self._helper_build_config("""[defaults]
+save_password = true""")
+ self.assertTrue(cfg.section(None).can_save_password)
+
  def test_initialise(self):
  str = StringIO()
  cfg = ConfigurationFile(str)
@@ -71,8 +81,6 @@ def test_initialise(self):
 
  self.assertEqual("""[defaults]
 save_password = False
-
-[default]
 base_uri = https://api.eu.onelogin.com/
 client_id = mock_client_id
 client_secret = mock_client_secret
@@ -90,3 +98,35 @@ def test_is_initialised(self):
  cf = self._helper_build_config("""[section]
 first=foo""")
  self.assertTrue(cf.is_initialised)
+
+ cf = self._helper_build_config("""[defaults]
+first=foo""")
+ self.assertTrue(cf.is_initialised)
+
+ def test_has_defaults(self):
+
+ content = StringIO()
+ cf = ConfigurationFile(content)
+ self.assertFalse(cf.has_defaults)
+
+ cf = self._helper_build_config("""[defaults]
+first=foo""")
+ self.assertTrue(cf.has_defaults)
+
+ def test_supports_default(self):
+
+ cf = self._helper_build_config("""[defaults]
+first=foo""")
+ self.assertIn("first", cf.defaults())
+
+ cf = self._helper_build_config("""[default]
+second=bar""")
+ self.assertIn("second", cf.defaults())
+
+ cf = self._helper_build_config("""[defaults]
+first=foo
+
+[default]
+second=bar""")
+ self.assertIn("first", cf.defaults())
+ self.assertNotIn("second", cf.defaults())