From a4414b019757d1205b7b2a47fa18815609b91840 Mon Sep 17 00:00:00 2001 From: Sam Kleinman Date: Wed, 29 Jul 2015 12:26:14 -0400 Subject: [PATCH] giza: credentials tweaks --- giza/giza/config/credentials.py | 33 ++++++++++++++++++++++++++++++++- 1 file changed, 32 insertions(+), 1 deletion(-) diff --git a/giza/giza/config/credentials.py b/giza/giza/config/credentials.py index 3940c7ee1..6468d6700 100644 --- a/giza/giza/config/credentials.py +++ b/giza/giza/config/credentials.py @@ -24,6 +24,7 @@ def get_credentials_skeleton(): 'jira': { 'username': None, 'password': None, + 'url': None, }, 'corp': { 'username': None, @@ -76,10 +77,38 @@ def aws(self): def aws(self, value): self.state['aws'] = AwsCredentialsConfig(value) + @property + def rhn(self): + return self.state['rhn'] + + @rhn.setter + def rhn(self, value): + self.state['rhn'] = RhnCredentialsConfig(value) + class JiraCredentialsConfig(ConfigurationBase): _option_registry = ['username', 'password'] + @property + def url(self): + if 'url' in self.state: + return self.state['url'] + else: + logger.error("jira url is not specified.") + return "" + + @url.setter + def url(self, value): + value = value.strip() + + if value.startswith('http'): + self.state['url'] = value + if value[4] != 's': + logger.warning("jira url is not https.") + else: + logger.error("invalid jira url") + raise TypeError + class CorpCredentialsConfig(ConfigurationBase): _option_registry = ['username', 'password', 'seed'] @@ -88,6 +117,8 @@ class CorpCredentialsConfig(ConfigurationBase): class GithubCredentialsConfig(ConfigurationBase): _option_registry = ['username', 'password', 'token'] - class AwsCredentialsConfig(ConfigurationBase): _option_registry = ['key', 'secret'] + +class RhnCredentialsConfig(ConfigurationBase): + _option_registry = ['username', 'password']