fog-aws 2.0.1 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 89a45cbf417fa066e177d10833cb5836dac4f8b9
-  data.tar.gz: a518960a957a466264af023553e61b0798798810
+SHA256:
+  metadata.gz: 8397c56917f7c1ee4e17de5f7ab0bd60878a95bb781f4c4bbada930ace0fea85
+  data.tar.gz: 6258fccc1a3bba86c6fe25c08a4cb59b3ce018d9d9b03ad1fccf2d9fa8f68e3f
 SHA512:
-  metadata.gz: 1e220677db83bb07bbc49b23407a1a69ce61e44413460e83ebcd91456ce790edf46f650fff7654e2cc2fe4912a8c52c8d764f57154d63ef320ce63b2ed53a066
-  data.tar.gz: cb82026c578840f2987840cc2a37fb528dace837039ba475ae33fba28628508fdd973d3e941c20b074828ceb5d50f1a0edb8d7541959998dfc3763a92174bbc5
+  metadata.gz: 5febe6270c40489d8c4c3eb2c0ae5cf25f026ebb86a33f91bfebcf15202bc558b542af6c6c4ea9ca2374be5e38d2ea46d5edfb19b143d3bfc7d8f760ae6c69c9
+  data.tar.gz: ae79ca65ce7c0d23ea19aafba363f9e5867a32062ef7b9f61d908454e9e35c1f502d08ad8bb5abc596a4a41fbfa961b376fd0e6131245086be21164f7f434ff9

data/CHANGELOG.md

@@ -2,7 +2,24 @@
 
 ## [Unreleased](https://github.com/fog/fog-aws/tree/HEAD)
 
