cmonson_2ndwatch_awspec 0.85.3 → 0.85.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 33dd8bac9f0d77278e8035e0549e1bd4dc4e5814
-  data.tar.gz: ece45fb9449e43744ff3c47d6e90cb42387343ad
+  metadata.gz: 7747322ebc0dcafa322102975d550714433fe847
+  data.tar.gz: 85c21fb4deedc086a7700100265adf07a292f49c
 SHA512:
-  metadata.gz: 53a1c30eae2150e96c0c6b64006f4ea9a5901c3137b87bc358d8a2695df696d52784eba7c7e4f7e1cdef53df8ea261c9f9bf5c306aa6a0da9ac3afbededc6dfa
-  data.tar.gz: c6091ecc71cd490195dc290f348704be64c51cab1eb1ec72fec8efdcbb4a83da44220ec676f7fbffe9b878a8a579db63d4ef281ec9c679bad9e98bb7942b8059
+  metadata.gz: 5f0d4dedbf7eae02c6f95d7541ea7480e842d1d48a295a32828e8e8a651c75034513dcbec7a1996317dbe2eab5e45bf6e6e2be719cacd08b445ff53c3c4ec007
+  data.tar.gz: b091a6d2e44a93ae4469515060499185665fd417b7811213210cebd2bcf4d8fe51080d24215b7e240daffde26315b013eae3495eacc5b71d831dbf917827e727

data/.gitignore

@@ -8,3 +8,5 @@
 /tmp/
 /spec/secrets.yml
 /.ruby-version
+*.sw*
+*.gem

data/Rakefile

@@ -23,7 +23,8 @@ if defined?(RSpec)
                'spec:core',
                'spec:generator_spec',
                'spec:generator_doc',
-               'spec:rubocop']
+               'spec:rubocop',
+               'spec:helper']
 
     task type: types
 
@@ -49,6 +50,10 @@ if defined?(RSpec)
       t.pattern = 'spec/generator/doc/*_spec.rb'
     end
 
+    RSpec::Core::RakeTask.new(:helper) do |t|
+      t.pattern = 'spec/lib/awspec/helper/*_spec.rb'
+    end
+
     RuboCop::RakeTask.new
   end
 end

data/doc/resource_types.md

@@ -515,7 +515,7 @@ describe cloudwatch_logs('my-cloudwatch-logs-group') do
 end
 ```
 
-### its(:log_group_name), its(:creation_time), its(:retention_in_days), its(:metric_filter_count), its(:arn), its(:stored_bytes)
+### its(:log_group_name), its(:creation_time), its(:retention_in_days), its(:metric_filter_count), its(:arn), its(:stored_bytes), its(:kms_key_id)
 ## <a name="customer_gateway">customer_gateway</a>
 
 CustomerGateway resource type.
@@ -1974,7 +1974,7 @@ end
 ```
 
 
