fog-maestrodev 1.7.0.20121114190951 → 1.8.0.20130109172219

data/lib/fog/aws/elb.rb

@@ -81,7 +81,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', 'us-west-2'].include?(@region)
+          unless ['ap-northeast-1', 'ap-southeast-1', 'ap-southeast-2', 'eu-west-1', 'us-east-1', 'us-west-1', 'us-west-2'].include?(@region)
             raise ArgumentError, "Unknown region: #{@region.inspect}"
           end
         end

data/lib/fog/aws/glacier.rb

@@ -169,4 +169,4 @@ module Fog
       end
     end
   end
-end
+end

data/lib/fog/aws/iam.rb

@@ -89,6 +89,7 @@ module Fog
               :users => Hash.new do |uhash, ukey|
                 uhash[ukey] = {
                   :user_id     => Fog::AWS::Mock.key_id,
+                  :path        => '/',
                   :arn         => "arn:aws:iam::#{Fog::AWS::Mock.owner_id}:user/#{ukey}",
                   :access_keys => [],
                   :policies    => {}

data/lib/fog/aws/models/auto_scaling/activities.rb

@@ -11,7 +11,7 @@ module Fog
           data = []
           next_token = nil
           loop do
-            result = connection.describe_scaling_activities('NextToken' => next_token).body['DescribeScalingActivitiesResult']
+            result = service.describe_scaling_activities('NextToken' => next_token).body['DescribeScalingActivitiesResult']
             data += result['Activities']
             next_token = result['NextToken']
             break if next_token.nil?
@@ -20,7 +20,7 @@ module Fog
         end
 
         def get(identity)
-          data = connection.describe_scaling_activities('ActivityId' => identity).body['DescribeScalingActivitiesResult']['Activities'].first
+          data = service.describe_scaling_activities('ActivityId' => identity).body['DescribeScalingActivitiesResult']['Activities'].first
           new(data) unless data.nil?
         end
 

data/lib/fog/aws/models/auto_scaling/activity.rb

@@ -16,7 +16,7 @@ module Fog
         attribute :status_message,          :aliases => 'StatusMessage'
 
         def group
-          connection.groups.get(attributes['AutoScalingGroupName'])
+          service.groups.get(attributes['AutoScalingGroupName'])
         end
 
         def save

data/lib/fog/aws/models/auto_scaling/configuration.rb

@@ -41,7 +41,7 @@ module Fog
 
           options = Hash[self.class.aliases.map { |key, value| [key, send(value)] }]
           options.delete_if { |key, value| value.nil? }
-          connection.create_launch_configuration(image_id, instance_type, id, options) #, listeners.map{|l| l.to_params})
+          service.create_launch_configuration(image_id, instance_type, id, options) #, listeners.map{|l| l.to_params})
 
           # reload instead of merge attributes b/c some attrs (like HealthCheck)
           # may be set, but only the DNS name is returned in the create_load_balance
@@ -56,7 +56,7 @@ module Fog
 
         def destroy
           requires :id
-          connection.delete_launch_configuration(id)
+          service.delete_launch_configuration(id)
         end
 
       end

data/lib/fog/aws/models/auto_scaling/configurations.rb

@@ -16,7 +16,7 @@ module Fog
           data = []
           next_token = nil
           loop do
-            result = connection.describe_launch_configurations('NextToken' => next_token).body['DescribeLaunchConfigurationsResult']
+            result = service.describe_launch_configurations('NextToken' => next_token).body['DescribeLaunchConfigurationsResult']
             data += result['LaunchConfigurations']
             next_token = result['NextToken']
             break if next_token.nil?
@@ -25,7 +25,7 @@ module Fog
         end
 
         def get(identity)
-          data = connection.describe_launch_configurations('LaunchConfigurationNames' => identity).body['DescribeLaunchConfigurationsResult']['LaunchConfigurations'].first
+          data = service.describe_launch_configurations('LaunchConfigurationNames' => identity).body['DescribeLaunchConfigurationsResult']['LaunchConfigurations'].first
 	  new(data) unless data.nil?
         end
 

data/lib/fog/aws/models/auto_scaling/group.rb

@@ -45,37 +45,37 @@ module Fog
           data = []
           next_token = nil
           loop do
-            result = connection.describe_scaling_activities('AutoScalingGroupName' => id, 'NextToken' => next_token).body['DescribeScalingActivitiesResult']
+            result = service.describe_scaling_activities('AutoScalingGroupName' => id, 'NextToken' => next_token).body['DescribeScalingActivitiesResult']
             data += result['Activities']
             next_token = result['NextToken']
             break if next_token.nil?
           end
           Fog::AWS::AutoScaling::Activities.new({
             :data => data,
-            :connection => connection,
+            :service => service,
             #:load_balancer => self
           })
         end
 
         def configuration
           requires :launch_configuration_name
-          connection.configurations.get(launch_configuration_name)
+          service.configurations.get(launch_configuration_name)
         end
 
         def disable_metrics_collection(metrics = {})
           requires :id
-          connection.disable_metrics_collection(id, 'Metrics' => metrics)
+          service.disable_metrics_collection(id, 'Metrics' => metrics)
           reload
         end
 
         def enable_metrics_collection(granularity = '1Minute', metrics = {})
           requires :id
-          connection.enable_metrics_collection(id, granularity, 'Metrics' => metrics)
+          service.enable_metrics_collection(id, granularity, 'Metrics' => metrics)
           reload
         end
 
         def instances
-          Fog::AWS::AutoScaling::Instances.new(:connection => connection).load(attributes[:instances])
+          Fog::AWS::AutoScaling::Instances.new(:service => service).load(attributes[:instances])
         end
 
         def instances_in_service
@@ -88,13 +88,13 @@ module Fog
 
         def resume_processes(processes = [])
           requires :id
-          connection.resume_processes(id, 'ScalingProcesses' => processes)
+          service.resume_processes(id, 'ScalingProcesses' => processes)
           reload
         end
 
         def suspend_processes(processes = [])
           requires :id
-          connection.suspend_processes(id, 'ScalingProcesses' => processes)
+          service.suspend_processes(id, 'ScalingProcesses' => processes)
           reload
         end
 
@@ -112,7 +112,7 @@ module Fog
           requires :max_size
           requires :min_size
 
-          connection.create_auto_scaling_group(id, availability_zones, launch_configuration_name, max_size, min_size, options)
+          service.create_auto_scaling_group(id, availability_zones, launch_configuration_name, max_size, min_size, options)
           reload
         end
 
@@ -125,14 +125,14 @@ module Fog
           requires :id
 
           opts = {}
-          opts.merge({'ForceDelete' => true}) if options[:force]
-          
-          connection.delete_auto_scaling_group(id, opts)
+          opts.merge!({'ForceDelete' => true}) if options[:force]
+
+          service.delete_auto_scaling_group(id, opts)
         end
 
         def update
           requires :id
-          connection.update_auto_scaling_group(id, options)
+          service.update_auto_scaling_group(id, options)
           reload
         end
 

data/lib/fog/aws/models/auto_scaling/groups.rb

@@ -16,7 +16,7 @@ module Fog
           data = []
           next_token = nil
           loop do
-            result = connection.describe_auto_scaling_groups('NextToken' => next_token).body['DescribeAutoScalingGroupsResult']
+            result = service.describe_auto_scaling_groups('NextToken' => next_token).body['DescribeAutoScalingGroupsResult']
             data += result['AutoScalingGroups']
             next_token = result['NextToken']
             break if next_token.nil?
@@ -25,7 +25,7 @@ module Fog
         end
 
         def get(identity)
-          data = connection.describe_auto_scaling_groups('AutoScalingGroupNames' => identity).body['DescribeAutoScalingGroupsResult']['AutoScalingGroups'].first
+          data = service.describe_auto_scaling_groups('AutoScalingGroupNames' => identity).body['DescribeAutoScalingGroupsResult']['AutoScalingGroups'].first
           new(data) unless data.nil?
         end
 

data/lib/fog/aws/models/auto_scaling/instance.rb

@@ -17,22 +17,22 @@ module Fog
         end
 
         def group
-          connection.groups.get(attributes['AutoScalingGroupName'])
+          service.groups.get(attributes['AutoScalingGroupName'])
         end
 
         def configuration
-          connection.configurations.get(attributes['LaunchConfigurationName'])
+          service.configurations.get(attributes['LaunchConfigurationName'])
         end
 
         def set_health(health_status, options)
           requires :id
-          connection.set_instance_health(health_status, id, options)
+          service.set_instance_health(health_status, id, options)
           reload
         end
 
         def terminate(should_decrement_desired_capacity)
           requires :id
-          connection.terminate_instance_in_auto_scaling_group(id, should_decrement_desired_capacity)
+          service.terminate_instance_in_auto_scaling_group(id, should_decrement_desired_capacity)
           reload
         end
 
@@ -51,7 +51,7 @@ module Fog
 
         #def destroy
         #  requires :id
-        #  connection.delete_auto_scaling_group(id)
+        #  service.delete_auto_scaling_group(id)
         #end
 
       end

data/lib/fog/aws/models/auto_scaling/instances.rb

@@ -11,7 +11,7 @@ module Fog
           data = []
           next_token = nil
           loop do
-            result = connection.describe_auto_scaling_instances('NextToken' => next_token).body['DescribeAutoScalingInstancesResult']
+            result = service.describe_auto_scaling_instances('NextToken' => next_token).body['DescribeAutoScalingInstancesResult']
             data += result['AutoScalingInstances']
             next_token = result['NextToken']
             break if next_token.nil?
@@ -20,7 +20,7 @@ module Fog
         end
 
         def get(identity)
-          data = connection.describe_auto_scaling_instances('InstanceIds' => identity).body['DescribeAutoScalingInstancesResult']['AutoScalingInstances'].first
+          data = service.describe_auto_scaling_instances('InstanceIds' => identity).body['DescribeAutoScalingInstancesResult']['AutoScalingInstances'].first
           new(data) unless data.nil?
         end
 

data/lib/fog/aws/models/auto_scaling/policies.rb

@@ -15,7 +15,7 @@ module Fog
           data = []
           next_token = nil
           loop do
-            result = connection.describe_policies('NextToken' => next_token).body['DescribePoliciesResult']
+            result = service.describe_policies('NextToken' => next_token).body['DescribePoliciesResult']
             data += result['ScalingPolicies']
             next_token = result['NextToken']
             break if next_token.nil?
@@ -24,7 +24,7 @@ module Fog
         end
 
         def get(identity, auto_scaling_group = nil)
-          data = connection.describe_policies('PolicyNames' => identity, 'AutoScalingGroupName' => auto_scaling_group).body['DescribePoliciesResult']['ScalingPolicies'].first
+          data = service.describe_policies('PolicyNames' => identity, 'AutoScalingGroupName' => auto_scaling_group).body['DescribePoliciesResult']['ScalingPolicies'].first
           new(data) unless data.nil?
         end
       end

data/lib/fog/aws/models/auto_scaling/policy.rb

@@ -31,14 +31,14 @@ module Fog
           options = Hash[self.class.aliases.map { |key, value| [key, send(value)] }]
           options.delete_if { |key, value| value.nil? }
 
-          connection.put_scaling_policy(adjustment_type, auto_scaling_group_name, id, scaling_adjustment, options)
+          service.put_scaling_policy(adjustment_type, auto_scaling_group_name, id, scaling_adjustment, options)
           reload
         end
 
         def destroy
           requires :id
           requires :auto_scaling_group_name
-          connection.delete_policy(auto_scaling_group_name, id)
+          service.delete_policy(auto_scaling_group_name, id)
         end
       end
     end

data/lib/fog/aws/models/beanstalk/application.rb

@@ -18,27 +18,27 @@ module Fog
 
         def environments
           requires :name
-          connection.environments.all({'ApplicationName' => name})
+          service.environments.all({'ApplicationName' => name})
         end
 
         def events
           requires :name
-          connection.events.all({'ApplicationName' => name})
+          service.events.all({'ApplicationName' => name})
         end
 
         def templates
           requires :name
-          connection.templates.all({'ApplicationName' => name})
+          service.templates.all({'ApplicationName' => name})
         end
 
         def versions
           requires :name
-          connection.versions.all({'ApplicationName' => name})
+          service.versions.all({'ApplicationName' => name})
         end
 
         def destroy
           requires :name
-          connection.delete_application(name)
+          service.delete_application(name)
           true
         end
 
@@ -50,7 +50,7 @@ module Fog
           }
           options['Description'] = description unless description.nil?
 
