terrafying 1.7.4 → 1.7.5

data/lib/terrafying/generator.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'json'
 require 'base64'
 require 'erb'
@@ -6,40 +8,36 @@ require 'deep_merge'
 require 'terrafying/aws'
 
 module Terrafying
-
-  ARG_PLACEHOLDER = "ARG_PLACEHOLDER123"
+  ARG_PLACEHOLDER = 'ARG_PLACEHOLDER123'
 
   class Ref
-
     def fn_call(fn, *args)
-      if args.length == 0
-        args = [ARG_PLACEHOLDER]
-      end
+      args = [ARG_PLACEHOLDER] if args.empty?
       FnRef.new(fn: fn, args: args, ref: self)
     end
 
     def downcase
-      fn_call("lower")
+      fn_call('lower')
     end
 
     def strip
-      fn_call("trimspace")
+      fn_call('trimspace')
     end
 
     def split(separator)
-      fn_call("split", separator, ARG_PLACEHOLDER)
+      fn_call('split', separator, ARG_PLACEHOLDER)
     end
 
-    def slice(idx, length=0)
+    def slice(idx, length = 0)
       if length != 0
-        fn_call("slice", ARG_PLACEHOLDER, idx, idx+length)
+        fn_call('slice', ARG_PLACEHOLDER, idx, idx + length)
       else
-        fn_call("element", ARG_PLACEHOLDER, idx)
+        fn_call('element', ARG_PLACEHOLDER, idx)
       end
     end
 
     def realise
-      ""
+      ''
     end
 
     def to_s
@@ -47,15 +45,15 @@ module Terrafying
     end
 
     def to_str
-      self.to_s
+      to_s
     end
 
     def <=>(other)
-      self.to_s <=> other.to_s
+      to_s <=> other.to_s
     end
 
     def ==(other)
-      self.to_s == other.to_s
+      to_s == other.to_s
     end
 
     def [](key)
@@ -66,18 +64,17 @@ module Terrafying
       end
     end
 
-    def []=(k, v)
+    def []=(_k, _v)
       raise "You can't set a value this way"
     end
-
   end
 
   class RootRef < Ref
     def initialize(
-          kind: :resource,
-          type: "",
-          name:
-        )
+      kind: :resource,
+      type: '',
+      name:
+    )
       @kind = kind
       @type = type
       @name = name
@@ -85,16 +82,14 @@ module Terrafying
 
     def realise
       type = [@type]
-      if @kind != :resource
-        type = [@kind, @type]
-      end
+      type = [@kind, @type] if @kind != :resource
 
-      (type + [@name]).reject(&:empty?).join(".")
+      (type + [@name]).reject(&:empty?).join('.')
     end
 
     def fn_call(fn, *args)
       if @kind == :resource
-        self["id"].fn_call(fn, *args)
+        self['id'].fn_call(fn, *args)
       else
         super
       end
@@ -111,9 +106,9 @@ module Terrafying
 
   class AttributeRef < Ref
     def initialize(
-          ref:,
-          key:
-        )
+      ref:,
+      key:
+    )
       @ref = ref
       @key = key
     end
@@ -125,9 +120,9 @@ module Terrafying
 
   class IndexRef < Ref
     def initialize(
-          ref:,
-          idx:
-        )
+      ref:,
+      idx:
+    )
       @ref = ref
       @idx = idx
     end
@@ -139,10 +134,10 @@ module Terrafying
 
   class FnRef < Ref
     def initialize(
-          ref:,
-          fn:,
-          args: []
-        )
+      ref:,
+      fn:,
+      args: []
+    )
       @ref = ref
       @fn = fn
       @args = args
@@ -150,7 +145,7 @@ module Terrafying
 
     def realise
       ref = @ref.realise
-      args = @args.map { |arg|
+      args = @args.map do |arg|
         if arg == ARG_PLACEHOLDER
           ref
         elsif arg.is_a? String
@@ -158,19 +153,18 @@ module Terrafying
         else
           arg
         end
-      }.join(", ")
+      end.join(', ')
 
       "#{@fn}(#{args})"
     end
   end
 
   class Context
-
-    REGION = ENV.fetch("AWS_REGION", "eu-west-1")
+    REGION = ENV.fetch('AWS_REGION', 'eu-west-1')
 
     PROVIDER_DEFAULTS = {
       aws: { region: REGION }
-    }
+    }.freeze
 
     def self.bundle(&block)
       ctx = Context.new
@@ -182,7 +176,7 @@ module Terrafying
 
     def initialize
       @output = {
-        "resource" => {}
+        'resource' => {}
       }
       @children = []
     end
@@ -195,6 +189,7 @@ module Terrafying
       key = provider_key(name, spec)
       @providers ||= {}
       raise "Duplicate provider configuration detected for #{key}" if key_exists_spec_differs(key, name, spec)
+
       @providers[key] = { name.to_s => spec }
       @output['provider'] = @providers.values
       key
@@ -209,37 +204,39 @@ module Terrafying
     end
 
     def local(name, value)
-      @output["locals"] ||= {}
+      @output['locals'] ||= {}
 
-      raise "Local already exists #{name.to_s}" if @output["locals"].has_key? name.to_s
+      raise "Local already exists #{name}" if @output['locals'].key? name.to_s
 
-      @output["locals"][name.to_s] = value
+      @output['locals'][name.to_s] = value
       RootRef.new(kind: :local, name: name)
     end
 
     def var(name, spec)
-      @output["variable"] ||= {}
+      @output['variable'] ||= {}
 
-      raise "Var already exists #{name.to_s}" if @output["variable"].has_key? name.to_s
+      raise "Var already exists #{name}" if @output['variable'].key? name.to_s
 
-      @output["variable"][name.to_s] = spec
+      @output['variable'][name.to_s] = spec
       RootRef.new(kind: :var, name: name)
     end
 
     def data(type, name, spec)
-      @output["data"] ||= {}
-      @output["data"][type.to_s] ||= {}
+      @output['data'] ||= {}
+      @output['data'][type.to_s] ||= {}
+
+      raise "Data already exists #{type}.#{name}" if @output['data'][type.to_s].key? name.to_s
 
-      raise "Data already exists #{type.to_s}.#{name.to_s}" if @output["data"][type.to_s].has_key? name.to_s
-      @output["data"][type.to_s][name.to_s] = spec
+      @output['data'][type.to_s][name.to_s] = spec
       RootRef.new(kind: :data, type: type, name: name)
     end
 
     def resource(type, name, attributes)
-      @output["resource"][type.to_s] ||= {}
+      @output['resource'][type.to_s] ||= {}
 
-      raise "Resource already exists #{type.to_s}.#{name.to_s}" if @output["resource"][type.to_s].has_key? name.to_s
-      @output["resource"][type.to_s][name.to_s] = attributes
+      raise "Resource already exists #{type}.#{name}" if @output['resource'][type.to_s].key? name.to_s
+
+      @output['resource'][type.to_s][name.to_s] = attributes
       RootRef.new(kind: :resource, type: type, name: name)
     end
 
@@ -255,8 +252,8 @@ module Terrafying
       @children.inject(@output) { |out, c| out.deep_merge(c.output_with_children) }
     end
 
-    def id_of(type,name)
-      output_of(type, name, "id")
+    def id_of(type, name)
+      output_of(type, name, 'id')
     end
 
     def output_of(type, name, key)
@@ -270,8 +267,8 @@ module Terrafying
     def resource_names
       out = output_with_children
       ret = []
-      for type in out["resource"].keys
-        for id in out["resource"][type].keys
+      out['resource'].keys.each do |type|
+        out['resource'][type].keys.each do |id|
           ret << "#{type}.#{id}"
         end
       end
@@ -281,8 +278,8 @@ module Terrafying
     def resources
       out = output_with_children
       ret = []
-      for type in out["resource"].keys
-        for id in out["resource"][type].keys
+      out['resource'].keys.each do |type|
+        out['resource'][type].keys.each do |id|
           ret << "${#{type}.#{id}.id}"
         end
       end
@@ -295,23 +292,21 @@ module Terrafying
     end
 
     def tf_safe(str)
-      str.gsub(/[\.\s\/\?]/, "-")
+      str.gsub(%r{[\.\s/\?]}, '-')
     end
-
   end
 
   class RootContext < Context
-
     def initialize
       super
       @providers = {}
     end
 
     def backend(name, spec)
-      @output["terraform"] = {
+      @output['terraform'] = {
         backend: {
-          name => spec,
-        },
+          name => spec
+        }
       }
     end
 
@@ -324,22 +319,19 @@ module Terrafying
     end
 
     def output_with_children
-
-      PROVIDER_DEFAULTS.each { |name, spec|
-        if not key_exists_spec_differs(provider_key(name, spec), name, spec)
+      PROVIDER_DEFAULTS.each do |name, spec|
+        unless key_exists_spec_differs(provider_key(name, spec), name, spec)
           provider(name, spec)
         end
-      }
+      end
 
       super
     end