-### its(:vpc_id), its(:db_instance_identifier), its(:db_instance_class), its(:engine), its(:db_instance_status), its(:master_username), its(:db_name), its(:endpoint), its(:allocated_storage), its(:instance_create_time), its(:preferred_backup_window), its(:backup_retention_period), its(:db_security_groups), its(:availability_zone), its(:preferred_maintenance_window), its(:pending_modified_values), its(:latest_restorable_time), its(:multi_az), its(:engine_version), its(:auto_minor_version_upgrade), its(:read_replica_source_db_instance_identifier), its(:read_replica_db_instance_identifiers), its(:read_replica_db_cluster_identifiers), its(:license_model), its(:iops), its(:character_set_name), its(:secondary_availability_zone), its(:publicly_accessible), its(:status_infos), its(:storage_type), its(:tde_credential_arn), its(:db_instance_port), its(:db_cluster_identifier), its(:storage_encrypted), its(:kms_key_id), its(:dbi_resource_id), its(:ca_certificate_identifier), its(:domain_memberships), its(:copy_tags_to_snapshot), its(:monitoring_interval), its(:enhanced_monitoring_resource_arn), its(:monitoring_role_arn), its(:promotion_tier), its(:db_instance_arn), its(:timezone), its(:iam_database_authentication_enabled)
+### its(:vpc_id), its(:db_instance_identifier), its(:db_instance_class), its(:engine), its(:db_instance_status), its(:master_username), its(:db_name), its(:endpoint), its(:allocated_storage), its(:instance_create_time), its(:preferred_backup_window), its(:backup_retention_period), its(:db_security_groups), its(:availability_zone), its(:preferred_maintenance_window), its(:pending_modified_values), its(:latest_restorable_time), its(:multi_az), its(:engine_version), its(:auto_minor_version_upgrade), its(:read_replica_source_db_instance_identifier), its(:read_replica_db_instance_identifiers), its(:read_replica_db_cluster_identifiers), its(:license_model), its(:iops), its(:character_set_name), its(:secondary_availability_zone), its(:publicly_accessible), its(:status_infos), its(:storage_type), its(:tde_credential_arn), its(:db_instance_port), its(:db_cluster_identifier), its(:storage_encrypted), its(:kms_key_id), its(:dbi_resource_id), its(:ca_certificate_identifier), its(:domain_memberships), its(:copy_tags_to_snapshot), its(:monitoring_interval), its(:enhanced_monitoring_resource_arn), its(:monitoring_role_arn), its(:promotion_tier), its(:db_instance_arn), its(:timezone), its(:iam_database_authentication_enabled), its(:performance_insights_enabled), its(:performance_insights_kms_key_id)
 ### :unlock: Advanced use
 
 `rds` can use `Aws::RDS::DBInstance` resource (see http://docs.aws.amazon.com/sdkforruby/api/Aws/RDS/DBInstance.html).

data/lib/awspec/helper/client_wrap.rb

@@ -0,0 +1,46 @@
+module Awspec::Helper
+  class ClientWrap
+    attr_reader :client, :backoff, :iteration, :backoff_limit, :symbol
+    def initialize(real_client = nil, args = {})
+      raise ArgumentError, 'Client can not be nil' if real_client.nil?
+      @client        = real_client
+      @backoff       = args.key?(:backoff) ? args[:backoff] : 0.0
+      @orig_backoff  = @backoff
+      @iteration     = args.key?(:iteration) ? args[:iteration] : 1
+      @orig_iter     = @iteration
+      @backoff_limit = args.key?(:backoff_limit) ? args[:backoff_limit] : 30.0
+      # build the symbol we'll use to compare to any errors caught in method_missing
+      # below.
+      @symbol = real_client.class.to_s.split('::').shift(2).push('Errors', 'RequestLimitExceeded').join('::').to_sym
+    end
+
+    protected
+
+    # used to capture only the "RequestLimitExceeded" error from an aws
+    # client api call.  In the case of matching it we want to try again,
+    # backing off successively each time, until the backoff_limit is reached or
+    # exceeded, in which case, the error will be re-raised and it should fail
+    # as expected.
+    def method_missing(m, *args, &block)
+      begin
+        results = client.send(m, *args, &block)
+      rescue Exception => e
+        raise unless e.class.to_s == symbol.to_s && backoff < backoff_limit
+
+        @backoff = backoff + (iteration * iteration * 0.5)
+        @iteration += 1
+        sleep backoff
+        results = self.send(m, *args, &block)
+      end
+
+      reset_backoff
+
+      results
+    end
+
+    def reset_backoff
+      @backoff   = @orig_backoff
+      @iteration = @orig_iter
+    end
+  end
+end

data/lib/awspec/helper/finder.rb

@@ -35,6 +35,8 @@ require 'awspec/helper/finder/cloudformation'
 
 require 'awspec/helper/finder/account_attributes'
 
+require 'awspec/helper/client_wrap'
+
 module Awspec::Helper
   module Finder
     include Awspec::Helper::Finder::Alb
@@ -111,7 +113,10 @@ module Awspec::Helper
     CLIENTS.each do |method_name, client|
       define_method method_name do
         unless self.methods.include? "@#{method_name}"
-          instance_variable_set("@#{method_name}", client.new(CLIENT_OPTIONS))
+          instance_variable_set(
+            "@#{method_name}",
+            Awspec::Helper::ClientWrap.new(client.new(CLIENT_OPTIONS))
+          )
         end
       end
     end

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

@@ -50,7 +50,7 @@ module Awspec::Helper
           method_name = 'describe_' + type + '_filters'
           resources = []
           loop do
-            res = cloudwatch_logs_client.method(method_name).call(req)
+            res = cloudwatch_logs_client.send(method_name, req)
             case type
             when 'metric' then
               resources.push(*res.metric_filters)

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

@@ -41,14 +41,16 @@ module Awspec::Helper
         define_method 'find_' + type + '_gateway' do |*args|
           gateway_id = args.first
           method_name = 'describe_' + type + '_gateways'
-          res = ec2_client.method(method_name).call({
-                                                      filters: [{ name: type + '-gateway-id', values: [gateway_id] }]
-                                                    })
+          res = ec2_client.send(
+            method_name,
+            { filters: [{ name: type + '-gateway-id', values: [gateway_id] }] }
+          )
           resource = res[type + '_gateways'].single_resource(gateway_id)
           return resource if resource
-          res = ec2_client.method(method_name).call({
-                                                      filters: [{ name: 'tag:Name', values: [gateway_id] }]
-                                                    })
+          res = ec2_client.send(
+            method_name,
+            { filters: [{ name: 'tag:Name', values: [gateway_id] }] }
+          )
           res[type + '_gateways'].single_resource(gateway_id)
         end
       end

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

@@ -7,7 +7,7 @@ module Awspec::Helper
         define_method 'find_iam_' + type do |*args|
           id = args.first
           selected = []
-          res = iam_client.method('list_' + type.pluralize).call
+          res = iam_client.send('list_' + type.pluralize)
           loop do
             selected += res[type.pluralize].select do |u|
               u[type + '_name'] == id || u[type + '_id'] == id || u.arn == id
@@ -40,16 +40,18 @@ module Awspec::Helper
 
       %w(user group role).each do |type|
         define_method 'select_iam_policy_by_' + type + '_name' do |name|
-          res = iam_client.method('list_attached_' + type + '_policies').call({
-                                                                                (type + '_name').to_sym => name
-                                                                              })
+          res = iam_client.send(
+            'list_attached_' + type + '_policies',
+            { (type + '_name').to_sym => name }
+          )
           res.attached_policies
         end
 
         define_method 'select_inline_policy_by_' + type + '_name' do |name|
-          res = iam_client.method('list_' + type + '_policies').call({
-                                                                       (type + '_name').to_sym => name
-                                                                     })
+          res = iam_client.send(
+            'list_' + type + '_policies',
+            { (type + '_name').to_sym => name }
+          )
           res.policy_names
         end
       end

data/lib/awspec/type/security_group.rb

@@ -103,6 +103,7 @@ module Awspec::Type
         end
         next true if sg.group_id == cidr
         sg2 = find_security_group(sg.group_id)
+        next false if sg2.nil?
         next true if sg2.group_name == cidr
         sg2.tags.find do |tag|
           tag.key == 'Name' && tag.value == cidr

data/lib/awspec/version.rb

@@ -1,3 +1,3 @@
 module Awspec
-  VERSION = '0.85.3'
+  VERSION = '0.85.4'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cmonson_2ndwatch_awspec
 version: !ruby/object:Gem::Version
-  version: 0.85.3
+  version: 0.85.4
 platform: ruby
 authors:
 - k1LoW
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-09-19 00:00:00.000000000 Z
+date: 2017-09-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -368,6 +368,7 @@ files:
 - lib/awspec/generator/spec/vpc.rb
 - lib/awspec/generator/template.rb
 - lib/awspec/helper.rb
+- lib/awspec/helper/client_wrap.rb
 - lib/awspec/helper/color.rb
 - lib/awspec/helper/finder.rb
 - lib/awspec/helper/finder/account_attributes.rb