fog 1.0.0 → 1.1.0

data/README.rdoc

@@ -105,20 +105,12 @@ geemus says: "That should give you everything you need to get started, but let m
 
 == Contributing
 
-* Find something you would like to work on. For suggestions look for the `easy`, `medium` and `hard` tags in the {issues}[http://github.com/geemus/fog/issues]
+* Find something you would like to work on. For suggestions look for the `easy`, `medium` and `hard` tags in the {issues}[http://github.com/fog/fog/issues]
 * Fork the project and do your work in a topic branch.
 * Add shindo tests to prove your code works and run all the tests using `bundle exec rake`.
 * Rebase your branch against geemus/fog to make sure everything is up to date.
 * Commit your changes and send a pull request.
 
-== T-Shirts
-
-Wonder how you can get a lovely fog shirt? Look no further!
-
-* Blue shirts go to people who have contributed indirectly, great examples are writing blog posts or giving lightning talks.
-* Grey shirts and a follow from @fog go to people who have made it on to the {contributors list}[https://github.com/geemus/fog/contributors] by submitting code.
-* Black shirts go to people who have made it on to the {collaborators list}[https://github.com/api/v2/json/repos/show/geemus/fog/collaborators] by coercing geemus into adding them.
-
 == Additional Resources
 
 {fog.io}[http://fog.io]
@@ -128,6 +120,7 @@ Wonder how you can get a lovely fog shirt? Look no further!
 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/Rakefile

@@ -203,9 +203,9 @@ task :changelog do
   changelog << ''
 
   require 'multi_json'
-  github_repo_data = MultiJson.decode(Excon.get('http://github.com/api/v2/json/repos/show/geemus/fog').body)
+  github_repo_data = MultiJson.decode(Excon.get('http://github.com/api/v2/json/repos/show/fog/fog').body)
   data = github_repo_data['repository'].reject {|key, value| !['forks', 'open_issues', 'watchers'].include?(key)}
-  github_collaborator_data = MultiJson.decode(Excon.get('http://github.com/api/v2/json/repos/show/geemus/fog/collaborators').body)
+  github_collaborator_data = MultiJson.decode(Excon.get('http://github.com/api/v2/json/repos/show/fog/fog/collaborators').body)
   data['collaborators'] = github_collaborator_data['collaborators'].length
   rubygems_data = MultiJson.decode(Excon.get('https://rubygems.org/api/v1/gems/fog.json').body)
   data['downloads'] = rubygems_data['downloads']
@@ -250,6 +250,7 @@ task :changelog do
         'Lincoln Stoll',
         'Luqman Amjad',
         'nightshade427',
+        'Patrick Debois',
         'Wesley Beary'
       ].include?(committer)
       next

data/docs/_layouts/default.html

@@ -35,32 +35,32 @@
       <dl>
         <dt>version</dt><dd>vX.Y.Z</dd>
         <dt>install</dt><dd><code>gem install fog</code></dd>
-        <dt>source</dt><dd><a href="http://github.com/geemus/fog">geemus/fog</a></dd>
+        <dt>source</dt><dd><a href="http://github.com/fog/fog">geemus/fog</a></dd>
       </dl>
     </header>
 
-    <div id="main">
-
-      {{ content }}
-
-      <h2>Services</h2>
+    <nav>
       <ul>
-        <li><a href="/cdn">CDN</a></li>
+        <li><a href="/">Home</a></li>
+        <li><a href="/about/structure.html">Structure</a></li>
+        <li><a href="/about/getting_started.html">Getting Started</a></li>
+        <li>&nbsp;</li>
+        <li><a href="/storage">Storage</a></li>
         <li><a href="/compute">Compute</a></li>
         <li><a href="/dns">DNS</a></li>
-        <li><a href="/storage">Storage</a></li>
-        {% for post in site.posts %}
-        <li><a href="{{ post.url }}">{{ post.title }}</a></li>
-        {% endfor %}
+        <li><a href="/cdn">CDN</a></li>
       </ul>
+    </nav>
+
+    <div id="main">
+
+      {{ content }}
 
       <h2>About</h2>
       <ul>
         <li><a href="/">Home</a></li>
         <li><a href="/about/contributing.html">Contributing</a></li>
-        <li><a href="/about/getting_started.html">Getting Started</a></li>
         <li><a href="/about/press.html">Press</a></li>
-        <li><a href="/about/structure.html">Structure</a></li>
         <li><a href="/about/supported_services.html">Supported Services</a></li>
         <li><a href="/about/users.html">Users</a></li>
       </ul>

data/docs/about/contributing.markdown

@@ -86,7 +86,7 @@ end
 
 ## Tests
 
-Now would be a good time to write some tests to make sure what you have written works (and will continue to). I've tried a couple variations on testing in the past, but have settled on consolidated lifetime testing. These vary enough that its hard to give a single simple example, but you can see many examples in "tests/compute/requests/aws":https://github.com/geemus/fog/tree/master/tests/compute/requests/aws/.
+Now would be a good time to write some tests to make sure what you have written works (and will continue to). I've tried a couple variations on testing in the past, but have settled on consolidated lifetime testing. These vary enough that its hard to give a single simple example, but you can see many examples in "tests/compute/requests/aws":https://github.com/fog/fog/tree/master/tests/compute/requests/aws/.
 
 ### Highlights:
 * Reuse the same objects and take them through their whole life cycle (this is much faster, and most of the time if one portion fails the others would anyway).

data/docs/about/getting_started.markdown

@@ -65,7 +65,7 @@ After that you should be able to check your directory list in fog or your filesy
 
 ## Next Steps
 
-Using the same interface you can also practice working against a real provider (such as Amazon S3).  Rather than worrying about signing up for an account right away though, we can use mocks to simulate S3 while we practice.
+Using the same interface you can also practice working against a real provider (such as Amazon S3). Rather than worrying about signing up for an account right away though, we can use mocks to simulate S3 while we practice.
 
 This time we will turn on mocking and then, just like before, we will need to make a connection.
 
@@ -76,8 +76,33 @@ This time we will turn on mocking and then, just like before, we will need to ma
       :provider               => 'AWS'
     })
 
-You may notice that we used bogus credentials, this is fine since we are just simulating things.  To use real S3 you can simply omit `Fog.mock!` and swap in your real credentials.
+You may notice that we used bogus credentials, this is fine since we are just simulating things. To use real S3 you can simply omit Fog.mock! and swap in your real credentials.
 
-Once you have your connection you can go through all the steps you did before, only now you will be working against a real cloud service (or at least a simulated one).
+If you'd like to turn off mocking after turning it on, you can do it at any time and every subsequent connection will be a real connection.
+
+    # Turn on mocking
+    Fog.mock!
+
+    # Create a mock connection to S3
+    storage = Fog::Storage.new({
+      :aws_access_key_id => "asdf",
+      :aws_secret_access_key => "asdf",
+      :provider => "AWS"
+    })
+
+    # Turn off mocking
+    Fog.unmock!
+
+    # Create a real connection to S3
+    storage = Fog::Storage.new({
+      :aws_access_key_id => "asdf",
+      :aws_secret_access_key => "asdf",
+      :provider => "AWS"
+    })
+
+Don't worry about your losing mock data, it stays around until you reset it or until your process exits.
+
+    # Reset all mock data
+    Fog::Mock.reset
 
 Congratulations and welcome to the cloud!  Continue your journey at [fog.io](http://fog.io)

data/docs/dns/index.markdown

@@ -41,7 +41,7 @@ Now that you have a zone you will need to update your registrar to let them know
 With your new zone in hand you can add records as needed.  First and foremost you will probably want the 'www' version of your site to point to whatever your ip might be:
 
     record = @zone.records.create(
-      :ip   => '1.2.3.4',
+      :value   => '1.2.3.4',
       :name => 'example.com',
       :type => 'A'
     )
@@ -49,7 +49,7 @@ With your new zone in hand you can add records as needed.  First and foremost yo
 Adding other records is similarly easy, for instance if we want 'www.example.com' to go to the same place, we can use a cname record:
 
     record = @zone.records.create(
-      :ip   => 'example.com',
+      :value   => 'example.com',
       :name => 'www',
       :type => 'CNAME'
     )
@@ -57,7 +57,7 @@ Adding other records is similarly easy, for instance if we want 'www.example.com
 Or, similarly you might want to have your blog elsewhere:
 
     record = @zone.records.create(
-      :ip   => '4.3.2.1',
+      :value   => '4.3.2.1',
       :name => 'blog.example.com',
       :type => 'A'
     )
@@ -76,4 +76,4 @@ If you already have an account with another service you can just as easily use t
 
 ## Go Forth and Resolve
 
-You can see an example of reusing code like this in the <a href="https://github.com/geemus/fog/blob/master/examples/dns_tests.rb">examples folder</a>. Using this makes it easier to give yourself shortcuts to your cloud servers and manage how clients and users access them as well. It is great to have this flexibility so that you can modify your cloud infrastructure as needed while keeping everything ship shape. It also provides a nice way to create custom subdomains for users and just generally round out your cloud solution.
+You can see an example of reusing code like this in the <a href="https://github.com/fog/fog/blob/master/examples/dns_tests.rb">examples folder</a>. Using this makes it easier to give yourself shortcuts to your cloud servers and manage how clients and users access them as well. It is great to have this flexibility so that you can modify your cloud infrastructure as needed while keeping everything ship shape. It also provides a nice way to create custom subdomains for users and just generally round out your cloud solution.

data/docs/index.markdown

@@ -42,20 +42,12 @@ geemus says: "That should give you everything you need to get started, but let m
 
 ## Contributing
 
-* Find something you would like to work on. For suggestions look for the `easy`, `medium` and `hard` tags in the [issues](http://github.com/geemus/fog/issues)
+* Find something you would like to work on. For suggestions look for the `easy`, `medium` and `hard` tags in the [issues](http://github.com/fog/fog/issues)
 * Fork the project and do your work in a topic branch.
 * Add shindo tests to prove your code works and run all the tests using `bundle exec rake`.
 * Rebase your branch against geemus/fog to make sure everything is up to date.
 * Commit your changes and send a pull request.
 
-## T-Shirts
-
-Wonder how you can get a lovely fog shirt? Look no further!
-
-* Blue shirts go to people who have contributed indirectly, great examples are writing blog posts or giving lightning talks.
-* Grey shirts and a follow from @fog go to people who have made it on to the [contributors list](https://github.com/geemus/fog/contributors) by submitting code.
-* Black shirts go to people who have made it on to the [collaborators list](https://github.com/api/v2/json/repos/show/geemus/fog/collaborators) by coercing geemus into adding them (geemus is currently the only member of this list).
-
 ## Resources
 
 Enjoy, and let me know what I can do to continue improving fog!
@@ -65,7 +57,7 @@ Enjoy, and let me know what I can do to continue improving fog!
 * Stay up to date by following [@fog](http://twitter.com/fog) and/or [@geemus](http://twitter.com/geemus) on Twitter.
 * Get and give help on the [#ruby-fog](irc://irc.freenode.net/ruby-fog) irc channel on Freenode
 * Follow release notes and discussions on the [mailing list](http://groups.google.com/group/ruby-fog)
-* Report bugs or find tasks to help with in the [issues](http://github.com/geemus/fog/issues)
+* Report bugs or find tasks to help with in the [issues](http://github.com/fog/fog/issues)
 * Learn about [contributing](/about/contributing.html)
 * See where fog is used and let the world know how you use it [in the wild](/about/users.html)
 * Check out blog posts and other mentions in the [press](/about/press.html)

data/docs/public/css/fog.css

@@ -56,7 +56,7 @@ header dl dt {
   font-weight: bold;
 }
 
-#main {
+nav, #main {
   background-color: #FFF;
   -moz-border-radius: 0.5em;
   border-radius: 0.5em;
@@ -66,6 +66,19 @@ header dl dt {
   margin-bottom: 2em;
 }
 
+nav {
+  padding: 1em;
+}
+
+nav li {
+  display: inline;
+  padding-left: 2em;
+}
+
+nav li a {
+  font-size: 1.5em;
+}
+
 footer {
   background-color: #A0C0E1;
   border-color: #70A1D2;

data/docs/storage/index.markdown

@@ -5,13 +5,13 @@ title:  Storage
 
 Having Ruby experience makes you hirable; but how can you stand out? You need to demonstrate your abilities. What better way than using Ruby and "the cloud" to store and serve your resume!
 
-In this blog post you will learn to use <a href="http://github.com/geemus/fog">fog</a> - the cloud computing library - to upload your resume to Amazon's <a href="http://aws.amazon.com/s3/">Simple Storage Service</a> (S3), Rackspace's <a href="http://www.rackspacecloud.com/cloud_hosting_products/files">CloudFiles</a> or Google's <a href="http://code.google.com/apis/storage/">Storage for Developers</a>.
+In this blog post you will learn to use <a href="http://github.com/fog/fog">fog</a> - the cloud computing library - to upload your resume to Amazon's <a href="http://aws.amazon.com/s3/">Simple Storage Service</a> (S3), Rackspace's <a href="http://www.rackspacecloud.com/cloud_hosting_products/files">CloudFiles</a> or Google's <a href="http://code.google.com/apis/storage/">Storage for Developers</a>.
 
 Here's my out of date resume stored on <a href="http://geemus.s3.amazonaws.com/resume.html">S3</a>, <a href="http://c0023559.cdn2.cloudfiles.rackspacecloud.com/resume.html">CloudFiles</a> and <a href="https://geemus.commondatastorage.googleapis.com/resume.html">Google Storage</a>; programmatically stored in the cloud using this tutorial. NOTE: my boss would like me to add that I'm not currently looking for a new gig ;)
 
 Check out those cloud-specific URLs! You could put all three in your job application, add the Ruby source for how you did it, and have your choice of Ruby jobs for being so awesome!
 
-How? The all-clouds-in-one library of choice is <a href="https://github.com/geemus/fog">fog</a>.
+How? The all-clouds-in-one library of choice is <a href="https://github.com/fog/fog">fog</a>.
 
 ## Installing fog
 

data/fog.gemspec

@@ -6,8 +6,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           = '1.0.0'
-  s.date              = '2011-09-29'
+  s.version           = '1.1.0'
+  s.date              = '2011-11-11'
   s.rubyforge_project = 'fog'
 
   ## Make sure your summary is short. The description may be as long
@@ -20,7 +20,7 @@ Gem::Specification.new do |s|
   ## a custom homepage, consider using your GitHub URL or the like.
   s.authors  = ["geemus (Wesley Beary)"]
   s.email    = 'geemus@gmail.com'
-  s.homepage = 'http://github.com/geemus/fog'
+  s.homepage = 'http://github.com/fog/fog'
 
   ## This sections is only necessary if you have C extensions.
   # s.require_paths << 'ext'
@@ -37,12 +37,12 @@ Gem::Specification.new do |s|
   ## List your runtime dependencies here. Runtime dependencies are those
   ## that are needed for an end user to actually USE your code.
   s.add_dependency('builder')
-  s.add_dependency('excon', '~>0.7.3')
+  s.add_dependency('excon', '~>0.7.4')
   s.add_dependency('formatador', '~>0.2.0')
   s.add_dependency('multi_json', '~>1.0.3')
   s.add_dependency('mime-types')
   s.add_dependency('net-scp', '~>1.0.4')
-  s.add_dependency('net-ssh', '~>2.1.4')
+  s.add_dependency('net-ssh', '>=2.2.1')
   s.add_dependency('nokogiri', '~>1.5.0')
   s.add_dependency('ruby-hmac')
 
@@ -50,6 +50,7 @@ Gem::Specification.new do |s|
   ## those that are only needed during development
   s.add_development_dependency('jekyll')
   s.add_development_dependency('rake')
+  s.add_development_dependency('rbvmomi')
   s.add_development_dependency('rdoc')
   s.add_development_dependency('rspec', '~>1.3.1')
   s.add_development_dependency('shindo', '~>0.3.4')

data/lib/fog.rb

@@ -3,7 +3,7 @@ require File.join(File.dirname(__FILE__), 'fog', 'core')
 module Fog
 
   unless const_defined?(:VERSION)
-    VERSION = '1.0.0'
+    VERSION = '1.1.0'
   end
 
 end

data/lib/fog/aws.rb

@@ -13,6 +13,7 @@ module Fog
     service(:dns,             'aws/dns',              'DNS')
     service(:elasticache,     'aws/elasticache',      'Elasticache')
     service(:elb,             'aws/elb',              'ELB')
+    service(:emr,             'aws/emr',              'EMR')
     service(:iam,             'aws/iam',              'IAM')
     service(:rds,             'aws/rds',              'RDS')
     service(:ses,             'aws/ses',              'SES')
@@ -27,10 +28,34 @@ module Fog
         key << '.%d'
       end
       [*values].each_with_index do |value, index|
-        params[format(key, index + 1)] = value
+        if value.respond_to?('keys')
+          k = format(key, index + 1)
+          value.each do | vkey, vvalue |
+            params["#{k}.#{vkey}"] = vvalue
+          end
+        else
+          params[format(key, index + 1)] = value
+        end
       end
       params
     end
+    
+    def self.serialize_keys(key, value, options = {})
+      case value
+      when Hash
+        value.each do | k, v |
+          options.merge!(serialize_keys("#{key}.#{k}", v))
+        end
+        return options
+      when Array
+        value.each_with_index do | it, idx |
+          options.merge!(serialize_keys("#{key}.member.#{(idx + 1)}", it))
+        end
+        return options
+      else
+        return {key => value}
+      end
+    end
 
     def self.indexed_filters(filters)
       params = {}

data/lib/fog/aws/auto_scaling.rb

@@ -88,6 +88,8 @@ module Fog
             'autoscaling.us-east-1.amazonaws.com'
           when 'us-west-1'
             'autoscaling.us-west-1.amazonaws.com'
+          when 'us-west-2'
+            'autoscaling.us-west-2.amazonaws.com'
           else
             raise ArgumentError, "Unknown region: #{options[:region].inspect}"
           end
@@ -204,7 +206,7 @@ module Fog
 
           @region = options[:region] || 'us-east-1'
 
-          unless ['ap-northeast-1', 'ap-southeast-1', 'eu-west-1', 'us-east-1', 'us-west-1'].include?(@region)
+          unless ['ap-northeast-1', 'ap-southeast-1', 'eu-west-1', 'us-east-1', 'us-west-1', 'us-west-2'].include?(@region)
             raise ArgumentError, "Unknown region: #{@region.inspect}"
           end
 

data/lib/fog/aws/cloud_formation.rb

@@ -9,6 +9,7 @@ module Fog
 
       request_path 'fog/aws/requests/cloud_formation'
       request :create_stack
+      request :update_stack
       request :delete_stack
       request :describe_stack_events
       request :describe_stack_resources
@@ -64,6 +65,8 @@ module Fog
             'cloudformation.us-east-1.amazonaws.com'
           when 'us-west-1'
             'cloudformation.us-west-1.amazonaws.com'
+          when 'us-west-2'
+            'cloudformation.us-west-2.amazonaws.com'
           else
             raise ArgumentError, "Unknown region: #{options[:region].inspect}"
           end

data/lib/fog/aws/cloud_watch.rb

@@ -13,12 +13,26 @@ module Fog
       request :list_metrics
       request :get_metric_statistics
       request :put_metric_data
+      request :describe_alarms
+      request :put_metric_alarm
+      request :delete_alarms
+      request :describe_alarm_history
+      request :enable_alarm_actions
+      request :disable_alarm_actions
+      request :describe_alarms_for_metric
+      request :set_alarm_state
 
       model_path 'fog/aws/models/cloud_watch'
       model       :metric
       collection  :metrics
       model       :metric_statistic
       collection  :metric_statistics
+      model       :alarm_datum
+      collection  :alarm_data
+      model       :alarm_history
+      collection  :alarm_histories
+      model       :alarm
+      collection  :alarms
 
       class Mock
 
@@ -43,7 +57,7 @@ module Fog
         #
         # ==== Parameters
         # * options<~Hash> - config arguments for connection.  Defaults to {}.
-        #   * region<~String> - optional region to use, in ['eu-west-1', 'us-east-1', 'us-west-1', 'ap-southeast-1', 'ap-northeast-1']
+        #   * region<~String> - optional region to use, in ['eu-west-1', 'us-east-1', 'us-west-1', 'us-west-2', 'ap-southeast-1', 'ap-northeast-1']
         #
         # ==== Returns
         # * CloudWatch object with connection to AWS.
@@ -65,6 +79,8 @@ module Fog
             'monitoring.us-east-1.amazonaws.com'
           when 'us-west-1'
             'monitoring.us-west-1.amazonaws.com'
+          when 'us-west-2'
+            'monitoring.us-west-2.amazonaws.com'
           else
             raise ArgumentError, "Unknown region: #{options[:region].inspect}"
           end

data/lib/fog/aws/compute.rb

@@ -93,7 +93,7 @@ module Fog
       class Real
 
         def modify_image_attributes(*params)
-          Fog::Logger.warning("modify_image_attributes is deprecated, use modify_image_attribute instead [light_black](#{caller.first})[/]")
+          Fog::Logger.deprecation("modify_image_attributes is deprecated, use modify_image_attribute instead [light_black](#{caller.first})[/]")
           modify_image_attribute(*params)
         end
 
@@ -103,12 +103,17 @@ module Fog
 
         def self.data
           @data ||= Hash.new do |hash, region|
-            owner_id = Fog::AWS::Mock.owner_id
             hash[region] = Hash.new do |region_hash, key|
+              owner_id = Fog::AWS::Mock.owner_id
               region_hash[key] = {
                 :deleted_at => {},
                 :addresses  => {},
                 :images     => {},
+                :image_launch_permissions => Hash.new do |permissions_hash, image_key|
+                  permissions_hash[image_key] = {
+                    :users => []
+                  }
+                end,
                 :instances  => {},
                 :reserved_instances => {},
                 :key_pairs  => {},
@@ -147,7 +152,10 @@ module Fog
                 },
                 :snapshots => {},
                 :volumes => {},
-                :tags => {}
+                :tags => {},
+                :tag_sets => Hash.new do |tag_set_hash, resource_id|
+                  tag_set_hash[resource_id] = {}
+                end
               }
             end
           end
@@ -162,41 +170,63 @@ module Fog
 
           @region = options[:region] || 'us-east-1'
 
-          unless ['ap-northeast-1', 'ap-southeast-1', 'eu-west-1', 'us-east-1', 'us-west-1'].include?(@region)
+          unless ['ap-northeast-1', 'ap-southeast-1', 'eu-west-1', 'us-east-1', 'us-west-1', 'us-west-2'].include?(@region)
             raise ArgumentError, "Unknown region: #{@region.inspect}"
           end
         end
 
+        def region_data
+          self.class.data[@region]
+        end
+
         def data
-          self.class.data[@region][@aws_access_key_id]
+          self.region_data[@aws_access_key_id]
         end
 
         def reset_data
-          self.class.data[@region].delete(@aws_access_key_id)
+          self.region_data.delete(@aws_access_key_id)
+        end
+
+        def visible_images
+          images = self.data[:images].values.inject({}) do |h, image|
+            h.update(image['imageId'] => image)
+          end
+
+          self.region_data.each do |aws_access_key_id, data|
+            data[:image_launch_permissions].each do |image_id, list|
+              if list[:users].include?(self.data[:owner_id])
+                images.update(image_id => data[:images][image_id])
+              end
+            end
+          end
+
+          images
         end
 
-        def apply_tag_filters(resources, filters)
+        def apply_tag_filters(resources, filters, resource_id_key)
+          tag_set_fetcher = lambda {|resource| self.data[:tag_sets][resource[resource_id_key]] }
+
           # tag-key: match resources tagged with this key (any value)
           if filters.has_key?('tag-key')
             value = filters.delete('tag-key')
-            resources = resources.select{|r| r['tagSet'].has_key?(value)}
+            resources = resources.select{|r| tag_set_fetcher[r].has_key?(value)}
           end
-          
+
           # tag-value: match resources tagged with this value (any key)
           if filters.has_key?('tag-value')
             value = filters.delete('tag-value')
-            resources = resources.select{|r| r['tagSet'].values.include?(value)}
+            resources = resources.select{|r| tag_set_fetcher[r].values.include?(value)}
           end
-          
-          # tag:key: match resources taged with a key-value pair.  Value may be an array, which is OR'd.
+
+          # tag:key: match resources tagged with a key-value pair.  Value may be an array, which is OR'd.
           tag_filters = {}
-          filters.keys.each do |key| 
+          filters.keys.each do |key|
             tag_filters[key.gsub('tag:', '')] = filters.delete(key) if /^tag:/ =~ key
           end
           for tag_key, tag_value in tag_filters
-            resources = resources.select{|r| tag_value.include?(r['tagSet'][tag_key])}
+            resources = resources.select{|r| tag_value.include?(tag_set_fetcher[r][tag_key])}
           end
-          
+
           resources
         end
       end
@@ -206,7 +236,7 @@ module Fog
         # Initialize connection to EC2
         #
         # ==== Notes
-        # options parameter must include values for :aws_access_key_id and 
+        # options parameter must include values for :aws_access_key_id and
         # :aws_secret_access_key in order to create a connection
         #
         # ==== Examples
@@ -218,7 +248,7 @@ module Fog
         # ==== Parameters
         # * options<~Hash> - config arguments for connection.  Defaults to {}.
         #   * region<~String> - optional region to use, in
-        #     ['eu-west-1', 'us-east-1', 'us-west-1', 'ap-northeast-1', 'ap-southeast-1']
+        #     ['eu-west-1', 'us-east-1', 'us-west-1', 'us-west-2', 'ap-northeast-1', 'ap-southeast-1']
         #
         # ==== Returns
         # * EC2 object with connection to aws.
@@ -249,6 +279,8 @@ module Fog
               'ec2.us-east-1.amazonaws.com'
             when 'us-west-1'
               'ec2.us-west-1.amazonaws.com'
+            when 'us-west-2'
+              'ec2.us-west-2.amazonaws.com'
             else
               raise ArgumentError, "Unknown region: #{options[:region].inspect}"
             end
@@ -265,7 +297,7 @@ module Fog
         end
 
         private
-        
+
         def request(params)
           idempotent  = params.delete(:idempotent)
           parser      = params.delete(:parser)