-          data = connection.create_application(options).body['CreateApplicationResult']['Application']
+          data = service.create_application(options).body['CreateApplicationResult']['Application']
           merge_attributes(data)
           true
         end
@@ -59,4 +59,4 @@ module Fog
 
     end
   end
-end
+end

data/lib/fog/aws/models/beanstalk/applications.rb

@@ -9,12 +9,12 @@ module Fog
         model Fog::AWS::ElasticBeanstalk::Application
 
         def all(application_names=[])
-          data = connection.describe_applications(application_names).body['DescribeApplicationsResult']['Applications']
+          data = service.describe_applications(application_names).body['DescribeApplicationsResult']['Applications']
           load(data) # data is an array of attribute hashes
         end
 
         def get(application_name)
-          if data = connection.describe_applications([application_name]).body['DescribeApplicationsResult']['Applications'].first
+          if data = service.describe_applications([application_name]).body['DescribeApplicationsResult']['Applications'].first
             new(data)
           end
         end

data/lib/fog/aws/models/beanstalk/environment.rb

@@ -40,7 +40,7 @@ module Fog
         # Returns the current live resources for this environment
         def live_resources
           requires :id
-          data = connection.describe_environment_resources({'EnvironmentId' => id}).body['DescribeEnvironmentResourcesResult']['EnvironmentResources']
+          data = service.describe_environment_resources({'EnvironmentId' => id}).body['DescribeEnvironmentResourcesResult']['EnvironmentResources']
           data.delete('EnvironmentName') # Delete the environment name from the result, only return actual resources
           data
         end
