awspec 0.73.1 → 0.73.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e570a6a990e351cb5185bfaea27857ba2179f155
-  data.tar.gz: 80339d75578c5fb87b0e2eb5b29eae3dd1ef38e1
+  metadata.gz: f6bd0b2085bd7ae739cea83dd5f2713235eb3bde
+  data.tar.gz: 3acda26007092f63eda0f5d5d0b23c7aba07f622
 SHA512:
-  metadata.gz: 992599280ba5f2de8d3457f990557564c23360c0200fb9c8e3b78ca99952d6d54e7b2a28d7b9c2a8dea5bb07d6ef6a09889e4f06303850b11c1b4eb966b3bf04
-  data.tar.gz: ea5fc0d07b3eedc77dbe34f9857391dd4a86bd3385f1f878a612e6bd1c51c3a5471babdece320710d115e0b932a350ec37b00e3ff4f3e84aa9eb2f5c0a64a842
+  metadata.gz: a8fb6fab06cf538c72b19c57d7e0555eb555d6d1e5df311855003050b2ed5edceab6a6f8bc9826c00d0a042597ea9cba421beda05730f2e88e6e31ed3eed8d5e
+  data.tar.gz: 9dfeb8d62661b6064eeee9a7f39908079ac1d5861326f59e461c8e7a67630ab9e6ff8f09674530352ae35670a988bd4bd54633e4704a57b2c26b9b438f94674d

data/lib/awspec/command/generate.rb

@@ -38,7 +38,7 @@ module Awspec
     types_for_generate_all = %w(
       cloudwatch_alarm cloudwatch_event directconnect ebs efs
       elasticsearch iam_group iam_policy iam_role iam_user kms lambda
-      acm
+      acm cloudwatch_logs
     )
 
     types_for_generate_all.each do |type|

data/lib/awspec/generator.rb

@@ -23,6 +23,7 @@ require 'awspec/generator/spec/iam_user'
 require 'awspec/generator/spec/iam_group'
 require 'awspec/generator/spec/iam_role'
 require 'awspec/generator/spec/acm'
+require 'awspec/generator/spec/cloudwatch_logs'
 
 # Doc
 require 'awspec/generator/doc/type'

data/lib/awspec/generator/spec/cloudwatch_event.rb

@@ -4,7 +4,7 @@ module Awspec::Generator
       include Awspec::Helper::Finder
       def generate_all
         events = select_all_cloudwatch_events
-        raise 'Not Found alarm' if events.empty?
+        raise 'Not Found event' if events.empty?
         ERB.new(event_spec_template, nil, '-').result(binding).chomp
       end
 

data/lib/awspec/generator/spec/cloudwatch_logs.rb

