awspec 0.75.1 → 0.75.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 49fe94ffa30e6b9c92023146cd85c521aceff9e2
-  data.tar.gz: 179a8c1ce8704c773a939256ae6d9236e0ede141
+  metadata.gz: cc2c82413eb3cee4c14e3d2c01f2644a83ea17db
+  data.tar.gz: b00e6c88ee1b8744d6f043ad87cb7f0c376321ba
 SHA512:
-  metadata.gz: a1e86efde98bdfac2803b68190fd244be251d51b623170d5369a7d1666cb5e6ff6077b1a301e7369c7be7a56655eebb3681d3fc02dfa13c1a13e5a0952c7612b
-  data.tar.gz: 666058aa1d1c028f5585fe798e4920010365d4fa74437b995072044c555bd3a760803308cdd9d8ff9d3264ac727ecef52760fc84b137d491389e6fd84aa83a46
+  metadata.gz: 92e63018b98c2be4d8a25bec3b1521783125c98d0f68aaafd046157c16b108299b6a4fa8ffcf2488ec4e3e6669cb1f4b575fe090f106845829716caa129d99b0
+  data.tar.gz: fd61c7868686629a9f1da1c31f1a89ce5a3cd2111e74a32d8a02f1e9e07041d880ebae81401afbe8bf7a744a1faaa89e8475bf6a58f54890eea20d0dc6c2a7b1

data/lib/awspec/generator.rb

@@ -26,6 +26,7 @@ require 'awspec/generator/spec/acm'
 require 'awspec/generator/spec/cloudwatch_logs'
 require 'awspec/generator/spec/alb'
 require 'awspec/generator/spec/internet_gateway'
+require 'awspec/generator/spec/elasticsearch'
 
 # Doc
 require 'awspec/generator/doc/type'

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

@@ -1,35 +1,38 @@
 module Awspec::Generator
   module Spec
-    class ElasticSearch
+    class Elasticsearch
       include Awspec::Helper::Finder
       def generate_all
         domains = select_all_elasticsearch_domains
-        raise 'Not Found Domain' if events.empty?
-        ERB.new(domain_spec_template, nil, '-').result(binding).chomp
+        raise 'Not Found Domain' if domains.empty?
+        ERB.new(domain_spec_template, nil, '-').result(binding).gsub(/^\n/, '')
       end
 
       def domain_spec_template
         template = <<-'EOF'
-<% domain.each do |domain| %>
-describe elasticsearch('<%= domain.domain_name %>') do
+<% domains.each do |domain| %>
+describe elasticsearch('<%= domain.domain_status.domain_name %>') do
   it { should exist }
-  <% if domain.ebs_options.created %>
+<% if domain.domain_status.created %>
   it { should be_created }
-  <% end %>
-  <% if domain.ebs_options.deleted %>
+<% end %>
+<% if domain.domain_status.deleted %>
   it { should be_deleted }
-  <% end %>
-  its(:elasticsearch_version) { should eq <%= domain.elasticsearch_version %> }
-  its('elasticsearch_cluster_config.instance_type') { should eq <%= domain.elasticsearch_cluster_config.instance_type %> }
-  its('ebs_options.ebs_enabled') { should eq <%= domain.ebs_options.ebs_enabled %> }
-  <% if domain.ebs_options.ebs_enabled %>
-  its('ebs_options.volume_type') { should eq <%= domain.ebs_options.ebs_volume_type %> }
-  its('ebs_options.volume_size') { should eq <%= domain.ebs_options.ebs_volume_size %> }
-  <% end %>
+<% end %>
+  its(:elasticsearch_version) { should eq '<%= domain.domain_status.elasticsearch_version %>' }
+  its('elasticsearch_cluster_config.instance_type') { should eq '<%= domain.domain_status.elasticsearch_cluster_config.instance_type %>' }
+  its('ebs_options.ebs_enabled') { should eq <%= domain.domain_status.ebs_options.ebs_enabled %> }
+<% if domain.domain_status.ebs_options.ebs_enabled -%>
+  its('ebs_options.volume_type') { should eq '<%= domain.domain_status.ebs_options.volume_type %>' }
+  its('ebs_options.volume_size') { should eq <%= domain.domain_status.ebs_options.volume_size %> }
+<% end %>
   it do
     should have_access_policies <<-policy
-<%= JSON.pretty_generate(JSON.load(domain.access_policies)) %>
+<%= JSON.pretty_generate(JSON.load(domain.domain_status.access_policies)) %>
   policy
+  end
+end
+<% end %>
 EOF
         template
       end

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

@@ -9,9 +9,9 @@ module Awspec::Helper
       end
 
       def select_all_elasticsearch_domains
-        domain_names = elastisearch_client.list_domain_names
-        domain_names.map do |domain_name|
-          elasticsearch_client.describe_elasticsearch_domain(domain_name)
+        domain_names = elasticsearch_client.list_domain_names.domain_names
+        domain_names.map do |domain|
+          elasticsearch_client.describe_elasticsearch_domain(domain_name: domain.domain_name)
         end
       end
     end

data/lib/awspec/version.rb

@@ -1,3 +1,3 @@
 module Awspec
-  VERSION = '0.75.1'
+  VERSION = '0.75.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: awspec
 version: !ruby/object:Gem::Version
-  version: 0.75.1
+  version: 0.75.2
 platform: ruby
 authors:
 - k1LoW
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-04-12 00:00:00.000000000 Z
+date: 2017-04-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec