mirror of
https://github.com/puppetlabs/vmfloaty.git
synced 2026-01-26 05:28:40 -05:00
(#34) Raise TokenError on operations that require tokens
Prior to this commit, the Pooler class would raise an exception if the token provided was nil and it attempted to make a request with Faraday. This fixes that by catching when nil tokens are provided and instead raising a TokenError to be caught by the consumer.
This commit is contained in:
parent
08760d8c0b
commit
b51a549fe5
3 changed files with 71 additions and 5 deletions
|
|
@ -177,7 +177,12 @@ class Vmfloaty
|
|||
token = options.token || config['token']
|
||||
|
||||
if lifetime || tags
|
||||
modify_req = Pooler.modify(verbose, url, hostname, token, lifetime, tags)
|
||||
begin
|
||||
modify_req = Pooler.modify(verbose, url, hostname, token, lifetime, tags)
|
||||
rescue TokenError => e
|
||||
STDERR.puts e
|
||||
exit 1
|
||||
end
|
||||
|
||||
if modify_req["ok"]
|
||||
puts "Successfully modified vm #{hostname}."
|
||||
|
|
@ -189,7 +194,13 @@ class Vmfloaty
|
|||
end
|
||||
|
||||
if disk
|
||||
disk_req = Pooler.disk(verbose, url, hostname, token, disk)
|
||||
begin
|
||||
disk_req = Pooler.disk(verbose, url, hostname, token, disk)
|
||||
rescue TokenError => e
|
||||
STDERR.puts e
|
||||
exit 1
|
||||
end
|
||||
|
||||
if disk_req["ok"]
|
||||
puts "Successfully updated disk space of vm #{hostname}."
|
||||
else
|
||||
|
|
@ -290,7 +301,13 @@ class Vmfloaty
|
|||
hostname = args[0]
|
||||
token = options.token ||= config['token']
|
||||
|
||||
snapshot_req = Pooler.snapshot(verbose, url, hostname, token)
|
||||
begin
|
||||
snapshot_req = Pooler.snapshot(verbose, url, hostname, token)
|
||||
rescue TokenError => e
|
||||
STDERR.puts e
|
||||
exit 1
|
||||
end
|
||||
|
||||
pp snapshot_req
|
||||
end
|
||||
end
|
||||
|
|
@ -315,7 +332,13 @@ class Vmfloaty
|
|||
STDERR.puts "Two snapshot arguments were given....using snapshot #{snapshot_sha}"
|
||||
end
|
||||
|
||||
revert_req = Pooler.revert(verbose, url, hostname, token, snapshot_sha)
|
||||
begin
|
||||
revert_req = Pooler.revert(verbose, url, hostname, token, snapshot_sha)
|
||||
rescue TokenError => e
|
||||
STDERR.puts e
|
||||
exit 1
|
||||
end
|
||||
|
||||
pp revert_req
|
||||
end
|
||||
end
|
||||
|
|
|
|||
|
|
@ -55,6 +55,10 @@ class Pooler
|
|||
end
|
||||
|
||||
def self.modify(verbose, url, hostname, token, lifetime, tags)
|
||||
if token.nil?
|
||||
raise TokenError, "Token provided was nil. Request cannot be made to modify vm"
|
||||
end
|
||||
|
||||
modify_body = {}
|
||||
if lifetime
|
||||
modify_body['lifetime'] = lifetime
|
||||
|
|
@ -76,6 +80,10 @@ class Pooler
|
|||
end
|
||||
|
||||
def self.disk(verbose, url, hostname, token, disk)
|
||||
if token.nil?
|
||||
raise TokenError, "Token provided was nil. Request cannot be made to modify vm"
|
||||
end
|
||||
|
||||
conn = Http.get_conn(verbose, url)
|
||||
conn.headers['X-AUTH-TOKEN'] = token
|
||||
|
||||
|
|
@ -129,6 +137,10 @@ class Pooler
|
|||
end
|
||||
|
||||
def self.snapshot(verbose, url, hostname, token)
|
||||
if token.nil?
|
||||
raise TokenError, "Token provided was nil. Request cannot be made to snapshot vm"
|
||||
end
|
||||
|
||||
conn = Http.get_conn(verbose, url)
|
||||
conn.headers['X-AUTH-TOKEN'] = token
|
||||
|
||||
|
|
@ -138,6 +150,10 @@ class Pooler
|
|||
end
|
||||
|
||||
def self.revert(verbose, url, hostname, token, snapshot_sha)
|
||||
if token.nil?
|
||||
raise TokenError, "Token provided was nil. Request cannot be made to revert vm"
|
||||
end
|
||||
|
||||
conn = Http.get_conn(verbose, url)
|
||||
conn.headers['X-AUTH-TOKEN'] = token
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue