Merge "Mark auth plugin options as secret"

This commit is contained in:
Jenkins
2014-08-08 16:25:11 +00:00
committed by Gerrit Code Review
3 changed files with 9 additions and 5 deletions

View File

@@ -121,7 +121,7 @@ class Password(Auth):
dest='username', dest='username',
deprecated_name='username', deprecated_name='username',
help='Username to login with'), help='Username to login with'),
cfg.StrOpt('password', help='Password to use'), cfg.StrOpt('password', secret=True, help='Password to use'),
]) ])
return options return options
@@ -148,7 +148,7 @@ class Token(Auth):
options = super(Token, cls).get_options() options = super(Token, cls).get_options()
options.extend([ options.extend([
cfg.StrOpt('token', help='Token'), cfg.StrOpt('token', secret=True, help='Token'),
]) ])
return options return options

View File

@@ -249,7 +249,7 @@ class Password(AuthConstructor):
deprecated_name='username'), deprecated_name='username'),
cfg.StrOpt('user-domain-id', help="User's domain id"), cfg.StrOpt('user-domain-id', help="User's domain id"),
cfg.StrOpt('user-domain-name', help="User's domain name"), cfg.StrOpt('user-domain-name', help="User's domain name"),
cfg.StrOpt('password', help="User's password"), cfg.StrOpt('password', secret=True, help="User's password"),
]) ])
return options return options
@@ -282,7 +282,9 @@ class Token(AuthConstructor):
options = super(Token, cls).get_options() options = super(Token, cls).get_options()
options.extend([ options.extend([
cfg.StrOpt('token', help='Token to authenticate with'), cfg.StrOpt('token',
secret=True,
help='Token to authenticate with'),
]) ])
return options return options

View File

@@ -44,7 +44,9 @@ class Token(base.BaseAuthPlugin):
options.extend([ options.extend([
cfg.StrOpt('endpoint', cfg.StrOpt('endpoint',
help='The endpoint that will always be used'), help='The endpoint that will always be used'),
cfg.StrOpt('token', help='The token that will always be used'), cfg.StrOpt('token',
secret=True,
help='The token that will always be used'),
]) ])
return options return options