Merge branch 'bug_fix' into release
This commit is contained in:
commit
eb753df4c9
@ -15,7 +15,6 @@ class Image < Handler
|
||||
end
|
||||
|
||||
def handle
|
||||
current_command = ARGV[1].to_sym
|
||||
@options, @args = @options_parser.parse_options_for!(current_command)
|
||||
case current_command
|
||||
when :list
|
||||
|
||||
@ -9,6 +9,7 @@ module Validators
|
||||
def validate!
|
||||
raise InvalidRecord.new(message) unless valid?
|
||||
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}")
|
||||
end
|
||||
|
||||
|
||||
@ -1,11 +1,12 @@
|
||||
require_relative "base"
|
||||
|
||||
|
||||
module Validators
|
||||
module FieldValidator
|
||||
class ProviderAccount < Base
|
||||
|
||||
def valid?
|
||||
accounts = AccountsFactory.accounts(@model.provider)
|
||||
accounts = ::Provider::AccountsFactory.accounts(@model.provider)
|
||||
accounts.map{|a| a.account_name}.include?(@value)
|
||||
end
|
||||
|
||||
|
||||
@ -56,7 +56,7 @@ module Provider
|
||||
end
|
||||
|
||||
def groups filters={}
|
||||
g = self.compute.describe_security_groups(filters)
|
||||
g = self.compute.describe_security_groups(filters || {})
|
||||
convert_groups(g.body["securityGroupInfo"])
|
||||
end
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user