fog 1.3.1 → 1.4.0

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

@@ -0,0 +1,36 @@
+require 'fog/core/collection'
+require 'fog/aws/models/iam/access_key'
+
+module Fog
+  module AWS
+    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']
+          # AWS response doesn't contain the UserName, this injects it
+          data.each {|access_key| access_key['UserName'] = @username }
+          load(data)
+        end
+
+        def get(identity)
+          self.all.select {|access_key| access_key.id == identity}.first
+        end
+        
+        def new(attributes = {})
+          super({ :username => @username }.merge!(attributes))
+        end
+
+      end
+    end
+  end
+end

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

@@ -0,0 +1,44 @@
+require 'fog/core/collection'
+require 'fog/aws/models/iam/policy'
+
+module Fog
+  module AWS
+    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, 
+          # 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
+          policies = []
+          policy_names.each do |policy_name|
+            policies << connection.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']
+          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

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

@@ -0,0 +1,39 @@
+require 'fog/core/model'
+
+module Fog
+  module AWS
+    class IAM
+
+      class Policy < Fog::Model
+
+        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
+          merge_attributes(data)
+          true
+        end
+        
+        def destroy
+          requires :id
+          requires :username
+
+          connection.delete_user_policy(username, id)
+          true
+        end
+        
+        def user
+          requires :username
+          connection.users.get(username)
+        end
+        
+      end
+    end
+  end
+end

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

@@ -0,0 +1,40 @@
+require 'fog/core/model'
+
+module Fog
+  module AWS
+    class IAM
+
+      class User < Fog::Model
+
+        identity  :id, :aliases => 'UserName'
+        attribute :path, :aliases => 'Path'
+        attribute :arn, :aliases => 'Arn'
+        attribute :user_id, :aliases => 'UserId'
+        
+        def save
+          requires :id
+          data = connection.create_user(id).body['User']
+          merge_attributes(data)
+          true
+        end
+        
+        def destroy
+          requires :id
+          connection.delete_user(id)
+          true
+        end
+        
+        def policies
+          requires :id
+          connection.policies(:username => id)
+        end
+        
+        def access_keys
+          requires :id
+          connection.access_keys(:username => id)
+        end
+        
+      end
+    end
+  end
+end

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

@@ -0,0 +1,27 @@
+require 'fog/core/collection'
+require 'fog/aws/models/iam/user'
+
+module Fog
+  module AWS
+    class IAM
+
+      class Users < Fog::Collection
+
+        model Fog::AWS::IAM::User
+
+        def all
+          data = connection.list_users.body['Users']
+          load(data) # data is an array of attribute hashes
+        end
+
+        def get(identity)
+          data = connection.get_user(identity).body['User']
+          new(data) # data is an attribute hash
+        rescue Fog::AWS::IAM::NotFound
+          nil
+        end
+
+      end
+    end
+  end
+end

data/lib/fog/aws/models/storage/directory.rb

@@ -7,17 +7,23 @@ module Fog
     class AWS
 
       class Directory < Fog::Model
+        VALID_ACLS = ['private', 'public-read', 'public-read-write', 'authenticated-read']
+
+        # See http://docs.amazonwebservices.com/AmazonS3/latest/API/RESTBucketPUT.html
+        INVALID_LOCATIONS = ['us-east-1']
+
+        attr_reader :acl
 
         identity  :key,           :aliases => ['Name', 'name']
 
         attribute :creation_date, :aliases => 'CreationDate'
 
         def acl=(new_acl)
-          valid_acls = ['private', 'public-read', 'public-read-write', 'authenticated-read']
-          unless valid_acls.include?(new_acl)
-            raise ArgumentError.new("acl must be one of [#{valid_acls.join(', ')}]")
+          unless VALID_ACLS.include?(new_acl)
+            raise ArgumentError.new("acl must be one of [#{VALID_ACLS.join(', ')}]")
+          else
+            @acl = new_acl
           end
-          @acl = new_acl
         end
 
         def destroy
@@ -30,21 +36,19 @@ module Fog
 
         def location
           requires :key
-          data = connection.get_bucket_location(key)
-          data.body['LocationConstraint']
+          attributes[:location] || bucket_location || self.connection.region
         end
 
         def location=(new_location)
-          @location = new_location
+          if INVALID_LOCATIONS.include?(new_location)
+            raise ArgumentError, "location must not include any of #{INVALID_LOCATIONS.join(', ')}. See http://docs.amazonwebservices.com/AmazonS3/latest/API/RESTBucketPUT.html"
+          else
+            merge_attributes(:location => new_location)
+          end
         end
 
         def files
-          @files ||= begin
-            Fog::Storage::AWS::Files.new(
-              :directory    => self,
-              :connection   => connection
-            )
-          end
+          @files ||= Fog::Storage::AWS::Files.new(:directory => self, :connection => connection)
         end
 
         def payer
@@ -71,20 +75,11 @@ module Fog
         end
 
         def versions