@@ -54,26 +54,26 @@ module Fog
         # Return events related to this version
         def events
           requires :id
-          connection.events.all({'EnvironmentId' => id})
+          service.events.all({'EnvironmentId' => id})
         end
 
         # Restarts the app servers in this environment
         def restart_app_server
           requires :id
-          connection.restart_app_server({'EnvironmentId' => id})
+          service.restart_app_server({'EnvironmentId' => id})
           reload
         end
 
         # Rebuilds the environment
         def rebuild
           requires :id
-          connection.rebuild_environment({'EnvironmentId' => id})
+          service.rebuild_environment({'EnvironmentId' => id})
           reload
         end
 
         def swap_cnames(source)
           requires :name
-          connection.swap_environment_cnames({
+          service.swap_environment_cnames({
               'SourceEnvironmentName' => source.name,
               'DestinationEnvironmentName' => name
                                              })
@@ -84,7 +84,7 @@ module Fog
         # Return the version object for this environment
         def version
           requires :application_name, :version_label
-          connection.versions.get(application_name, version_label)
+          service.versions.get(application_name, version_label)
         end
 
         # Update the running version of this environment
@@ -102,7 +102,7 @@ module Fog
             raise "Version label not specified."
           end
 
-          data = connection.update_environment({
+          data = service.update_environment({
               'EnvironmentId' => id,
               'VersionLabel' => new_version_label
                                         }).body['UpdateEnvironmentResult']
@@ -112,7 +112,7 @@ module Fog
 
         def destroy
           requires :id
-          connection.terminate_environment({'EnvironmentId' => id})
+          service.terminate_environment({'EnvironmentId' => id})
           true
         end
 
@@ -133,7 +133,7 @@ module Fog
           }
           options.delete_if {|key, value| value.nil?}
 
-          data = connection.create_environment(options).body['CreateEnvironmentResult']
+          data = service.create_environment(options).body['CreateEnvironmentResult']
           merge_attributes(data)
           true
         end
@@ -142,4 +142,4 @@ module Fog
 
     end
   end
-end
+end

data/lib/fog/aws/models/beanstalk/environments.rb

@@ -9,7 +9,7 @@ module Fog
         model Fog::AWS::ElasticBeanstalk::Environment
 
         def all(options={})
-          data = connection.describe_environments(options).body['DescribeEnvironmentsResult']['Environments']
+          data = service.describe_environments(options).body['DescribeEnvironmentsResult']['Environments']
           load(data) # data is an array of attribute hashes
         end
 
@@ -18,7 +18,7 @@ module Fog
         def get(environment_name)
           options = { 'EnvironmentNames' => [environment_name] }
 
-          if data = connection.describe_environments(options).body['DescribeEnvironmentsResult']['Environments'].first
+          if data = service.describe_environments(options).body['DescribeEnvironmentsResult']['Environments'].first
             new(data)
           end
         end