Skip to content

CLI now ignores whitespace for resolver credentials #495

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
huntc merged 1 commit into from
Jun 14, 2017
Merged

CLI now ignores whitespace for resolver credentials #495

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion conductr_cli/resolvers/bintray_resolver.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
BINTRAY_DOWNLOAD_BASE_URL = 'https://dl.bintray.com'
BINTRAY_DOWNLOAD_REALM = 'Bintray'
BINTRAY_CREDENTIAL_FILE_PATH = '{}/.lightbend/commercial.credentials'.format(os.path.expanduser('~'))
BINTRAY_PROPERTIES_RE = re.compile('^(\S+)\s*=\s*([\S]+)$')
BINTRAY_PROPERTIES_RE = re.compile('^\s*(\S+)\s*=\s*([\S]+)\s*$')
BINTRAY_LIGHTBEND_ORG = 'lightbend'
BINTRAY_CONDUCTR_COMMERCIAL_REPO = 'commercial-releases'
BINTRAY_CONDUCTR_GENERIC_REPO = 'generic'
Expand Down
19 changes: 19 additions & 0 deletions conductr_cli/resolvers/test/test_bintray_resolver.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -998,6 +998,25 @@ def test_success(self):
exists_mock.assert_called_with('{}/.lightbend/commercial.credentials'.format(os.path.expanduser('~')))
open_mock.assert_called_with('{}/.lightbend/commercial.credentials'.format(os.path.expanduser('~')), 'r')

def test_success_whitespace(self):
bintray_credential_file = \
' user = user1 \n' \
' password = sec=ret \n' \
'# Some comment'

exists_mock = MagicMock(return_value=True)
open_mock = MagicMock(return_value=io.StringIO(bintray_credential_file))

with patch('os.path.exists', exists_mock), \
patch('builtins.open', open_mock):
realm, username, password = bintray_resolver.load_bintray_credentials()
self.assertEqual('Bintray', realm)
self.assertEqual('user1', username)
self.assertEqual('sec=ret', password)

exists_mock.assert_called_with('{}/.lightbend/commercial.credentials'.format(os.path.expanduser('~')))
open_mock.assert_called_with('{}/.lightbend/commercial.credentials'.format(os.path.expanduser('~')), 'r')

def test_credential_file_not_having_username_password(self):
bintray_credential_file = strip_margin(
"""|dummy = yes
Expand Down