itamae-mitsurin 0.9 → 0.10

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

@@ -5,11 +5,11 @@ module ItamaeMitsurin
   module Resource
     class AwsRoute53Rrset < Base
 
-        define_attribute :region, type: String
+        define_attribute :region, type: String, required: true
         define_attribute :action, default: :create
         define_attribute :name, type: String, default_name: true
         define_attribute :hosted_zone_id, type: String, required: true
-        define_attribute :type, type: String, required: true, required: true
+        define_attribute :type, type: String, required: true
         define_attribute :weight, type: Integer
         define_attribute :failover, type: String
         define_attribute :ttl, type: Integer
@@ -18,10 +18,9 @@ module ItamaeMitsurin
         define_attribute :traffic_policy_instance_id, type: String
 
         def pre_action
-          Aws.config[:region] = attributes.region
-          route53 = ::Aws::Route53::Client.new
+          @route53 = ::Aws::Route53::Client.new(region: attributes.region)
 
-          @record = route53.list_resource_record_sets({
+          @record = @route53.list_resource_record_sets({
               hosted_zone_id: attributes.hosted_zone_id,
               start_record_name: attributes.name,
               start_record_type: attributes.type,
@@ -66,29 +65,26 @@ module ItamaeMitsurin
         end
 
         def action_create(options)
-          Aws.config[:region] = attributes.region
-          route53 = ::Aws::Route53::Client.new
-
           unless @record[0][0][0] == attributes.name
-            resp = route53.change_resource_record_sets(@rrset_hash)
+            resp = @route53.change_resource_record_sets(@rrset_hash)
+            ItamaeMitsurin.logger.debug "#{resp}"
+            ItamaeMitsurin.logger.info "created record #{attributes.name}"
             updated!
           end
         end
 
         def action_upsert(options)
-          Aws.config[:region] = attributes.region
-          route53 = ::Aws::Route53::Client.new
-
-          resp = route53.change_resource_record_sets(@rrset_hash)
+          resp = @route53.change_resource_record_sets(@rrset_hash)
+          ItamaeMitsurin.logger.debug "#{resp}"
+          ItamaeMitsurin.logger.info "upserted record #{attributes.name}"
           updated!
         end
 
         def action_delete(options)
-          Aws.config[:region] = attributes.region
-          route53 = ::Aws::Route53::Client.new
-
           if @record[0][0][0] == attributes.name
-            resp = route53.change_resource_record_sets(@rrset_hash)
+            resp = @route53.change_resource_record_sets(@rrset_hash)
+            ItamaeMitsurin.logger.debug "#{resp}"
+            ItamaeMitsurin.logger.info "deleted record #{attributes.name}"
             updated!
           end
         end

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

@@ -5,10 +5,10 @@ module ItamaeMitsurin
   module Resource
     class AwsRoute53RrsetAlias < Base
 
-        define_attribute :region, type: String
+        define_attribute :region, type: String, required: true
         define_attribute :action, default: :create
         define_attribute :name, type: String, default_name: true
-        define_attribute :type, type: String, required: true, required: true
+        define_attribute :type, type: String, required: true
         define_attribute :hosted_zone_id, type: String, required: true
         define_attribute :weight, type: Integer
         define_attribute :failover, type: String
@@ -20,10 +20,9 @@ module ItamaeMitsurin
         define_attribute :traffic_policy_instance_id, type: String
 
         def pre_action
-          Aws.config[:region] = attributes.region
-          route53 = ::Aws::Route53::Client.new
+          @route53 = ::Aws::Route53::Client.new(region: attributes.region)
 
-          @record = route53.list_resource_record_sets({
+          @record = @route53.list_resource_record_sets({
               hosted_zone_id: attributes.hosted_zone_id,
               start_record_name: attributes.name,
               start_record_type: attributes.type,
@@ -67,29 +66,26 @@ module ItamaeMitsurin
         end
 
         def action_create(options)
-          Aws.config[:region] = attributes.region
-          route53 = ::Aws::Route53::Client.new
-
           unless @record[0][0][0] == attributes.name
-            resp = route53.change_resource_record_sets(@rrset_hash)
+            resp = @route53.change_resource_record_sets(@rrset_hash)
+            ItamaeMitsurin.logger.debug "#{resp}"
+            ItamaeMitsurin.logger.info "created record #{attributes.name}"
             updated!
           end
         end
 
         def action_upsert(options)
-          Aws.config[:region] = attributes.region
-          route53 = ::Aws::Route53::Client.new
-
-          resp = route53.change_resource_record_sets(@rrset_hash)
+          resp = @route53.change_resource_record_sets(@rrset_hash)
+            ItamaeMitsurin.logger.debug "#{resp}"
+            ItamaeMitsurin.logger.info "upserted record #{attributes.name}"
           updated!
         end
 
         def action_delete(options)
-          Aws.config[:region] = attributes.region
-          route53 = ::Aws::Route53::Client.new
-
           if @record[0][0][0] == attributes.name
-            resp = route53.change_resource_record_sets(@rrset_hash)
+            resp = @route53.change_resource_record_sets(@rrset_hash)
+            ItamaeMitsurin.logger.debug "#{resp}"
+            ItamaeMitsurin.logger.info "deleted record #{attributes.name}"
             updated!
           end
         end

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

@@ -60,15 +60,6 @@ module ItamaeMitsurin
           run_command(["touch", attributes.path])
         end
 
-        change_target = @temppath || attributes.path
-
-        if attributes.mode
-          run_specinfra(:change_file_mode, change_target, attributes.mode)
-        end
-        if attributes.owner || attributes.group
-          run_specinfra(:change_file_owner, change_target, attributes.owner, attributes.group)
-        end
-
         if @temppath
           if run_specinfra(:check_file_is_file, attributes.path)
             unless check_command(["diff", "-q", @temppath, attributes.path])
@@ -79,10 +70,20 @@ module ItamaeMitsurin
             # new file
             updated!
           end
+        end
 
-          if updated?
-            run_specinfra(:move_file, @temppath, attributes.path)
-          end
+        change_target = @temppath && updated?  ? @temppath : attributes.path
+
+        if attributes.mode
+          run_specinfra(:change_file_mode, change_target, attributes.mode)
+        end
+
+        if attributes.owner || attributes.group
+          run_specinfra(:change_file_owner, change_target, attributes.owner, attributes.group)
+        end
+
+        if @temppath && updated?
+          run_specinfra(:move_file, @temppath, attributes.path)
         end
       end
 
@@ -170,7 +171,11 @@ module ItamaeMitsurin
                 end
 
           @temppath = ::File.join(runner.tmpdir, Time.now.to_f.to_s)
+
+          run_command(["touch", @temppath])
+          run_specinfra(:change_file_mode, @temppath, '0600')
           backend.send_file(src, @temppath)
+          run_specinfra(:change_file_mode, @temppath, '0600')
         ensure
           f.unlink if f
         end

data/lib/itamae-mitsurin/version.txt

@@ -1 +1 @@
-0.9
+0.10

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: itamae-mitsurin
 version: !ruby/object:Gem::Version
-  version: '0.9'
+  version: '0.10'
 platform: ruby
 authors:
 - Akihiro Kamiyama
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-11 00:00:00.000000000 Z
+date: 2016-03-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -274,6 +274,7 @@ files:
 - lib/itamae-mitsurin/mitsurin/itamae_task.rb
 - lib/itamae-mitsurin/mitsurin/itamae_with_git_task.rb
 - lib/itamae-mitsurin/mitsurin/serverspec_task.rb
+- lib/itamae-mitsurin/mitsurin/task_base.rb
 - lib/itamae-mitsurin/node.rb
 - lib/itamae-mitsurin/notification.rb
 - lib/itamae-mitsurin/recipe.rb