openstack/deb-python-dcos
Code Issues Proposed changes

auth: grammar edits from @joel-hamill (#862)

Browse Source
This commit is contained in:
tamarrow
2017-01-03 17:22:39 -08:00
committed by GitHub
parent 33c44b4a9f
commit 2b2fb3b0d6
4 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
cli/dcoscli/data/help/auth.txt
View File

@@ -27,14 +27,14 @@ Options:
--password=<password>
Specify password on the command line (insecure).
--password-env=<password_env>
Specify environment variable name that contains the password.
Specify an environment variable name that contains the password.
--password-file=<password_file>
Specify path to a file that contains the password.
Specify the path to a file that contains the password.
--provider=<provider_id>
Specify authentication provider to use for login.
Specify the authentication provider to use for login.
--private-key=<key_path>
Specify path to file that contains the private key.
Specify the path to a file that contains the private key.
--username=<username>
Specify username for login.
Specify the username for login.
--version
Print version information.

10
cli/tests/data/help/auth.txt
View File

@@ -27,14 +27,14 @@ Options:
--password=<password>
Specify password on the command line (insecure).
--password-env=<password_env>
Specify environment variable name that contains the password.
Specify an environment variable name that contains the password.
--password-file=<password_file>
Specify path to a file that contains the password.
Specify the path to a file that contains the password.
--provider=<provider_id>
Specify authentication provider to use for login.
Specify the authentication provider to use for login.
--private-key=<key_path>
Specify path to file that contains the private key.
Specify the path to a file that contains the private key.
--username=<username>
Specify username for login.
Specify the username for login.
--version
Print version information.

4
cli/tests/unit/data/auth_provider.txt
View File

@@ -1,2 +1,2 @@
PROVIDER ID AUTHENTICATION TYPE
dcos-users Authenticate with a regular user account (using username and password)
PROVIDER ID AUTHENTICATION TYPE
dcos-users Authenticate using a standard DC/OS user account (using username and password)

10
dcos/auth.py
View File

@@ -359,19 +359,19 @@ def auth_type_description(provider_info):
auth_type = provider_info.get("authentication-type")
if auth_type == "dcos-uid-password":
msg = ("Authenticate with a regular user account "
msg = ("Authenticate using a standard DC/OS user account "
"(using username and password)")
elif auth_type == "dcos-uid-servicekey":
msg = ("Authenticate with a service user account "
msg = ("Authenticate using a DC/OS service user account "
"(using username and private key)")
elif auth_type == "dcos-uid-password-ldap":
msg = ("Authenticate with a LDAP user account "
msg = ("Authenticate using an LDAP user account "
"(using username and password)")
elif auth_type == "saml-sp-initiated":
msg = "Authenticate via SAML 2.0 ({})".format(
msg = "Authenticate using SAML 2.0 ({})".format(
provider_info["description"])
elif auth_type in ["oidc-authorization-code-flow", "oidc-implicit-flow"]:
msg = "Authenticate via OpenID Connect ({})".format(
msg = "Authenticate using OpenID Connect ({})".format(
provider_info["description"])
else:
raise DCOSException("Unknown authentication type")