@@ -0,0 +1,68 @@
+module Awspec::Generator
+  module Spec
+    class CloudwatchLogs
+      include Awspec::Helper::Finder
+      def generate_all
+        log_groups = select_all_cloudwatch_logs_log_groups
+        raise 'Not Found Log Group' if log_groups.empty?
+        specs = log_groups.map do |log_group|
+          log_stream_line = generate_log_stream_spec(log_group.log_group_name)
+          metric_filter_lines = generate_log_metric_filters_specs(log_group.log_group_name)
+          subscription_filter_lines = generate_log_subscription_filters_specs(log_group.log_group_name)
+          content = ERB.new(cloudwatch_logs_spec_template, nil, '-').result(binding).gsub(/^\n/, '')
+        end
+        specs.join("\n")
+      end
+
+      def generate_log_stream_spec(log_group)
+        log_stream = find_cloudwatch_logs_stream_by_log_group_name(log_group)
+        "it { should have_log_stream('#{log_stream.log_stream_name}') }" unless log_stream.nil?
+      end
+
+      def generate_log_metric_filters_specs(log_group)
+        metric_filters = select_all_cloudwatch_logs_metric_filter(log_group)
+        metric_filter_lines = []
+        metric_filters.each do |metric_filter|
+          line = "it { should have_metric_filter('#{metric_filter.filter_name}') }"
+          metric_filter_lines.push(line)
+        end
+        metric_filter_lines
+      end
+
+      def generate_log_subscription_filters_specs(log_group)
+        subscription_filters = select_all_cloudwatch_logs_subscription_filter(log_group)
+        subscription_filter_lines = []
+        subscription_filters.each do |subscription_filter|
+          line = "it { should have_subscription_filter('#{subscription_filter.filter_name}')"
+          unless subscription_filter.filter_pattern.empty?
+            line += ".filter_pattern('#{subscription_filter.filter_pattern}')"
+          end
+          line += ' }'
+          subscription_filter_lines.push(line)
+        end
+        subscription_filter_lines
+      end
+
+      def cloudwatch_logs_spec_template
+        template = <<-'EOF'
+describe cloudwatch_logs('<%= log_group.log_group_name %>') do
+  it { should exist }
+<%- unless log_group.retention_in_days.nil? -%>
+  its(:retention_in_days) { should eq <%= log_group.retention_in_days %> }
+<% end -%>
+<%- unless log_stream_line.nil? -%>
+  <%= log_stream_line %>
+<% end -%>
+<% metric_filter_lines.each do |metric_filter_line| %>
+  <%= metric_filter_line %>
+<% end %>
+<% subscription_filter_lines.each do |subscription_filter_line| %>
+  <%= subscription_filter_line %>
+<% end %>
+end
+EOF
+        template
+      end
+    end
+  end
+end

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

@@ -30,6 +30,39 @@ module Awspec::Helper
           filter.filter_name == filter_name
         end
       end
+
+      def select_all_cloudwatch_logs_log_groups
+        req = {}
+        log_groups = []
+        loop do
+          res = cloudwatch_logs_client.describe_log_groups(req)
+          log_groups.push(*res.log_groups)
+          break if res.next_token.nil?
+          req[:next_token] = res.next_token
+        end
+        log_groups
+      end
+
+      filter_types = %w(metric subscription)
+      filter_types.each do |type|
+        define_method 'select_all_cloudwatch_logs_' + type + '_filter' do |*args|
+          req = { log_group_name: args.first }
+          method_name = 'describe_' + type + '_filters'
+          resources = []
+          loop do
+            res = cloudwatch_logs_client.method(method_name).call(req)
+            case type
+            when 'metric' then
+              resources.push(*res.metric_filters)
+            when 'subscription' then
+              resources.push(*res.subscription_filters)
+            end
+            break if res.next_token.nil?
+            req[:next_token] = res.next_token
+          end
+          resources
+        end
+      end
     end
   end
 end

data/lib/awspec/type/cloudwatch_logs.rb

@@ -20,7 +20,11 @@ module Awspec::Type
 
     def has_subscription_filter?(filter_name, pattern = nil)
       ret = find_cloudwatch_logs_subscription_fileter_by_log_group_name(@id, filter_name)
-      return false unless ret.filter_pattern == pattern
+      if pattern.nil?
+        return true if ret.filter_name == filter_name
+      else
+        return false unless ret.filter_pattern == pattern
+      end
       return true if ret.filter_name == filter_name
     end
   end

data/lib/awspec/version.rb

@@ -1,3 +1,3 @@
 module Awspec
-  VERSION = '0.73.1'
+  VERSION = '0.73.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: awspec
 version: !ruby/object:Gem::Version
-  version: 0.73.1
+  version: 0.73.2
 platform: ruby
 authors:
 - k1LoW
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-03-30 00:00:00.000000000 Z
+date: 2017-04-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -330,6 +330,7 @@ files:
 - lib/awspec/generator/spec/acm.rb
 - lib/awspec/generator/spec/cloudwatch_alarm.rb
 - lib/awspec/generator/spec/cloudwatch_event.rb
+- lib/awspec/generator/spec/cloudwatch_logs.rb
 - lib/awspec/generator/spec/directconnect.rb
 - lib/awspec/generator/spec/ebs.rb
 - lib/awspec/generator/spec/ec2.rb