fog 0.3.17 → 0.3.18

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    fog (0.3.17)
+    fog (0.3.18)
       builder
       excon (>= 0.2.4)
       formatador (>= 0.0.15)
@@ -24,9 +24,9 @@ GEM
     net-ssh (2.0.23)
     nokogiri (1.4.3.1)
     rake (0.8.7)
-    rspec (1.3.0)
+    rspec (1.3.1)
     ruby-hmac (0.4.0)
-    shindo (0.1.7)
+    shindo (0.1.9)
       formatador (>= 0.0.14)
       gestalt (>= 0.0.11)
 
@@ -43,6 +43,6 @@ DEPENDENCIES
   net-ssh (~> 2.0.23)
   nokogiri (~> 1.4.3.1)
   rake
-  rspec
+  rspec (= 1.3.1)
   ruby-hmac
-  shindo (= 0.1.7)
+  shindo (= 0.1.9)

data/README.rdoc

@@ -18,8 +18,10 @@ Now just type 'fog' to trying stuff out, confident that fog should let you know
 
   >> server = AWS.servers.create
   ArgumentError: image_id is required for this operation
+
   >> server = AWS.servers.create(:image_id => 'ami-5ee70037')
   <Fog::AWS::EC2::Server [...]>
+
   >> server.destroy # cleanup after yourself or regret it, trust me
   true
 
@@ -34,10 +36,10 @@ You can see a list of available collections by calling #collections on the conne
 Some of these collections are available across multiple providers. For example, all compute providers have +flavors+, +images+ and +servers+, and storage providers have +directory+ and +file+. 
 
 Collections share most of the basic CRUD type operations, such as:
-* +#all+ - fetch every object of that type from the provider.
-* +#create+  initialize a new record locally and then persists it with the provider.
-* +#get+ - fetch a single object by its identity from the provider.
-* +#new+ - initialize a new record locally, but do not persist it to the provider.
+* +all+ - fetch every object of that type from the provider.
+* +create+ - initialize a new record locally and then persists it with the provider.
+* +get+ - fetch a single object by its identity from the provider.
+* +new+ - initialize a new record locally, but do not persist it to the provider.
 
 As an example, we'll try initializing and persisting a Rackspace Cloud server:
 
@@ -63,9 +65,9 @@ As an example, we'll try initializing and persisting a Rackspace Cloud server:
 == Models
 
 Many of the collection methods return individual objects, which also provide some common methods:
-* +#destroy+ - will destroy the persisted object from the provider
-* +#save+ - persist the object to the provider
-* +#wait_for+ - takes a block and waits for either the block to return true for the object or for a timeout (defaults to 10 minutes)
+* +destroy+ - will destroy the persisted object from the provider
+* +save+ - persist the object to the provider
+* +wait_for+ - takes a block and waits for either the block to return true for the object or for a timeout (defaults to 10 minutes)
 
 == Mocks
 
