itamae-mitsurin 0.9 → 0.10

data/lib/itamae-mitsurin/mitsurin/serverspec_task.rb

@@ -1,123 +1,88 @@
 require 'json'
 require 'highline'
+require 'itamae-mitsurin/mitsurin/task_base'
 include Rake::DSL if defined? Rake::DSL
 
 module Itamae
   module Mitsurin
     class ServerspecTask
 
-      class << self
+      TaskBase = ItamaeMitsurin::Mitsurin::TaskBase
 
-        task :spec => 'spec:all'
-        task :default => :spec
+      namespace :spec do
+        all = []
+        Dir.glob("tmp-nodes/**/*.json").each do |node_file|
 
-        def self.get_roles(node_file)
-          roles = []
-          JSON.parse(File.read(node_file))['run_list'].each do |role|
-            roles << role.gsub(/role\[(.+)\]/, '\1') if /role\[(.+)\]/ === role
-          end
-          roles
-        end
+          file_name = File.basename(node_file, '.json')
+          node_attr = JSON.parse(File.read(node_file), symbolize_names: true)
 
-        def self.get_recipes(role)
-          recipes = []
-          JSON.parse(File.read("roles/#{role}.json"))['run_list'].each do |recipe|
-            if /recipe\[(.+)::(.+)\]/ === recipe
-              recipes << {recipe.gsub(/recipe\[(.+)::(.+)\]/, '\1') => recipe.gsub(/recipe\[(.+)::(.+)\]/, '\2')}
-            else
-              recipes << {recipe.gsub(/recipe\[(.+)\]/, '\1') => nil}
-            end
-          end
-          recipes
-        end
+          desc "Spec to #{file_name}"
+          task node_attr[:environments][:hostname].split(".")[0] do
 
-        def self.get_node_recipes(node_file)
-          recipes = []
-          JSON.parse(File.read(node_file))['run_list'].each do |recipe|
-            if /recipe\[(.+)::(.+)\]/ === recipe
-              recipes << {recipe.gsub(/recipe\[(.+)::(.+)\]/, '\1') => recipe.gsub(/recipe\[(.+)::(.+)\]/, '\2')}
-            else
-              recipes << {recipe.gsub(/recipe\[(.+)\]/, '\1') => nil} unless /role\[(.+)\]/ === recipe
+          begin
+            recipes = []
+            TaskBase.get_roles(node_file).each do |role|
+              recipes << TaskBase.get_recipes(role)
             end
-          end
-          recipes
-        end
-
-        hl = HighLine.new
-
-        namespace :spec do
-          all = []
-          Dir.glob("tmp-nodes/**/*.json").each do |node_file|
-
-            file_name = File.basename(node_file, '.json')
-            node_attr = JSON.parse(File.read(node_file), symbolize_names: true)
-
-            desc "Spec to #{file_name}"
-            task node_attr[:environments][:hostname].split(".")[0] do
-
-            begin
-              recipes = []
-              get_roles(node_file).each do |role|
-                recipes << get_recipes(role)
-              end
-              get_node_recipes(node_file).each do |recipe|
-                recipes << recipe
-              end
-            rescue Exception => e
-              puts e.class.to_s + ", " + e.backtrace[0].to_s
-              puts "nodefile or role error, nodefile:#{node_file} reason:#{e.message}"
-              exit 1
-            else
-              recipes << {'_base' => nil}
-              recipes.flatten!
+            TaskBase.get_node_recipes(node_file).each do |recipe|
+              recipes << recipe
             end
+          rescue Exception => e
+            puts e.class.to_s + ", " + e.backtrace[0].to_s
+            puts "nodefile or role error, nodefile:#{node_file} reason:#{e.message}"
+            exit 1
+          else
+            recipes << {'_base' => nil}
+            recipes.flatten!
+          end
 
-            node_name = node_attr[:environments][:hostname]
-            ssh_user = node_attr[:environments][:ssh_user]
-            ssh_password = node_attr[:environments][:ssh_password]
-            sudo_password = node_attr[:environments][:sudo_password]
-            ssh_port = node_attr[:environments][:ssh_port]
-            ssh_key = node_attr[:environments][:ssh_key]
+          node_name = node_attr[:environments][:hostname]
+          ssh_user = node_attr[:environments][:ssh_user]
+          ssh_password = node_attr[:environments][:ssh_password]
+          sudo_password = node_attr[:environments][:sudo_password]
+          ssh_port = node_attr[:environments][:ssh_port]
+          ssh_key = node_attr[:environments][:ssh_key]
 
