fog 1.8.0 → 1.9.0

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

@@ -6,39 +6,39 @@ module Fog
     class IAM
 
       class Policies < Fog::Collection
-                
+
         model Fog::AWS::IAM::Policy
-        
+
         def initialize(attributes = {})
           @username = attributes[:username]
           raise ArgumentError.new("Can't get a policy's user without a username") unless @username
           super
         end
-        
+
 
         def all
-          # AWS method get_user_policy only returns an array of policy names, this is kind of useless, 
+          # AWS method get_user_policy only returns an array of policy names, this is kind of useless,
           # that's why it has to loop through the list to get the details of each element. I don't like it because it makes this method slow
-          policy_names = connection.list_user_policies(@username).body['PolicyNames'] # it returns an array
+          policy_names = service.list_user_policies(@username).body['PolicyNames'] # it returns an array
           policies = []
           policy_names.each do |policy_name|
-            policies << connection.get_user_policy(policy_name,@username).body['Policy']
+            policies << service.get_user_policy(policy_name,@username).body['Policy']
           end
           load(policies) # data is an array of attribute hashes
         end
 
         def get(identity)
-          data = connection.get_user_policy(identity,@username).body['Policy']
+          data = service.get_user_policy(identity,@username).body['Policy']
           new(data) # data is an attribute hash
         rescue Fog::AWS::IAM::NotFound
           nil
         end
-        
+
         def new(attributes = {})
           super({ :username => @username }.merge!(attributes))
         end
-        
+
       end
     end
   end
-end
+end

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

@@ -9,31 +9,31 @@ module Fog
         identity  :id, :aliases => 'PolicyName'
         attribute :username, :aliases => 'UserName'
         attribute :document, :aliases => 'PolicyDocument'
-        
+
         def save
           requires :id
           requires :username
           requires :document
 
-          data = connection.put_user_policy(username, id, document).body
+          data = service.put_user_policy(username, id, document).body
           merge_attributes(data)
           true
         end
-        
+
         def destroy
           requires :id
           requires :username
 
-          connection.delete_user_policy(username, id)
+          service.delete_user_policy(username, id)
           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/user.rb

@@ -10,31 +10,31 @@ module Fog
         attribute :path, :aliases => 'Path'
         attribute :arn, :aliases => 'Arn'
         attribute :user_id, :aliases => 'UserId'
-        
+
         def save
           requires :id
-          data = connection.create_user(id, path || '/').body['User']
+          data = service.create_user(id, path || '/').body['User']
           merge_attributes(data)
           true
         end
-        
+
         def destroy
           requires :id
-          connection.delete_user(id)
+          service.delete_user(id)
           true
         end
-        
+
         def policies
           requires :id
-          connection.policies(:username => id)
+          service.policies(:username => id)
         end
-        
+
         def access_keys
           requires :id
-          connection.access_keys(:username => id)
+          service.access_keys(:username => id)
         end
-        
+
       end
     end
   end
-end
+end

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

@@ -14,13 +14,13 @@ module Fog
 
         def all(options = {})
           merge_attributes(options)
-          data = connection.list_users(options).body
+          data = service.list_users(options).body
           merge_attributes('IsTruncated' => data['IsTruncated'], 'Marker' => data['Marker'])
           load(data['Users']) # data is an array of attribute hashes
         end
 
         def get(identity)
-          data = connection.get_user(identity).body['User']
+          data = service.get_user(identity).body['User']
           new(data) # data is an attribute hash
         rescue Fog::AWS::IAM::NotFound
           nil

data/lib/fog/aws/models/rds/parameter.rb

@@ -3,7 +3,7 @@ require 'fog/core/model'
 module Fog
   module AWS
     class RDS
-      
+
       class Parameter < Fog::Model
 
         attribute  :name, :aliases => ['ParameterName']
@@ -14,7 +14,7 @@ module Fog
         attribute  :modifiable, :aliases => 'IsModifiable'
         attribute  :apply_type, :aliases => 'ApplyType'
         attribute  :value, :aliases => 'ParameterValue'
-        
+
       end
     end
   end

data/lib/fog/aws/models/rds/parameter_group.rb

@@ -3,34 +3,34 @@ require 'fog/core/model'
 module Fog
   module AWS
     class RDS
-      
+
       class ParameterGroup < Fog::Model
 
         identity  :id, :aliases => ['DBParameterGroupName', :name]
         attribute  :family, :aliases => 'DBParameterGroupFamily'
         attribute  :description, :aliases => 'Description'
-        
+
         def save
           requires :family
           requires :description
           requires :id
-          connection.create_db_parameter_group(id, family, description)
+          service.create_db_parameter_group(id, family, description)
         end
-        
+
         def modify(changes)
-          connection.modify_db_parameter_group id, changes.collect {|c| {'ParameterName' => c[:name], 'ParameterValue' => c[:value], 'ApplyMethod' => c[:apply_method]}}
+          service.modify_db_parameter_group id, changes.collect {|c| {'ParameterName' => c[:name], 'ParameterValue' => c[:value], 'ApplyMethod' => c[:apply_method]}}
         end
