Skip to content

Commit 15bb643

Browse files
authored
Merge pull request #319 from galaxyproject/318-default-master-key
Default master api key
2 parents e1f58b0 + eeced1e commit 15bb643

2 files changed

Lines changed: 3 additions & 2 deletions

File tree

abm/lib/common.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -225,11 +225,12 @@ def parse_profile(profile_name: str):
225225
return nones
226226
profile = profiles[profile_name]
227227
kube = None
228-
master = 'galaxypassword'
229228
if 'kube' in profile:
230229
kube = os.path.expanduser(profile['kube'])
231230
if 'master' in profile:
232231
master = profile['master']
232+
elif 'key' in profile:
233+
master = profile['key']
233234
return (profile['url'], profile['key'], kube, master)
234235

235236

abm/lib/users.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ def usage(context: Context, args: list):
7676
return
7777

7878
# TODO the master API key needs to be parameterized or specified in a config file.
79-
context.API_KEY = "galaxypassword"
79+
context.API_KEY = context.MASTER_KEY
8080
gi = connect(context)
8181
id = _get_user_id(gi, args[0])
8282
if id is None:

0 commit comments

Comments
 (0)