fog-aws 0.7.6 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: daae4cd317d3b006fd8a5673438f8714d1dbc701
-  data.tar.gz: 9e9fb35e71f5f20eb329ed20c7fc610bbc999b34
+  metadata.gz: 58d538460f3f7fdf4b55f6ff22436610834d5d2f
+  data.tar.gz: e2d865117e046119af32d8c22a2db4918678dddb
 SHA512:
-  metadata.gz: 5edb10c809ca8d5b5e98ea65a9ee58a810bb13312cbb28c1358d4b2caa4104a1f9fab5cba1f310d480e3c9cc8911c398a6dbc107cf85d9fb5ed9d3479b92dacf
-  data.tar.gz: bf3b096a51f49366306adfb75a99699ee354ca2890b8ff2ef781bdce50d4516bcce633bb6d50fafe23899749a3c7fdb532d7e1ac4a6c298ec964885ed82fedfa
+  metadata.gz: 5d141b55a36a590acfd0cd3b403a94c35c227c3e8cf09533c9ad9bd3ceee63ba972bba16c334b28d454ae4562026fb6585a24bf274befd7f42560261b384e05a
+  data.tar.gz: 74adabc3b6a46cbb973809e4567f6c4a0f2780f381cb336fe9dd35cca02ea92d36996d9f331e40c46ddb8ae117d7eeb730f7598c1f41b999707bc4b4c61da0c2

data/CHANGELOG.md

@@ -1,5 +1,17 @@
 # Change Log
 
