ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2024-12-20 21:43:14 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

NOTICK - Add option to reset keyring for test-manager (#5043)

Browse Source
This commit is contained in:
Tommy Lillehagen 2019-04-18 14:13:06 +01:00 committed by GitHub
parent a416d5025f
commit c7f03247f4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
release-tools/testing/login_manager.py
View File

@ -39,7 +39,7 @@ def confirm(message, auto_yes=False):
# }}} # }}}
# {{{ login(account, user, password, use_keyring) - Present user with login prompt and return the provided username and password. If use_keyring is true, use previously provided password (if any) # {{{ login(account, user, password, use_keyring) - Present user with login prompt and return the provided username and password. If use_keyring is true, use previously provided password (if any)
def login(account, user=None, password=None, use_keyring=True): def login(account, user=None, password=None, use_keyring=True, reset_keyring=False):
if not user: if not user:
if 'JIRA_USER' not in os.environ: if 'JIRA_USER' not in os.environ:
user = prompt('Username: ') user = prompt('Username: ')
@ -51,7 +51,9 @@ def login(account, user=None, password=None, use_keyring=True):
else: else:
user = u'{}@r3.com'.format(user) if '@' not in user else user user = u'{}@r3.com'.format(user) if '@' not in user else user
print('Username: {}'.format(user)) print('Username: {}'.format(user))
password = get_password(account, user) if password is None and use_keyring else password if reset_keyring:
set_password(account, user, '')
password = get_password(account, user) if password is None and use_keyring and not reset_keyring else password
if not password: if not password:
password = prompt('Password: ', secret=True) password = prompt('Password: ', secret=True)
if not password: return (None, None) if not password: return (None, None)

13
release-tools/testing/test-manager
View File

@ -59,7 +59,7 @@ QUERY_LIST_BLOCKING_TEST_CASES = \
# {{{ list_test_cases() - List active test cases for a specific product # {{{ list_test_cases() - List active test cases for a specific product
def list_test_cases(args): def list_test_cases(args):
user, password = login('jira', args.user) user, password = login('jira', args.user, use_keyring=not args.no_keyring, reset_keyring=args.reset_keyring)
if not user or not password: sys.exit(1) if not user or not password: sys.exit(1)
jira = Jira().login(user, password) jira = Jira().login(user, password)
print(u'List of active test cases for {}:'.format(yellow(product_map[args.PRODUCT]))) print(u'List of active test cases for {}:'.format(yellow(product_map[args.PRODUCT])))
@ -85,7 +85,7 @@ def format_candidate(candidate):
# {{{ show_status() - Show the status of all test runs for a specific release or release candidate # {{{ show_status() - Show the status of all test runs for a specific release or release candidate
def show_status(args): def show_status(args):
user, password = login('jira', args.user) user, password = login('jira', args.user, use_keyring=not args.no_keyring, reset_keyring=args.reset_keyring)
if not user or not password: sys.exit(1) if not user or not password: sys.exit(1)
jira = Jira().login(user, password) jira = Jira().login(user, password)
version = '{} {}'.format(product_map[args.PRODUCT], args.VERSION).replace('.0', '') version = '{} {}'.format(product_map[args.PRODUCT], args.VERSION).replace('.0', '')
@ -145,7 +145,7 @@ def show_status(args):
# {{{ create_version() - Create a new JIRA version # {{{ create_version() - Create a new JIRA version
def create_version(args): def create_version(args):
user, password = login('jira', args.user) user, password = login('jira', args.user, use_keyring=not args.no_keyring, reset_keyring=args.reset_keyring)
if not user or not password: sys.exit(1) if not user or not password: sys.exit(1)
jira = Jira().login(user, password) jira = Jira().login(user, password)
version = '{} {}'.format(product_map[args.PRODUCT], args.VERSION).replace('.0', '') version = '{} {}'.format(product_map[args.PRODUCT], args.VERSION).replace('.0', '')
@ -170,7 +170,7 @@ def create_version(args):
# {{{ create_release() - Create test cases for a specific version of a product # {{{ create_release() - Create test cases for a specific version of a product
def create_release(args): def create_release(args):
user, password = login('jira', args.user) user, password = login('jira', args.user, use_keyring=not args.no_keyring, reset_keyring=args.reset_keyring)
if not user or not password: sys.exit(1) if not user or not password: sys.exit(1)
jira = Jira().login(user, password) jira = Jira().login(user, password)
version = '{} {}'.format(product_map[args.PRODUCT], args.VERSION).replace('.0', '') version = '{} {}'.format(product_map[args.PRODUCT], args.VERSION).replace('.0', '')
@ -235,7 +235,7 @@ def create_release(args):
# {{{ create_release_candidate() - Create test run tickets for a specific release candidate of a product # {{{ create_release_candidate() - Create test run tickets for a specific release candidate of a product
def create_release_candidate(args): def create_release_candidate(args):
user, password = login('jira', args.user) user, password = login('jira', args.user, use_keyring=not args.no_keyring, reset_keyring=args.reset_keyring)
if not user or not password: sys.exit(1) if not user or not password: sys.exit(1)
jira = Jira().login(user, password) jira = Jira().login(user, password)
version = '{} {}'.format(product_map[args.PRODUCT], args.VERSION).replace('.0', '') version = '{} {}'.format(product_map[args.PRODUCT], args.VERSION).replace('.0', '')
@ -285,7 +285,8 @@ def main():
program.add('--verbose', '-v', help='turn on verbose logging', action='store_true') program.add('--verbose', '-v', help='turn on verbose logging', action='store_true')
program.add('--yes', '-y', help='automatically answer "yes" to all prompts', action='store_true') program.add('--yes', '-y', help='automatically answer "yes" to all prompts', action='store_true')
program.add('--user', '-u', help='the user name or email address used to log in to JIRA', type=str, metavar='USER') program.add('--user', '-u', help='the user name or email address used to log in to JIRA', type=str, metavar='USER')
program.add('--no-keyring', help='do not retrieve passwords persisted in the keyring', action='store_true') program.add('--no-keyring', help='do not persist passwords in the keyring', action='store_true')
program.add('--reset-keyring', help='reset passwords persisted in the keyring (if any)', action='store_true')
def mixin_dry_run(command): def mixin_dry_run(command):
command.add('--dry-run', '-d', help='run action without applying any changes to JIRA', action='store_true') command.add('--dry-run', '-d', help='run action without applying any changes to JIRA', action='store_true')