-            node_short = node_name.split(".")[0]
+          node_short = node_name.split(".")[0]
             all << node_short
 
             desc "Run spec to #{file_name}"
-              ENV['TARGET_HOST'] = node_name
-              ENV['NODE_FILE'] = node_file
-              ENV['SSH_PASSWORD'] = ssh_password
-              ENV['SUDO_PASSWORD'] = sudo_password
-              ENV['SSH_KEY'] = "keys/#{ssh_key}"
-              ENV['SSH_PORT'] = ssh_port
-              ENV['SSH_USER'] = ssh_user
-
-              specs = "bundle exec rspec"
-
-              # recipe load to_spec
-              spec_pattern = []
-              recipes.each do |spec_h|
-                if spec_h["#{spec_h.keys.join}"].nil?
-                  spec_pattern <<
-                      " #{Dir.glob("site-cookbooks/**/#{spec_h.keys.join}/spec/default_spec.rb").join}"
-                else
-                  spec_pattern <<
-                      " #{Dir.glob("site-cookbooks/**/#{spec_h.keys.join}/spec/#{spec_h["#{spec_h.keys.join}"]}_spec.rb").join}"
-                end
+            ENV['TARGET_HOST'] = node_name
+            ENV['NODE_FILE'] = node_file
+            ENV['SSH_PASSWORD'] = ssh_password
+            ENV['SUDO_PASSWORD'] = sudo_password
+            ENV['SSH_KEY'] = "keys/#{ssh_key}"
+            ENV['SSH_PORT'] = ssh_port
+            ENV['SSH_USER'] = ssh_user
+
+            specs = "bundle exec rspec"
+
+            # recipe load to_spec
+            spec_pattern = []
+            recipes.each do |spec_h|
+              if spec_h["#{spec_h.keys.join}"].nil?
+                spec_pattern <<
+                    " #{Dir.glob("site-cookbooks/**/#{spec_h.keys.join}/spec/default_spec.rb").join}"
+              else
+                spec_pattern <<
+                    " #{Dir.glob("site-cookbooks/**/#{spec_h.keys.join}/spec/#{spec_h["#{spec_h.keys.join}"]}_spec.rb").join}"
               end