-        
+
         def destroy
           requires :id
-          connection.delete_db_parameter_group(id)
+          service.delete_db_parameter_group(id)
           true
         end
-        
+
         def parameters(filters={})
-          connection.parameters({:group => self}.merge(filters))
+          service.parameters({:group => self}.merge(filters))
         end
       end
     end
   end
-end
+end

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

@@ -10,12 +10,12 @@ module Fog
         model Fog::AWS::RDS::ParameterGroup
 
         def all
-          data = connection.describe_db_parameter_groups.body['DescribeDBParameterGroupsResult']['DBParameterGroups']
+          data = service.describe_db_parameter_groups.body['DescribeDBParameterGroupsResult']['DBParameterGroups']
           load(data) # data is an array of attribute hashes
         end
 
         def get(identity)
-          data = connection.describe_db_parameter_groups(identity).body['DescribeDBParameterGroupsResult']['DBParameterGroups'].first
+          data = service.describe_db_parameter_groups(identity).body['DescribeDBParameterGroupsResult']['DBParameterGroups'].first
           new(data) # data is an attribute hash
         rescue Fog::AWS::RDS::NotFound
           nil
@@ -24,4 +24,4 @@ module Fog
       end
     end
   end
-end
+end

data/lib/fog/aws/models/rds/parameters.rb

@@ -24,7 +24,7 @@ module Fog
           marker = nil
           finished = false
           while !finished
-            data = connection.describe_db_parameters(group.id, filters.merge(:marker => marker)).body
+            data = service.describe_db_parameters(group.id, filters.merge(:marker => marker)).body
             result.concat(data['DescribeDBParametersResult']['Parameters'])
             marker = data['DescribeDBParametersResult']['Marker']
             finished = marker.nil?
@@ -34,4 +34,4 @@ module Fog
       end
     end
   end
-end
+end

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

@@ -19,7 +19,7 @@ module Fog
 
         def destroy
           requires :id
-          connection.delete_db_security_group(id)
+          service.delete_db_security_group(id)
           true
         end
 
@@ -27,7 +27,7 @@ module Fog
           requires :id
           requires :description
 
-          data = connection.create_db_security_group(id, description).body['CreateDBSecurityGroupResult']['DBSecurityGroup']
+          data = service.create_db_security_group(id, description).body['CreateDBSecurityGroupResult']['DBSecurityGroup']
           merge_attributes(data)
           true
         end
@@ -55,7 +55,7 @@ module Fog
         end
 
         def authorize_ingress(opts)
-          data = connection.authorize_db_security_group_ingress(id, opts).body['AuthorizeDBSecurityGroupIngressResult']['DBSecurityGroup']
+          data = service.authorize_db_security_group_ingress(id, opts).body['AuthorizeDBSecurityGroupIngressResult']['DBSecurityGroup']
           merge_attributes(data)
         end
 
@@ -72,7 +72,7 @@ module Fog
         end
 
         def revoke_ingress(opts)
-          data = connection.revoke_db_security_group_ingress(id, opts).body['RevokeDBSecurityGroupIngressResult']['DBSecurityGroup']
+          data = service.revoke_db_security_group_ingress(id, opts).body['RevokeDBSecurityGroupIngressResult']['DBSecurityGroup']
           merge_attributes(data)
         end
 

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

@@ -20,14 +20,14 @@ module Fog
 
         def all(filters = filters)
           self.filters = filters
-          data = connection.describe_db_security_groups(filters).body['DescribeDBSecurityGroupsResult']['DBSecurityGroups']
+          data = service.describe_db_security_groups(filters).body['DescribeDBSecurityGroupsResult']['DBSecurityGroups']
           load(data) # data is an array of attribute hashes
         end
 
         # Example:
         # get('my_db_security_group') # => model for my_db_security_group
         def get(identity)
-          data = connection.describe_db_security_groups(identity).body['DescribeDBSecurityGroupsResult']['DBSecurityGroups'].first
+          data = service.describe_db_security_groups(identity).body['DescribeDBSecurityGroupsResult']['DBSecurityGroups'].first
           new(data) # data is an attribute hash
         rescue Fog::AWS::RDS::NotFound
           nil

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

@@ -36,8 +36,8 @@ module Fog
         def create_read_replica(replica_id, options={})
           options[:security_group_names] ||= options['DBSecurityGroups']
           params = self.class.new(options).attributes_to_params
-          connection.create_db_instance_read_replica(replica_id, id, params)
-          connection.servers.get(replica_id)
+          service.create_db_instance_read_replica(replica_id, id, params)
+          service.servers.get(replica_id)
         end
 
         def ready?
@@ -46,42 +46,42 @@ module Fog
 
         def destroy(snapshot_identifier=nil)
           requires :id
-          connection.delete_db_instance(id, snapshot_identifier, snapshot_identifier.nil?)
+          service.delete_db_instance(id, snapshot_identifier, snapshot_identifier.nil?)
           true
         end
 
         def reboot
