minfra-cli 4.2.0 → 4.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6d03bf07a73181fc3684097f17a648f741a090faeb2c978d3811595419c16e6e
-  data.tar.gz: 2a34f444e718d6dea3b8cc667d015a0d7dcbdcea3a642dccef010d249c8c7295
+  metadata.gz: 3130c38b75f95a1e33c187d6b2026ef0eead6ae92855021ef8c52a3d47aefc28
+  data.tar.gz: fe0fbbfee11d712ae34668bd9c5f87696fbf7c08186b409f0e33baf1d24ec449
 SHA512:
-  metadata.gz: '086bbbf454c3718828da81615cc774944b1e48bb029c51fde17ed222927f80f22d384367968da7c8256eb4b56d175bfca473dd8d8b1a56a69bf0d1a91e18aa11'
-  data.tar.gz: 5d34129f956690ef81f21740903e1ffa1bde883358e5deb01342103971293c942b6e18883d8aee14060bfe0ea1baea0399fd19d5edb57fd32f24251cd63bcb2a
+  metadata.gz: 5b52d83585031a954c4db6a632322ecb3077936bed7ffa824d125e5ca6fb6341aead5abf1220671e9e17fcd6c7c0f541ea2a39405d541b51b5c1db11d9c8ffd1
+  data.tar.gz: 46aaa7a2acfe06a6fc190a21e5c7e0c391a55d503eda59618961b77f334203a1efa47d6c0ea337bdccbf2c22d255021ca1f148e9a23ae9f1863e543fa1748e27

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+# 4.3.0
+ * raising EnvNotFound when the environment is not found
+ * instead of patching yaml we're introducing yeaml backend to lookup eyaml files without decryption
+ * fixing hiera setup so environment file is loaded first and merged into scope
 # 4.2.0
  * --no-rc don't load rc files
  * MINFRA_DEBUG_HIERA_LOOKUPS=true also shows the results of the lookup

data/lib/{minfra/cli/hiera_yaml_backend_patch.rb → hiera/backend/yeaml_backend.rb}

@@ -1,13 +1,15 @@
+require 'hiera/backend/yaml_backend'
+# require 'debug'
 class Hiera
   module Backend
-    class Yaml_backend
-
+    class Yeaml_backend < Hiera::Backend::Yaml_backend
       def lookup(key, scope, order_override, resolution_type, context)
         answer = nil
         found = false
 
-        Hiera.debug("Looking up #{key} in YAML backend")
-        Backend.datasourcefiles(:yaml, scope, Config[:yaml][:extension] || "yaml", order_override) do |source, yamlfile|
+        Hiera.debug("Looking up #{key} in YEAML backend")
+        Backend.datasourcefiles(:yeaml, scope, Config[:yeaml][:extension] || "eyaml", order_override) do |source, yamlfile|
+#          debugger if scope['env']== "dev-on-premises" && ['cluster', 'env','lookup_options'].include?(key)
           data = @cache.read_file(yamlfile, Hash) do |data|
             YAML.load(data) || {}
           end

data/lib/minfra/cli/cli_starter.rb

@@ -153,6 +153,10 @@ module Minfra
             backends: ENV.fetch('MINFRA_HIERA_BACKENDS','').split(',')
           )
         end
+        unless @envs[@env_name]
+          @logger.error("Environment '#{@env_name}' not found")
+          raise Errors::EnvNotFound.new(@env_name) 
+        end
         @env = @envs[@env_name] # set the current env
       end
 

data/lib/minfra/cli/errors.rb

@@ -5,6 +5,8 @@ module Minfra
     module Errors
       class ExitError < StandardError
       end
+      class EnvNotFound < StandardError
+      end
     end
   end
 end

data/lib/minfra/cli/hiera_looker.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'English'
+# require 'debug'
 module Minfra
   module Cli
     class HieraLooker
@@ -12,11 +13,10 @@ module Minfra
 
         @hiera = Hiera.new(config: @root.join('hiera.yaml').to_s)
         # now that hiera has loaded the backends let's patch 'em
-        require 'minfra/cli/hiera_yaml_backend_patch' if defined?(Hiera::Backend::Yaml_backend)
         
         Hiera.logger = :noop
         if backends && !backends.empty?
-          @hiera.config[:backends] = backends 
+          @hiera.config[:backends] = backends
           Hiera::Config.load_backends
         end
 
@@ -25,11 +25,11 @@ module Minfra
         raise("unknown environment #{@env_name}, I expect a file at #{hiera_main_path}") unless hiera_main_path.exist?
 
         scope = { 'hieraroot' => @root.to_s, 'env' => @env_name }
+        # we have to do this first as the hierarchy definitions only are valid if with the env variables injected
+        node_scope = @hiera.lookup('env', {}, scope, nil, :priority)
+        @scope = scope.merge(node_scope)
 
         @special_lookups = @hiera.lookup('lookup_options', {}, scope, nil, :priority)
-
-        node_scope = @hiera.lookup('env', {}, scope, nil, :deeper)
-        @scope = scope.merge(node_scope)
         @debug_lookups = debug_lookups
         debug("hiera: scope -> #{@scope}") if @debug_lookups
       end

data/lib/minfra/cli/version.rb

@@ -2,6 +2,6 @@
 
 module Minfra
   module Cli
-    VERSION = '4.2.0'
+    VERSION = '4.3.0'
   end
 end

data/lib/minfra/cli.rb

@@ -51,6 +51,7 @@ module Minfra
     end
 
     def self.exec(argv)
+     
       init(argv) unless init?
       cli.install
       cli.run

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: minfra-cli
 version: !ruby/object:Gem::Version
-  version: 4.2.0
+  version: 4.3.0
 platform: ruby
 authors:
 - Peter Schrammel
@@ -182,6 +182,7 @@ files:
 - exe/minfra
 - lib/deep_merge.rb
 - lib/hash.rb
+- lib/hiera/backend/yeaml_backend.rb
 - lib/minfra/cli.rb
 - lib/minfra/cli/ask.rb
 - lib/minfra/cli/cli_starter.rb
@@ -205,7 +206,6 @@ files:
 - lib/minfra/cli/errors.rb
 - lib/minfra/cli/helm_runner.rb
 - lib/minfra/cli/hiera_looker.rb
-- lib/minfra/cli/hiera_yaml_backend_patch.rb
 - lib/minfra/cli/hook.rb
 - lib/minfra/cli/kubectl_runner.rb
 - lib/minfra/cli/logging.rb