-
   end
 
   Generator = RootContext.new
 
   module DSL
-
     %w[
       add!
       aws
@@ -353,12 +345,10 @@ module Terrafying
       tf_safe
       id_of
       output_of
-    ].each { |name|
-      define_method(name) { |*args|
+    ].each do |name|
+      define_method(name) do |*args|
         Generator.send(name, *args)
-      }
-    }
-
+      end
+    end
   end
-
 end

data/lib/terrafying/lock.rb

@@ -1,16 +1,19 @@
+# frozen_string_literal: true
+
 require 'terrafying/dynamodb/named_lock'
 
 module Terrafying
   module Locks
     class NoOpLock
       def acquire
-        ""
+        ''
       end
+
       def steal
-        ""
-      end
-      def release(lock_id)
+        ''
       end
+
+      def release(lock_id); end
     end
 
     def self.noop
@@ -20,6 +23,5 @@ module Terrafying
     def self.dynamodb(scope)
       Terrafying::DynamoDb::NamedLock.new(Terrafying::DynamoDb.config.lock_table, scope)
     end
-
   end
 end

data/lib/terrafying/state.rb

@@ -1,9 +1,10 @@
+# frozen_string_literal: true
+
 require 'terrafying/dynamodb/state'
 
 module Terrafying
   module State
-
-    STATE_FILENAME = "terraform.tfstate"
+    STATE_FILENAME = 'terraform.tfstate'
 
     def self.store(config)
       if LocalStateStore.has_local_state?(config)
@@ -20,7 +21,7 @@ module Terrafying
     def self.remote(config)
       Terrafying::DynamoDb::StateStore.new(config.scope)
     end
-    
+
     class LocalStateStore
       def initialize(path)
         @path = LocalStateStore.state_path(path)
@@ -39,10 +40,11 @@ module Terrafying
       end
 
       def self.has_local_state?(config)
-        File.exists?(state_path(config.path))
+        File.exist?(state_path(config.path))
       end
-      
+
       private
+
       def self.state_path(path)
         File.join(File.dirname(path), STATE_FILENAME)
       end

data/lib/terrafying/util.rb

@@ -1,32 +1,29 @@
+# frozen_string_literal: true
 
 require 'yaml'
 
 def data_url_from_string(str)
   b64_contents = Base64.strict_encode64(str)
-  return "data:;base64,#{b64_contents}"
+  "data:;base64,#{b64_contents}"
 end
 
 module Terrafying
-
   module Util
-
     def self.to_ignition(yaml)
-      config = YAML.load(yaml)
+      config = YAML.safe_load(yaml)
+
+      if config.key?('storage') && config['storage'].key?('files')
+        files = config['storage']['files']
+        config['storage']['files'] = files.each do |file|
+          next unless file['contents'].is_a? String
 
-      if config.has_key? "storage" and config["storage"].has_key? "files"
-        files = config["storage"]["files"]
-        config["storage"]["files"] = files.each { |file|
-          if file["contents"].is_a? String
-            file["contents"] = {
-              source: data_url_from_string(file["contents"]),
-            }
-          end
-        }
+          file['contents'] = {
+            source: data_url_from_string(file['contents'])
+          }
+        end
       end
 
       JSON.generate(config)
     end
-
   end
-
 end

data/lib/terrafying/version.rb

@@ -1,4 +1,6 @@
+# frozen_string_literal: true
+
 module Terrafying
-  VERSION = "1.7.4" # will be inserted by Drone
-  CLI_VERSION = "0.11.7"
+  VERSION = '1.7.5' # will be inserted by Drone
+  CLI_VERSION = '0.11.7'
 end

data/lib/terrafying.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'fileutils'
 require 'logger'
 require 'pathname'
@@ -12,9 +14,7 @@ require 'terrafying/version'
 require 'terrafying/state'
 
 module Terrafying
-
   class Config
-
     attr_reader :path, :scope
 
     def initialize(path, options)
@@ -22,7 +22,7 @@ module Terrafying
       @options = options
       @scope = options[:scope] || scope_for_path(@path)
 
-      $stderr.puts "Scope: #{@scope}"
+      warn "Scope: #{@scope}"
 
       load(path)
     end
@@ -97,9 +97,7 @@ module Terrafying
       with_lock do
         local = State.local(self)
         state = local.get
-        if state
-          State.remote(self).put(state)
-        end
+        State.remote(self).put(state) if state
         local.delete
       end
     end
@@ -108,9 +106,7 @@ module Terrafying
       with_lock do
         remote = State.remote(self)
         state = remote.get
-        if state
-          State.local(self).put(state)
-        end
+        State.local(self).put(state) if state
       end
     end
 
@@ -127,6 +123,7 @@ module Terrafying
     end
 
     private
+
     def lock_timeout
       "-lock-timeout=#{@options[:lock_timeout]}" if @options[:lock_timeout]
     end
@@ -144,24 +141,22 @@ module Terrafying
     end
 
     def with_config(&block)
-      abort("***** ERROR: You must have terraform installed to run this gem *****") unless terraform_installed?
+      abort('***** ERROR: You must have terraform installed to run this gem *****') unless terraform_installed?
       check_version
-      name = File.basename(@path, ".*")
+      name = File.basename(@path, '.*')
       dir = File.join(git_toplevel, 'tmp', SecureRandom.uuid)
-      terraform_files = File.join(git_toplevel, ".terraform/")
-      unless Dir.exists?(terraform_files)
+      terraform_files = File.join(git_toplevel, '.terraform/')
+      unless Dir.exist?(terraform_files)
         abort("***** ERROR: No .terraform directory found. Please run 'terraform init' to install plugins *****")
       end
       FileUtils.mkdir_p(dir)
-      output_path = File.join(dir, name + ".tf.json")
+      output_path = File.join(dir, name + '.tf.json')
       FileUtils.cp_r(terraform_files, dir)
       Dir.chdir(dir) do
-        begin
-          File.write(output_path, Terrafying::Generator.pretty_generate)
-          yield block
-        ensure
-          FileUtils.rm_rf(dir) unless @options[:keep]
-        end
+        File.write(output_path, Terrafying::Generator.pretty_generate)
+        yield block
+      ensure
+        FileUtils.rm_rf(dir) unless @options[:keep]
       end
     end
 
@@ -191,31 +186,27 @@ module Terrafying
     end
 
     def with_state(opts, &block)
-      if !@options[:dynamodb]
-        return yield(block)
-      end
+      return yield(block) unless @options[:dynamodb]
 
       store = State.store(self)
 
       begin
         state = store.get
         File.write(State::STATE_FILENAME, state) if state
-      rescue => e
+      rescue StandardError => e
         raise "Error retrieving state for config #{self}: #{e}"
       end
 
       yield block
 
       begin
-        if opts[:mode] == :update
-          store.put(IO.read(State::STATE_FILENAME))
-        end
-      rescue => e
+        store.put(IO.read(State::STATE_FILENAME)) if opts[:mode] == :update
+      rescue StandardError => e
         raise "Error updating state for config #{self}: #{e}"
       end
     end
 
-    def scope_for_path(path)
+    def scope_for_path(_path)
       top_level_path = Pathname.new(git_toplevel)
       Pathname.new(@path).relative_path_from(top_level_path).to_s
     end
@@ -224,6 +215,7 @@ module Terrafying
       @top_level ||= begin
                        top_level = `git rev-parse --show-toplevel`
                        raise "Unable to find .git directory top level for '#{@path}'" if top_level.empty?
+
                        File.expand_path(top_level.chomp)
                      end
     end
@@ -239,16 +231,16 @@ module Terrafying
     end
 
     def terraform_version
-      `terraform -v`.split("\n").first.split("v").last
+      `terraform -v`.split("\n").first.split('v').last
     end
 
     def stream_command(cmd)
       IO.popen(cmd) do |io|
-        while (line = io.gets) do
-          puts line.gsub('\n', "\n").gsub('\\"', "\"")
+        while (line = io.gets)
+          puts line.gsub('\n', "\n").gsub('\\"', '"')
         end
       end
-      return $?.exitstatus
+      $CHILD_STATUS.exitstatus
     end
 
     # Cross-platform way of finding an executable in the $PATH.
@@ -257,12 +249,12 @@ module Terrafying
     def which(cmd)
       exts = ENV['PATHEXT'] ? ENV['PATHEXT'].split(';') : ['']
       ENV['PATH'].split(File::PATH_SEPARATOR).each do |path|
-        exts.each { |ext|
+        exts.each do |ext|
           exe = File.join(path, "#{cmd}#{ext}")
           return exe if File.executable?(exe) && !File.directory?(exe)
-        }
+        end
       end
-      return nil
+      nil
     end
   end
 end