Skip to content

Commit

Permalink
Change operations order
Browse files Browse the repository at this point in the history
  • Loading branch information
Yaroslav Kudrin authored and Yaroslav Kudrin committed Aug 26, 2021
1 parent b8c5bf8 commit 3e415f4
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion tests/functional_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -137,9 +137,9 @@ def test_generate_credentials(custom_args):

# Emulate helpers.process_options() bypassing interactive portions.
tool_args = helpers.setup(custom_args)
helpers.process_environment()
helpers.process_ini_file(tool_args.config_file, "default")
helpers.process_arguments(tool_args)
helpers.process_environment()

if (
settings.role_arn is None
Expand Down
8 changes: 4 additions & 4 deletions tokendito/helpers.py
Original file line number Diff line number Diff line change
Expand Up @@ -781,12 +781,12 @@ def process_options(args):
update_configuration(args.config_file, args.okta_profile)
sys.exit(0)

# 1: read ini file (if it exists)
# 1: read ENV
process_environment()
# 2: override with ini file (if it exists)
process_ini_file(args.config_file, args.okta_profile)
# 2: override with args
# 3: override with args
process_arguments(args)
# 3: override with ENV
process_environment()

process_okta_aws_app_url()
# Set username and password for Okta Authentication
Expand Down

0 comments on commit 3e415f4

Please sign in to comment.