-              spec_pattern.sort_by! {|item| File.dirname(item)}
-              specs << spec_pattern.join
-              run_list_noti = []
-              spec_pattern.each {|c_spec| run_list_noti << c_spec.split("/") [2]}
-              puts hl.color(%!Run Serverspec to \"#{node_name}\"!, :red)
-              puts hl.color(%!Run List to \"#{run_list_noti.uniq.join(", ")}\"!, :green)
-              st = system specs
-              exit 1 unless st
             end
-            task :all => all
-            task :default => :all
+
+            spec_pattern.sort_by! {|item| File.dirname(item)}
+            specs << spec_pattern.join
+            run_list_noti = []
+            spec_pattern.each {|c_spec| run_list_noti << c_spec.split("/") [2]}
+            puts TaskBase.hl.color(%!Run Serverspec to \"#{node_name}\"!, :red)
+            puts TaskBase.hl.color(%!Run List to \"#{run_list_noti.uniq.join(", ")}\"!, :green)
+            st = system specs
+            exit 1 unless st
           end
+        task :all => all
+        task :default => :all
         end
       end
+
     end
   end
 end

data/lib/itamae-mitsurin/mitsurin/task_base.rb

@@ -0,0 +1,72 @@
+
+module ItamaeMitsurin
+  module Mitsurin
+    module TaskBase
+
+      class << self
+        class ::Hash
+          def deep_merge(other)
+            merger = lambda {|key, v1, v2| Hash === v1 && Hash === v2 ? v1.merge(v2, &merger) : v2}
+            self.merge(other, &merger)
+          end
+
+          def deep_merge!(other)
+            merger = lambda {|key, v1, v2| Hash === v1 && Hash === v2 ? v1.merge(v2, &merger) : v2}
+            self.merge!(other, &merger)
+          end
+        end
+
+        def get_roles(node_file)
+          roles = []
+          JSON.parse(File.read(node_file))['run_list'].each do |role|
+            roles << role.gsub(/role\[(.+)\]/, '\1') if /role\[(.+)\]/ === role
+          end
+          roles
+        end
+
+        def get_recipes(role)
+          recipes = []
+          JSON.parse(File.read("roles/#{role}.json"))['run_list'].each do |recipe|
+            if /recipe\[(.+)::(.+)\]/ === recipe
+              recipes << {recipe.gsub(/recipe\[(.+)::(.+)\]/, '\1') => recipe.gsub(/recipe\[(.+)::(.+)\]/, '\2')}
+            else
+              recipes << {recipe.gsub(/recipe\[(.+)\]/, '\1') => nil}
+            end
+          end
+          recipes
+        end
+
+        def get_node_recipes(node_file)
+          recipes = []
+          JSON.parse(File.read(node_file))['run_list'].each do |recipe|
+            if /recipe\[(.+)::(.+)\]/ === recipe
+              recipes << {recipe.gsub(/recipe\[(.+)::(.+)\]/, '\1') => recipe.gsub(/recipe\[(.+)::(.+)\]/, '\2')}
+            else
+              recipes << {recipe.gsub(/recipe\[(.+)\]/, '\1') => nil} unless /role\[(.+)\]/ === recipe
+            end
+          end
+          recipes
+        end
+
+        def jq(*objs)
+          par = nil
+          objs.each {|obj| par = JSON::pretty_generate(obj, :allow_nan => true, :max_nesting => false)}
+          return par
+        end
+
+        def write_json(filename)
+          File.open "tmp-nodes/#{filename}.json", 'w' do |f|
+            f.flock File::LOCK_EX
+            yield f
+            f.flock File::LOCK_UN
+          end
+        end
+
+        def hl
+          HighLine.new
+        end
+      end
+
+    end
+  end
+end

data/lib/itamae-mitsurin/resource.rb

@@ -19,6 +19,7 @@ require 'itamae-mitsurin/resource/gem_package'
 require 'itamae-mitsurin/resource/aws_ebs_volume'
 require 'itamae-mitsurin/resource/aws_route53_rrset'
 require 'itamae-mitsurin/resource/aws_route53_rrset_alias'
+require 'itamae-mitsurin/resource/aws_ec2_instance'
 
 module ItamaeMitsurin
   module Resource

data/lib/itamae-mitsurin/resource/aws_ebs_volume.rb

@@ -2,92 +2,85 @@ require 'itamae-mitsurin'
 require 'itamae-mitsurin/mitsurin'
 
 module ItamaeMitsurin
-    module Resource
-      class AwsEbsVolume < Base
-        define_attribute :action, default: :create
-        define_attribute :name, type: String, default_name: true
-        define_attribute :region, type: String
-        define_attribute :availability_zone, type: String
-        define_attribute :device, type: String
-        define_attribute :instance_id, type: String
-        define_attribute :volume_type, type: String
-        define_attribute :size, type: Integer
+  module Resource
+    class AwsEbsVolume < Base
 
-        def action_create(options)
-          ec2 = ::Aws::EC2::Client.new(region: attributes.region)
-          volumes = ec2.describe_volumes(
+      define_attribute :action, default: :create
+      define_attribute :name, type: String, default_name: true
+      define_attribute :region, type: String
+      define_attribute :availability_zone, type: String
+      define_attribute :device, type: String
+      define_attribute :instance_id, type: String
+      define_attribute :volume_type, type: String
+      define_attribute :size, type: Integer
+
+      def action_create(options)
+        ec2 = ::Aws::EC2::Client.new(region: attributes.region)
+        volumes = ec2.describe_volumes({
+          filters: [
             {
-              filters: [
-                {
-                  name: 'tag:Name',
-                  values: [ attributes.name ],
-                },
-              ],
-            }
-          ).volumes
+              name: 'tag:Name',
+              values: [ attributes.name ],
+            },
+          ],
+        }).volumes
 
-          if volumes.empty?
-            @volume = ec2.create_volume(
-              size: attributes[:size], # attributes.size returns the size of attributes hash
-              availability_zone: attributes.availability_zone,
-              volume_type: attributes.volume_type,
-            )
-            ec2.wait_until(:volume_available, volume_ids: [ @volume.volume_id ])
+        if volumes.empty?
+          @volume = ec2.create_volume(
+            size: attributes[:size], # attributes.size returns the size of attributes hash
+            availability_zone: attributes.availability_zone,
+            volume_type: attributes.volume_type,
+          )
+          ec2.wait_until(:volume_available, volume_ids: [ @volume.volume_id ])
 
-            ec2.create_tags(
+          ec2.create_tags({
+            resources: [ @volume.volume_id ],
+            tags: [
               {
-                resources: [ @volume.volume_id ],
-                tags: [
-                  {
-                    key: 'Name',
-                    value: attributes.name,
-                  },
-                ],
-              }
-            )
-
-            ItamaeMitsurin.logger.color(:green) do
-              ItamaeMitsurin.info "create volume compleated!"
-            end
-            updated!
-          else
-            @volume = volumes[0]
-          end
+                key: 'Name',
+                value: attributes.name,
+              },
+            ],
+          })
 
+          ItamaeMitsurin.logger.color(:green) do
+          ItamaeMitsurin.info "create volume compleated!"
+        end
+          updated!
+        else
+          @volume = volumes[0]
         end
+      end
 
-        def action_attach(options)
-          ec2 = ::Aws::EC2::Client.new(region: attributes.region)
-          volumes = ec2.describe_volumes(
+      def action_attach(options)
+        ec2 = ::Aws::EC2::Client.new(region: attributes.region)
+        volumes = ec2.describe_volumes({
+          filters: [
             {
-              filters: [
-                {
-                  name: 'tag:Name',
-                  values: [ attributes.name ],
-                },
-              ],
-            }
-          ).volumes
-
-          unless volumes.empty?
-            @volume = ec2.attach_volume({
-              volume_id: @volume.volume_id,
-              instance_id: attributes.instance_id,
-              device: attributes.device
-            })
-            ec2.wait_until(:volume_in_use, volume_ids: [ @volume.volume_id ])
+              name: 'tag:Name',
+              values: [ attributes.name ],
+            },
+          ],
+        }).volumes
 
+        unless volumes.empty?
+          @volume = ec2.attach_volume({
+            volume_id: @volume.volume_id,
+            instance_id: attributes.instance_id,
+            device: attributes.device
+          })
+        ec2.wait_until(:volume_in_use, volume_ids: [ @volume.volume_id ])
 
-            ItamaeMitsurin.logger.color(:green) do
-              ItamaeMitsurin.info "attach volume compleated!"
-            end
-            updated!
-          else
-            @volume = volumes[0]
-          end
 
+        ItamaeMitsurin.logger.color(:green) do
+        ItamaeMitsurin.info "attach volume compleated!"
+        end
+          updated!
+        else
+          @volume = volumes[0]
         end
       end
     end
+  end
 end
 

data/lib/itamae-mitsurin/resource/aws_ec2_instance.rb

@@ -5,12 +5,12 @@ module ItamaeMitsurin
   module Resource
     class AwsEc2Instance < Base
 
-      define_attribute :region, type: String
+      define_attribute :region, type: String, required: true
       define_attribute :action, default: :create
       define_attribute :dry_run, type: [TrueClass, FalseClass], default_name: false
       define_attribute :name, type: String, default_name: true
       define_attribute :image_id, type: String, required: true
-      define_attribute :key_name, type: String, required: true
+      define_attribute :key_name, type: String
       define_attribute :security_group_ids, type: Array
       define_attribute :user_data, type: String
       define_attribute :instance_type, type: String, required: true
@@ -18,11 +18,11 @@ module ItamaeMitsurin
       define_attribute :ramdisk_id, type: String
       define_attribute :device_name, type: String
       define_attribute :snapshot_id, type: String
-      define_attribute :volume_size, type: Integer
+      define_attribute :volume_size, type: Integer, required: true
       define_attribute :delete_on_termination, type: [TrueClass, FalseClass], default: true
       define_attribute :volume_type, type: String, default: "gp2"
       define_attribute :iops, type: Integer
-      define_attribute :encrypted, type: [TrueClass, FalseClass]
+      define_attribute :encrypted, type: TrueClass
       define_attribute :monitoring, type: [TrueClass, FalseClass], default: false
       define_attribute :subnet_id, type: String
       define_attribute :disable_api_termination, type: [TrueClass, FalseClass], default: false
@@ -32,7 +32,7 @@ module ItamaeMitsurin
       define_attribute :additional_info, type: String
       define_attribute :network_interface_id, type: String
       define_attribute :device_index, type: String
-      define_attribute :subnet_id, type: String
+      define_attribute :subnet_id, type: String, required: true
       define_attribute :private_ip_address, type: String
       define_attribute :groups, type: Array
       define_attribute :private_ip_address, type: String