fog-aws 1.2.1 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5e768fc1ff288fe562ed0dd7c933c719dcdc33f4
-  data.tar.gz: 526f5ba1b58f9ba023ef1567b5a9cd79334f7212
+  metadata.gz: 507acde666f266cc70e6346a9274bcf1e1bff19c
+  data.tar.gz: 105bb905004f27b5336ff4f17feb006164feef21
 SHA512:
-  metadata.gz: 71f1af91375c2b20e8de2ca347fb5c1ae7e62f2606b5cab88813a89c3a5cdaeb41da1d30000caf47eb8e2d2e8ffe2b405a893944d23016bc5a8e085842e74a3c
-  data.tar.gz: 23faf3f32d79b4da048189a3e1a3261c62e30425091cc3964f467af4d3f0b12a835951a0ba56a03f18df2191086e2e94b8868616db4a39d44e5aa3e00d95f590
+  metadata.gz: 6403c1fc64c5cc9396f4671118897c6be37aa49e88b09f8e96cdbe9f5ef68f18e087ec52a03755d53f04c4991f4616f6064e386bff3cdaa0d5dd084e7537d43e
+  data.tar.gz: d5e45bdab2ee7dca720cc549ba6dd0202f1d9d60d98c3b2e178e36fb6910c72ac069a6197c2cf6167b8741067bc2d41280ace84430f0c2c59afe3580d1cb7f15

data/CHANGELOG.md

@@ -2,7 +2,22 @@
 
 ## [Unreleased](https://github.com/fog/fog-aws/tree/HEAD)
 
