mirror of
https://github.com/fog/fog.git
synced 2022-11-09 13:51:43 -05:00
Use #has_key? instead of #keys.include?
This commit is contained in:
parent
db6b50cd60
commit
3469dbaf3f
19 changed files with 20 additions and 20 deletions
|
@ -34,7 +34,7 @@ module Fog
|
|||
Excon::Response.new.tap do |response|
|
||||
if (queue = data[:queues][queue_url])
|
||||
message_id, _ = queue[:receipt_handles].find { |message_id, receipts|
|
||||
receipts.keys.include?(receipt_handle)
|
||||
receipts.has_key?(receipt_handle)
|
||||
}
|
||||
|
||||
if message_id
|
||||
|
|
|
@ -32,7 +32,7 @@ module Fog
|
|||
Excon::Response.new.tap do |response|
|
||||
if (queue = data[:queues][queue_url])
|
||||
message_id, _ = queue[:receipt_handles].find { |msg_id, receipts|
|
||||
receipts.keys.include?(receipt_handle)
|
||||
receipts.has_key?(receipt_handle)
|
||||
}
|
||||
|
||||
if message_id
|
||||
|
|
|
@ -7,7 +7,7 @@ module Fog
|
|||
if configure
|
||||
required_opts + [ :id, :href, :timeout ]
|
||||
end
|
||||
unless required_opts.all? { |opt| service_data.keys.include?(opt) }
|
||||
unless required_opts.all? { |opt| service_data.has_key?(opt) }
|
||||
raise ArgumentError.new("Required Backup Internet Service data missing: #{(required_opts - service_data.keys).map(&:inspect).join(", ")}")
|
||||
end
|
||||
end
|
||||
|
|
|
@ -15,7 +15,7 @@ module Fog
|
|||
[:type, :url_send_string, :http_headers, :receive_string, :is_enabled]
|
||||
end
|
||||
|
||||
unless required_opts.all? { |opt| monitor.keys.include?(opt) && monitor[opt] }
|
||||
unless required_opts.all? { |opt| monitor.has_key?(opt) && monitor[opt] }
|
||||
raise ArgumentError.new("Required Monitor data missing: #{(required_opts - monitor.keys).map(&:inspect).join(", ")}")
|
||||
end
|
||||
|
||||
|
@ -36,7 +36,7 @@ module Fog
|
|||
if configure
|
||||
required_opts + [ :id, :href, :timeout ]
|
||||
end
|
||||
unless required_opts.all? { |opt| service_data.keys.include?(opt) }
|
||||
unless required_opts.all? { |opt| service_data.has_key?(opt) }
|
||||
raise ArgumentError.new("Required Internet Service data missing: #{(required_opts - service_data.keys).map(&:inspect).join(", ")}")
|
||||
end
|
||||
end
|
||||
|
|
|
@ -20,7 +20,7 @@ module Fog
|
|||
if configure
|
||||
valid_opts.delete_if { |opt| ![:name, :enabled, :description].include?(opt) }
|
||||
end
|
||||
unless valid_opts.all? { |opt| node_data.keys.include?(opt) }
|
||||
unless valid_opts.all? { |opt| node_data.has_key?(opt) }
|
||||
raise ArgumentError.new("Required data missing: #{(valid_opts - node_data.keys).map(&:inspect).join(", ")}")
|
||||
end
|
||||
end
|
||||
|
|
|
@ -5,7 +5,7 @@ module Fog
|
|||
|
||||
def validate_clone_vapp_options(options)
|
||||
valid_opts = [:name, :poweron]
|
||||
unless valid_opts.all? { |opt| options.keys.include?(opt) }
|
||||
unless valid_opts.all? { |opt| options.has_key?(opt) }
|
||||
raise ArgumentError.new("Required data missing: #{(valid_opts - options.keys).map(&:inspect).join(", ")}")
|
||||
end
|
||||
end
|
||||
|
|
|
@ -6,7 +6,7 @@ module Fog
|
|||
|
||||
def validate_public_ip_address_data(ip_address_data)
|
||||
valid_opts = [:name, :href, :id]
|
||||
unless valid_opts.all? { |opt| ip_address_data.keys.include?(opt) }
|
||||
unless valid_opts.all? { |opt| ip_address_data.has_key?(opt) }
|
||||
raise ArgumentError.new("Required Internet Service data missing: #{(valid_opts - ip_address_data.keys).map(&:inspect).join(", ")}")
|
||||
end
|
||||
end
|
||||
|
|
|
@ -5,7 +5,7 @@ module Fog
|
|||
|
||||
def validate_network_data(network_data, configure=false)
|
||||
valid_opts = [:id, :href, :name, :rnat, :address, :broadcast, :gateway]
|
||||
unless valid_opts.all? { |opt| network_data.keys.include?(opt) }
|
||||
unless valid_opts.all? { |opt| network_data.has_key?(opt) }
|
||||
raise ArgumentError.new("Required data missing: #{(valid_opts - network_data.keys).map(&:inspect).join(", ")}")
|
||||
end
|
||||
end
|
||||
|
|
|
@ -6,7 +6,7 @@ module Fog
|
|||
|
||||
def validate_network_ip_data(network_ip_data)
|
||||
valid_opts = [:id, :href, :name, :status, :server, :rnat]
|
||||
unless valid_opts.all? { |opt| network_ip_data.keys.include?(opt) }
|
||||
unless valid_opts.all? { |opt| network_ip_data.has_key?(opt) }
|
||||
raise ArgumentError.new("Required data missing: #{(valid_opts - network_ip_data.keys).map(&:inspect).join(", ")}")
|
||||
end
|
||||
end
|
||||
|
|
|
@ -6,7 +6,7 @@ module Fog
|
|||
|
||||
def validate_vapp_data(vapp_data)
|
||||
valid_opts = [:name, :cpus, :memory, :disks]
|
||||
unless valid_opts.all? { |opt| vapp_data.keys.include?(opt) }
|
||||
unless valid_opts.all? { |opt| vapp_data.has_key?(opt) }
|
||||
raise ArgumentError.new("Required Vapp data missing: #{(valid_opts - vapp_data.keys).map(&:inspect).join(", ")}")
|
||||
end
|
||||
end
|
||||
|
|
|
@ -6,7 +6,7 @@ module Fog
|
|||
|
||||
def validate_instantiate_vapp_template_options(catalog_item_uri, options)
|
||||
valid_opts = [:name, :vdc_uri, :network_uri, :cpus, :memory, :row, :group]
|
||||
unless valid_opts.all? { |opt| options.keys.include?(opt) }
|
||||
unless valid_opts.all? { |opt| options.has_key?(opt) }
|
||||
raise ArgumentError.new("Required data missing: #{(valid_opts - options.keys).map(&:inspect).join(", ")}")
|
||||
end
|
||||
|
||||
|
|
|
@ -125,7 +125,7 @@ module Fog
|
|||
unless response.body.empty?
|
||||
response.body = MultiJson.decode(response.body)
|
||||
end
|
||||
if response.body.keys.include?('full_error')
|
||||
if response.body.has_key?('full_error')
|
||||
raise(Fog::Compute::StormOnDemand::Error, response.body.inspect)
|
||||
end
|
||||
response
|
||||
|
|
|
@ -5,7 +5,7 @@ module Fog
|
|||
|
||||
def validate_clone_vapp_options(options)
|
||||
valid_opts = [:name, :poweron]
|
||||
unless valid_opts.all? { |opt| options.keys.include?(opt) }
|
||||
unless valid_opts.all? { |opt| options.has_key?(opt) }
|
||||
raise ArgumentError.new("Required data missing: #{(valid_opts - options.keys).map(&:inspect).join(", ")}")
|
||||
end
|
||||
end
|
||||
|
|
|
@ -5,7 +5,7 @@ module Fog
|
|||
|
||||
def validate_network_data(network_data, configure=false)
|
||||
valid_opts = [:id, :href, :name, :address, :broadcast, :gateway]
|
||||
unless valid_opts.all? { |opt| network_data.keys.include?(opt) }
|
||||
unless valid_opts.all? { |opt| network_data.has_key?(opt) }
|
||||
raise ArgumentError.new("Required data missing: #{(valid_opts - network_data.keys).map(&:inspect).join(", ")}")
|
||||
end
|
||||
end
|
||||
|
|
|
@ -6,7 +6,7 @@ module Fog
|
|||
|
||||
def validate_network_ip_data(network_ip_data)
|
||||
valid_opts = [:id, :href, :name, :status, :server]
|
||||
unless valid_opts.all? { |opt| network_ip_data.keys.include?(opt) }
|
||||
unless valid_opts.all? { |opt| network_ip_data.has_key?(opt) }
|
||||
raise ArgumentError.new("Required data missing: #{(valid_opts - network_ip_data.keys).map(&:inspect).join(", ")}")
|
||||
end
|
||||
end
|
||||
|
|
|
@ -6,7 +6,7 @@ module Fog
|
|||
|
||||
def validate_vapp_data(vapp_data)
|
||||
valid_opts = [:name, :cpus, :memory, :disks]
|
||||
unless valid_opts.all? { |opt| vapp_data.keys.include?(opt) }
|
||||
unless valid_opts.all? { |opt| vapp_data.has_key?(opt) }
|
||||
raise ArgumentError.new("Required Vapp data missing: #{(valid_opts - vapp_data.keys).map(&:inspect).join(", ")}")
|
||||
end
|
||||
end
|
||||
|
|
|
@ -138,7 +138,7 @@ module Fog
|
|||
|
||||
def validate_vm_data(vm_data)
|
||||
valid_opts = [:name, :cpus, :memory, :disks]
|
||||
unless valid_opts.all? { |opt| vm_data.keys.include?(opt) }
|
||||
unless valid_opts.all? { |opt| vm_data.has_key?(opt) }
|
||||
raise ArgumentError.new("Required vm data missing: #{(valid_opts - vm_data.keys).map(&:inspect).join(", ")}")
|
||||
end
|
||||
end
|
||||
|
|
|
@ -7,7 +7,7 @@ module Fog
|
|||
def validate_instantiate_vapp_template_options options
|
||||
# :network_uri removed, if not specified will use template network config.
|
||||
valid_opts = [:catalog_item_uri, :name, :vdc_uri]
|
||||
unless valid_opts.all? { |opt| options.keys.include?(opt) }
|
||||
unless valid_opts.all? { |opt| options.has_key?(opt) }
|
||||
raise ArgumentError.new("Required data missing: #{(valid_opts - options.keys).map(&:inspect).join(", ")}")
|
||||
end
|
||||
|
||||
|
|
|
@ -327,7 +327,7 @@ end
|
|||
Spec::Matchers.define :have_keys_with_values do |expected|
|
||||
match do |actual|
|
||||
actual.each_pair.all? do |key, value|
|
||||
expected.keys.include?(key) && expected[key] == value
|
||||
expected.has_key?(key) && expected[key] == value
|
||||
end
|
||||
end
|
||||
end
|
||||
|
|
Loading…
Add table
Reference in a new issue