-          connection.reboot_db_instance(id)
+          service.reboot_db_instance(id)
           true
         end
 
         def snapshots
           requires :id
-          connection.snapshots(:server => self)
+          service.snapshots(:server => self)
         end
 
         def tags
           requires :id
-          connection.list_tags_for_resource(id).
+          service.list_tags_for_resource(id).
             body['ListTagsForResourceResult']['TagList']
         end
 
         def add_tags(new_tags)
           requires :id
-          connection.add_tags_to_resource(id, new_tags)
+          service.add_tags_to_resource(id, new_tags)
           tags
         end
 
         def remove_tags(tag_keys)
           requires :id
-          connection.remove_tags_from_resource(id, tag_keys)
+          service.remove_tags_from_resource(id, tag_keys)
           tags
         end
 
         def modify(immediately, options)
           options[:security_group_names] ||= options['DBSecurityGroups']
           params = self.class.new(options).attributes_to_params
-          data = connection.modify_db_instance(id, immediately, params)
+          data = service.modify_db_instance(id, immediately, params)
           merge_attributes(data.body['ModifyDBInstanceResult']['DBInstance'])
           true
         end
@@ -94,7 +94,7 @@ module Fog
 
           self.flavor_id ||= 'db.m1.small'
 
-          data = connection.create_db_instance(id, attributes_to_params)
+          data = service.create_db_instance(id, attributes_to_params)
           merge_attributes(data.body['CreateDBInstanceResult']['DBInstance'])
           true
         end

data/lib/fog/aws/models/rds/servers.rb

@@ -10,12 +10,12 @@ module Fog
         model Fog::AWS::RDS::Server
 
         def all
-          data = connection.describe_db_instances.body['DescribeDBInstancesResult']['DBInstances']
+          data = service.describe_db_instances.body['DescribeDBInstancesResult']['DBInstances']
           load(data) # data is an array of attribute hashes
         end
 
         def get(identity)
-          data = connection.describe_db_instances(identity).body['DescribeDBInstancesResult']['DBInstances'].first
+          data = service.describe_db_instances(identity).body['DescribeDBInstancesResult']['DBInstances'].first
           new(data) # data is an attribute hash
         rescue Fog::AWS::RDS::NotFound
           nil
@@ -24,4 +24,4 @@ module Fog
       end
     end
   end
-end
+end

data/lib/fog/aws/models/rds/snapshot.rb

@@ -26,7 +26,7 @@ module Fog
         def destroy
           requires :id
 
-          connection.delete_db_snapshot(id)
+          service.delete_db_snapshot(id)
           true
         end
 
@@ -34,14 +34,14 @@ module Fog
           requires :instance_id
           requires :id
 
-          data = connection.create_db_snapshot(instance_id, id).body['CreateDBSnapshotResult']['DBSnapshot']
+          data = service.create_db_snapshot(instance_id, id).body['CreateDBSnapshotResult']['DBSnapshot']
           merge_attributes(data)
           true
         end
 
         def server
           requires :instance_id
-          connection.servers.get(instance_id)
+          service.servers.get(instance_id)
         end
 
       end

data/lib/fog/aws/models/rds/snapshots.rb

@@ -23,12 +23,12 @@ module Fog
 
         def all(filters = filters)
           self.filters = filters
-          data = connection.describe_db_snapshots(filters).body['DescribeDBSnapshotsResult']['DBSnapshots']
+          data = service.describe_db_snapshots(filters).body['DescribeDBSnapshotsResult']['DBSnapshots']
           load(data) # data is an array of attribute hashes
         end
 
         def get(identity)
-          data = connection.describe_db_snapshots(:snapshot_id => identity).body['DescribeDBSnapshotsResult']['DBSnapshots'].first
+          data = service.describe_db_snapshots(:snapshot_id => identity).body['DescribeDBSnapshotsResult']['DBSnapshots'].first
           new(data) # data is an attribute hash
         rescue Fog::AWS::RDS::NotFound
           nil
@@ -45,4 +45,4 @@ module Fog
       end
     end
   end
-end
+end

data/lib/fog/aws/models/rds/subnet_groups.rb

@@ -10,12 +10,12 @@ module Fog
         model Fog::AWS::RDS::SubnetGroup
 
         def all
-          data = connection.describe_db_subnet_groups.body['DescribeDBSubnetGroupsResult']['DBSubnetGroups']
+          data = service.describe_db_subnet_groups.body['DescribeDBSubnetGroupsResult']['DBSubnetGroups']
           load(data) # data is an array of attribute hashes
         end
 
         def get(identity)
-          data = connection.describe_db_subnet_groups(identity).body['DescribeDBSubnetGroupsResult']['DBSubnetGroups'].first
+          data = service.describe_db_subnet_groups(identity).body['DescribeDBSubnetGroupsResult']['DBSubnetGroups'].first
           new(data) # data is an attribute hash
         rescue Fog::AWS::RDS::NotFound
           nil