+## [v0.7.6](https://github.com/fog/fog-aws/tree/v0.7.6) (2015-08-26)
+[Full Changelog](https://github.com/fog/fog-aws/compare/v0.7.5...v0.7.6)
+
+**Closed issues:**
+
+- mock directories.create destroys existing directory [\#172](https://github.com/fog/fog-aws/issues/172)
+
+**Merged pull requests:**
+
+- Add GovCloud region name to validation set. [\#175](https://github.com/fog/fog-aws/pull/175) ([triplepoint](https://github.com/triplepoint))
+- Mocked put\_bucket no longer clobbers existing bucket [\#174](https://github.com/fog/fog-aws/pull/174) ([jgr](https://github.com/jgr))
+
 ## [v0.7.5](https://github.com/fog/fog-aws/tree/v0.7.5) (2015-08-24)
 [Full Changelog](https://github.com/fog/fog-aws/compare/v0.7.4...v0.7.5)
 

data/Gemfile

@@ -5,5 +5,6 @@ gemspec
 
 group :test, :default do
   gem 'pry-nav'
+  gem 'mime-types', '~> 2.6', '>= 2.6.2'
 end
 gem "codeclimate-test-reporter", group: :test, require: nil

data/lib/fog/aws/compute.rb

@@ -415,7 +415,7 @@ module Fog
             tag_filters[key.gsub('tag:', '')] = filters.delete(key) if /^tag:/ =~ key
           end
           for tag_key, tag_value in tag_filters
-            resources = resources.select{|r| tag_value == tag_set_fetcher[r][tag_key]}
+            resources = resources.select{|r| [tag_value].flatten.include? tag_set_fetcher[r][tag_key]}
           end
 
           resources

data/lib/fog/aws/iam/paged_collection.rb

@@ -13,7 +13,9 @@ module Fog
           to_a.each(*args, &block)
         end
 
-        def each
+        def each(options={})
+          limit = options[:limit] || 100
+
           if !block_given?
             self
           else
@@ -23,7 +25,7 @@ module Fog
 
             while subset.truncated
               subset.
-                all(:marker => subset.marker, :limit => 1000).
+                all(:marker => subset.marker, :limit => limit).
                 each_entry { |f| yield f }
             end
 

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

@@ -205,7 +205,6 @@ module Fog
 
         def setup(credentials = {})
           requires :ssh_ip_address, :username
-          require 'net/ssh'
 
           commands = [
             %{mkdir .ssh},

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

@@ -18,7 +18,8 @@ module Fog
         attribute :parameter_group, :aliases => 'CacheParameterGroup'
         attribute :pending_values, :aliases => 'PendingModifiedValues'
         attribute :create_time, :aliases => 'CacheClusterCreateTime', :type => :timestamp
-        attribute :security_groups, :aliases => 'CacheSecurityGroups', :type => :array
+        attribute :cache_security_groups, :aliases => 'CacheSecurityGroups', :type => :array
+        attribute :security_groups, :aliases => 'SecurityGroups', :type => :array
         attribute :notification_config, :aliases => 'NotificationConfiguration'
         attribute :cache_subnet_group_name, :aliases => 'CacheSubnetGroupName'
         attribute :vpc_security_groups, :aliases => 'VpcSecurityGroups', :type => :array

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

@@ -3,31 +3,28 @@ require 'fog/aws/models/iam/role'
 module Fog
   module AWS
     class IAM
-      class Roles < Fog::Collection
+      class Roles < Fog::AWS::IAM::PagedCollection
+
         model Fog::AWS::IAM::Role
 
-        def initialize(attributes = {})
-          super
-        end
+        def all(options={})
+          body = service.list_roles(page_params(options)).body
 
-        def all
-          data = service.list_roles.body['Roles']
-          load(data)
+          merge_attributes(body)
+          load(body["Roles"])
         end
 
         def get(identity)
-          role = nil
-          begin
-            role = service.roles.new( service.get_role( identity ).data[:body]["Role"] )
-          rescue Excon::Errors::NotFound, Fog::AWS::IAM::NotFound # ignore not found error
-          end
-          role
+          new(service.get_role(identity).body["Role"])
+        rescue Excon::Errors::NotFound, Fog::AWS::IAM::NotFound
+          nil
         end
 
         def new(attributes = {})
-          if not attributes.key?(:assume_role_policy_document)
+          unless attributes.key?(:assume_role_policy_document)
             attributes[:assume_role_policy_document] = Fog::AWS::IAM::EC2_ASSUME_ROLE_POLICY.to_s
           end
+
           super
         end
       end

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

@@ -131,8 +131,8 @@ module Fog
             'DBSubnetGroupName'             => db_subnet_group_name,
             'Engine'                        => engine,
             'EngineVersion'                 => engine_version,
-            'StorageEncrypted'              => storage_encrypted,
             'Iops'                          => iops,
+            'KmsKeyId'                      => kms_key_id,
             'LicenseModel'                  => license_model,
             'MasterUserPassword'            => password || attributes['MasterUserPassword'],
             'MasterUsername'                => master_username,
@@ -141,6 +141,7 @@ module Fog
             'PreferredBackupWindow'         => preferred_backup_window,
             'PreferredMaintenanceWindow'    => preferred_maintenance_window,
             'PubliclyAccessible'            => publicly_accessible,
+            'StorageEncrypted'              => storage_encrypted,
             'StorageType'                   => storage_type,
             'VpcSecurityGroups'             => vpc_security_groups,
           }

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

@@ -31,7 +31,7 @@ module Fog
         end
 
         def location
-          @location ||= (bucket_location || self.service.region)
+          @location ||= (bucket_location || AWS::DEFAULT_REGION)
         end
 
         # NOTE: you can't change the region once the bucket is created

data/lib/fog/aws/parsers/elasticache/cache_cluster_parser.rb

@@ -15,17 +15,26 @@ module Fog
               'CacheSecurityGroups' => [],
               'CacheNodes' => [],
               'CacheParameterGroup' => {},
-              'ConfigurationEndpoint' => {}
+              'ConfigurationEndpoint' => {},
+              'SecurityGroups' => []
             }
           end
 
           def start_element(name, attrs = [])
             super
             case name
-            when 'CacheSecurityGroup'; then @security_group = {}
+            when 'CacheSecurityGroup'; then @cache_security_group = {}
             when 'CacheNode'; then @cache_node = {}
             when 'PendingModifiedValues'; then @pending_values = {}
             when 'ConfigurationEndpoint'; then @configuration_endpoint = {} 
+            when 'SecurityGroups'
+              @in_security_groups = true
+              @security_group_members = []
+            when 'member'
+              if @in_security_groups
+                @in_security_group_member = true
+                @security_group_member = {}
+              end
             end
           end
 
@@ -50,11 +59,17 @@ module Fog
             when 'CacheClusterCreateTime'
               @cache_cluster[name] = DateTime.parse(value)
             when 'CacheSecurityGroup'
-              @cache_cluster["#{name}s"] << @security_group unless @security_group.empty?
+              @cache_cluster["#{name}s"] << @cache_security_group unless @cache_security_group.empty?
             when 'ConfigurationEndpoint'
               @cache_cluster['ConfigurationEndpoint'] = @configuration_endpoint
-            when 'CacheSecurityGroupName', 'Status', 'CacheSubnetGroupName'
+            when 'CacheSecurityGroupName', 'CacheSubnetGroupName'
               @cache_cluster[name] = value
+            when 'Status'
+              if @in_security_group_member
+                @security_group_member[name] = value
+              else
+                @cache_cluster[name] = value
+              end
             when 'CacheNode'
               @cache_cluster["#{name}s"] << @cache_node unless @cache_node.empty?
               @cache_node = nil
@@ -78,6 +93,16 @@ module Fog
               end
             when 'CacheNodeIdsToReboots', 'CacheParameterGroupName', 'ParameterApplyStatus'
               @cache_cluster['CacheParameterGroup'][name] = value
+            when 'SecurityGroups'
+              @in_security_groups = false
+              @cache_cluster['SecurityGroups'] = @security_group_members
+            when 'SecurityGroupId'
+              @security_group_member[name] = value if @in_security_group_member
+            when 'member'
+              if @in_security_groups
+                @in_security_group_member = false
+                @security_group_members << @security_group_member
+              end
             else
               super
             end

data/lib/fog/aws/parsers/storage/get_bucket_lifecycle.rb

@@ -5,7 +5,9 @@ module Fog
         class GetBucketLifecycle < Fog::Parsers::Base
           def reset
             @expiration = {}
+            @version_expiration = {}
             @transition = {}
+            @version_transition = {}
             @rule = {}
             @response = { 'Rules' => [] }
           end
@@ -17,6 +19,10 @@ module Fog
               @in_expiration = true
             when 'Transition'
               @in_transition = true
+            when 'NoncurrentVersionExpiration'
+              @in_version_expiration = true
+            when 'NoncurrentVersionTransition'
+              @in_version_transition = true
             end
           end
 
@@ -32,6 +38,17 @@ module Fog
                 @in_expiration = false
                 @expiration = {}
               end
+            elsif @in_version_expiration
+              case name
+              when 'NoncurrentDays'
+                @version_expiration[name] = value.to_i
+              when 'Date'
+                @version_expiration[name] = value
+              when 'NoncurrentVersionExpiration'
+                @rule['NoncurrentVersionExpiration'] = @version_expiration
+                @in_version_expiration = false
+                @version_expiration = {}
+              end
             elsif @in_transition
               case name
               when 'StorageClass',
@@ -45,6 +62,19 @@ module Fog
                 @in_transition = false
                 @transition = {}
               end
+            elsif @in_version_transition
+              case name
+              when 'StorageClass',
+                @version_transition['StorageClass'] = value
+              when 'Date'
+                @version_transition[name] = value
+              when 'NoncurrentDays'
+                @version_transition[name] = value.to_i
+              when 'NoncurrentVersionTransition'
+                @rule['NoncurrentVersionTransition'] = @transition
+                @in_version_transition = false
+                @version_transition = {}
+              end
             else
               case name
               when 'ID', 'Prefix'

data/lib/fog/aws/requests/compute/describe_instances.rb

@@ -199,7 +199,7 @@ module Fog
             when 'rebooting'
               instance['instanceState'] = { 'code' => 16, 'name' => 'running' }
             when 'stopping'
-              instance['instanceState'] = { 'code' => 0, 'name' => 'stopping' }
+              instance['instanceState'] = { 'code' => 0, 'name' => 'stopped' }
               instance['stateReason'] = { 'code' => 0 }
             when 'shutting-down'
               if Time.now - self.data[:deleted_at][instance['instanceId']] >= Fog::Mock.delay * 2

data/lib/fog/aws/requests/compute/start_instances.rb

@@ -41,6 +41,7 @@ module Fog
             response.status = 200
 
             response.body = {
+              'requestId'    => Fog::AWS::Mock.request_id,
               'instancesSet' => instance_set.reduce([]) do |ia, instance|
                                   ia << {'currentState' => { 'code' => 0, 'name' => 'pending' },
                                          'previousState' => instance['instanceState'],

data/lib/fog/aws/requests/compute/stop_instances.rb

@@ -42,6 +42,7 @@ module Fog
             response.status = 200
 
             response.body = {
+              'requestId'    => Fog::AWS::Mock.request_id,
               'instancesSet' => instance_set.reduce([]) do |ia, instance|
                                   instance['classicLinkSecurityGroups'] = nil
                                   instance['classicLinkVpcId'] = nil

data/lib/fog/aws/requests/dynamodb/batch_get_item.rb

@@ -8,22 +8,19 @@ module Fog
         # * 'request_items'<~Hash>:
         #   * 'table_name'<~Hash>:
         #     * 'Keys'<~Array>: array of keys
-        #       * 'HashKeyElement'<~Hash>: info for primary key
-        #         * 'AttributeType'<~String> - type of attribute
-        #         * 'AttributeName'<~String> - name of attribute
-        #       * 'RangeKeyElement'<~Hash>: optional, info for range key
-        #         * 'AttributeType'<~String> - type of attribute
-        #         * 'AttributeName'<~String> - name of attribute
-        #     * 'AttributesToGet'<~Array> - optional attributes to return, defaults to all
         #
         # ==== Returns
         # * response<~Excon::Response>:
         #   * body<~Hash>:
         #     * 'Responses'<~Hash>:
-        #       * 'table_name'<~Hash>:
-        #         * 'Items'<~Array> - Matching items
-        #         * 'ConsumedCapacityUnits'<~Float> - Capacity units used in read
+        #       * 'table_name'<~Array> - array of all elements
         #     * 'UnprocessedKeys':<~Hash> - tables and keys in excess of per request limit, pass this to subsequent batch get for pseudo-pagination
+        #     * 'ConsumedCapacity':<~Hash>:
+        #       * 'TableName'<~String> - the name of the table
+        #       * 'CapacityUnits'<~Float> - Capacity units used in read
+        #
+        # See DynamoDB Documentation: http://docs.aws.amazon.com/amazondynamodb/latest/APIReference/API_BatchGetItem.html
+        #
         def batch_get_item(request_items)
           body = {
             'RequestItems' => request_items
@@ -31,7 +28,7 @@ module Fog
 
           request(
             :body       => Fog::JSON.encode(body),
-            :headers    => {'x-amz-target' => 'DynamoDB_20111205.BatchGetItem'},
+            :headers    => {'x-amz-target' => 'DynamoDB_20120810.BatchGetItem'},
             :idempotent => true
           )
         end

data/lib/fog/aws/requests/dynamodb/batch_write_item.rb

@@ -7,16 +7,18 @@ module Fog
           batch_write_item(request_items)
         end
 
-        #request_items has form:
-        #{"table_name"=>
+        # request_items has form:
+        #
+        # {"table_name"=>
         #  [{"PutRequest"=>
         #    {"Item"=>
-        #      {"hash_key"=>{"N"=>"99"},
-        #       "range_key"=>{"N"=>"99"},
-        #       "attribute"=>{"S"=>"hi"}
-        #       }}}, ... ]}
-        # For more information:
-        # http://docs.amazonwebservices.com/amazondynamodb/latest/developerguide/API_BatchWriteItems.html
+        #       {"hi" => {"N" => 99}}
+        #    }
+        #  }]
+        # }
+        #
+        # See DynamoDB Documentation: http://docs.amazonwebservices.com/amazondynamodb/latest/developerguide/API_BatchWriteItems.html
+        #
         def batch_write_item(request_items)
           body = {
             'RequestItems' => request_items
@@ -24,7 +26,7 @@ module Fog
 
           request(
             :body       => Fog::JSON.encode(body),
-            :headers    => {'x-amz-target' => 'DynamoDB_20111205.BatchWriteItem'}
+            :headers    => {'x-amz-target' => 'DynamoDB_20120810.BatchWriteItem'}
           )
         end
       end

data/lib/fog/aws/requests/dynamodb/create_table.rb

@@ -6,14 +6,10 @@ module Fog
         #
         # ==== Parameters
         # * 'table_name'<~String> - name of table to create
-        # * 'key_schema'<~Hash>:
-        #   * 'HashKeyElement'<~Hash>: info for primary key
+        # * 'key_schema'<~Array>:
         #     * 'AttributeName'<~String> - name of attribute
-        #     * 'AttributeType'<~String> - type of attribute, in %w{N NS S SS} for number, number set, string, string set
-        #   * 'RangeKeyElement'<~Hash>: optional, info for range key
-        #     * 'AttributeName'<~String> - name of attribute
-        #     * 'AttributeType'<~String> - type of attribute, in %w{N NS S SS} for number, number set, string, string set
-        # * 'provisioned_throughput'<~Hash>:
+        #     * 'KeyType'<~String> - type of attribute, in %w{N NS S SS} for number, number set, string, string set
+        # * 'ProvisionedThroughput'<~Hash>:
         #   * 'ReadCapacityUnits'<~Integer> - read capacity for table, in 5..10000
         #   * 'WriteCapacityUnits'<~Integer> - write capacity for table, in 5..10000
         #
@@ -22,18 +18,17 @@ module Fog
         #   * body<~Hash>:
         #     * 'TableDescription'<~Hash>
         #       * 'CreationDateTime'<~Float> - Unix epoch time of table creation
-        #       * 'KeySchema'<~Hash> - schema for table
-        #         * 'HashKeyElement'<~Hash>: info for primary key
-        #           * 'AttributeName'<~String> - name of attribute
-        #           * 'AttributeType'<~String> - type of attribute, in %w{N NS S SS} for number, number set, string, string set
-        #         * 'RangeKeyElement'<~Hash>: optional, info for range key
+        #       * 'KeySchema'<~Array> - schema for table
         #           * 'AttributeName'<~String> - name of attribute
-        #           * 'AttributeType'<~String> - type of attribute, in %w{N NS S SS} for number, number set, string, string set
+        #           * 'KeyType'<~String> - type of attribute, in %w{N NS S SS} for number, number set, string, string set
         #       * 'ProvisionedThroughput'<~Hash>:
         #         * 'ReadCapacityUnits'<~Integer> - read capacity for table, in 5..10000
         #         * 'WriteCapacityUnits'<~Integer> - write capacity for table, in 5..10000
         #       * 'TableName'<~String> - name of table
         #       * 'TableStatus'<~String> - status of table
+        #
+        # See DynamoDB Documentation: http://docs.aws.amazon.com/amazondynamodb/latest/APIReference/API_CreateTable.html
+        #
         def create_table(table_name, key_schema, provisioned_throughput)
           body = {
             'KeySchema'             => key_schema,
@@ -43,7 +38,7 @@ module Fog
 
           request(
             :body       => Fog::JSON.encode(body),
-            :headers    => {'x-amz-target' => 'DynamoDB_20111205.CreateTable'},
+            :headers    => {'x-amz-target' => 'DynamoDB_20120810.CreateTable'},
             :idempotent => true
           )
         end

data/lib/fog/aws/requests/dynamodb/delete_item.rb

@@ -6,25 +6,15 @@ module Fog
         #
         # ==== Parameters
         # * 'table_name'<~String> - name of table for item
-        # * 'key'<~Hash>:
-        #   * 'HashKeyElement'<~Hash>: info for primary key
-        #     * 'AttributeName'<~String> - name of attribute
-        #     * 'AttributeType'<~String> - type of attribute
-        #   * 'RangeKeyElement'<~Hash>: optional, info for range key
-        #     * 'AttributeName'<~String> - name of attribute
-        #     * 'AttributeType'<~String> - type of attribute
-        # * 'options'<~Hash>:
-        #   * 'Expected'<~Hash>: data to check against
-        #     * 'AttributeName'<~String> - name of attribute
-        #     * 'Value'<~Hash> - a value to check for the value of
-        #     or
-        #     * 'Exists'<~Boolean> - set as false to only allow update if attribute doesn't exist
-        #   * 'ReturnValues'<~String> - data to return in %w{ALL_NEW ALL_OLD NONE UPDATED_NEW UPDATED_OLD}, defaults to NONE
+        # * 'key'<~Hash> - hash of attributes
         #
         # ==== Returns
         # * response<~Excon::Response>:
         #   * body<~Hash>:
         #     varies based on ReturnValues param, see: http://docs.amazonwebservices.com/amazondynamodb/latest/developerguide/API_UpdateItem.html
+        #
+        # See DynamoDB Documentation: http://docs.aws.amazon.com/amazondynamodb/latest/APIReference/API_DeleteItem.html
+        #
         def delete_item(table_name, key, options = {})
           body = {
             'Key'               => key,
@@ -33,7 +23,7 @@ module Fog
 
           request(
             :body       => Fog::JSON.encode(body),
-            :headers    => {'x-amz-target' => 'DynamoDB_20111205.DeleteItem'},
+            :headers    => {'x-amz-target' => 'DynamoDB_20120810.DeleteItem'},
             :idempotent => true
           )
         end