yle_tf 1.2.0 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a8818ef98a06e9ccd0e7890e54284f0b3640a0ca7a1e5000f951c4f82bb99011
-  data.tar.gz: 3a4ec6e95da88cdea69c5d02d93829a9a777303f46dcd571469ec5866c932d64
+  metadata.gz: 7811f980206094727502839932ba9a800a4e37694ae26bc71d9c4935de38d3c3
+  data.tar.gz: 95e2c481a30b3caffb65c08407f9e222210fe01514f59ff88ca38a00915ea31b
 SHA512:
-  metadata.gz: 1dba1594a58ceff3dc5519f938b9096fd0269e935c0e1443c12be20f16733ff2bb4cc4fc2c0956ba4629e75e579c00ac81638204eea0490520968e97321c2752
-  data.tar.gz: 0655f4e7d53d0cc57008afd7787c8b18ab47986a36d24d36e77fc602feef1e921e9fcdb504a0945e334337478c045891336db0a94c88bfe9942d16c78c089a7a
+  metadata.gz: 84010f77dfa1d2786f0c9b4a3783073ad15bbf6146bac16f4a49401b8b378e28f0747f82a6880eb01dda175fccbd1465f3e25391586e10c11d424e304fe8e74b
+  data.tar.gz: 95c19822da06edb58e250215fb0c5e2154da99e8881a2b8a8ce4fb9fe7c124772e81d7a2774595fdedb97cec3166e0b34e7c098ac20d8133ad97bfcb1196534e

data/lib/yle_tf/action/terraform_init.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require 'pathname'
+
 require 'yle_tf/logger'
 require 'yle_tf/plugin'
 require 'yle_tf/system'
@@ -14,13 +16,14 @@ class YleTf
         stdout: :debug                            # Hide the output to the debug level
       }.freeze
 
+      attr_reader :config
+
       def initialize(app)
         @app = app
       end
 
       def call(env)
-        config = env[:config]
-        backend = backend(config)
+        @config = env[:config]
 
         Logger.info('Initializing Terraform')
         Logger.debug("Backend configuration: #{backend}")
@@ -34,17 +37,34 @@ class YleTf
         Logger.debug('Configuring the backend')
         backend.configure
 
+        Logger.debug('Symlinking errored.tfstate')
+        symlink_errored_tfstate
+
         Logger.debug('Initializing Terraform')
-        YleTf::System.cmd('terraform', 'init', *TF_CMD_ARGS, TF_CMD_OPTS)
+        YleTf::System.cmd('terraform', 'init', *TF_CMD_ARGS, **TF_CMD_OPTS)
+      end
+
+      def backend
+        @backend ||= find_backend
       end
 
-      def backend(config)
+      def find_backend
         backend_type = config.fetch('backend', 'type').downcase
         backend_proc = Plugin.manager.backends[backend_type]
 
         klass = backend_proc.call
         klass.new(config)
       end
+
+      def symlink_errored_tfstate
+        local_path = Pathname.pwd.join('errored.tfstate')
+        remote_path = config.module_dir.join('errored.tfstate')
+
+        # Remove the possibly copied old file
+        local_path.unlink if local_path.exist?
+
+        local_path.make_symlink(remote_path)
+      end
     end
   end
 end

data/lib/yle_tf/action/write_terraformrc_defaults.rb

@@ -10,7 +10,7 @@ class YleTf
       RC_PATH = '~/.terraformrc'
 
       # Path of the plugin cache directory
-      DEFAULT_PLUGIN_CACHE_PATH = '~/.terraform.d/plugin-cache'
+      DEFAULT_PLUGIN_CACHE_PATH = '$HOME/.terraform.d/plugin-cache'
 
       def initialize(app)
         @app = app

data/lib/yle_tf/cli.rb

@@ -50,7 +50,7 @@ class YleTf
           if TF_OPTIONS.include?(arg)
             @tf_options[key(arg)] = true
           else
-            STDERR.puts "Unknown option '#{arg}'"
+            warn "Unknown option '#{arg}'"
             @tf_command = 'help'
             @tf_env = 'error'
             break

data/lib/yle_tf/config.rb

@@ -20,7 +20,7 @@ class YleTf
       }
 
       config = Loader.new(opts).load
