fog 1.6.0 → 1.7.0

data/.gitignore

@@ -6,6 +6,7 @@
 .bundle
 .DS_Store
 .idea
+/tests/.fog
 bin/*
 !bin/fog
 !bin/rdoc

data/README.md

@@ -114,6 +114,7 @@ geemus says: "That should give you everything you need to get started, but let m
 
 * Find something you would like to work on. For suggestions look for the `easy`, `medium` and `hard` tags in the [issues](https://github.com/fog/fog/issues)
 * Fork the project and do your work in a topic branch.
+* Add a config at `~/.fog` for the component you want to test.
 * Add shindo tests to prove your code works and run all the tests using `bundle exec rake`.
 * Rebase your branch against fog/fog to make sure everything is up to date.
 * Commit your changes and send a pull request.

data/Rakefile

@@ -59,7 +59,7 @@ namespace :test do
 end
 
 task :test do
-  Rake::Task[:mock_tests].invoke && Rake::Task[:real_tests].invoke
+  Rake::Task[:mock_tests].invoke
 end
 
 def tests(mocked)
@@ -239,6 +239,7 @@ task :changelog do
         'Lincoln Stoll',
         'Luqman Amjad',
         'Michael Zeng',
+        'Nick Osborn',
         'nightshade427',
         'Patrick Debois',
         'Stepan G. Fedorov',

data/changelog.txt

@@ -1,3 +1,187 @@
+1.7.0 11/04/2012 aa853488c9d84d849f52cf348787030fbb963163
+=========================================================
+
+Stats! { 'collaborators' => 41, 'downloads' => 1216554, 'forks' => 599, 'open_issues' => 80, 'watchers' => 2206 }
+
+MVP! Nick Osborn
+
+[AWS::Mock|create_image]
+  automatic registration of ebs image upon image_create. thanks Chielo Zimmerman
+
+[AWS|Glacier]
+  Fix description header not being passed through Fog.escape. thanks Frederick Cheung
+
+[Brightbox]
+  Change code to return Single user. thanks Hemant Kumar
+  Adds ApiClient Model. thanks Hemant Kumar
+  Add identifier to get_account method. thanks Hemant Kumar
+  Reuses connection for image selection. thanks Paul Thornthwaite
+  Fixes cloud IP options default. thanks Paul Thornthwaite
+  Deprecates overloaded requests. thanks Paul Thornthwaite
+  Standardises update_firewall_rule. thanks Paul Thornthwaite
+  Deprecates old account update request. thanks Paul Thornthwaite
+  Use correct request to update account. thanks Paul Thornthwaite
+  Brightbox tests should select the smallest official image. thanks Steve Smith
+  Allows authentication as user. thanks Steve Smith
+  Allow users to lists all accounts associated with the current credentials. thanks Steve Smith
+  add support for User Applications. thanks Steve Smith
+
+[HP|Storage]
+  remove debug output. thanks geemus
+
+[Ninefold|Storage]
+  Use Atmos in Ninefold storage. thanks Timur Alperovich
+
+[aws|auto_scaling]
+  update display_*_types. thanks Nick Osborn
+  Fix documentation URL. thanks Nick Osborn
+  support termination policies. thanks Nick Osborn
+  correct DefaultCooldown in mocks. thanks Nick Osborn
+  documentation tinkering. thanks Nick Osborn
+  support ForceDelete for delete_auto_scaling_group. thanks Nick Osborn
+  better tag handling. thanks Nick Osborn
+  DRY out ARNs in mocks. thanks Nick Osborn
+  document Tags option to create_auto_scaling_group. thanks Nick Osborn
+  fix AutoScalingGroupName in mock. thanks Nick Osborn
+  expose delete_notification_configuration request. thanks Nick Osborn
+  improve describe_*_types test. thanks Nick Osborn
+  improve notification configurations. thanks Nick Osborn
+  s/data/self.data/ in mocks. thanks Nick Osborn
+  mark describe_*_types requests as idempotent. thanks Nick Osborn
+  tags support. thanks Nick Osborn
+  expose termination policies in group model. thanks Nick Osborn
+
+[aws|autoscaling]
+  fix casting availability_zones to array in create_auto_scaling_group mock. thanks geemus
+  mark problematic auto_scaling mocked tests as pending     see also #1183. thanks geemus
+
+[aws|cdn]
+  cover AWS CDN with some non-exhaustive tests. thanks Brice Figureau
+  Implements AWS CDN get_invalidation request. thanks Brice Figureau
+  fix incorrect get_invalidation result. thanks Brice Figureau
+  add aws cdn tests for streaming distributions. thanks Brice Figureau
+  fix cdn documentation. thanks Brice Figureau
+  AWS CDN models. thanks Brice Figureau
+  add request mock support for AWS Cloudfront. thanks Brice Figureau
+  fix up failing mocked tests around invalidations. thanks geemus
+
+[aws|cloud_watch]
+  Add instrumentation support. thanks Michael Hale
+
+[aws|ec2]
+  describe_availability_zones parser handles nested <item> tags. thanks Aaron Suggs
+
+[aws|rds]
+  add region and owner_id as RDS connection attributes. thanks Benton Roberts
+  add request definitions for RDS tagging and increment RDS API version. thanks Benton Roberts
+  add tests for RDS tagging requests. thanks Benton Roberts
+  add tagging methods to RDS server model. thanks Benton Roberts
+  add tagging tests for RDS server model. thanks Benton Roberts
+  store mocked RDS instance tags in connection object. thanks Benton Roberts
+  FIX non-1.8-compliant syntax bug. thanks Benton Roberts
+
+[misc]
+  modified create function to include options. changed "diskConfig" to "OS-DCF:diskConfig" to allow disk configuration to be properly set. thanks Alex Dunn
+  Removed options attribute and used the already existing disk_config attribute instead. Passed in options hash to create_server method with disk_config attribute unless nil. thanks Alex Dunn
+  Replace nil return value with private IP, implementation as in public_ip_address method. thanks Andrew Taylor
+  Change the metadata method to support amazon tags such as x-amz-website-redirect-location. thanks Arthur Gunawan
+  Fix issue #1245 - mock register_image fails with block device mapping. thanks Brice Figureau
+  Added ninefold load balancers. thanks Carl Woodward
+  Added other commands for load balancers. thanks Carl Woodward
+  Fix create load balancer test. thanks Carl Woodward
+  Add assign list to load balancer rules and update load balancer rule for     Ninefold. thanks Carl Woodward
+  Add remove from load balancer test. thanks Carl Woodward
+  Move ssh private_key, public_key, username to Server model to reduce duplication. thanks Carlos Sanchez
+  Joyent server creation should not wait for server to be ready. thanks Carlos Sanchez
+  Added ParameterValue to engine_defaults_parser. thanks Curtis Stewart
+  Added outputs 'Description' field to DescribeStacks parser. thanks Curtis Stewart
+  Make region available to mock. thanks Edward Muller
+  Added OpenStack::Server#created and #updated. thanks Eric Hodel
+  Use :default from tests/.fog for test credentials. thanks Eric Hodel
+  Only run mocked tests by default. thanks Eric Hodel
+  Tested handling of Openstack server created and updated times. thanks Eric Hodel
+  create image now supports block device mapping. thanks Eric Stonfer
+  create image extended to allow for EBS volume handling. thanks Eric Stonfer
+  fix indexed_param usage. thanks Eric Stonfer
+  forgot to commit some changes. thanks Eric Stonfer
+  when querying servers by icenter group, servers will return nil.  fixed this. thanks Eugene Howe
+  fixed bad request names. thanks Eugene Howe
+  correct the options checking in BlueBox create_block. thanks Josh Kalderimis
+  changed list nova servers request to get details. thanks Julio Feijo
+  Correct the handling of the power_on option. thanks Karan Misra
+  Added support for scheduler_hints in OpenStack. thanks Mariusz Pietrzyk
+  add force option to auto scaling group destroy method. thanks Michael Hale
+  use hash args. thanks Michael Hale
+  [AWS|cloud_watch]: fix list_metrics NextMarker should be NextToken. thanks Michael Hale
+  Fix to resolve "objectid is required for this operation" error message when calling public_url. thanks Michael Harrison
+  Fix to resolve "objectid is required for this operation" error message when calling public_url. thanks Michael Harrison
+  Return nil on public_url if the file isn't present on the cloud storage. thanks Michael Harrison
+  Added file existence check before file deletion attempt. thanks Michael Harrison
+  Rolled back deletion guard as some may be using the exception raised in their code. thanks Michael Harrison
+  Changed Atmos::FIle.public_url so an exception is thrown if the file doesn't exist on the cloud storage. thanks Michael Harrison
+  Changed Atmos::FIle.public_url so returns nil if the file doesn't exist on the cloud storage.  This brings the method in line with other storage implementations such as AWS and Rackspace. thanks Michael Harrison
+  Changed Atmos::FIle.public_url so checks for existence of the file on storage on every call to the method minimising the potential for a 404 error. thanks Michael Harrison
+  added documentation. thanks Nick Huanuca
+  ammend dest_folder disclaimer. thanks Nick Huanuca
+  fixed vm listing problem. thanks Ohad Levy
+  Allows tests to run against FOG_RC setting. thanks Paul Thornthwaite
+  Beginning implementation of RDS subnet groups. thanks Rusty Geldmacher
+  Changes RDS subnet attribute name from subnets to subnet_ids. thanks Rusty Geldmacher
+  allow port to be included in queue_url. thanks Sairam
+  Fixed typos in elasticache and rds describe_events.  Added better documentation of describe_events. thanks Sean Hart
+  Added test for describe_events.rb.  It is very simple, and I'm not familiar with Shindo, so may need some assistance expanding. thanks Sean Hart
+  Added parsing for Marker.  AWS limits response to 100 lines and gives you a marker to get the next batch with. thanks Sean Hart
+  Added missing header. thanks Stephen von Takach
+  Bumped mocked maximum value for provisioned iops. thanks Thom Mahoney
+  Ignore existing directory when creating on local storage. thanks Thomas Wright
+  Add config instructions to README. thanks Thomas Wright
+  Fix reference to config file. thanks Thomas Wright
+  expect public_key option instead of ssh_key on block create. thanks Trevor Bramble
+  Added usagePrice the hourly cost for a reserved instance. thanks Ulf Mansson
+  Added RDS describe_events. thanks Your Name
+  Created describe events for RDS. thanks Your Name
+  Update lib/fog/vsphere/requests/compute/vm_clone.rb. thanks endzyme
+  Update lib/fog/vsphere/requests/compute/vm_clone.rb. thanks endzyme
+  Update lib/fog/vsphere/requests/compute/vm_clone.rb. thanks endzyme
+
+[ninefold|compute]
+  update load balancer tests to pass hash parameters for backwards compatability. thanks geemus
+  mark before/after blocks as pending in mocked mode also. thanks geemus
+
+[openstack]
+  Authentication Mocks. thanks Nelvin Driz
+  Fix Failing Shindo Tests. thanks Nelvin Driz
+  Ensure String Username for Authentication. thanks Nelvin Driz
+  Changed volumes attributes of mocks from camelcase to     snakecase. thanks Philip Mark M. Deazeta
+  Updated mocks for quota, image, tenant and volumes. thanks Philip Mark M. Deazeta
+  Fixed mocks for failing shindo tests. thanks Philip Mark M. Deazeta
+  Updated 'image update' mocks. thanks Philip Mark M. Deazeta
+
+[openstack|compute]
+  Added auth_token_expiration. thanks Alfonso Juan Dillera
+  Fixed security groups typos. thanks Alfonso Juan Dillera
+  Fix Server Mocks and `find_by_id` method. thanks Nelvin Driz
+
+[openstack|identity]
+  Update for failing mock test. thanks Alvin Garcia
+  Update Identity Mocking Process. thanks Nelvin Driz
+  Update Fog Mocks on Authentication, User and Roles. thanks Nelvin Driz
+
+[openstack|image]
+  Added update_members function. thanks Alvin Garcia
+  Added updateable attributes. thanks Alvin Garcia
+  Added optional attributes to set on create image. thanks Alvin Garcia
+  Fixed update image and list public images mocks. thanks Alvin Garcia
+  Fix Hash Access on Mock of Create Image. thanks Nelvin Driz
+
+[openstack|network]
+  Add support for OpenStack Quantum. thanks Ferran Rodenas
+  Add filters to networks, ports and subnets. thanks Ferran Rodenas
+
+[rackspace|identity]
+  user should be alphanumeric. thanks geemus
+
+
 1.6.0 09/15/2012 4bd909557fd595a656ebd86a3d7c5849bd923fe1
 =========================================================
 

data/docs/cdn/index.markdown

@@ -37,21 +37,72 @@ Now you'll need to create a 'distribution' which represents a mapping from the C
 
     # parse the response for stuff you'll need later
     distribution_id   = data.body['Id']
-    caller_reference  = data.body['CallerReference']
+    caller_reference  = data.body['DistributionConfig']['CallerReference']
     etag              = data.headers['ETag']
     cdn_domain_name   = data.body['DomainName']
 
     # wait for the updates to propogate
     Fog.wait_for {
-      cdn.get_distribution(distribution_id).body['Status'] ## 'Deployed'
+      cdn.get_distribution(distribution_id).body['Status'] == 'Deployed'
     }
 
+Fog also supports models for the AWS CDN. The above code can also be written like this:
+
+    distribution = cdn.distributions.create( :custom_origin => {
+          'DNSName'               => 'www.example.com',
+          'OriginProtocolPolicy'  => 'match-viewer'
+        }, :enabled => true
+    })
+    
+    distribution.wait_for { ready? }
+
+Like other collections supported by Fog, it is also possible to browse the list of distributions:
+
+    cdn.distributions.all
+    
+Or get access to a distinct distribution by its identity:
+
+    cdn.distributions.get(distribution_id)
+
+
 ## Getting Served
 
 With the domain name from the distribution in hand you should now be ready to serve content from the edge.  All you need to do is start replacing urls like `http://www.example.com/stylesheets/foo.css` with `#{cdn_domain_name}/stylesheets/foo.css`. Just because you can do something doesn't always mean you should though.  Dynamic pages are not really well suited to CDN storage, since CDN content will be the same for every user.  Fortunately some of your most used content is a great fit.  By just switching over your images, javascripts and stylesheets you can have an impact for each and every one of your users.
 
 Congrats, your site is faster! By default the urls aren't very pretty, something like `http://d1xdx2sah5udd0.cloudfront.net/stylesheets/foo.css`.  Thankfully you can use CNAME config options to utilize something like `http://assets.example.com/stylesheets/foo.css`, if you are interested in learning more about this let me know in the comments.
 
+## Invalidating the CDN caches
+
+Sometimes, some part of the CDN cache needs to be invalidated because the origin changed and we need a faster propagation than waiting for the objects to expire by themselves. To do this, CloudFront supports creating <a href="http://docs.amazonwebservices.com/AmazonCloudFront/latest/APIReference/Actions_Invalidations.html">distributions invalidation</a>.
+
+An invalidation can be created with the following code:
+
+    # let's invalidate /test.html and /path/to/file.html
+    data = cdn.post_invalidation(distribution_id, [ "/test.html", "/path/to/file.html" ])
+    invalidation_id = data.body['Id']
+
+    Fog.wait_for { cdn.get_invalidation(distribution_id, invalidation_id).body['Status'] == 'Completed' }
+
+It is also possible to list past and current invalidation for a given distribution:
+
+    cdn.get_invalidation_list(distribution_id)
+
+The same can be written with Fog CDN model abstraction:
+
+    distribution = cdn.distributions.get(distribution_id)
+    
+    invalidation = distribution.invalidations.create(:paths => [ "/test.html", "/path/to/file.html" ])
+    invalidation.wait_for { ready? }
+    
+Listing invalidations is as simple as:
+
+    distribution.invalidations.all
+
+    # this returns only summarized invalidation
+    # to get access to the invalidations path:
+    distribution.invalidations.get(invalidation_id)
+
+
 ## Cleaning Up
 
 But, just in case you need to update things I'll run through how you can make changes. In my case I just want to clean up after myself, so I'll use the distribution_id and ETag from before to disable the distribution. We need to use the ETag as well because it provides a way to refer to different versions of the same distribution and ensures we are updating the version that we think we are.
@@ -75,8 +126,23 @@ But, just in case you need to update things I'll run through how you can make ch
 Now you just need to wait for the update to happen like before and once its disabled we can delete it:
 
     Fog.wait_for {
-      cdn.get_distribution(distribution_id).body['Status'] ## 'Deployed'
+      cdn.get_distribution(distribution_id).body['Status'] == 'Deployed'
     }
     cdn.delete_distribution(distribution_id, etag)
 
+This can also be written with CDN models as:
+
+    distribution = cdn.distributions.get(distribution_id)
+    
+    # make sure the distribution is deployed otherwise it can't be disabled
+    distribution.wait_for { ready? }
+    
+    distribution.disable
+    
+    # Disabling a distribution is a lengthy operation
+    distribution.wait_for { ready? }
+    
+    # and finally let's get rid of it
+    distribution.destroy
+
 Thats it, now go forth and speed up some load times!

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.6.0'
-  s.date              = '2012-09-15'
+  s.version           = '1.7.0'
+  s.date              = '2012-11-04'
   s.rubyforge_project = 'fog'
 
 

data/lib/fog.rb

@@ -3,7 +3,7 @@ require File.join(File.dirname(__FILE__), 'fog', 'core')
 module Fog
 
   unless const_defined?(:VERSION)
-    VERSION = '1.6.0'
+    VERSION = '1.7.0'
   end
 
 end
@@ -18,4 +18,5 @@ require 'fog/image'
 require 'fog/volume'
 require 'fog/cdn'
 require 'fog/dns'
+require 'fog/network'
 require 'fog/storage'

data/lib/fog/atmos/models/storage/file.rb

@@ -57,20 +57,22 @@ module Fog
 
         # By default, expire in 5 years
         def public_url(expires = (Time.now + 5 * 365 * 24 * 60 * 60))
-          requires :objectid
-          # TODO - more efficient method to get this?
-          storage = Fog::Storage.new(:provider => 'Atmos')
-          uri = URI::HTTP.build(:scheme => @prefix, :host => @storage_host, :port => @storage_port.to_i, :path => "/rest/objects/#{objectid}" )
-          Fog::Storage.new(:provider => 'Atmos').uid
-
-          sb = "GET\n"
-          sb += uri.path.downcase + "\n"
-          sb += storage.uid + "\n"
-          sb += String(expires.to_i())
-
-          signature = storage.sign( sb )
-          uri.query = "uid=#{CGI::escape(storage.uid)}&expires=#{expires.to_i()}&signature=#{CGI::escape(signature)}"
-          uri.to_s
+          file = directory.files.head(key)
+          self.objectid = if file.present? then file.attributes['x-emc-meta'].scan(/objectid=(\w+),/).flatten[0] else nil end
+          if self.objectid.present?
+            uri = URI::HTTP.build(:scheme => connection.ssl? ? "http" : "https" , :host => connection.host, :port => connection.port.to_i, :path => "/rest/objects/#{self.objectid}" )
+
+            sb = "GET\n"
+            sb += uri.path.downcase + "\n"
+            sb += connection.uid + "\n"
+            sb += String(expires.to_i())
+
+            signature = connection.sign( sb )
+            uri.query = "uid=#{CGI::escape(connection.uid)}&expires=#{expires.to_i()}&signature=#{CGI::escape(signature)}"
+            uri.to_s
+          else
+            nil
+          end
         end
 
         def save(options = {})

data/lib/fog/aws/auto_scaling.rb

@@ -15,25 +15,32 @@ module Fog
       request_path 'fog/aws/requests/auto_scaling'
       request :create_auto_scaling_group
       request :create_launch_configuration
+      request :create_or_update_tags
       request :delete_auto_scaling_group
       request :delete_launch_configuration
+      request :delete_notification_configuration
       request :delete_policy
       request :delete_scheduled_action
+      request :delete_tags
       request :describe_adjustment_types
       request :describe_auto_scaling_groups
       request :describe_auto_scaling_instances
+      request :describe_auto_scaling_notification_types
       request :describe_launch_configurations
       request :describe_metric_collection_types
+      request :describe_notification_configurations
       request :describe_policies
       request :describe_scaling_activities
       request :describe_scaling_process_types
       request :describe_scheduled_actions
+      request :describe_tags
+      request :describe_termination_policy_types
       request :disable_metrics_collection
       request :enable_metrics_collection
       request :execute_policy
+      request :put_notification_configuration
       request :put_scaling_policy
       request :put_scheduled_update_group_action
-      request :put_notification_configuration
       request :resume_processes
       request :set_desired_capacity
       request :set_instance_health
@@ -55,6 +62,9 @@ module Fog
 
       class Real
         include Fog::AWS::CredentialFetcher::ConnectionMethods
+
+        attr_accessor :region
+
         # Initialize connection to AutoScaling
         #
         # ==== Notes
@@ -72,6 +82,7 @@ module Fog
         #
         # ==== Returns
         # * AutoScaling object with connection to AWS.
+
         def initialize(options={})
           require 'fog/core/parser'
 
@@ -82,8 +93,10 @@ module Fog
 
           @instrumentor           = options[:instrumentor]
           @instrumentor_name      = options[:instrumentor_name] || 'fog.aws.auto_scaling'
-          
+
           options[:region] ||= 'us-east-1'
+          @region = options[:region]
+
           @host = options[:host] || "autoscaling.#{options[:region]}.amazonaws.com"
           @path       = options[:path]        || '/'
           @port       = options[:port]        || 443
@@ -159,9 +172,9 @@ module Fog
         end
 
         def setup_credentials(options)
-          @aws_access_key_id      = options[:aws_access_key_id]
-          @aws_secret_access_key  = options[:aws_secret_access_key]
-          @aws_session_token      = options[:aws_session_token]
+          @aws_access_key_id         = options[:aws_access_key_id]
+          @aws_secret_access_key     = options[:aws_secret_access_key]
+          @aws_session_token         = options[:aws_session_token]
           @aws_credentials_expire_at = options[:aws_credentials_expire_at]
 
           @hmac       = Fog::HMAC.new('sha256', @aws_secret_access_key)
@@ -170,9 +183,13 @@ module Fog
 
 
       class Mock
+        include Fog::AWS::CredentialFetcher::ConnectionMethods
+
+        attr_accessor :region
 
         def self.data
           @data ||= Hash.new do |hash, region|
+            owner_id = Fog::AWS::Mock.owner_id
             hash[region] = Hash.new do |region_hash, key|
               region_hash[key] = {
                 :adjustment_types => [
@@ -182,10 +199,15 @@ module Fog
                 ],
                 :auto_scaling_groups => {},
                 :scaling_policies => {},
-                :health_states => ['Healthy', 'Unhealthy'],
+                :health_states => [
+                  'Healthy',
+                  'Unhealthy'
+                ],
                 :launch_configurations => {},
                 :metric_collection_types => {
-                  :granularities => [ '1Minute' ],
+                  :granularities => [
+                    '1Minute'
+                  ],
                   :metrics => [
                     'GroupMinSize',
                     'GroupMaxSize',
@@ -194,16 +216,33 @@ module Fog
                     'GroupPendingInstances',
                     'GroupTerminatingInstances',
                     'GroupTotalInstances'
-                  ],
+                  ]
                 },
+                :notification_configurations => {},
+                :notification_types => [
+                  'autoscaling:EC2_INSTANCE_LAUNCH',
+                  'autoscaling:EC2_INSTANCE_LAUNCH_ERROR',
+                  'autoscaling:EC2_INSTANCE_TERMINATE',
+                  'autoscaling:EC2_INSTANCE_TERMINATE_ERROR',
+                  'autoscaling:TEST_NOTIFICATION'
+                ],
+                :owner_id => owner_id,
                 :process_types => [
                   'AZRebalance',
+                  'AddToLoadBalancer',
                   'AlarmNotification',
                   'HealthCheck',
                   'Launch',
                   'ReplaceUnhealthy',
                   'ScheduledActions',
                   'Terminate'
+                ],
+                :termination_policy_types => [
+                  'ClosestToNextInstanceHour',
+                  'Default',
+                  'NewestInstance',
+                  'OldestInstance',
+                  'OldestLaunchConfiguration'
                 ]
               }
             end
@@ -222,19 +261,22 @@ module Fog
           unless ['ap-northeast-1', 'ap-southeast-1', 'eu-west-1', 'sa-east-1', 'us-east-1', 'us-west-1', 'us-west-2'].include?(@region)
             raise ArgumentError, "Unknown region: #{@region.inspect}"
           end
-
         end
 
-        def setup_credentials(options)
-          @aws_access_key_id      = options[:aws_access_key_id]
+        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 setup_credentials(options)
+          @aws_access_key_id = options[:aws_access_key_id]
         end
 
       end