kotovalexarian-likes-github/fog--fog
1
0
Fork 0
mirror of https://github.com/fog/fog.git synced 2022-11-09 13:51:43 -05:00
Code Releases Activity

[aws|compute] model level warnings/fixes for filters

Browse source
This commit is contained in:
geemus 2010-10-11 13:45:26 -07:00
parent 40ab6052ea
commit a1374e9aa5
6 changed files with 24 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lib/fog/aws/models/compute/addresses.rb
View file

@ -18,6 +18,10 @@ module Fog
end end
def all(filters = @filters) def all(filters = @filters)
unless filters.is_a?(Hash)
Formatador.display_line("[yellow][WARN] all with #{filters.class} param is deprecated, use all('public-ip' => []) instead[/] [light_black](#{caller.first})[/]")
filters = {'public-ip' => [*filters]}
end
@filters = filters @filters = filters
data = connection.describe_addresses(filters).body data = connection.describe_addresses(filters).body
load( load(

4
lib/fog/aws/models/compute/key_pairs.rb
View file

@ -17,6 +17,10 @@ module Fog
end end
def all(filters = @filters) def all(filters = @filters)
unless filters.is_a?(Hash)
Formatador.display_line("[yellow][WARN] all with #{filters.class} param is deprecated, use all('key-name' => []) instead[/] [light_black](#{caller.first})[/]")
filters = {'key-name' => [*filters]}
end
@filters = filters @filters = filters
data = connection.describe_key_pairs(filters).body data = connection.describe_key_pairs(filters).body
load(data['keySet']) load(data['keySet'])

4
lib/fog/aws/models/compute/security_groups.rb
View file

@ -17,6 +17,10 @@ module Fog
end end
def all(filters = @filters) def all(filters = @filters)
unless filters.is_a?(Hash)
Formatador.display_line("[yellow][WARN] all with #{filters.class} param is deprecated, use all('group-name' => []) instead[/] [light_black](#{caller.first})[/]")
filters = {'group-name' => [*filters]}
end
@filters = filters @filters = filters
data = connection.describe_security_groups(@filters).body data = connection.describe_security_groups(@filters).body
load(data['securityGroupInfo']) load(data['securityGroupInfo'])

4
lib/fog/aws/models/compute/servers.rb
View file

@ -19,6 +19,10 @@ module Fog
end end
def all(filters = @filters) def all(filters = @filters)
unless filters.is_a?(Hash)
Formatador.display_line("[yellow][WARN] all with #{filters.class} param is deprecated, use all('instance-id' => []) instead[/] [light_black](#{caller.first})[/]")
filters = {'instance-id' => [*filters]}
end
@filters = filters @filters = filters
data = connection.describe_instances(filters).body data = connection.describe_instances(filters).body
load( load(

7
lib/fog/aws/models/compute/snapshots.rb
View file

@ -18,10 +18,11 @@ module Fog
end end
def all(filters = @filters, options = {}) def all(filters = @filters, options = {})
unless options.empty? unless filters.is_a?(Hash)
Formatador.display_line("[yellow][WARN] describe_snapshots with a second param is deprecated, use describe_snapshots(options) instead[/] [light_black](#{caller.first})[/]") Formatador.display_line("[yellow][WARN] all with #{filters.class} param is deprecated, use all('snapshot-id' => []) instead[/] [light_black](#{caller.first})[/]")
filters.merge!(options) filters = {'snapshot-id' => [*filters]}
end end
@filters = filters
data = connection.describe_snapshots(filters.merge!(options)).body data = connection.describe_snapshots(filters.merge!(options)).body
load(data['snapshotSet']) load(data['snapshotSet'])
if volume if volume

4
lib/fog/aws/models/compute/volumes.rb
View file

@ -18,6 +18,10 @@ module Fog
end end
def all(filters = @filters) def all(filters = @filters)
unless filters.is_a?(Hash)
Formatador.display_line("[yellow][WARN] all with #{filters.class} param is deprecated, use all('volume-id' => []) instead[/] [light_black](#{caller.first})[/]")
filters = {'volume-id' => [*filters]}
end
@filters = filters @filters = filters
data = connection.describe_volumes(@filters).body data = connection.describe_volumes(@filters).body
load(data['volumeSet']) load(data['volumeSet'])