-      new(config, opts)
+      new(config, **opts)
     end
 
     attr_reader :config, :tf_env, :module_dir

data/lib/yle_tf/config/loader.rb

@@ -91,7 +91,7 @@ class YleTf
 
       def migrate_old_config(config, **opts)
         task('  -> Migrating') do
-          Config::Migration.migrate_old_config(config, opts)
+          Config::Migration.migrate_old_config(config, **opts)
         end
       end
 

data/lib/yle_tf/logger.rb

@@ -23,7 +23,6 @@ class YleTf
 
     def self.logger
       @logger ||= ::Logger.new(DEVICE).tap do |logger|
-        patch_for_old_ruby(logger)
         logger.level = log_level
         logger.formatter = log_formatter
       end
@@ -65,14 +64,5 @@ class YleTf
         :brown
       end
     end
-
-    # Patches the `::Logger` in older Ruby versions to
-    # accept log level as a `String`
-    def self.patch_for_old_ruby(logger)
-      if Gem::Version.new(RUBY_VERSION) < Gem::Version.new('2.3')
-        require_relative '../../vendor/logger_level_patch'
-        logger.extend(LoggerLevelPatch)
-      end
-    end
   end
 end

data/lib/yle_tf/system.rb

@@ -3,6 +3,7 @@
 require 'English'
 require 'open3'
 require 'shellwords'
+require 'stringio'
 require 'thwait'
 require 'yle_tf/error'
 require 'yle_tf/logger'
@@ -46,7 +47,7 @@ class YleTf
 
     def self.read_cmd(*args, **opts)
       buffer = StringIO.new
-      cmd(*args, opts.merge(stdout: buffer))
+      cmd(*args, **opts.merge(stdout: buffer))
       buffer.string
     end
 

data/lib/yle_tf/system/io_handlers.rb

@@ -108,7 +108,7 @@ class YleTf
         while (data = source.readpartial(BLOCK_SIZE))
           target.write(data)
         end
-      rescue EOFError # rubocop:disable Lint/HandleExceptions
+      rescue EOFError # rubocop:disable Lint/SuppressedException
         # All read
       rescue IOError => e
         YleTf::Logger.debug e.full_message

data/lib/yle_tf/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 class YleTf
-  VERSION = '1.2.0'
+  VERSION = '1.3.0'
 end

metadata

@@ -1,17 +1,31 @@
 --- !ruby/object:Gem::Specification
 name: yle_tf
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.0
 platform: ruby
 authors:
 - Yleisradio
 - Teemu Matilainen
 - Antti Forsell
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-01-24 00:00:00.000000000 Z
+date: 2020-10-12 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: thwait
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.2.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.2.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -46,14 +60,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.0'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.0'
+        version: '13.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -146,7 +160,6 @@ files:
 - lib/yle_tf_plugins/commands/version/command.rb
 - lib/yle_tf_plugins/commands/version/plugin.rb
 - vendor/hash_deep_merge.rb
-- vendor/logger_level_patch.rb
 - vendor/middleware/LICENSE
 - vendor/middleware/builder.rb
 - vendor/middleware/runner.rb
@@ -154,7 +167,7 @@ homepage: https://github.com/Yleisradio/yle_tf
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -169,8 +182,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.1
-signing_key: 
+rubygems_version: 3.1.2
+signing_key:
 specification_version: 4
 summary: Tooling for Terraform
 test_files: []

data/vendor/logger_level_patch.rb

@@ -1,29 +0,0 @@
-require 'logger'
-
-class YleTf
-  module LoggerLevelPatch
-    # Taken from Ruby 2.4.1
-    def level=(severity)
-      if severity.is_a?(Integer)
-        @level = severity
-      else
-        case severity.to_s.downcase
-        when 'debug'.freeze
-          @level = ::Logger::DEBUG
-        when 'info'.freeze
-          @level = ::Logger::INFO
-        when 'warn'.freeze
-          @level = ::Logger::WARN
-        when 'error'.freeze
-          @level = ::Logger::ERROR
-        when 'fatal'.freeze
-          @level = ::Logger::FATAL
-        when 'unknown'.freeze
-          @level = ::Logger::UNKNOWN
-        else
-          raise ArgumentError, "invalid log level: #{severity}"
-        end
-      end
-    end
-  end
-end