Merge branch 'bug_fix' into release

This commit is contained in:
Tim Lianov 2016-01-14 11:16:22 -05:00
commit eb753df4c9
4 changed files with 4 additions and 3 deletions

View File

@ -15,7 +15,6 @@ class Image < Handler
end end
def handle def handle
current_command = ARGV[1].to_sym
@options, @args = @options_parser.parse_options_for!(current_command) @options, @args = @options_parser.parse_options_for!(current_command)
case current_command case current_command
when :list when :list

View File

@ -9,6 +9,7 @@ module Validators
def validate! def validate!
raise InvalidRecord.new(message) unless valid? raise InvalidRecord.new(message) unless valid?
rescue StandardError => e rescue StandardError => e
puts [e.message, e.backtrace].join("\n")
raise InvalidRecord.new("An error raised during validation with #{self.class}: #{e.class}: #{e.message}") raise InvalidRecord.new("An error raised during validation with #{self.class}: #{e.class}: #{e.message}")
end end

View File

@ -1,11 +1,12 @@
require_relative "base" require_relative "base"
module Validators module Validators
module FieldValidator module FieldValidator
class ProviderAccount < Base class ProviderAccount < Base
def valid? def valid?
accounts = AccountsFactory.accounts(@model.provider) accounts = ::Provider::AccountsFactory.accounts(@model.provider)
accounts.map{|a| a.account_name}.include?(@value) accounts.map{|a| a.account_name}.include?(@value)
end end

View File

@ -56,7 +56,7 @@ module Provider
end end
def groups filters={} def groups filters={}
g = self.compute.describe_security_groups(filters) g = self.compute.describe_security_groups(filters || {})
convert_groups(g.body["securityGroupInfo"]) convert_groups(g.body["securityGroupInfo"])
end end