fog-aws 1.4.0 → 1.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6337216d400d2563de64b38f700c73f5c35c1b9d
-  data.tar.gz: 014d339b4064fe6d22b6114817225778c3b131ee
+  metadata.gz: 3973a7b70a274c20de34e9d05a1a848c2d93fcef
+  data.tar.gz: 73a49e9277d918bc99701d78c9482d5c7d6b302f
 SHA512:
-  metadata.gz: 52648d0ea0a5f618477d8db41edf397064796c475871b857a916650c1b7d3f295dd094f286a7b5cdc7c816e57379b4d1e3545e8b2b26bd8a67561e6d4275932e
-  data.tar.gz: 36a0947508b7d40a7ff78b20763a84ece69d7b7b439fcc2e15d34743f99d934ed4f761d2d3971e08131f2b4e334071332096034915a197a01458895d0a7fad66
+  metadata.gz: 3701fda2e9477f984781026b92b19643c54be23780e9b404f7cd767a42013333c9924eb9d15a7c14e1c1015a90d50e675f384813da0a2c56fbb349bf865b300e
+  data.tar.gz: 55536ba768289f268e29150fd78d0cc01cbd434f0b51c8080839d14c179130c9f37dc67bb12e5a5f291d5c100a6f77914a8423c01f229a8ed31e7db4b510e233

data/CHANGELOG.md

@@ -2,7 +2,25 @@
 
 ## [Unreleased](https://github.com/fog/fog-aws/tree/HEAD)
 