-[Full Changelog](https://github.com/fog/fog-aws/compare/v1.2.0...HEAD)
+[Full Changelog](https://github.com/fog/fog-aws/compare/v1.2.1...HEAD)
+
+**Closed issues:**
+
+- Do we need to list all files before creating one? [\#357](https://github.com/fog/fog-aws/issues/357)
+
+**Merged pull requests:**
+
+- Authorize vpc to rds sg [\#356](https://github.com/fog/fog-aws/pull/356) ([ehowe](https://github.com/ehowe))
+- classic link enhancements [\#355](https://github.com/fog/fog-aws/pull/355) ([ehowe](https://github.com/ehowe))
+- Add new i3 class instances. [\#353](https://github.com/fog/fog-aws/pull/353) ([rogersd](https://github.com/rogersd))
+- Add check for self.etag before running gsub [\#351](https://github.com/fog/fog-aws/pull/351) ([dmcorboy](https://github.com/dmcorboy))
+- Modify volume [\#350](https://github.com/fog/fog-aws/pull/350) ([ehowe](https://github.com/ehowe))
+
+## [v1.2.1](https://github.com/fog/fog-aws/tree/v1.2.1) (2017-02-27)
+[Full Changelog](https://github.com/fog/fog-aws/compare/v1.2.0...v1.2.1)
 
 **Closed issues:**
 

data/lib/fog/aws/compute.rb

@@ -120,18 +120,22 @@ module Fog
       request :describe_subnets
       request :describe_tags
       request :describe_volumes
+      request :describe_volumes_modifications
       request :describe_volume_status
       request :describe_vpcs
       request :describe_vpc_attribute
       request :describe_vpc_classic_link
+      request :describe_vpc_classic_link_dns_support
       request :detach_network_interface
       request :detach_internet_gateway
       request :detach_volume
       request :detach_classic_link_vpc
       request :disable_vpc_classic_link
+      request :disable_vpc_classic_link_dns_support
       request :disassociate_address
       request :disassociate_route_table
       request :enable_vpc_classic_link
+      request :enable_vpc_classic_link_dns_support
       request :get_console_output
       request :get_password_data
       request :import_key_pair
@@ -140,6 +144,7 @@ module Fog
       request :modify_network_interface_attribute
       request :modify_snapshot_attribute
       request :modify_subnet_attribute
+      request :modify_volume
       request :modify_volume_attribute
       request :modify_vpc_attribute
       request :move_address_to_vpc
@@ -290,6 +295,7 @@ module Fog
                   }
                 ],
                 :spot_requests => {},
+                :volume_modifications => {}
               }
             end
           end

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

@@ -424,6 +424,66 @@ module Fog
           :ebs_optimized_available => false,
           :instance_store_volumes  => 8
         },
+        {
+          :id                      => 'i3.large',
+          :name                    => 'I3 Large',
+          :bits                    => 64,
+          :cores                   => 2,
+          :disk                    => 475,
+          :ram                     => 15616,
+          :ebs_optimized_available => true,
+          :instance_store_volumes  => 1
+        },
+        {
+          :id                      => 'i3.xlarge',
+          :name                    => 'I3 Extra Large',
+          :bits                    => 64,
+          :cores                   => 4,
+          :disk                    => 950,
+          :ram                     => 31232,
+          :ebs_optimized_available => true,
+          :instance_store_volumes  => 1
+        },
+        {
+          :id                      => 'i3.2xlarge',
+          :name                    => 'I3 Double Extra Large',
+          :bits                    => 64,
+          :cores                   => 8,
+          :disk                    => 1900,
+          :ram                     => 62464,
+          :ebs_optimized_available => true,
+          :instance_store_volumes  => 1
+        },
+        {
+          :id                      => 'i3.4xlarge',
+          :name                    => 'I3 Quadruple Extra Large',
+          :bits                    => 64,
+          :cores                   => 16,
+          :disk                    => 3800,
+          :ram                     => 124928,
+          :ebs_optimized_available => true,
+          :instance_store_volumes  => 2
+        },
+        {
+          :id                      => 'i3.8xlarge',
+          :name                    => 'I3 Eight Extra Large',
+          :bits                    => 64,
+          :cores                   => 32,
+          :disk                    => 7600,
+          :ram                     => 249856,
+          :ebs_optimized_available => true,
+          :instance_store_volumes  => 4
+        },
+        {
+          :id                      => 'i3.16xlarge',
+          :name                    => 'I3 Sixteen Extra Large',
+          :bits                    => 64,
+          :cores                   => 32,
+          :disk                    => 15200,
+          :ram                     => 499712,
+          :ebs_optimized_available => true,
+          :instance_store_volumes  => 8
+        },
         {
           :id                      => "r3.large",
           :name                    => "R3 Large",

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

@@ -36,31 +36,50 @@ module Fog
           state == 'available'
         end
 
-        def save
-          raise Fog::Errors::Error.new('Resaving an existing object may create a duplicate') if persisted?
-          requires :availability_zone
-          requires_one :size, :snapshot_id
-
-          if type == 'io1'
-            requires :iops
-          end
-
-          data = service.create_volume(availability_zone, size, create_params).body
-          merge_attributes(data)
+        def modification_in_progress?
+          modifications.any? { |m| m['modificationState'] != 'completed' }
+        end
 
-          if tags = self.tags
-            # expect eventual consistency
-            Fog.wait_for { self.reload rescue nil }
-            service.create_tags(
-              self.identity,
-              tags
-            )
-          end
+        def modifications
+          requires :identity
+          service.describe_volumes_modifications('volume-id' => self.identity).body['volumeModificationSet']
+        end
 
-          if @server
-            self.server = @server
+        def save
+          if identity
+            update_params = {
+              'Size'       => self.size,
+              'Iops'       => self.iops,
+              'VolumeType' => self.type
+            }
+
+            service.modify_volume(self.identity, update_params)
+            true
+          else
+            requires :availability_zone
+            requires_one :size, :snapshot_id
+
+            if type == 'io1'
+              requires :iops
+            end
+
+            data = service.create_volume(availability_zone, size, create_params).body
+            merge_attributes(data)
+
+            if tags = self.tags
+              # expect eventual consistency
+              Fog.wait_for { self.reload rescue nil }
+              service.create_tags(
+                self.identity,
+                tags
+              )
+            end
+
+            if @server
+              self.server = @server
+            end
+            true
           end
-          true
         end
 
         def server

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

@@ -47,6 +47,40 @@ module Fog
           true
         end
 
+        def classic_link_enabled?
+          requires :identity
+          service.describe_vpc_classic_link(:vpc_ids => [self.identity]).body['vpcSet'].first['classicLinkEnabled']
+        rescue
+          nil
+        end
+
+        def enable_classic_link
+          requires :identity
+          service.enable_vpc_classic_link(self.identity).body['return']
+        end
+
+        def disable_classic_link
+          requires :identity
+          service.disable_vpc_classic_link(self.identity).body['return']
+        end
+
+        def classic_link_dns_enabled?
+          requires :identity
+          service.describe_vpc_classic_link_dns_support(:vpc_ids => [self.identity]).body['vpcs'].first['classicLinkDnsSupported']
+        rescue
+          nil
+        end
+
+        def enable_classic_link_dns
+          requires :identity
+          service.enable_vpc_classic_link_dns_support(self.identity).body['return']
+        end
+
+        def disable_classic_link_dns
+          requires :identity
+          service.disable_vpc_classic_link_dns_support(self.identity).body['return']
+        end
+
         # Create a vpc
         #
         # >> g = AWS.vpcs.new(:cidr_block => "10.1.2.0/24")

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

@@ -29,8 +29,9 @@ module Fog
 
         # group_owner_id defaults to the current owner_id
         def authorize_ec2_security_group(group_name, group_owner_id=owner_id)
+          key = group_name.match(/^sg-/) ? 'EC2SecurityGroupId' : 'EC2SecurityGroupName'
           authorize_ingress({
-            'EC2SecurityGroupName' => group_name,
+            key                       => group_name,
             'EC2SecurityGroupOwnerId' => group_owner_id
           })
         end
@@ -56,8 +57,9 @@ module Fog
 
         # group_owner_id defaults to the current owner_id
         def revoke_ec2_security_group(group_name, group_owner_id=owner_id)
+          key = group_name.match(/^sg-/) ? 'EC2SecurityGroupId' : 'EC2SecurityGroupName'
           revoke_ingress({
-            'EC2SecurityGroupName' => group_name,
+            key                       => group_name,
             'EC2SecurityGroupOwnerId' => group_owner_id
           })
         end

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

@@ -219,7 +219,7 @@ module Fog
             data = service.put_object(directory.key, key, body, options)
             merge_attributes(data.headers.reject {|key, value| ['Content-Length', 'Content-Type'].include?(key)})
           end
-          self.etag.gsub!('"','')
+          self.etag.gsub!('"','') if self.etag
           self.content_length = Fog::Storage.get_body_size(body)
           self.content_type ||= Fog::Storage.get_content_type(body)
           true

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

@@ -0,0 +1,30 @@
+module Fog
+  module Parsers
+    module Compute
+      module AWS
+        class DescribeVolumesModifications < Fog::Parsers::Base
+          def reset
+            @response     = { 'volumeModificationSet' => [] }
+            @modification = {}
+          end
+
+          def end_element(name)
+            case name
+            when 'modificationState', 'originalVolumeType', 'statusMessage', 'targetVolumeType', 'volumeId'
+              @modification[name] = value
+            when 'startTime', 'endTime'
+              @modification[name] = Time.parse(value)
+            when 'originalIops', 'originalSize', 'progress', 'targetIops', 'targetSize'
+              @modification[name] = value.to_i
+            when 'requestId'
+              @response[name] = value
+            when 'item'
+              @response['volumeModificationSet'] << @modification.dup
+              @modification = {}
+            end
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -30,8 +30,10 @@ module Fog
               end
             else
               case name
-              when 'vpcId', 'classicLinkEnabled'
+              when 'vpcId'
                 @vpc[name] = value
+              when 'classicLinkEnabled'
+                @vpc[name] = value == 'true'
               when 'item'
                 @response['vpcSet'] << @vpc
                 @vpc = { 'tagSet' => {} }

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

@@ -0,0 +1,26 @@
+module Fog
+  module Parsers
+    module Compute
+      module AWS
+        class DescribeVpcClassicLinkDnsSupport < Fog::Parsers::Base
+          def reset
+            @vpc      = {}
+            @response = { 'vpcs' => [] }
+          end
+
+          def end_element(name)
+            case name
+            when 'vpcId'
+              @vpc[name] = value
+            when 'classicLinkDnsSupported'
+              @vpc[name] = value == 'true'
+            when 'item'
+              @response['vpcs'] << @vpc
+              @vpc = {}
+            end
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,26 @@
+module Fog
+  module Parsers
+    module Compute
+      module AWS
+        class ModifyVolume < Fog::Parsers::Base
+          def reset
+            @response = {'volumeModification' => {}}
+          end
+
+          def end_element(name)
+            case name
+            when 'modificationState', 'originalVolumeType', 'statusMessage', 'targetVolumeType', 'volumeId'
+              @response['volumeModification'][name] = value
+            when 'startTime', 'endTime'
+              @response['volumeModification'][name] = Time.parse(value)
+            when 'originalIops', 'originalSize', 'progress', 'targetIops', 'targetSize'
+              @response['volumeModification'][name] = value.to_i
+            when 'requestId'
+              @response[name] = value
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/fog/aws/rds.rb

@@ -164,7 +164,7 @@ module Fog
           @data = nil
         end
 
-        attr_accessor :region
+        attr_accessor :region, :aws_access_key_id
 
         def initialize(options={})
           @use_iam_profile = options[:use_iam_profile]

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

@@ -26,7 +26,7 @@ module Fog
             'DryRun'    => dry_run,
             :parser     => Fog::Parsers::Compute::AWS::Basic.new
           }.merge(Fog::AWS.indexed_param('SecurityGroupId', security_group_ids)))
-          
+
         end
       end
 
@@ -50,11 +50,11 @@ module Fog
               'return'    => true
             }
             unless dry_run
-              instance['classicLinkSecurityGroups'] = security_group_ids 
+              instance['classicLinkSecurityGroups'] = security_group_ids
               instance['classicLinkVpcId'] = vpc_id
             end
             response
-          elsif !instance 
+          elsif !instance
             raise Fog::Compute::AWS::NotFound.new("The instance ID '#{instance_id}' does not exist.")
           elsif !vpc
             raise Fog::Compute::AWS::NotFound.new("The VPC '#{vpc_id}' does not exist.")

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

@@ -43,15 +43,16 @@ module Fog
               response.status = 200
               vpc_id = Fog::AWS::Mock.vpc_id
               vpc = {
-                'vpcId'              => vpc_id,
-                'state'              => 'pending',
-                'cidrBlock'          => cidrBlock,
-                'dhcpOptionsId'      => Fog::AWS::Mock.request_id,
-                'tagSet'             => {},
-                'enableDnsSupport'   => true,
-                'enableDnsHostnames' => false,
-                'mapPublicIpOnLaunch'=> false,
-                'classicLinkEnabled' => false
+                'vpcId'                 => vpc_id,
+                'state'                 => 'pending',
+                'cidrBlock'             => cidrBlock,
+                'dhcpOptionsId'         => Fog::AWS::Mock.request_id,
+                'tagSet'                => {},
+                'enableDnsSupport'      => true,
+                'enableDnsHostnames'    => false,
+                'mapPublicIpOnLaunch'   => false,
+                'classicLinkEnabled'    => false,
+                'classicLinkDnsSupport' => false
               }
               self.data[:vpcs].push(vpc)