-          @versions ||= begin
-            Fog::Storage::AWS::Versions.new(
-                :directory    => self,
-                :connection   => connection
-            )
-          end
+          @versions ||= Fog::Storage::AWS::Versions.new(:directory => self, :connection => connection)
         end
 
         def public=(new_public)
-          if new_public
-            @acl = 'public-read'
-          else
-            @acl = 'private'
-          end
+          self.acl = new_public ? 'public-read' : 'private'
           new_public
         end
 
@@ -103,15 +98,27 @@ module Fog
 
         def save
           requires :key
+
           options = {}
-          if @acl
-            options['x-amz-acl'] = @acl
+
+          options['x-amz-acl'] = acl if acl
+
+          if location = attributes[:location] || (self.connection.region != 'us-east-1' && self.connection.region)
+            options['LocationConstraint'] = location
           end
-          options['LocationConstraint'] = @location || self.connection.region
+
           connection.put_bucket(key, options)
+
           true
         end
 
+        private
+
+        def bucket_location
+          data = connection.get_bucket_location(key)
+          data.body['LocationConstraint']
+        end
+
       end
 
     end

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

@@ -141,7 +141,7 @@ module Fog
 
         def url(expires, options = {})
           requires :key
-          collection.get_https_url(key, expires, options)
+          collection.get_url(key, expires, options)
         end
 
         def versions

data/lib/fog/aws/models/storage/files.rb

@@ -78,6 +78,11 @@ module Fog
           end
         end
 
+        def get_url(key, expires, options = {})
+          requires :directory
+          connection.get_object_url(directory.key, key, expires, options)
+        end
+
         def get_http_url(key, expires, options = {})
           requires :directory
           connection.get_object_http_url(directory.key, key, expires, options)

data/lib/fog/aws/parsers/auto_scaling/put_notification_configuration.rb

@@ -0,0 +1,27 @@
+module Fog
+  module Parsers
+    module AWS
+      module AutoScaling
+
+        class PutNotificationConfiguration < Fog::Parsers::Base
+
+          def reset
+            @response = { 'ResponseMetadata' => {} }
+          end
+
+          def start_element(name, attrs = [])
+            super
+          end
+          
+          def end_element(name)
+            case name
+            when 'RequestId'
+              @response['ResponseMetadata'][name] = value
+            end
+          end
+
+        end
+      end
+    end
+  end
+end

data/lib/fog/aws/parsers/cloud_formation/describe_stacks.rb

@@ -6,7 +6,7 @@ module Fog
         class DescribeStacks < Fog::Parsers::Base
 
           def reset
-            @stack = { 'Outputs' => [], 'Parameters' => [] }
+            @stack = { 'Outputs' => [], 'Parameters' => [], 'Capabilities' => [] }
             @output = {}
             @parameter = {}
             @response = { 'Stacks' => [] }
@@ -19,7 +19,9 @@ module Fog
               @in_outputs = true
             when 'Parameters'
               @in_parameters = true
-            end
+            when 'Capabilities'
+              @in_capabilities = true
+            end            
           end
 
           def end_element(name)
@@ -43,11 +45,18 @@ module Fog
               when 'Parameters'
                 @in_parameters = false
               end
+            elsif @in_capabilities
+              case name             
+              when 'member'
+                @stack['Capabilities'] << value        
+              when 'Capabilities'
+                @in_capabilities = false
+              end  
             else
               case name
               when 'member'
                 @response['Stacks'] << @stack
-                @stack = { 'Outputs' => [], 'Parameters' => [] }
+                @stack = { 'Outputs' => [], 'Parameters' => [], 'Capabilities' => []}
               when 'RequestId'
                 @response[name] = value
               when 'CreationTime'

data/lib/fog/aws/parsers/compute/associate_dhcp_options.rb

@@ -0,0 +1,24 @@
+module Fog
+  module Parsers
+    module Compute
+      module AWS
+
+        class AssociateDhcpOptions  < Fog::Parsers::Base
+
+          def end_element(name)
+            case name
+            when 'requestId'
+              @response[name] = value
+            when 'return'
+              if value == 'true'
+                @response[name] = true
+              else
+                @response[name] = false
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/fog/aws/parsers/compute/attach_internet_gateway.rb

@@ -0,0 +1,24 @@
+module Fog
+  module Parsers
+    module Compute
+      module AWS
+
+        class AttachInternetGateway < Fog::Parsers::Base
+
+          def end_element(name)
+            case name
+            when 'requestId'
+              @response[name] = value
+            when 'return'
+              if value == 'true'
+                @response[name] = true
+              else
+                @response[name] = false
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/fog/aws/parsers/compute/attach_network_interface.rb

@@ -0,0 +1,18 @@
+module Fog
+  module Parsers
+    module Compute
+      module AWS
+
+        class AttachNetworkInterface < Fog::Parsers::Base
+
+          def end_element(name)
+            case name
+            when 'requestId', 'attachmentId'
+              @response[name] = value
+            end
+          end
+        end
+      end
+    end
+  end
+end