fog 1.8.0 → 1.9.0

data/lib/fog/aws/models/elasticache/parameter_groups.rb

@@ -10,13 +10,13 @@ module Fog
 
         def all
           load(
-            connection.describe_cache_parameter_groups.body['CacheParameterGroups']
+            service.describe_cache_parameter_groups.body['CacheParameterGroups']
           )
         end
 
         def get(identity)
           new(
-            connection.describe_cache_parameter_groups(
+            service.describe_cache_parameter_groups(
               identity
             ).body['CacheParameterGroups'].first
           )

data/lib/fog/aws/models/elasticache/security_group.rb

@@ -17,20 +17,20 @@ module Fog
 
         def destroy
           requires :id
-          connection.delete_cache_security_group(id)
+          service.delete_cache_security_group(id)
           true
         end
 
         def save
           requires :id
           requires :description
-          connection.create_cache_security_group(id, description)
+          service.create_cache_security_group(id, description)
         end
 
         def authorize_ec2_group(group_name, group_owner_id=owner_id)
           requires :id
           requires :owner_id if group_owner_id.nil?
-          data = connection.authorize_cache_security_group_ingress(
+          data = service.authorize_cache_security_group_ingress(
             id, group_name, group_owner_id
           )
           merge_attributes(data.body['CacheSecurityGroup'])
@@ -39,7 +39,7 @@ module Fog
         def revoke_ec2_group(group_name, group_owner_id=owner_id)
           requires :id
           requires :owner_id if group_owner_id.nil?
-          data = connection.revoke_cache_security_group_ingress(
+          data = service.revoke_cache_security_group_ingress(
             id, group_name, group_owner_id
           )
           merge_attributes(data.body['CacheSecurityGroup'])

data/lib/fog/aws/models/elasticache/security_groups.rb

@@ -10,13 +10,13 @@ module Fog
 
         def all
           load(
-            connection.describe_cache_security_groups.body['CacheSecurityGroups']
+            service.describe_cache_security_groups.body['CacheSecurityGroups']
           )
         end
 
         def get(identity)
           new(
-            connection.describe_cache_security_groups(
+            service.describe_cache_security_groups(
               identity
             ).body['CacheSecurityGroups'].first
           )

data/lib/fog/aws/models/elb/listener.rb

@@ -19,13 +19,13 @@ module Fog
 
         def save
           requires :load_balancer, :instance_port, :lb_port, :protocol, :instance_protocol
-          connection.create_load_balancer_listeners(load_balancer.id, [to_params])
+          service.create_load_balancer_listeners(load_balancer.id, [to_params])
           reload
         end
 
         def destroy
           requires :load_balancer, :lb_port
-          connection.delete_load_balancer_listeners(load_balancer.id, [lb_port])
+          service.delete_load_balancer_listeners(load_balancer.id, [lb_port])
           reload
         end
 

data/lib/fog/aws/models/elb/load_balancer.rb

@@ -21,7 +21,7 @@ module Fog
 
         def initialize(attributes={})
           if attributes[:subnet_ids] ||= attributes['Subnets']
-            attributes[:availability_zones] ||= attributes['AvailabilityZones'] 
+            attributes[:availability_zones] ||= attributes['AvailabilityZones']
           else
             attributes[:availability_zones] ||= attributes['AvailabilityZones']  || %w(us-east-1a us-east-1b us-east-1c us-east-1d)
           end
@@ -38,51 +38,51 @@ module Fog
 
         def register_instances(instances)
           requires :id
-          data = connection.register_instances_with_load_balancer(instances, id).body['RegisterInstancesWithLoadBalancerResult']
+          data = service.register_instances_with_load_balancer(instances, id).body['RegisterInstancesWithLoadBalancerResult']
           data['Instances'].map!{|h| h['InstanceId']}
           merge_attributes(data)
         end
 
         def deregister_instances(instances)
           requires :id
-          data = connection.deregister_instances_from_load_balancer(instances, id).body['DeregisterInstancesFromLoadBalancerResult']
+          data = service.deregister_instances_from_load_balancer(instances, id).body['DeregisterInstancesFromLoadBalancerResult']
           data['Instances'].map!{|h| h['InstanceId']}
           merge_attributes(data)
         end
 
         def enable_availability_zones(zones)
           requires :id
-          data = connection.enable_availability_zones_for_load_balancer(zones, id).body['EnableAvailabilityZonesForLoadBalancerResult']
+          data = service.enable_availability_zones_for_load_balancer(zones, id).body['EnableAvailabilityZonesForLoadBalancerResult']
           merge_attributes(data)
         end
 
         def disable_availability_zones(zones)
           requires :id
-          data = connection.disable_availability_zones_for_load_balancer(zones, id).body['DisableAvailabilityZonesForLoadBalancerResult']
+          data = service.disable_availability_zones_for_load_balancer(zones, id).body['DisableAvailabilityZonesForLoadBalancerResult']
           merge_attributes(data)
         end
-        
+
         def attach_subnets(subnet_ids)
           requires :id
-          data = connection.attach_load_balancer_to_subnets(subnet_ids, id).body['AttachLoadBalancerToSubnetsResult']
+          data = service.attach_load_balancer_to_subnets(subnet_ids, id).body['AttachLoadBalancerToSubnetsResult']
           merge_attributes(data)
         end
 
         def detach_subnets(subnet_ids)
           requires :id
-          data = connection.detach_load_balancer_from_subnets(subnet_ids, id).body['DetachLoadBalancerFromSubnetsResult']
+          data = service.detach_load_balancer_from_subnets(subnet_ids, id).body['DetachLoadBalancerFromSubnetsResult']
           merge_attributes(data)
         end
-        
+
         def apply_security_groups(security_groups)
           requires :id
-          data = connection.apply_security_groups_to_load_balancer(security_groups, id).body['ApplySecurityGroupsToLoadBalancerResult']
+          data = service.apply_security_groups_to_load_balancer(security_groups, id).body['ApplySecurityGroupsToLoadBalancerResult']
           merge_attributes(data)
         end
 
         def instance_health
           requires :id
-          @instance_health ||= connection.describe_instance_health(id).body['DescribeInstanceHealthResult']['InstanceStates']
+          @instance_health ||= service.describe_instance_health(id).body['DescribeInstanceHealthResult']['InstanceStates']
         end
 
         def instances_in_service
@@ -95,14 +95,14 @@ module Fog
 
         def configure_health_check(health_check)
           requires :id
-          data = connection.configure_health_check(id, health_check).body['ConfigureHealthCheckResult']['HealthCheck']
+          data = service.configure_health_check(id, health_check).body['ConfigureHealthCheckResult']['HealthCheck']
           merge_attributes(:health_check => data)
         end
 
         def listeners
           Fog::AWS::ELB::Listeners.new({
             :data => attributes['ListenerDescriptions'],
-            :connection => connection,
+            :service => service,
             :load_balancer => self
           })
         end
@@ -110,7 +110,7 @@ module Fog
         def policies
           Fog::AWS::ELB::Policies.new({
             :data => attributes['Policies'],
-            :connection => connection,
+            :service => service,
             :load_balancer => self
           })
         end
@@ -118,13 +118,13 @@ module Fog
         def set_listener_policy(port, policy_name)
           requires :id
           policy_name = [policy_name].flatten
-          connection.set_load_balancer_policies_of_listener(id, port, policy_name)
+          service.set_load_balancer_policies_of_listener(id, port, policy_name)
           reload
         end
 
         def set_listener_ssl_certificate(port, ssl_certificate_id)
           requires :id
-          connection.set_load_balancer_listener_ssl_certificate(id, port, ssl_certificate_id)
+          service.set_load_balancer_listener_ssl_certificate(id, port, ssl_certificate_id)
           reload
         end
 
@@ -144,8 +144,8 @@ module Fog
           # if both are specified, the availability zones have preference
           #requires :availability_zones
           if (availability_zones || subnet_ids)
-            connection.create_load_balancer(availability_zones, id, listeners.map{|l| l.to_params}) if availability_zones
-            connection.create_load_balancer(nil, id, listeners.map{|l| l.to_params}, {:subnet_ids => subnet_ids, :security_groups => security_groups, :scheme => scheme}) if subnet_ids && !availability_zones
+            service.create_load_balancer(availability_zones, id, listeners.map{|l| l.to_params}) if availability_zones
+            service.create_load_balancer(nil, id, listeners.map{|l| l.to_params}, {:subnet_ids => subnet_ids, :security_groups => security_groups, :scheme => scheme}) if subnet_ids && !availability_zones
           else
             throw Fog::Errors::Error.new("No availability zones or subnet ids specified")
           end
@@ -164,7 +164,7 @@ module Fog
 
         def destroy
           requires :id
-          connection.delete_load_balancer(id)
+          service.delete_load_balancer(id)
         end
 
       end

data/lib/fog/aws/models/elb/load_balancers.rb

@@ -15,7 +15,7 @@ module Fog
           marker = nil
           finished = false
           while !finished
-            data = connection.describe_load_balancers('Marker' => marker).body
+            data = service.describe_load_balancers('Marker' => marker).body
             result.concat(data['DescribeLoadBalancersResult']['LoadBalancerDescriptions'])
             marker = data['DescribeLoadBalancersResult']['NextMarker']
             finished = marker.nil?
@@ -25,7 +25,7 @@ module Fog
 
         def get(identity)
           if identity
-            data = connection.describe_load_balancers('LoadBalancerNames' => identity).body['DescribeLoadBalancersResult']['LoadBalancerDescriptions'].first
+            data = service.describe_load_balancers('LoadBalancerNames' => identity).body['DescribeLoadBalancersResult']['LoadBalancerDescriptions'].first
             new(data)
           end
         rescue Fog::AWS::ELB::NotFound

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

@@ -13,7 +13,7 @@ module Fog
 
         def save
           requires :id, :load_balancer, :cookie_stickiness
-          connection_method = nil
+          service_method = nil
           args = [load_balancer.id, id]
           case cookie_stickiness
           when :app
@@ -27,13 +27,13 @@ module Fog
             raise ArgumentError.new('cookie_stickiness must be :app or :lb')
           end
 
-          connection.send(method, *args)
+          service.send(method, *args)
           reload
         end
 
         def destroy
           requires :id, :load_balancer
-          connection.delete_load_balancer_policy(load_balancer.id, id)
+          service.delete_load_balancer_policy(load_balancer.id, id)
           reload
         end
 

data/lib/fog/aws/models/glacier/archive.rb

@@ -22,15 +22,15 @@ module Fog
           if multipart_chunk_size && body.respond_to?(:read)
             self.id = multipart_save
           else
-            data = connection.create_archive(vault.id, body, 'description' => description)
+            data = service.create_archive(vault.id, body, 'description' => description)
             self.id = data.headers['x-amz-archive-id']
           end
           true
         end
-        
+
         def destroy
           requires :id
-          connection.delete_archive(vault.id,id)
+          service.delete_archive(vault.id,id)
         end
 
         private
@@ -41,7 +41,7 @@ module Fog
 
         def multipart_save
           # Initiate the upload
-          res = connection.initiate_multipart_upload vault.id, multipart_chunk_size, 'description' => description
+          res = service.initiate_multipart_upload vault.id, multipart_chunk_size, 'description' => description
           upload_id = res.headers["x-amz-multipart-upload-id"]
 
           hash = Fog::AWS::Glacier::TreeHash.new
@@ -50,17 +50,17 @@ module Fog
           offset = 0
           while (chunk = body.read(multipart_chunk_size)) do
             part_hash = hash.add_part(chunk)
-            part_upload = connection.upload_part(vault.id, upload_id, chunk, offset, part_hash  )
+            part_upload = service.upload_part(vault.id, upload_id, chunk, offset, part_hash  )
             offset += chunk.bytesize
           end
 
         rescue
           # Abort the upload & reraise
-          connection.abort_multipart_upload(vault.id, upload_id) if upload_id
+          service.abort_multipart_upload(vault.id, upload_id) if upload_id
           raise
         else
           # Complete the upload
-          connection.complete_multipart_upload(vault.id, upload_id, offset, hash.hexdigest).headers['x-amz-archive-id']
+          service.complete_multipart_upload(vault.id, upload_id, offset, hash.hexdigest).headers['x-amz-archive-id']
         end
 
       end

data/lib/fog/aws/models/glacier/job.rb

@@ -35,7 +35,7 @@ module Fog
           requires :vault, :type
           specification = {'Type' => type, 'ArchiveId' => archive_id, 'Format' => format, 'Description' => description, 'SNSTopic' => sns_topic}.reject{|k,v| v.nil?}
 
-          data = connection.initiate_job(vault.id, specification)
+          data = service.initiate_job(vault.id, specification)
           self.id = data.headers['x-amz-job-id']
           reload
         end
@@ -51,7 +51,7 @@ module Fog
             options = options.merge :response_block => lambda {|chunk, remaining_bytes, total_bytes| io.write chunk}
           end
           options['Range'] = options.delete :range
-          connection.get_job_output(vault.id, id, options)
+          service.get_job_output(vault.id, id, options)
         end
 
         private

data/lib/fog/aws/models/glacier/jobs.rb

@@ -10,7 +10,7 @@ module Fog
         model Fog::AWS::Glacier::Job
         attribute :vault
         attribute :filters
-        
+
         def initialize(attributes)
           self.filters = {}
           super
@@ -21,12 +21,12 @@ module Fog
         # completed (true/false)
         def all(filters = self.filters)
           self.filters = filters
-          data = connection.list_jobs(vault.id, self.filters).body['JobList']
+          data = service.list_jobs(vault.id, self.filters).body['JobList']
           load(data)
         end
 
         def get(key)
-          data = connection.describe_job(vault.id, key).body
+          data = service.describe_job(vault.id, key).body
           new(data)
         rescue Excon::Errors::NotFound
           nil

data/lib/fog/aws/models/glacier/vault.rb

@@ -21,30 +21,30 @@ module Fog
         end
 
         def archives
-          @archives ||= Fog::AWS::Glacier::Archives.new(:vault => self, :connection => connection)
+          @archives ||= Fog::AWS::Glacier::Archives.new(:vault => self, :service => service)
         end
 
         def jobs(filters={})
-          Fog::AWS::Glacier::Jobs.new(:vault => self, :connection => connection, :filters => filters)
+          Fog::AWS::Glacier::Jobs.new(:vault => self, :service => service, :filters => filters)
         end
 
         def set_notification_configuration(topic, events)
-          connection.set_vault_notification_configuration(id, topic, events)
+          service.set_vault_notification_configuration(id, topic, events)
         end
 
         def delete_notification_configuration
-          connection.delete_vault_notification_configuration
+          service.delete_vault_notification_configuration
         end
-        
+
         def save
           requires :id
-          connection.create_vault(id)
+          service.create_vault(id)
           reload
         end
 
         def destroy
           requires :id
-          connection.delete_vault(id)
+          service.delete_vault(id)
         end
 
       end

data/lib/fog/aws/models/glacier/vaults.rb

@@ -10,12 +10,12 @@ module Fog
         model Fog::AWS::Glacier::Vault
 
         def all
-          data = connection.list_vaults.body['VaultList']
+          data = service.list_vaults.body['VaultList']
           load(data)
         end
 
         def get(key)
-          data = connection.describe_vault(key).body
+          data = service.describe_vault(key).body
           new(data)
         rescue Excon::Errors::NotFound
           nil

data/lib/fog/aws/models/iam/access_key.rb

@@ -10,29 +10,29 @@ module Fog
         attribute :username, :aliases => 'UserName'
         attribute :secret_access_key, :aliases => 'SecretAccessKey'
         attribute :status, :aliases => 'Status'
-        
+
         def save
           requires :username
 
-          data = connection.create_access_key('UserName'=> username).body["AccessKey"]
+          data = service.create_access_key('UserName'=> username).body["AccessKey"]
           merge_attributes(data)
           true
         end
-        
+
         def destroy
           requires :id
           requires :username
 
-          connection.delete_access_key(id,'UserName'=> username)
+          service.delete_access_key(id,'UserName'=> username)
           true
         end
-        
+
         def user
           requires :username
-          connection.users.get(username)
+          service.users.get(username)
         end
-        
+
       end
     end
   end
-end
+end

data/lib/fog/aws/models/iam/access_keys.rb

@@ -6,17 +6,17 @@ module Fog
     class IAM
 
       class AccessKeys < Fog::Collection
-    
+
         model Fog::AWS::IAM::AccessKey
-        
+
         def initialize(attributes = {})
           @username = attributes[:username]
           raise ArgumentError.new("Can't get an access_key's user without a username") unless @username
           super
         end
-        
-        def all 
-          data = connection.list_access_keys('UserName'=> @username).body['AccessKeys']
+
+        def all
+          data = service.list_access_keys('UserName'=> @username).body['AccessKeys']
           # AWS response doesn't contain the UserName, this injects it
           data.each {|access_key| access_key['UserName'] = @username }
           load(data)
@@ -25,7 +25,7 @@ module Fog
         def get(identity)
           self.all.select {|access_key| access_key.id == identity}.first
         end
-        
+
         def new(attributes = {})
           super({ :username => @username }.merge!(attributes))
         end
@@ -33,4 +33,4 @@ module Fog
       end
     end
   end
-end
+end