awspec 0.10.2 → 0.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 735ac3ea11197e0d21958bd387af953a77720760
-  data.tar.gz: 177f17845d8acacc5fc45e541dad53f4333109b0
+  metadata.gz: 16910d9cda734c86c840666374dc2c4b76879fbb
+  data.tar.gz: 4155b14d91f07184993c5ae95e7a4145ac00ff04
 SHA512:
-  metadata.gz: e8506223f8805c9daa7001cc9d5c2ffeb57fca18c02df41e4af06bfe88b305c8f7ea66bb7f20058c272e0749507297cff3ef7b0fb7612958a16dcc0f37587c88
-  data.tar.gz: 69f5c5c2289aab357c3479f0a08b4f48721dea1eb3c41f136d503c7d866cb2ef240beaf8eba68badc5467c21090cbf6aacec3cb172c9f32f3ccb6ceb3c45b49e
+  metadata.gz: d2ebfcdabd2c5bc3510d267d8078c103af3342a616af6c73f32eaf1759799eba171b07161d33b31e9e7d38d16887f66663a210dde5ba8e552f850cb9dc62ff55
+  data.tar.gz: 134eb310c685f2a8fdc7686d54f6b1f2ae85996fc3e2d71f475e8d7e6a332b724c7720454c1598c16802a5371957d031784c5bff722053aac394f87d3ec69c41

data/README.md

@@ -60,6 +60,7 @@ describe ec2('my-ec2-tag-name') do
   it { should belong_to_vpc('my-vpc') }
   it { should belong_to_subnet('subnet-1234a567') }
   it { should have_eip('123.0.456.789') }
+  it { should be_disabled_api_termination }
 end
 ```
 

data/doc/resource_types.md

@@ -31,6 +31,8 @@ end
 ```
 
 
+### be_disabled_api_termination
+
 ### be_pending
 
 ### be_running

data/lib/awspec/helper/finder/ec2.rb

@@ -36,6 +36,12 @@ module Awspec::Helper
                                                              res[:reservations].first[:instances].count == 1
       end
 
+      def find_ec2_attribute(id, attribute)
+        res = @ec2_client.describe_instance_attribute({
+                                                        instance_id: id, attribute: attribute
+                                                      })
+      end
+
       def find_subnet(subnet_id)
         res = @ec2_client.describe_subnets({
                                              filters: [{ name: 'subnet-id', values: [subnet_id] }]

data/lib/awspec/stub/ec2.rb

@@ -40,6 +40,12 @@ Aws.config[:ec2] = {
         }
       ]
     },
+    describe_instance_attribute: {
+      instance_id: 'i-ec12345a',
+      disable_api_termination: {
+        value: true
+      }
+    },
     describe_vpcs: {
       vpcs: [
         {

data/lib/awspec/stub/iam_group.rb

@@ -37,7 +37,7 @@ Aws.config[:iam] = {
         }
       ],
       is_truncated: false,
-      maker: nil
+      marker: nil
     }
   }
 }

data/lib/awspec/stub/iam_role.rb

@@ -17,7 +17,7 @@ Aws.config[:iam] = {
         }
       ],
       is_truncated: false,
-      maker: nil
+      marker: nil
     }
   }
 }

data/lib/awspec/stub/iam_user.rb

@@ -28,7 +28,7 @@ Aws.config[:iam] = {
         }
       ],
       is_truncated: false,
-      maker: nil
+      marker: nil
     }
   }
 }

data/lib/awspec/type/ec2.rb

@@ -20,6 +20,11 @@ module Awspec::Type
       end
     end
 
+    def disabled_api_termination?
+      ret = find_ec2_attribute(@id, 'disableApiTermination')
+      ret[:disable_api_termination][:value]
+    end
+
     def has_eip?(ip_address = nil)
       option = {
         filters: [{ name: 'instance-id', values: [@id] }]

data/lib/awspec/type/rds_db_parameter_group.rb

@@ -5,18 +5,17 @@ module Awspec::Type
     def initialize(name)
       super
       @parameters = {}
+      res = @rds_client.describe_db_parameters({
+                                                 db_parameter_group_name: name
+                                               })
 
-      marker = nil
-      while @parameters.empty? || !marker.nil?
-        res = @rds_client.describe_db_parameters(
-          db_parameter_group_name: name,
-          marker: marker)
-        marker = res.marker
-        break if res.parameters.empty?
+      loop do
         res.parameters.each do |param|
           @parameters[param.parameter_name] = param.parameter_value
         end
+        (res.next_page? && res = res.next_page) || break
       end
+
       @id = name unless @parameters.empty?
       @resource = @parameters
     end

data/lib/awspec/version.rb

@@ -1,3 +1,3 @@
 module Awspec
-  VERSION = '0.10.2'
+  VERSION = '0.11.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: awspec
 version: !ruby/object:Gem::Version
-  version: 0.10.2
+  version: 0.11.0
 platform: ruby
 authors:
 - k1LoW
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-10 00:00:00.000000000 Z
+date: 2015-09-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec