yutani 0.1.18 → 0.1.19

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bb2d4ad0c04c2786185ef8c2fc5dee90be6460a3
-  data.tar.gz: f178131e875565618b1ce5d80bec675d2139e2cd
+  metadata.gz: 19392ae5e18da8ace5f0da1b75df60195b02344e
+  data.tar.gz: 58d4d3605b5364954891c45c7bd6b4db756e248d
 SHA512:
-  metadata.gz: 680b9f75c7ac957e049625be0ed4008f4e4ee00806f3877deca9333770692d2d5db3efffade73d7cb945387fc7835facaff6a81704b985f6a15ca2c207aaa99e
-  data.tar.gz: ba161b43a65b0f9269964e9f4dc093630762b69986223ac7f50433493c177958193290862f6aeac51c5dac07adb810b280b81616ffc922ae663a742fa92221e1
+  metadata.gz: 192cea6e367fbb41488479646ae933eb7931825566adb7ec9b654e4f40f0c045f6093f3068d597cd4ba4bd7b8949c0b691f5d0aaf2b56e4ef1dd2b4c287269a4
+  data.tar.gz: 8154a43329154a3466949852de0ba4d7bc20f6ad3fe79f7a248d34989ac5a889bd1789fe638299a5523fb9dc1f5b6802bc49b1c5b29983148cdc925dcce176ef

data/lib/yutani/cli.rb

@@ -50,9 +50,14 @@ module Yutani
         Yutani.logger.info "Re-build triggered: #{a} added" unless a.empty?
         Yutani.logger.info "Re-build triggered: #{d} deleted" unless d.empty?
 
-        build
-
-        Yutani.logger.info "Re-build finished"
+        begin
+          build
+        rescue Exception => e
+          Yutani.logger.error "#{e.class.name} #{e.message}"
+          #Yutani.logger.error Yutani::Cli.format_backtrace(e.backtrace) unless e.backtrace.empty?
+        else
+          Yutani.logger.info "Re-build finished successfully"
+        end
       end.start
 
       # exit cleanly upon Ctrl-C
@@ -70,42 +75,26 @@ module Yutani
       puts Yutani::VERSION
     end
 
-    desc 'target', 'Generate list of Terraform targets'
-    def target(stack_dir, *args)
-      files = Dir.glob(File.join(stack_dir, '*.tf.json'))
-      if files.empty?
-        raise "Could not find *.tf.json files in #{stack_dir}"
-      end
-
-      if args.empty?
-        raise "No targets specified"
-      end
-
-      contents = files.inject({}) do |h, f|
-        h.merge!(JSON.parse(File.read(f)))
-        h
-      end
-
-      targets = contents['resource'].inject({}) do |h,(k,v)|
-        h[k] = v.select do |k,v|
-          (args - k.split('_')).empty?
+    %w(plan apply destroy).each do |tf_cmd|
+      desc tf_cmd, "Run terraform #{tf_cmd} with wildcard targets"
+      define_method tf_cmd do |*args|
+        # we only support json files
+        files = Dir.glob('*.tf.json')
+        if files.empty?
+          raise "Could not find any *.tf.json files"
         end
-        h
-      end.reject{|k,v| v.empty? }
 
-      target_flags = targets.inject([]) do |flags, (k,v)|
-        flags << v.keys.map do |resource_name|
-          "-target " + ["resource", k, resource_name].join('.')
+        # merge contents of *.tf.json files into one hash
+        contents = files.inject({}) do |h, f|
+          h.merge!(JSON.parse(File.read(f)))
+          h
         end
-        flags
-      end.flatten
 
-      puts target_flags.join(" ")
-    end
+        new_args = []
+        expand_target_wildcard_args(new_args, args, contents)
 
-    # Invoke Terraform CLI command
-    def method_missing(name, *args, &block)
-      %x/terraform #{name} #{args}/
+        Yutani::Utils.run_tf_command(tf_cmd, new_args)
+      end
     end
 
     desc 'init', 'Initialize with a basic setup'
@@ -147,6 +136,55 @@ module Yutani
 
     private
 
+    # horror show, in dire need of a succint algorithm
+    def expand_target_wildcard_args(new_args, args, contents)
+      flag = args.shift
+
+      if flag == '-target'
+        target_val = args.shift
+
+        if target_val.nil?
+          raise "-target arg missing corresponding target resource"
+        end
+
+        # if no wildcard found, then pass through unaltered
+        if target_val !~ /\*/
+          new_args << '-target'
+          new_args << target_val
+          expand_target_wildcard_args(new_args, args, contents)
+        end
+
+        target_regex = Regexp.new('^' + target_val.gsub(/\*/, '.*') + '$')
+
+        tf_targets = []
+        contents['resource'].each do |resource_type,v|
+          v.each do |resource_name,_|
+            if "#{resource_type}.#{resource_name}" =~ target_regex
+              tf_targets << "#{resource_type}.#{resource_name}"
+            end
+          end
+        end
+
+        if tf_targets.empty?
+          # we didn't find any matches, so pass through unaltered and
+          # let TF throw error
+          new_args << '-target'
+          new_args << target_val
+        else
+          tf_targets.each do |target|
+            new_args << '-target'
+            new_args << target
+          end
+        end
+      elsif flag.nil?
+        return
+      else
+        new_args.push flag
+      end
+
+      expand_target_wildcard_args(new_args, args, contents)
+    end
+
     def self.format_backtrace(bt)
       "Backtrace: #{bt.join("\n   from ")}"
     end

data/lib/yutani/utils.rb

@@ -7,17 +7,23 @@ class Array
 end
 
 module Yutani
-	class IndifferentHash < Hash
+  class IndifferentHash < Hash
     include Hashie::Extensions::MergeInitializer
-		include Hashie::Extensions::IndifferentAccess
-	end
+    include Hashie::Extensions::IndifferentAccess
+  end
 
-	class DeepMergeHash < Hash
-		include Hashie::Extensions::DeepMerge
-	end
+  class DeepMergeHash < Hash
+    include Hashie::Extensions::DeepMerge
+  end
 
   module Utils
     class << self
+      def run_tf_command(cmd, *args)
+        command = ENV.fetch('TERRAFORM', 'terraform') + ' ' + cmd + ' ' + args.join(' ')
+        Yutani.logger.info command
+        exec(command)
+      end
+
       def convert_symbols_to_strings_in_flat_hash(h)
         h.inject({}) do |h, (k,v)|
           k = k.is_a?(Symbol) ? k.to_s : k

data/lib/yutani/version.rb

@@ -1,3 +1,3 @@
 module Yutani
-  VERSION = '0.1.18'
+  VERSION = '0.1.19'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: yutani
 version: !ruby/object:Gem::Version
-  version: 0.1.18
+  version: 0.1.19
 platform: ruby
 authors:
 - Louis Garman