-[Full Changelog](https://github.com/fog/fog-aws/compare/v1.3.0...HEAD)
+[Full Changelog](https://github.com/fog/fog-aws/compare/v1.4.0...HEAD)
+
+**Closed issues:**
+
+- retrieval of ipv6 vpc  [\#379](https://github.com/fog/fog-aws/issues/379)
+- Timeout when trying to bootstrap or ssh spot request instances [\#372](https://github.com/fog/fog-aws/issues/372)
+- Why default VPC does not require Elastic IP to connect in internet [\#338](https://github.com/fog/fog-aws/issues/338)
+- Chunked images response causing Nokogiri::XML::SyntaxError [\#273](https://github.com/fog/fog-aws/issues/273)
+
+**Merged pull requests:**
+
+- Allow specifying kms key id to use [\#382](https://github.com/fog/fog-aws/pull/382) ([fcheung](https://github.com/fcheung))
+- added support to retrieve and create vpc with ipv6 cidr block [\#381](https://github.com/fog/fog-aws/pull/381) ([chanakyacool](https://github.com/chanakyacool))
+- Add MaxResults filter to describe reserved instances offerings [\#376](https://github.com/fog/fog-aws/pull/376) ([KevinLoiseau](https://github.com/KevinLoiseau))
+- Fix Fog::Compute::AWS::Images\#all [\#375](https://github.com/fog/fog-aws/pull/375) ([eddiej](https://github.com/eddiej))
+- Fix AWS credential mocking [\#374](https://github.com/fog/fog-aws/pull/374) ([v-yarotsky](https://github.com/v-yarotsky))
+
+## [v1.4.0](https://github.com/fog/fog-aws/tree/v1.4.0) (2017-06-14)
+[Full Changelog](https://github.com/fog/fog-aws/compare/v1.3.0...v1.4.0)
 
 **Closed issues:**
 
@@ -197,7 +215,7 @@
 **Merged pull requests:**
 
 - Parse EbsOptimized parameter in launch configuration description [\#259](https://github.com/fog/fog-aws/pull/259) ([djudd](https://github.com/djudd))
-- Allow case-insensitive record comparison [\#258](https://github.com/fog/fog-aws/pull/258) ([mpick92](https://github.com/mpick92))
+- Allow case-insensitive record comparison [\#258](https://github.com/fog/fog-aws/pull/258) ([matthewpick](https://github.com/matthewpick))
 - Fix for empty ETag values [\#257](https://github.com/fog/fog-aws/pull/257) ([baryshev](https://github.com/baryshev))
 - do not make requests if mocked. [\#252](https://github.com/fog/fog-aws/pull/252) ([shaiguitar](https://github.com/shaiguitar))
 - Parse CloudWatch alarm actions as arrays instead of strings [\#245](https://github.com/fog/fog-aws/pull/245) ([eherot](https://github.com/eherot))

data/lib/fog/aws/credential_fetcher.rb

@@ -11,7 +11,7 @@ module Fog
       module ServiceMethods
         def fetch_credentials(options)
           if options[:use_iam_profile] && Fog.mocking?
-            Fog::Compute::AWS::Mock.data[:iam_role_based_creds]
+            return Fog::Compute::AWS::Mock.data[:iam_role_based_creds]
           end
           if options[:use_iam_profile]
             begin

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

@@ -10,6 +10,8 @@ module Fog
         attribute :tags,             :aliases => 'tagSet'
         attribute :tenancy,          :aliases => 'instanceTenancy'
         attribute :is_default,       :aliases => 'isDefault'
+        attribute :ipv_6_cidr_block_association_set,  :aliases => 'ipv6CidrBlockAssociationSet'
+        attribute :amazon_provided_ipv_6_cidr_block,  :aliases => 'amazonProvidedIpv6CidrBlock'
 
         def subnets
           service.subnets(:filters => {'vpcId' => self.identity}).all
@@ -18,6 +20,7 @@ module Fog
         def initialize(attributes={})
           self.dhcp_options_id ||= "default"
           self.tenancy ||= "default"
+          self.amazon_provided_ipv_6_cidr_block ||=false
           super
         end
 
@@ -94,8 +97,7 @@ module Fog
 
         def save
           requires :cidr_block
-
-          data = service.create_vpc(cidr_block).body['vpcSet'].first
+          data = service.create_vpc(cidr_block, { 'AmazonProvidedIpv6CidrBlock' => amazon_provided_ipv_6_cidr_block }).body['vpcSet'].first
           new_attributes = data.reject {|key,value| key == 'requestId'}
           new_attributes = data.reject {|key,value| key == 'requestId' || key == 'tagSet' }
           merge_attributes(new_attributes)

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

@@ -24,6 +24,7 @@ module Fog
         attribute :encryption,          :aliases => 'x-amz-server-side-encryption'
         attribute :encryption_key,      :aliases => 'x-amz-server-side-encryption-customer-key'
         attribute :version,             :aliases => 'x-amz-version-id'
+        attribute :kms_key_id,          :aliases => 'x-amz-server-side-encryption-aws-kms-key-id'
 
         # @note Chunk size to use for multipart uploads.
         #     Use small chunk sizes to minimize memory. E.g. 5242880 = 5mb
@@ -294,7 +295,7 @@ module Fog
           if encryption && encryption_key
             encryption_customer_key_headers
           elsif encryption
-            { 'x-amz-server-side-encryption' => encryption }
+            { 'x-amz-server-side-encryption' => encryption, 'x-amz-server-side-encryption-aws-kms-key-id' => kms_key_id }.reject {|_, value| value.nil?}
           else
             {}
           end

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

@@ -75,7 +75,7 @@ module Fog
                   @image[name] = false
                 end
               when 'creationDate'
-                @image[name] = Time.parse(value)
+                @image[name] = Time.parse(value) if value && !value.empty?
               when 'item'
                 @response['imagesSet'] << @image
                 @image = { 'blockDeviceMapping' => [], 'productCodes' => [], 'stateReason' => {}, 'tagSet' => {} }

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

@@ -19,7 +19,7 @@ module Fog
             when 'item'
               @response['reservedInstancesOfferingsSet'] << @reserved_instances_offering unless @reserved_instances_offering.empty?
               @reserved_instances_offering = {}
-            when 'requestId'
+            when 'requestId', 'nextToken'
               @response[name] = value
             end
           end

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

@@ -4,7 +4,7 @@ module Fog
       module AWS
         class DescribeVpcs < Fog::Parsers::Base
           def reset
-            @vpc = { 'tagSet' => {} }
+            @vpc = { 'tagSet' => {}, 'ipv6CidrBlockAssociationSet' => {} }
             @response = { 'vpcSet' => [] }
             @tag = {}
           end
@@ -14,6 +14,8 @@ module Fog
             case name
             when 'tagSet'
               @in_tag_set = true
+            when 'ipv6CidrBlockAssociationSet'
+              @in_ipv6_set = true
             end
           end
 
@@ -28,15 +30,25 @@ module Fog
                 when 'tagSet'
                   @in_tag_set = false
               end
+            elsif @in_ipv6_set
+              case name
+              when 'ipv6CidrBlock', 'associationId'
+                @vpc['ipv6CidrBlockAssociationSet'][name] = value
+              when 'ipv6CidrBlockState'
+                @vpc['ipv6CidrBlockAssociationSet'][name] = {'State' => value.squish}
+              when 'ipv6CidrBlockAssociationSet'
+                @vpc['amazonProvidedIpv6CidrBlock'] = !value.blank?
+                @in_ipv6_set = false
+              end
             else
               case name
               when 'vpcId', 'state', 'cidrBlock', 'dhcpOptionsId', 'instanceTenancy'
                 @vpc[name] = value
               when 'isDefault'
-                @vpc['isDefault'] = value == 'true'
+                @vpc['isDefault'] = value == 'true'        
               when 'item'
                 @response['vpcSet'] << @vpc
-                @vpc = { 'tagSet' => {} }
+                @vpc = { 'tagSet' => {}, 'ipv6CidrBlockAssociationSet' => {} }
               when 'requestId'
                 @response[name] = value
               end

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

@@ -16,6 +16,8 @@ module Fog
         #     * 'ProductDescription'<~String> - description of offering, in ['Linux/UNIX', 'Linux/UNIX (Amazon VPC)', 'Windows', 'Windows (Amazon VPC)']
         #     * 'MaxDuration'<~Integer> - maximum duration (in seconds) of offering
         #     * 'MinDuration'<~Integer> - minimum duration (in seconds) of offering
+        #     * 'MaxResults'<~Integer> - The maximum number of results to return for the request in a single page
+        #     * 'NextToken'<~String> - The token to retrieve the next page of results
         #
         # ==== Returns
         # * response<~Excon::Response>:
@@ -31,11 +33,12 @@ module Fog
         #       * 'productDescription'<~String> - description of offering
         #       * 'reservedInstancesOfferingId'<~String> - id of offering
         #       * 'usagePrice'<~Float> - usage price of offering, per hour
+        #     * 'NextToken'<~String> - The token to retrieve the next page of results
         #
         # {Amazon API Reference}[http://docs.amazonwebservices.com/AWSEC2/latest/APIReference/ApiReference-query-DescribeReservedInstancesOfferings.html]
         def describe_reserved_instances_offerings(filters = {})
           options = {}
-          for key in ['AvailabilityZone', 'InstanceType', 'InstanceTenancy', 'OfferingType', 'ProductDescription', 'MaxDuration', 'MinDuration']
+          for key in %w(AvailabilityZone InstanceType InstanceTenancy OfferingType ProductDescription MaxDuration MinDuration MaxResults NextToken)
             if filters.is_a?(Hash) && filters.key?(key)
               options[key] = filters.delete(key)
             end
@@ -69,7 +72,8 @@ module Fog
 
           response.body = {
             'reservedInstancesOfferingsSet' => self.data[:reserved_instances_offerings],
-            'requestId' => Fog::AWS::Mock.request_id
+            'requestId' => Fog::AWS::Mock.request_id,
+            'nextToken' => (0...64).map { ('a'..'z').to_a[rand(26)] }.join
           }
 
           response

data/lib/fog/aws/version.rb

@@ -1,5 +1,5 @@
 module Fog
   module AWS
-    VERSION = "1.4.0"
+    VERSION = "1.4.1"
   end
 end

data/tests/credentials_tests.rb

@@ -2,10 +2,9 @@ Shindo.tests('AWS | credentials', ['aws']) do
   old_mock_value = Excon.defaults[:mock]
   fog_was_mocked = Fog.mocking?
   Excon.stubs.clear
-  Fog.mock!
+  Fog.unmock!
   begin
     Excon.defaults[:mock] = true
-    default_credentials = Fog::Compute::AWS.fetch_credentials({})
     Excon.stub({:method => :get, :path => "/latest/meta-data/iam/security-credentials/"}, {:status => 200, :body => 'arole'})
     Excon.stub({:method => :get, :path => "/latest/meta-data/placement/availability-zone/"}, {:status => 200, :body => 'us-west-1a'})
 
@@ -17,7 +16,6 @@ Shindo.tests('AWS | credentials', ['aws']) do
       'Expiration' => expires_at.xmlschema
     }
 
-    Fog::Compute::AWS::Mock.data[:iam_role_based_creds] = credentials
     Excon.stub({:method => :get, :path => "/latest/meta-data/iam/security-credentials/arole"}, {:status => 200, :body => Fog::JSON.encode(credentials)})
 
     tests("#fetch_credentials") do
@@ -60,16 +58,29 @@ Shindo.tests('AWS | credentials', ['aws']) do
     end
     Fog::Time.now = Time.now
 
+    default_credentials = Fog::Compute::AWS.fetch_credentials({})
     tests("#fetch_credentials when the url 404s") do
       Excon.stub({:method => :get, :path => "/latest/meta-data/iam/security-credentials/"}, {:status => 404, :body => 'not bound'})
       Excon.stub({:method => :get, :path => "/latest/meta-data/placement/availability-zone/"}, {:status => 400, :body => 'not found'})
       returns(default_credentials) {Fog::Compute::AWS.fetch_credentials(:use_iam_profile => true)}
     end
 
+    mocked_credentials = {
+      :aws_access_key_id => "access-key-id",
+      :aws_secret_access_key => "secret-access-key",
+      :aws_session_token => "session-token",
+      :aws_credentials_expire_at => Time.at(Time.now.to_i + 500).xmlschema
+    }
+    tests("#fetch_credentials when mocking") do
+      Fog.mock!
+      Fog::Compute::AWS::Mock.data[:iam_role_based_creds] = mocked_credentials
+      returns(mocked_credentials) {Fog::Compute::AWS.fetch_credentials(:use_iam_profile => true)}
+    end
+
   ensure
     ENV["AWS_CONTAINER_CREDENTIALS_RELATIVE_URI"] = nil
     Excon.stubs.clear
     Excon.defaults[:mock] = old_mock_value
-    Fog.unmock! if !fog_was_mocked
+    Fog.mock! if fog_was_mocked
   end
 end

data/tests/parsers/compute/describe_images_tests.rb

@@ -0,0 +1,33 @@
+require 'fog/xml'
+require 'fog/aws/parsers/compute/describe_images'
+
+DESCRIBE_IMAGES_RESULT = <<-EOF
+<DescribeImagesResponse xmlns="http://ec2.amazonaws.com/doc/2016-11-15/">
+    <requestId>180a8433-ade0-4a6c-b35b-107897579572</requestId>
+    <imagesSet>
+        <item>
+            <imageId>aki-02486376</imageId>
+            <imageLocation>ec2-public-images-eu/vmlinuz-2.6.21-2.fc8xen-ec2-v1.0.i386.aki.manifest.xml</imageLocation>
+            <imageState>available</imageState>
+            <imageOwnerId>206029621532</imageOwnerId>
+            <creationDate/>
+            <isPublic>true</isPublic>
+            <architecture>i386</architecture>
+            <imageType>kernel</imageType>
+            <imageOwnerAlias>amazon</imageOwnerAlias>
+            <rootDeviceType>instance-store</rootDeviceType>
+            <blockDeviceMapping/>
+            <virtualizationType>paravirtual</virtualizationType>
+            <hypervisor>xen</hypervisor>
+        </item>
+    </imagesSet>
+</DescribeImagesResponse>
+EOF
+
+Shindo.tests('Compute::AWS | parsers | describe_images', ['compute', 'aws', 'parser']) do
+  tests('parses the xml').formats(AWS::Compute::Formats::DESCRIBE_IMAGES) do
+    parser = Nokogiri::XML::SAX::Parser.new(Fog::Parsers::Compute::AWS::DescribeImages.new)
+    parser.parse(DESCRIBE_IMAGES_RESULT)
+    parser.document.response
+  end
+end

data/tests/requests/compute/helper.rb

@@ -2,9 +2,26 @@ class AWS
   module Compute
     module Formats
       BASIC = {
-        'requestId' => String,
-        'return'    => ::Fog::Boolean
+        'requestId' => String
       }
+
+      DESCRIBE_IMAGES = BASIC.merge({
+        "imagesSet" => [{
+          "imageId" => String,
+          "imageLocation" => String,
+          "imageState" => String,
+          "imageOwnerId" => String,
+          "creationDate" => Fog::Nullable::String,
+          "isPublic" => Fog::Nullable::Boolean,
+          "architecture" => String,
+          "imageType" => String,
+          "imageOwnerAlias" => String,
+          "rootDeviceType" => String,
+          "blockDeviceMapping" => Array,
+          "virtualizationType" => String,
+          "hypervisor" => String
+        }]
+      })
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fog-aws
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.4.1
 platform: ruby
 authors:
 - Josh Lane
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-14 00:00:00.000000000 Z
+date: 2017-08-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -1533,6 +1533,7 @@ files:
 - tests/models/storage/version_tests.rb
 - tests/models/storage/versions_tests.rb
 - tests/models/support/trusted_advisor_tests.rb
+- tests/parsers/compute/describe_images_tests.rb
 - tests/parsers/elb/describe_load_balancers.rb
 - tests/requests/auto_scaling/auto_scaling_tests.rb
 - tests/requests/auto_scaling/describe_types_tests.rb
@@ -1699,7 +1700,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.12
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: Module for the 'fog' gem to support Amazon Web Services.