yle_tf 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: eb4e7fc05d7f0f0d5c7f2a268d8fc35e89b9b188ad791bb0b40073ced1c99bd3
-  data.tar.gz: b04514a89cbf3b88da4d36c2bc1a896c2801e2bdd0c68e87df6a43a967ba1e86
+  metadata.gz: a8818ef98a06e9ccd0e7890e54284f0b3640a0ca7a1e5000f951c4f82bb99011
+  data.tar.gz: 3a4ec6e95da88cdea69c5d02d93829a9a777303f46dcd571469ec5866c932d64
 SHA512:
-  metadata.gz: 1cb5d2a5c7cf0dc68ff19ff89f925542a251439d9a9c99458e003c867ba7421cfb0ec94e59c3ea027ac2a8f981a86d6cb60aca9ec754f6b7e9a9d0278efd4747
-  data.tar.gz: 3f8289688e55497d80ab25e16cbefd13ad830f378d17c829af8cb28188d34096f25a296f91ea219ff8f84dba3828f295e87d4811758821e40f0d44110553ef4f
+  metadata.gz: 1dba1594a58ceff3dc5519f938b9096fd0269e935c0e1443c12be20f16733ff2bb4cc4fc2c0956ba4629e75e579c00ac81638204eea0490520968e97321c2752
+  data.tar.gz: 0655f4e7d53d0cc57008afd7787c8b18ab47986a36d24d36e77fc602feef1e921e9fcdb504a0945e334337478c045891336db0a94c88bfe9942d16c78c089a7a

data/lib/yle_tf/action.rb

@@ -12,11 +12,13 @@ class YleTf
     autoload :TmpDir, 'yle_tf/action/tmpdir'
     autoload :VerifyTerraformVersion, 'yle_tf/action/verify_terraform_version'
     autoload :VerifyTfEnv, 'yle_tf/action/verify_tf_env'
+    autoload :VerifyYleTfVersion, 'yle_tf/action/verify_yle_tf_version'
     autoload :WriteTerraformrcDefaults, 'yle_tf/action/write_terraformrc_defaults'
 
     def self.default_action_stack(command_class = nil)
       Builder.new do
         use LoadConfig
+        use VerifyYleTfVersion
         use VerifyTfEnv
         use TmpDir
         use WriteTerraformrcDefaults

data/lib/yle_tf/action/tf_hooks.rb

@@ -3,9 +3,6 @@
 require 'yle_tf/logger'
 require 'yle_tf/tf_hook/runner'
 
-require 'yle_tf/logger'
-require 'yle_tf/tf_hook/runner'
-
 class YleTf
   module Action
     class TfHooks
@@ -23,7 +20,7 @@ class YleTf
 
       def hook_runner
         if run_hooks?
-          TfHook::Runner.new(@env[:config], hook_env)
+          TfHook::Runner.new(config, hook_env)
         else
           NoRunner
         end
@@ -31,11 +28,16 @@ class YleTf
 
       def hook_env
         {
-          'TF_COMMAND' => @env[:tf_command],
-          'TF_ENV'     => @env[:tf_env],
+          'TF_COMMAND'    => @env[:tf_command],
+          'TF_ENV'        => @env[:tf_env],
+          'TF_MODULE_DIR' => config.module_dir.to_s,
         }
       end
 
+      def config
+        @env[:config]
+      end
+
       def run_hooks?
         !@env[:tf_options][:no_hooks]
       end

data/lib/yle_tf/action/verify_yle_tf_version.rb

@@ -0,0 +1,36 @@
+# frozen_string_literal: true
+
+require 'yle_tf/error'
+require 'yle_tf/logger'
+require 'yle_tf/version'
+require 'yle_tf/version_requirement'
+
+class YleTf
+  module Action
+    class VerifyYleTfVersion
+      def initialize(app)
+        @app = app
+      end
+
+      def call(env)
+        Logger.debug('Verifying YleTf version')
+
+        requirement = requirement(env[:config])
+        verify_version(requirement)
+
+        @app.call(env)
+      end
+
+      def requirement(config)
+        requirement = config.fetch('yle_tf', 'version_requirement') { nil }
+        VersionRequirement.new(requirement)
+      end
+
+      def verify_version(requirement)
+        return if requirement.satisfied_by?(YleTf::VERSION)
+
+        raise Error, "YleTf version '#{YleTf::VERSION}', '#{requirement}' required by config"
+      end
+    end
+  end
+end

data/lib/yle_tf/config/defaults.rb

@@ -23,6 +23,9 @@ class YleTf
         },
         'terraform' => {
           'version_requirement' => nil
+        },
+        'yle_tf'    => {
+          'version_requirement' => nil
         }
       }.freeze
 

data/lib/yle_tf/config/migration.rb

@@ -49,7 +49,7 @@ class YleTf
       def deprecation_warning
         return nil if ENV['TF_OLD_CONFIG_WARNINGS'] == 'false'
 
-        ->(new_config) do
+        lambda do |new_config|
           Logger.warn("Old configuration found in #{config_source}")
           Logger.warn("Please migrate to relevant parts of:\n" \
                       "#{sanitize_config(new_config)}")

data/lib/yle_tf/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: yle_tf
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Yleisradio
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-04 00:00:00.000000000 Z
+date: 2019-01-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -18,14 +18,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.13'
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.13'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: guard-rspec
   requirement: !ruby/object:Gem::Requirement
@@ -105,6 +105,7 @@ files:
 - lib/yle_tf/action/tmpdir.rb
 - lib/yle_tf/action/verify_terraform_version.rb
 - lib/yle_tf/action/verify_tf_env.rb
+- lib/yle_tf/action/verify_yle_tf_version.rb
 - lib/yle_tf/action/write_terraformrc_defaults.rb
 - lib/yle_tf/backend.rb
 - lib/yle_tf/cli.rb