@@ -100,6 +102,7 @@ Play around and use the console to explore or check out the {getting started gui
 You should try out the (varying) support fog has for:
 * {AWS}[http://aws.amazon.com] [{Compute}[http://aws.amazon.com/ec2], {ELB}[http://aws.amazon.com/elasticloadbalancing], {Storage}[http://aws.amazon.com/s3], {SimpleDB}[http://aws.amazon.com/simpledb]]
 * {Blue Box Group}[http://www.blueboxgrp.com] [{Compute}[http://www.blueboxgrp.com/blocks]]
+* {Brightbox}[http://www.brightbox.co.uk] [{Compute}[http://beta.brightbox.com/]]
 * {Google}[http://www.google.com] [{Storage}[http://code.google.com/apis/storage]]
 * {Rackspace}[http://www.rackspace.com] [{Compute}[http://www.rackspacecloud.com/cloud_hosting_products/servers], {Storage}[http://www.rackspacecloud.com/cloud_hosting_products/files]]
 * {Slicehost}[http://www.slicehost.com] [{Compute}[http://www.slicehost.com]]
@@ -120,6 +123,12 @@ Enjoy, and let me know what I can do to continue improving fog!
 * Learn about {contributing}[http://github.com/geemus/fog/wiki/contributor-guide] or find more info about the {Providers}[http://github.com/geemus/fog/wiki/Providers] (including some todo items)
 * See what already uses fog and add your own stuff to {the list}[http://wiki.github.com/geemus/fog/in-the-wild]
 
+== Sponsorship
+
+http://www.engineyard.com/images/logo.png
+
+All new work on fog is sponsored by {Engine Yard}[http://engineyard.com]
+
 == Copyright
 
 (The MIT License)

data/fog.gemspec

@@ -7,8 +7,8 @@ Gem::Specification.new do |s|
   ## If your rubyforge_project name is different, then edit it and comment out
   ## the sub! line in the Rakefile
   s.name              = 'fog'
-  s.version           = '0.3.17'
-  s.date              = '2010-11-05'
+  s.version           = '0.3.18'
+  s.date              = '2010-11-16'
   s.rubyforge_project = 'fog'
 
   ## Make sure your summary is short. The description may be as long
@@ -54,8 +54,8 @@ Gem::Specification.new do |s|
   ## List your development dependencies here. Development dependencies are
   ## those that are only needed during development
   s.add_development_dependency('rake')
-  s.add_development_dependency('rspec')
-  s.add_development_dependency('shindo', '0.1.7')
+  s.add_development_dependency('rspec', '1.3.1')
+  s.add_development_dependency('shindo', '0.1.9')
 
   ## Leave this section as-is. It will be automatically generated from the
   ## contents of your Git repository via the gemspec task. DO NOT REMOVE
@@ -141,6 +141,8 @@ Gem::Specification.new do |s|
     lib/fog/aws/parsers/elb/register_instances_with_load_balancer.rb
     lib/fog/aws/parsers/iam/basic.rb
     lib/fog/aws/parsers/iam/create_group.rb
+    lib/fog/aws/parsers/iam/create_user.rb
+    lib/fog/aws/parsers/iam/list_group_policies.rb
     lib/fog/aws/parsers/iam/list_groups.rb
     lib/fog/aws/parsers/simpledb/basic.rb
     lib/fog/aws/parsers/simpledb/domain_metadata.rb
@@ -148,6 +150,7 @@ Gem::Specification.new do |s|
     lib/fog/aws/parsers/simpledb/list_domains.rb
     lib/fog/aws/parsers/simpledb/select.rb
     lib/fog/aws/parsers/storage/access_control_list.rb
+    lib/fog/aws/parsers/storage/complete_multipart_upload.rb
     lib/fog/aws/parsers/storage/copy_object.rb
     lib/fog/aws/parsers/storage/get_bucket.rb
     lib/fog/aws/parsers/storage/get_bucket_location.rb
@@ -156,11 +159,15 @@ Gem::Specification.new do |s|
     lib/fog/aws/parsers/storage/get_bucket_versioning.rb
     lib/fog/aws/parsers/storage/get_request_payment.rb
     lib/fog/aws/parsers/storage/get_service.rb
+    lib/fog/aws/parsers/storage/initiate_multipart_upload.rb
+    lib/fog/aws/parsers/storage/list_multipart_uploads.rb
+    lib/fog/aws/parsers/storage/list_parts.rb
     lib/fog/aws/requests/cdn/delete_distribution.rb
     lib/fog/aws/requests/cdn/get_distribution.rb
     lib/fog/aws/requests/cdn/get_distribution_list.rb
     lib/fog/aws/requests/cdn/post_distribution.rb
     lib/fog/aws/requests/cdn/post_invalidation.rb
+    lib/fog/aws/requests/cdn/put_distribution_config.rb
     lib/fog/aws/requests/compute/allocate_address.rb
     lib/fog/aws/requests/compute/associate_address.rb
     lib/fog/aws/requests/compute/attach_volume.rb
@@ -210,9 +217,16 @@ Gem::Specification.new do |s|
     lib/fog/aws/requests/elb/disable_availability_zones_for_load_balancer.rb
     lib/fog/aws/requests/elb/enable_availability_zones_for_load_balancer.rb
     lib/fog/aws/requests/elb/register_instances_with_load_balancer.rb
+    lib/fog/aws/requests/iam/add_user_to_group.rb
     lib/fog/aws/requests/iam/create_group.rb
+    lib/fog/aws/requests/iam/create_user.rb
     lib/fog/aws/requests/iam/delete_group.rb
+    lib/fog/aws/requests/iam/delete_group_policy.rb
+    lib/fog/aws/requests/iam/delete_user.rb
+    lib/fog/aws/requests/iam/list_group_policies.rb
     lib/fog/aws/requests/iam/list_groups.rb
+    lib/fog/aws/requests/iam/put_group_policy.rb
+    lib/fog/aws/requests/iam/remove_user_from_group.rb
     lib/fog/aws/requests/simpledb/batch_put_attributes.rb
     lib/fog/aws/requests/simpledb/create_domain.rb
     lib/fog/aws/requests/simpledb/delete_attributes.rb
@@ -222,6 +236,8 @@ Gem::Specification.new do |s|
     lib/fog/aws/requests/simpledb/list_domains.rb
     lib/fog/aws/requests/simpledb/put_attributes.rb
     lib/fog/aws/requests/simpledb/select.rb
+    lib/fog/aws/requests/storage/abort_multipart_upload.rb
+    lib/fog/aws/requests/storage/complete_multipart_upload.rb
     lib/fog/aws/requests/storage/copy_object.rb
     lib/fog/aws/requests/storage/delete_bucket.rb
     lib/fog/aws/requests/storage/delete_object.rb
@@ -238,6 +254,9 @@ Gem::Specification.new do |s|
     lib/fog/aws/requests/storage/get_request_payment.rb
     lib/fog/aws/requests/storage/get_service.rb
     lib/fog/aws/requests/storage/head_object.rb
+    lib/fog/aws/requests/storage/initiate_multipart_upload.rb
+    lib/fog/aws/requests/storage/list_multipart_uploads.rb
+    lib/fog/aws/requests/storage/list_parts.rb
     lib/fog/aws/requests/storage/post_object_hidden_fields.rb
     lib/fog/aws/requests/storage/put_bucket.rb
     lib/fog/aws/requests/storage/put_bucket_acl.rb
@@ -246,6 +265,7 @@ Gem::Specification.new do |s|
     lib/fog/aws/requests/storage/put_object.rb
     lib/fog/aws/requests/storage/put_object_url.rb
     lib/fog/aws/requests/storage/put_request_payment.rb
+    lib/fog/aws/requests/storage/upload_part.rb
     lib/fog/aws/s3.rb
     lib/fog/aws/simpledb.rb
     lib/fog/aws/storage.rb
@@ -267,6 +287,59 @@ Gem::Specification.new do |s|
     lib/fog/bluebox/requests/compute/get_template.rb
     lib/fog/bluebox/requests/compute/get_templates.rb
     lib/fog/bluebox/requests/compute/reboot_block.rb
+    lib/fog/brightbox.rb
+    lib/fog/brightbox/bin.rb
+    lib/fog/brightbox/compute.rb
+    lib/fog/brightbox/models/compute/account.rb
+    lib/fog/brightbox/models/compute/cloud_ip.rb
+    lib/fog/brightbox/models/compute/cloud_ips.rb
+    lib/fog/brightbox/models/compute/flavor.rb
+    lib/fog/brightbox/models/compute/flavors.rb
+    lib/fog/brightbox/models/compute/image.rb
+    lib/fog/brightbox/models/compute/images.rb
+    lib/fog/brightbox/models/compute/server.rb
+    lib/fog/brightbox/models/compute/servers.rb
+    lib/fog/brightbox/models/compute/user.rb
+    lib/fog/brightbox/models/compute/users.rb
+    lib/fog/brightbox/models/compute/zone.rb
+    lib/fog/brightbox/models/compute/zones.rb
+    lib/fog/brightbox/requests/compute/create_api_client.rb
+    lib/fog/brightbox/requests/compute/create_cloud_ip.rb
+    lib/fog/brightbox/requests/compute/create_image.rb
+    lib/fog/brightbox/requests/compute/create_server.rb
+    lib/fog/brightbox/requests/compute/destroy_api_client.rb
+    lib/fog/brightbox/requests/compute/destroy_cloud_ip.rb
+    lib/fog/brightbox/requests/compute/destroy_image.rb
+    lib/fog/brightbox/requests/compute/destroy_server.rb
+    lib/fog/brightbox/requests/compute/get_account.rb
+    lib/fog/brightbox/requests/compute/get_api_client.rb
+    lib/fog/brightbox/requests/compute/get_cloud_ip.rb
+    lib/fog/brightbox/requests/compute/get_image.rb
+    lib/fog/brightbox/requests/compute/get_interface.rb
+    lib/fog/brightbox/requests/compute/get_server.rb
+    lib/fog/brightbox/requests/compute/get_server_type.rb
+    lib/fog/brightbox/requests/compute/get_user.rb
+    lib/fog/brightbox/requests/compute/get_zone.rb
+    lib/fog/brightbox/requests/compute/list_api_clients.rb
+    lib/fog/brightbox/requests/compute/list_cloud_ips.rb
+    lib/fog/brightbox/requests/compute/list_images.rb
+    lib/fog/brightbox/requests/compute/list_server_types.rb
+    lib/fog/brightbox/requests/compute/list_servers.rb
+    lib/fog/brightbox/requests/compute/list_users.rb
+    lib/fog/brightbox/requests/compute/list_zones.rb
+    lib/fog/brightbox/requests/compute/map_cloud_ip.rb
+    lib/fog/brightbox/requests/compute/reset_ftp_password_account.rb
+    lib/fog/brightbox/requests/compute/resize_server.rb
+    lib/fog/brightbox/requests/compute/shutdown_server.rb
+    lib/fog/brightbox/requests/compute/snapshot_server.rb
+    lib/fog/brightbox/requests/compute/start_server.rb
+    lib/fog/brightbox/requests/compute/stop_server.rb
+    lib/fog/brightbox/requests/compute/unmap_cloud_ip.rb
+    lib/fog/brightbox/requests/compute/update_account.rb
+    lib/fog/brightbox/requests/compute/update_api_client.rb
+    lib/fog/brightbox/requests/compute/update_image.rb
+    lib/fog/brightbox/requests/compute/update_server.rb
+    lib/fog/brightbox/requests/compute/update_user.rb
     lib/fog/core.rb
     lib/fog/core/attributes.rb
     lib/fog/core/bin.rb
@@ -569,13 +642,11 @@ Gem::Specification.new do |s|
     lib/fog/vcloud/terremark/vcloud/requests/get_vdc.rb
     spec/aws/models/compute/address_spec.rb
     spec/aws/models/compute/addresses_spec.rb
-    spec/aws/models/compute/flavors_spec.rb
     spec/aws/models/compute/key_pair_spec.rb
     spec/aws/models/compute/key_pairs_spec.rb
     spec/aws/models/compute/security_group_spec.rb
     spec/aws/models/compute/security_groups_spec.rb
     spec/aws/models/compute/server_spec.rb
-    spec/aws/models/compute/servers_spec.rb
     spec/aws/models/compute/snapshot_spec.rb
     spec/aws/models/compute/snapshots_spec.rb
     spec/aws/models/compute/volume_spec.rb
@@ -589,29 +660,9 @@ Gem::Specification.new do |s|
     spec/aws/requests/simpledb/list_domains_spec.rb
     spec/aws/requests/simpledb/put_attributes_spec.rb
     spec/aws/requests/simpledb/select_spec.rb
-    spec/bluebox/models/compute/flavors_spec.rb
-    spec/bluebox/models/compute/server_spec.rb
-    spec/bluebox/models/compute/servers_spec.rb
     spec/compact_progress_bar_formatter.rb
-    spec/google/requests/storage/copy_object_spec.rb
-    spec/google/requests/storage/delete_bucket_spec.rb
-    spec/google/requests/storage/delete_object_spec.rb
-    spec/google/requests/storage/get_bucket_spec.rb
-    spec/google/requests/storage/get_object_spec.rb
-    spec/google/requests/storage/get_service_spec.rb
-    spec/google/requests/storage/head_object_spec.rb
-    spec/google/requests/storage/put_bucket_spec.rb
-    spec/google/requests/storage/put_object_spec.rb
+    spec/core/attributes_spec.rb
     spec/lorem.txt
-    spec/rackspace/models/compute/flavors_spec.rb
-    spec/rackspace/models/compute/server_spec.rb
-    spec/rackspace/models/compute/servers_spec.rb
-    spec/shared_examples/flavors_examples.rb
-    spec/shared_examples/server_examples.rb
-    spec/shared_examples/servers_examples.rb
-    spec/slicehost/models/compute/flavors_spec.rb
-    spec/slicehost/models/compute/server_spec.rb
-    spec/slicehost/models/compute/servers_spec.rb
     spec/spec_helper.rb
     spec/vcloud/bin_spec.rb
     spec/vcloud/models/vdc_spec.rb
@@ -662,6 +713,9 @@ Gem::Specification.new do |s|
     spec/vcloud/terremark/ecloud/requests/power_on_spec.rb
     spec/vcloud/vcloud_spec.rb
     tests/aws/helper.rb
+    tests/aws/models/compute/flavors_tests.rb
+    tests/aws/models/compute/server_tests.rb
+    tests/aws/models/compute/servers_tests.rb
     tests/aws/models/storage/directories_tests.rb
     tests/aws/models/storage/directory_tests.rb
     tests/aws/models/storage/file_tests.rb
@@ -677,19 +731,34 @@ Gem::Specification.new do |s|
     tests/aws/requests/compute/tag_tests.rb
     tests/aws/requests/compute/volume_tests.rb
     tests/aws/requests/storage/bucket_tests.rb
+    tests/aws/requests/storage/multipart_upload_tests.rb
     tests/aws/requests/storage/object_tests.rb
     tests/bluebox/helper.rb
+    tests/bluebox/models/compute/flavors_tests.rb
+    tests/bluebox/models/compute/server_tests.rb
+    tests/bluebox/models/compute/servers_tests.rb
     tests/bluebox/requests/compute/block_tests.rb
     tests/bluebox/requests/compute/product_tests.rb
     tests/bluebox/requests/compute/template_tests.rb
+    tests/brightbox/helper.rb
+    tests/brightbox/models/compute/flavors_tests.rb
+    tests/brightbox/models/compute/server_tests.rb
+    tests/brightbox/models/compute/servers_tests.rb
     tests/go_grid/helper.rb
     tests/go_grid/requests/compute/image_tests.rb
     tests/google/models/storage/directories_tests.rb
     tests/google/models/storage/directory_tests.rb
     tests/google/models/storage/file_tests.rb
     tests/google/models/storage/files_tests.rb
+    tests/google/requests/storage/bucket_tests.rb
+    tests/google/requests/storage/object_tests.rb
     tests/helper.rb
     tests/helper_tests.rb
+    tests/helpers/collection_tests.rb
+    tests/helpers/compute/flavors_tests.rb
+    tests/helpers/compute/server_tests.rb
+    tests/helpers/compute/servers_tests.rb
+    tests/helpers/model_tests.rb
     tests/helpers/storage/directories_tests.rb
     tests/helpers/storage/directory_tests.rb
     tests/helpers/storage/file_tests.rb
@@ -705,6 +774,9 @@ Gem::Specification.new do |s|
     tests/local/models/storage/files_tests.rb
     tests/lorem.txt
     tests/rackspace/helper.rb
+    tests/rackspace/models/compute/flavors_tests.rb
+    tests/rackspace/models/compute/server_tests.rb
+    tests/rackspace/models/compute/servers_tests.rb
     tests/rackspace/models/storage/directories_tests.rb
     tests/rackspace/models/storage/directory_tests.rb
     tests/rackspace/models/storage/file_tests.rb
@@ -716,6 +788,9 @@ Gem::Specification.new do |s|
     tests/rackspace/requests/storage/container_tests.rb
     tests/rackspace/requests/storage/object_tests.rb
     tests/slicehost/helper.rb
+    tests/slicehost/models/compute/flavors_tests.rb
+    tests/slicehost/models/compute/server_tests.rb
+    tests/slicehost/models/compute/servers_tests.rb
     tests/slicehost/requests/compute/backup_tests.rb
     tests/slicehost/requests/compute/flavor_tests.rb
     tests/slicehost/requests/compute/image_tests.rb

data/lib/fog.rb

@@ -18,7 +18,7 @@ module Fog
   @mocking = false
 
   unless const_defined?(:VERSION)
-    VERSION = '0.3.17'
+    VERSION = '0.3.18'
   end
 
   module Mock
@@ -67,11 +67,12 @@ module Fog
       { :duration => duration }
     end
   end
-
+  
 end
 
 require 'fog/aws'
 require 'fog/bluebox'
+require 'fog/brightbox'
 require 'fog/go_grid'
 require 'fog/linode'
 require 'fog/local'

data/lib/fog/aws/cdn.rb

@@ -12,6 +12,7 @@ module Fog
       request 'get_distribution_list'
       request 'post_distribution'
       request 'post_invalidation'
+      request 'put_distribution_config'
 
       class Mock
 
@@ -69,7 +70,7 @@ module Fog
           @path     = options[:path]      || '/'
           @port     = options[:port]      || 443
           @scheme   = options[:scheme]    || 'https'
-          @version  = options[:version]  || '2010-08-01'
+          @version  = options[:version]  || '2010-11-01'
           @connection = Fog::Connection.new("#{@scheme}://#{@host}:#{@port}#{@path}", options[:persistent] || true)
         end
 

data/lib/fog/aws/compute.rb

@@ -2,7 +2,8 @@ module Fog
   module AWS
     class Compute < Fog::Service
 
-      requires :aws_access_key_id, :aws_secret_access_key
+      requires   :aws_access_key_id, :aws_secret_access_key
+      recognizes :endpoint, :region, :host, :path, :port, :scheme, :persistent
 
       model_path 'fog/aws/models/compute'
       model       :address
@@ -192,7 +193,7 @@ module Fog
         end
 
         private
-
+        
         def request(params)
           idempotent  = params.delete(:idempotent)
           parser      = params.delete(:parser)

data/lib/fog/aws/iam.rb

@@ -5,9 +5,16 @@ module Fog
       requires :aws_access_key_id, :aws_secret_access_key
 
       request_path 'fog/aws/requests/iam'
+      request :add_user_to_group
       request :create_group
+      request :create_user
       request :delete_group
+      request :delete_group_policy
+      request :delete_user
       request :list_groups
+      request :list_group_policies
+      request :put_group_policy
+      request :remove_user_from_group
 
       class Mock
 
@@ -36,6 +43,7 @@ module Fog
         # ==== Returns
         # * IAM object with connection to AWS.
         def initialize(options={})
+          require 'json'
           @aws_access_key_id      = options[:aws_access_key_id]
           @aws_secret_access_key  = options[:aws_secret_access_key]
           @hmac       = Fog::HMAC.new('sha256', @aws_secret_access_key)

data/lib/fog/aws/models/compute/flavors.rb

@@ -24,7 +24,8 @@ module Fog
             { :bits => 64, :cores =>   13, :disk => 850,  :id =>  'm2.2xlarge', :name => 'High Memory Double Extra Large',    :ram => 35020.8},
             { :bits => 64, :cores =>   26, :disk => 1690, :id =>  'm2.4xlarge', :name => 'High Memory Quadruple Extra Large', :ram => 70041.6},
 
-            { :bits => 64, :cores => 33.5, :disk => 1690, :id => 'cc1.4xlarge', :name => 'Cluster Compute Quadruple Extra Large', :ram => 23552}
+            { :bits => 64, :cores => 33.5, :disk => 1690, :id => 'cc1.4xlarge', :name => 'Cluster Compute Quadruple Extra Large', :ram => 23552},
+            { :bits => 64, :cores => 33.5, :disk => 1690, :id => 'cg1.4xlarge', :name => 'Cluster GPU Quadruple Extra Large',     :ram => 22528}
           ]
           load(data)
           self

data/lib/fog/aws/models/compute/server.rb

@@ -17,6 +17,7 @@ module Fog
         attribute :groups
         attribute :flavor_id,             :aliases => 'instanceType'
         attribute :image_id,              :aliases => 'imageId'
+        attr_accessor :instance_initiated_shutdown_behavior
         attribute :ip_address,            :aliases => 'ipAddress'
         attribute :kernel_id,             :aliases => 'kernelId'
         attribute :key_name,              :aliases => 'keyName'
@@ -138,6 +139,7 @@ module Fog
           options = {
             'BlockDeviceMapping'          => block_device_mapping,
             'ClientToken'                 => client_token,
+            'InstanceInitiatedShutdownBehavior' => instance_initiated_shutdown_behavior,
             'InstanceType'                => flavor_id,
             'KernelId'                    => kernel_id,
             'KeyName'                     => key_name,
@@ -148,6 +150,7 @@ module Fog
             'SubnetId'                    => subnet_id,
             'UserData'                    => user_data
           }
+          options.delete_if {|key, value| value.nil?}
 
           # If subnet is defined we are working on a virtual private cloud.
           # subnet & security group cannot co-exist. I wish VPC just ignored