Skip to content

Commit

Permalink
cli: add the ability to specify a token description w/ awx login
Browse files Browse the repository at this point in the history
  • Loading branch information
ryanpetrello committed Feb 28, 2020
1 parent 7fe5726 commit 3e0e4b6
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 1 deletion.
3 changes: 2 additions & 1 deletion awxkit/awxkit/api/pages/base.py
Original file line number Diff line number Diff line change
Expand Up @@ -140,6 +140,7 @@ def load_authtoken(self, username='', password=''):
load_default_authtoken = load_authtoken

def get_oauth2_token(self, username='', password='', client_id=None,
description='AWX CLI',
client_secret=None, scope='write'):
default_cred = config.credentials.default
username = username or default_cred.username
Expand Down Expand Up @@ -176,7 +177,7 @@ def get_oauth2_token(self, username='', password='', client_id=None,
resp = self.connection.post(
'/api/v2/users/{}/personal_tokens/'.format(username),
json={
"description": "Tower CLI",
"description": description,
"application": None,
"scope": scope
},
Expand Down
3 changes: 3 additions & 0 deletions awxkit/awxkit/cli/resource.py
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,7 @@ def print_help(self, parser):

def handle(self, client, parser):
auth = parser.add_argument_group('OAuth2.0 Options')
auth.add_argument('--description', help='description of the generated OAuth2.0 token', metavar='TEXT')
auth.add_argument('--conf.client_id', metavar='TEXT')
auth.add_argument('--conf.client_secret', metavar='TEXT')
auth.add_argument(
Expand All @@ -90,6 +91,8 @@ def handle(self, client, parser):
'client_secret': getattr(parsed, 'conf.client_secret', None),
'scope': getattr(parsed, 'conf.scope', None),
}
if getattr(parsed, 'description', None):
kwargs['description'] = parsed.description
try:
token = api.Api().get_oauth2_token(**kwargs)
except Exception as e:
Expand Down

0 comments on commit 3e0e4b6

Please sign in to comment.