-[Full Changelog](https://github.com/fog/fog-aws/compare/v2.0.0...HEAD)
+[Full Changelog](https://github.com/fog/fog-aws/compare/v2.0.1...HEAD)
+
+**Closed issues:**
+
+- Easily Delete S3 directory and it contents? [\#435](https://github.com/fog/fog-aws/issues/435)
+- S3 upload help -- likely user error :\) [\#432](https://github.com/fog/fog-aws/issues/432)
+- Fog not work without pry [\#317](https://github.com/fog/fog-aws/issues/317)
+
+**Merged pull requests:**
+
+- fix: attach volume on \#save, remove \#server= [\#443](https://github.com/fog/fog-aws/pull/443) ([lanej](https://github.com/lanej))
+- Adding g3 flavors [\#440](https://github.com/fog/fog-aws/pull/440) ([AlexLamande](https://github.com/AlexLamande))
+- Add c5 and m5 instance types. [\#439](https://github.com/fog/fog-aws/pull/439) ([rogersd](https://github.com/rogersd))
+- Include link to full documentation [\#434](https://github.com/fog/fog-aws/pull/434) ([kylefox](https://github.com/kylefox))
+- fog-core 2.x, fog-json 1.x [\#433](https://github.com/fog/fog-aws/pull/433) ([lanej](https://github.com/lanej))
+
+## [v2.0.1](https://github.com/fog/fog-aws/tree/v2.0.1) (2018-02-28)
+[Full Changelog](https://github.com/fog/fog-aws/compare/v2.0.0...v2.0.1)
 
 **Closed issues:**
 

data/README.md

@@ -76,6 +76,10 @@ instance.destroy
 
 Fog::AWS is more than EC2 since it supports many services provided by AWS. The best way to learn and to know about how many services are supported is to take a look at the source code. To review the tests directory and to play with the library in ```irb``` can be very helpful resources as well.
 
+## Documentation
+
+See the [online documentation](http://www.rubydoc.info/github/fog/fog-aws) for a complete API reference.
+
 ## Contributing
 
 1. Fork it ( https://github.com/fog/fog-aws/fork )

data/fog-aws.gemspec

@@ -23,11 +23,11 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency 'bundler', '~> 1.15'
   spec.add_development_dependency 'rake',    '~> 10.0'
-  spec.add_development_dependency 'shindo',  '~> 0.3'
   spec.add_development_dependency 'rubyzip', '~> 1.2.1'
+  spec.add_development_dependency 'shindo',  '~> 0.3'
 
-  spec.add_dependency 'fog-core',  '~> 1.38'
-  spec.add_dependency 'fog-json',  '~> 1.0'
+  spec.add_dependency 'fog-core',  '~> 2.1'
+  spec.add_dependency 'fog-json',  '~> 1.1'
   spec.add_dependency 'fog-xml',   '~> 0.1'
   spec.add_dependency 'ipaddress', '~> 0.8'
 end

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

@@ -244,6 +244,66 @@ module Fog
           :ebs_optimized_available => true,
           :instance_store_volumes  => 0
         },
+        {
+          :id                      => 'c5.large',
+          :name                    => 'C5 Large',
+          :bits                    => 64,
+          :cores                   => 2,
+          :disk                    => 0,
+          :ram                     => 4096,
+          :ebs_optimized_available => true,
+          :instance_store_volumes  => 0
+        },
+        {
+          :id                      => 'c5.xlarge',
+          :name                    => 'C5 Extra Large',
+          :bits                    => 64,
+          :cores                   => 4,
+          :disk                    => 0,
+          :ram                     => 8192,
+          :ebs_optimized_available => true,
+          :instance_store_volumes  => 0
+        },
+        {
+          :id                      => 'c5.2xlarge',
+          :name                    => 'C5 Double Extra Large',
+          :bits                    => 64,
+          :cores                   => 8,
+          :disk                    => 0,
+          :ram                     => 16384,
+          :ebs_optimized_available => true,
+          :instance_store_volumes  => 0
+        },
+        {
+          :id                      => 'c5.4xlarge',
+          :name                    => 'C5 Quadruple Extra Large',
+          :bits                    => 64,
+          :cores                   => 16,
+          :disk                    => 0,
+          :ram                     => 32768,
+          :ebs_optimized_available => true,
+          :instance_store_volumes  => 0
+        },
+        {
+          :id                      => 'c5.9xlarge',
+          :name                    => 'C5 Nine Extra Large',
+          :bits                    => 64,
+          :cores                   => 36,
+          :disk                    => 0,
+          :ram                     => 73728,
+          :ebs_optimized_available => true,
+          :instance_store_volumes  => 0
+        },
+        {
+          :id                      => 'c5.18xlarge',
+          :name                    => 'C5 Eighteen Extra Large',
+          :bits                    => 64,
+          :cores                   => 72,
+          :disk                    => 0,
+          :ram                     => 147456,
+          :ebs_optimized_available => true,
+          :instance_store_volumes  => 0
+        },
         {
           :id                      => 'g2.2xlarge',
           :name                    => 'GPU Double Extra Large',
@@ -694,6 +754,66 @@ module Fog
           :ebs_optimized_available => true,
           :instance_store_volumes  => 0
         },
+        {
+          :id                      => "m5.large",
+          :name                    => "M5 Large",
+          :bits                    => 64,
+          :cores                   => 2,
+          :ram                     => 8192,
+          :disk                    => 0,
+          :ebs_optimized_available => true,
+          :instance_store_volumes  => 0
+        },
+        {
+          :id                      => "m5.xlarge",
+          :name                    => "M5 Extra Large",
+          :bits                    => 64,
+          :cores                   => 4,
+          :ram                     => 16384,
+          :disk                    => 0,
+          :ebs_optimized_available => true,
+          :instance_store_volumes  => 0
+        },
+        {
+          :id                      => "m5.2xlarge",
+          :name                    => "M5 Double Extra Large",
+          :bits                    => 64,
+          :cores                   => 8,
+          :ram                     => 32768,
+          :disk                    => 0,
+          :ebs_optimized_available => true,
+          :instance_store_volumes  => 0
+        },
+        {
+          :id                      => "m5.4xlarge",
+          :name                    => "M5 Quadruple Extra Large",
+          :bits                    => 64,
+          :cores                   => 16,
+          :ram                     => 65536,
+          :disk                    => 0,
+          :ebs_optimized_available => true,
+          :instance_store_volumes  => 0
+        },
+        {
+          :id                      => "m5.12xlarge",
+          :name                    => "M5 Twelve Extra Large",
+          :bits                    => 64,
+          :cores                   => 48,
+          :ram                     => 196608,
+          :disk                    => 0,
+          :ebs_optimized_available => true,
+          :instance_store_volumes  => 0
+        },
+        {
+          :id                      => "m5.24xlarge",
+          :name                    => "M5 Twenty Four Extra Large",
+          :bits                    => 64,
+          :cores                   => 96,
+          :ram                     => 393216,
+          :disk                    => 0,
+          :ebs_optimized_available => true,
+          :instance_store_volumes  => 0
+        },
         {
           :id                      => "p2.xlarge",
           :name                    => "General Purpose GPU Extra Large",
@@ -753,6 +873,36 @@ module Fog
           :disk                    => 0,
           :ebs_optimized_available => true,
           :instance_store_volumes  => 0
+        },
+        {
+          :id                      => 'g3.4xlarge',
+          :name                    => 'G3 Quadruple Extra Large',
+          :bits                    => 64,
+          :cores                   => 16,
+          :disk                    => 0,
+          :ram                     => 124928,
+          :ebs_optimized_available => true,
+          :instance_store_volumes  => 0
+        },
+        {
+          :id                      => 'g3.8xlarge',
+          :name                    => 'G3 Octuple Extra Large',
+          :bits                    => 64,
+          :cores                   => 32,
+          :disk                    => 0,
+          :ram                     => 249856,
+          :ebs_optimized_available => true,
+          :instance_store_volumes  => 0
+        },
+        {
+          :id                      => 'g3.16xlarge',
+          :name                    => 'G3 Sixteen Extra Large',
+          :bits                    => 64,
+          :cores                   => 64,
+          :disk                    => 0,
+          :ram                     => 499712,
+          :ebs_optimized_available => true,
+          :instance_store_volumes  => 0
         }
       ]
 

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

@@ -21,7 +21,7 @@ module Fog
 
         def initialize(attributes = {})
           # assign server first to prevent race condition with persisted?
-          self.server = attributes.delete(:server)
+          @server = attributes.delete(:server)
           super
         end
 
@@ -59,27 +59,21 @@ module Fog
             requires :availability_zone
             requires_one :size, :snapshot_id
 
-            if type == 'io1'
-              requires :iops
-            end
+            requires :iops if type == 'io1'
 
             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
-              )
+              Fog.wait_for { service.volumes.get(identity) }
+              service.create_tags(identity, tags)
             end
 
-            if @server
-              self.server = @server
-            end
-            true
+            attach(@server, device) if @server && device
           end
+
+          true
         end
 
         def server
@@ -87,14 +81,6 @@ module Fog
           service.servers.get(server_id)
         end
 
-        def server=(new_server)
-          if new_server
-            attach(new_server)
-          else
-            detach
-          end
-        end
-
         def snapshots
           requires :id
           service.snapshots(:volume => self)
@@ -109,22 +95,15 @@ module Fog
           detach(true)
         end
 
-        private
-
-        def attachmentSet=(new_attachment_set)
-          merge_attributes(new_attachment_set.first || {})
-        end
-
-        def attach(new_server)
+        def attach(new_server, new_device)
           if !persisted?
             @server = new_server
             self.availability_zone = new_server.availability_zone
           elsif new_server
-            requires :device
             wait_for { ready? }
             @server = nil
             self.server_id = new_server.id
-            service.attach_volume(server_id, id, device)
+            service.attach_volume(server_id, id, new_device)
             reload
           end
         end
@@ -138,6 +117,16 @@ module Fog
           end
         end
 
+        def server=(_)
+          raise NoMethodError, 'use Fog::Compute::AWS::Volume#attach(server, device)'
+        end
+
+        private
+
+        def attachmentSet=(new_attachment_set)
+          merge_attributes(new_attachment_set.first || {})
+        end
+
         def create_params
           {
             'Encrypted'  => encrypted,

data/lib/fog/aws/models/elb/backend_server_descriptions.rb

@@ -12,7 +12,7 @@ module Fog
         end
 
         def get(instance_port)
-          all.find{|e| e.instance_port == instance_port}
+          all.find { |e| e.instance_port == instance_port }
         end
       end
     end

data/lib/fog/aws/models/elb/listeners.rb

@@ -12,17 +12,16 @@ module Fog
         end
 
         def get(lb_port)
-          all.find{|listener| listener.lb_port == lb_port}
+          all.find { |listener| listener.lb_port == lb_port }
         end
 
         private
+
         # Munge an array of ListenerDescription hashes like:
         # {'Listener' => listener, 'PolicyNames' => []}
         # to an array of listeners with a PolicyNames key
         def munged_data
-          data.map {|description|
-            description['Listener'].merge('PolicyNames' => description['PolicyNames'])
-          }
+          data.map { |description| description['Listener'].merge('PolicyNames' => description['PolicyNames']) }
         end
       end
     end

data/lib/fog/aws/models/elb/load_balancer.rb

@@ -223,16 +223,24 @@ module Fog
         end
 
         def reload
-          super
           @instance_health = nil
           @policy_descriptions = nil
-          self
+          super
         end
 
         def destroy
           requires :id
           service.delete_load_balancer(id)
         end
+
+        protected
+
+        def all_associations_and_attributes
+          super.merge(
+            'ListenerDescriptions' => attributes['ListenerDescriptions'],
+            'BackendServerDescriptions' => attributes['BackendServerDescriptions'],
+          )
+        end
       end
     end
   end

data/lib/fog/aws/models/elb/load_balancers.rb

@@ -6,7 +6,7 @@ module Fog
         model Fog::AWS::ELB::LoadBalancer
 
         # Creates a new load balancer
-        def initialize(attributes={})
+        def initialize(attributes = {})
           super
         end
 
@@ -14,7 +14,7 @@ module Fog
           result = []
           marker = nil
           finished = false
-          while !finished
+          until finished
             data = service.describe_load_balancers('Marker' => marker).body
             result.concat(data['DescribeLoadBalancersResult']['LoadBalancerDescriptions'])
             marker = data['DescribeLoadBalancersResult']['NextMarker']
@@ -24,10 +24,9 @@ module Fog
         end
 
         def get(identity)
-          if identity
-            data = service.describe_load_balancers('LoadBalancerNames' => identity).body['DescribeLoadBalancersResult']['LoadBalancerDescriptions'].first
-            new(data)
-          end
+          return unless identity
+          data = service.describe_load_balancers('LoadBalancerNames' => identity).body['DescribeLoadBalancersResult']['LoadBalancerDescriptions'].first
+          new(data)
         rescue Fog::AWS::ELB::NotFound
           nil
         end

data/lib/fog/aws/requests/elb/create_load_balancer_listeners.rb

@@ -51,34 +51,37 @@ module Fog
 
       class Mock
         def create_load_balancer_listeners(lb_name, listeners)
-          if load_balancer = self.data[:load_balancers][lb_name]
-            response = Excon::Response.new
+          load_balancer = data[:load_balancers][lb_name]
+          raise Fog::AWS::ELB::NotFound unless load_balancer
+          response = Excon::Response.new
 
-            certificate_ids = Fog::AWS::IAM::Mock.data[@aws_access_key_id][:server_certificates].map {|n, c| c['Arn'] }
+          certificate_ids = Fog::AWS::IAM::Mock.data[@aws_access_key_id][:server_certificates].map { |_n, c| c['Arn'] }
 
-            listeners.each do |listener|
-              if listener['SSLCertificateId'] and !certificate_ids.include? listener['SSLCertificateId']
-                raise Fog::AWS::IAM::NotFound.new('CertificateNotFound')
-              end
+          listeners.each do |listener|
+            if listener['SSLCertificateId'] && !certificate_ids.include?(listener['SSLCertificateId'])
+              raise Fog::AWS::IAM::NotFound, 'CertificateNotFound'
+            end
 
-              if (%w( HTTP HTTPS).include?(listener['Protocol']) && !%w( HTTP HTTPS ).include?(listener['InstanceProtocol'])) ||
-                  (%w( TCP SSL).include?(listener['Protocol']) && !%w( TCP SSL ).include?(listener['InstanceProtocol']))
-                raise Fog::AWS::ELB::ValidationError
-              end if listener['Protocol'] && listener['InstanceProtocol']
-              load_balancer['ListenerDescriptions'] << {'Listener' => listener, 'PolicyNames' => []}
+            if listener['Protocol'] && listener['InstanceProtocol']
+              if (
+                  %w[HTTP HTTPS].include?(listener['Protocol']) && !%w[HTTP HTTPS].include?(listener['InstanceProtocol'])
+              ) || (
+                %w[TCP SSL].include?(listener['Protocol']) && !%w[TCP SSL].include?(listener['InstanceProtocol'])
+              )
+              raise Fog::AWS::ELB::ValidationError
+              end
             end
+            load_balancer['ListenerDescriptions'] << { 'Listener' => listener, 'PolicyNames' => [] }
+          end
 
-            response.status = 200
-            response.body = {
-              'ResponseMetadata' => {
-                'RequestId' => Fog::AWS::Mock.request_id
-              }
+          response.status = 200
+          response.body = {
+            'ResponseMetadata' => {
+              'RequestId' => Fog::AWS::Mock.request_id
             }
+          }
 
-            response
-          else
-            raise Fog::AWS::ELB::NotFound
-          end
+          response
         end
       end
     end

data/lib/fog/aws/version.rb

@@ -1,5 +1,5 @@
 module Fog
   module AWS
-    VERSION = "2.0.1"
+    VERSION = "3.0.0"
   end
 end

data/tests/models/compute/volume_tests.rb

@@ -1,37 +1,45 @@
-Shindo.tests("Fog::Compute[:aws] | volume", ['aws']) do
-
+Shindo.tests('Fog::Compute[:aws] | volume', ['aws']) do
   @server = Fog::Compute[:aws].servers.create
   @server.wait_for { ready? }
 
-  model_tests(Fog::Compute[:aws].volumes, {:availability_zone => @server.availability_zone, :size => 1, :device => '/dev/sdz1', :tags => {"key" => "value"}, :type => 'gp2'}, true) do
-
-    @instance.wait_for { ready? }
-
-    tests('#server = @server').succeeds do
-      @instance.server = @server
+  model_tests(
+    Fog::Compute[:aws].volumes,
+    {
+      availability_zone: @server.availability_zone,
+      size: 1,
+      tags: { 'key' => 'value' },
+      type: 'gp2',
+      server: @server,
+      device: '/dev/sdz1'
+    },
+    true
+  ) do
+
+    tests('attached').succeeds do
+      @instance.server == @server
     end
 
-    @instance.wait_for { state == 'in-use' }
-
-    tests('#server').succeeds do
-      @instance.server.id == @server.id
+    tests('#detach').succeeds do
+      @instance.detach
+      @instance.wait_for { ready? }
+      @instance.server.nil?
     end
 
-    tests('#server = nil').succeeds do
-      (@instance.server = nil).nil?
+    tests('#server=').raises(NoMethodError, 'use Fog::Compute::AWS::Volume#attach(server, device)') do
+      @instance.server = @server
     end
 
-    @instance.wait_for { ready? }
-
-    @instance.server = @server
-    @instance.wait_for { state == 'in-use' }
+    tests('#attach(server, device)').succeeds do
+      @instance.attach(@server, '/dev/sdz1')
+      @instance.server == @server
+    end
 
     tests('#force_detach').succeeds do
       @instance.force_detach
+      @instance.wait_for { ready? }
+      @instance.server.nil?
     end
 
-    @instance.wait_for { ready? }
-
     @instance.type = 'io1'
     @instance.iops = 5000
     @instance.size = 100
@@ -47,10 +55,9 @@ Shindo.tests("Fog::Compute[:aws] | volume", ['aws']) do
     returns(5000)  { @instance.iops }
     returns(100)   { @instance.size }
 
-    tests('@instance.reload.tags').returns({'key' => 'value'}) do
-      @instance.reload.tags
+    tests('@instance.tags').returns({'key' => 'value'}) do
+      @instance.tags
     end
-
   end
 
   @server.destroy

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fog-aws
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 3.0.0
 platform: ruby
 authors:
 - Josh Lane
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-28 00:00:00.000000000 Z
+date: 2018-04-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -40,61 +40,61 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '10.0'
 - !ruby/object:Gem::Dependency
-  name: shindo
+  name: rubyzip
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: 1.2.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: 1.2.1
 - !ruby/object:Gem::Dependency
-  name: rubyzip
+  name: shindo
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.1
+        version: '0.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.1
+        version: '0.3'
 - !ruby/object:Gem::Dependency
   name: fog-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.38'
+        version: '2.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.38'
+        version: '2.1'
 - !ruby/object:Gem::Dependency
   name: fog-json
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: fog-xml
   requirement: !ruby/object:Gem::Requirement
@@ -1700,7 +1700,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Module for the 'fog' gem to support Amazon Web Services.