puppetlabs/vmfloaty
2
0
Fork 0
mirror of https://github.com/puppetlabs/vmfloaty.git synced 2026-01-26 05:28:40 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

(#33) Handle Auth class errors

Browse source 
This commit updates the Auth class to properly raise an error when
something goes wrong. It also updates the vmpooler command class to
handle when those errors get raised.
This commit is contained in:
Brian Cain 2016-09-24 11:11:14 -07:00
parent 05e9d5a0cc
commit 8da1deaf6b
4 changed files with 85 additions and 45 deletions
Download patch file Download diff file Expand all files Collapse all files

88
lib/vmfloaty.rb
View file

@ -55,11 +55,15 @@ class Vmfloaty
raise "You did not provide a user to authenticate to vmpooler with"
end
pass = password "Enter your password please:", '*'
token = Auth.get_token(verbose, url, user, pass)
unless token.nil?
puts "\nToken retrieved!"
puts token
begin
token = Auth.get_token(verbose, url, user, pass)
rescue => e
STDERR.puts e
exit 1
end
puts "\nToken retrieved!"
puts token
end
response = Pooler.retrieve(verbose, os_types, token, url)
@ -91,16 +95,18 @@ class Vmfloaty
if active
# list active vms
status = Auth.token_status(verbose, url, token)
unless status.nil?
# print vms
vms = status[token]['vms']
if vms.nil?
STDERR.puts "You have no running vms"
exit 0
end
else
STDERR.puts "Could not retrieve active vms"
begin
status = Auth.token_status(verbose, url, token)
rescue => e
STDERR.puts e
exit 1
end
# print vms
vms = status[token]['vms']
if vms.nil?
STDERR.puts "You have no running vms"
exit 0
end
running_vms = vms['running']
@ -199,10 +205,10 @@ class Vmfloaty
if delete_all
# get vms with token
status = Auth.token_status(verbose, url, token)
if status.nil?
STDERR.puts "Could not retrieve status with token"
begin
status = Auth.token_status(verbose, url, token)
rescue => e
STDERR.puts e
exit 1
end
@ -348,27 +354,33 @@ class Vmfloaty
case action
when "get"
pass = password "Enter your password please:", '*'
token = Auth.get_token(verbose, url, user, pass)
unless token.nil?
puts token
else
STDERR.puts 'Could not make a request for a token'
begin
token = Auth.get_token(verbose, url, user, pass)
rescue => e
STDERR.puts e
exit 1
end
puts token
exit 0
when "delete"
pass = password "Enter your password please:", '*'
result = Auth.delete_token(verbose, url, user, pass, token)
unless result.nil?
puts result
else
STDERR.puts 'Could not make a request to delete a token'
begin
result = Auth.delete_token(verbose, url, user, pass, token)
rescue => e
STDERR.puts e
exit 1
end
puts result
exit 1
when "status"
status = Auth.token_status(verbose, url, token)
unless status.nil?
puts status
else
STDERR.puts 'Could not make a request to get token status'
begin
status = Auth.token_status(verbose, url, token)
rescue => e
STDERR.puts e
exit 1
end
puts status
exit 0
when nil
STDERR.puts "No action provided"
else
@ -407,12 +419,14 @@ class Vmfloaty
raise "You did not provide a user to authenticate to vmpooler with"
end
pass = password "Enter your password please:", '*'
token = Auth.get_token(verbose, url, user, pass)
unless token.nil?
begin
token = Auth.get_token(verbose, url, user, pass)
rescue => e
STDERR.puts e
STDERR.puts 'Could not get token...requesting vm without a token anyway...'
else
puts "\nToken retrieved!"
puts token
else
STDERR.puts 'Could not get token...requesting vm without a token anyway...'
end
end

12
lib/vmfloaty/auth.rb
View file

@ -1,6 +1,7 @@
require 'faraday'
require 'json'
require 'vmfloaty/http'
require 'vmfloaty/errors'
class Auth
def self.get_token(verbose, url, user, password)
@ -12,15 +13,13 @@ class Auth
if res_body["ok"]
return res_body["token"]
else
STDERR.puts "There was a problem with your request:\n#{res_body}"
return nil
raise TokenError, "HTTP #{resp.status}: There was a problem requesting a token:\n#{res_body}"
end
end
def self.delete_token(verbose, url, user, password, token)
if token.nil?
STDERR.puts 'You did not provide a token'
return nil
end
conn = Http.get_conn_with_auth(verbose, url, user, password)
@ -30,15 +29,13 @@ class Auth
if res_body["ok"]
return res_body
else
STDERR.puts "There was a problem with your request:\n#{res_body}"
return nil
raise TokenError, "HTTP #{response.status}: There was a problem deleting a token:\n#{res_body}"
end
end
def self.token_status(verbose, url, token)
if token.nil?
STDERR.puts 'You did not provide a token'
return nil
end
conn = Http.get_conn(verbose, url)
@ -49,8 +46,7 @@ class Auth
if res_body["ok"]
return res_body
else
STDERR.puts "There was a problem with your request:\n#{res_body}"
return nil
raise TokenError, "HTTP #{response.status}: There was a problem getting the status of a token:\n#{res_body}"
end
end
end

6
lib/vmfloaty/errors.rb
View file

@ -3,3 +3,9 @@ class AuthError < StandardError
super
end
end
class TokenError < StandardError
def initialize(msg="Could not do operation with token provided")
super
end
end