projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch '2412-do-not-reuse-task-work-dirs'
[arvados.git]
/
services
/
api
/
script
/
setup-new-user.rb
diff --git
a/services/api/script/setup-new-user.rb
b/services/api/script/setup-new-user.rb
index 561f8175126520e09f54b8d44c6f549050aa07ad..19f5aeb7b78803e7009600480e60c046e6739ca8 100755
(executable)
--- a/
services/api/script/setup-new-user.rb
+++ b/
services/api/script/setup-new-user.rb
@@
-38,7
+38,7
@@
arv = Arvados.new(api_version: 'v1')
begin
found_user = arv.user.get(uuid: user_arg)
rescue Arvados::TransactionFailedError
begin
found_user = arv.user.get(uuid: user_arg)
rescue Arvados::TransactionFailedError
- found = arv.user.list(where: {email:
ARGV[0]
})[:items]
+ found = arv.user.list(where: {email:
user_arg
})[:items]
if found.count == 0
if !user_arg.match(/\w\@\w+\.\w+/)
if found.count == 0
if !user_arg.match(/\w\@\w+\.\w+/)
@@
-46,28
+46,21
@@
rescue Arvados::TransactionFailedError
"does not look like an email address. Stop."
end
elsif found.count != 1
"does not look like an email address. Stop."
end
elsif found.count != 1
- abort "Found #{found.count} users " +
- "with uuid or email #{user_arg.inspect}. Stop."
+ abort "Found #{found.count} users with email. Stop."
else
found_user = found.first
end
end
else
found_user = found.first
end
end
-# Invoke user setup method
+# Invoke user setup method
if (found_user)
if (found_user)
- user = {uuid: found_user[:uuid]}
+ user = arv.user.setup uuid: found_user[:uuid], repo_name: user_repo_name,
+ vm_uuid: vm_uuid, openid_prefix: opts.openid_prefix
else
else
- user = {email: user_arg}
+ user = arv.user.setup user: {email: user_arg}, repo_name: user_repo_name,
+ vm_uuid: vm_uuid, openid_prefix: opts.openid_prefix
end
end
-if opts.openid_prefix
- puts "used the -o option"
-end
-
-user = arv.user.setup(user: user, repo_name: user_repo_name, vm_uuid: vm_uuid,
- openid_prefix: opts.openid_prefix)
-
-log.info { "user uuid: " + user[:uuid] }
+log.info {"user uuid: " + user[:uuid]}
puts user.inspect
puts user.inspect
-