minfra-cli 4.1.1 → 4.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ea616e6ead0473faae98389aa80a06a829059445d4e2c04c6860b8ab293f557e
-  data.tar.gz: 75e9ef0413aeaf293e69c1e19918dc9cb7179bdb97fac7450fdc8b21bfce3565
+  metadata.gz: 3130c38b75f95a1e33c187d6b2026ef0eead6ae92855021ef8c52a3d47aefc28
+  data.tar.gz: fe0fbbfee11d712ae34668bd9c5f87696fbf7c08186b409f0e33baf1d24ec449
 SHA512:
-  metadata.gz: d68c1105544f8f64cc80d46dd4ee534e1e46ce4827c38dbbfc50e503283185ba4c1a15b1287e9e05584fb6a4b5ab34e72bca0a93c8533472cddaeec869dc170e
-  data.tar.gz: f8ee54db259d6afed47ea39c1b1f5ba8af5438c9f063607719028e4360f0f45e15aeeeab53d723e153a147cf1c5c6c5d2e73c428b673e0bc0a23fb41e6b3728b
+  metadata.gz: 5b52d83585031a954c4db6a632322ecb3077936bed7ffa824d125e5ca6fb6341aead5abf1220671e9e17fcd6c7c0f541ea2a39405d541b51b5c1db11d9c8ffd1
+  data.tar.gz: 46aaa7a2acfe06a6fc190a21e5c7e0c391a55d503eda59618961b77f334203a1efa47d6c0ea337bdccbf2c22d255021ca1f148e9a23ae9f1863e543fa1748e27

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+# 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
+ * adding some needed hiera patches
 # 4.1.1
  * fix: puts statement removed
 # 4.1.0
@@ -26,7 +34,7 @@
  * fixing: setup dev
  * adding: colored errors and warnings
  * change: wrapping hiera lookup errors of gpg
- * adding: HIERA_DEBUG_LOOKUPS=true
+ * adding: MINFRA_DEBUG_HIERA_LOOKUPS=true
 # 2.0.1
  Refactorings
  * installing into Kernel only when 'exec' not at 'init' time

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

@@ -27,9 +27,9 @@ module Minfra
 
         init_logger
 
-        @logger.debug("Minfra: loglevel: #{@logger.level}, env: #{@config.orch_env}")
+        @logger.debug("Minfra: loglevel: #{@logger.level}, env: #{@config.orch_env}, options: #{@options.inspect}")
 
-        init_minfrarc
+        init_minfrarc unless @options[:norc]
         init_envs
         
         init_hiera
@@ -86,28 +86,23 @@ module Minfra
 
       # will parse -e, --argv_file, --
       def parse_global_options
-        @options = {}
-        if (idx = @argv.index('-e'))
-          @options[:env] = @argv[idx + 1]
-          @argv.delete_at(idx)
-          @argv.delete_at(idx)
-        end
-
-        if (idx = argv.index('--minfra_argv_file'))
-          @options[:argv_file] = @argv[idx + 1]
-          @argv.delete_at(idx)
-          @argv.delete_at(idx)
-        end
+        extract_option('-e', :env, 1)
+        extract_option('--minfra_argv_file', :argv_file, 1)
+        extract_option('--minfra_path', :base_path, 1)
+        extract_option('--no-rc', :norc)
+      end
 
-        if (idx = argv.index('--minfra_path'))
-          @options[:base_path] = @argv[idx + 1]
-          @argv.delete_at(idx)
+      def extract_option(name, sym, arity=0)
+        if idx = @argv.index(name)
+          if arity == 0
+            @options[sym] = true
+          else
+            @options[sym] = @argv[idx + 1]
+            @argv.delete_at(idx)
+          end
           @argv.delete_at(idx)
         end
-
-        @options
       end
-
       def init_minfrarc
         # load minfrarc for configs
         project_minfrarc_path = @config.base_path.join('config', 'minfrarc.rb')
@@ -149,15 +144,19 @@ module Minfra
         env_path = config.project.dig(:minfra, :hiera, :env_path) || 'environments'
         root = base_path.join('hiera')
         root.join('hieradata',env_path).glob('*.eyaml').sort.each do |path|
-          env_name = path.basename.sub(/(\..+)/,'').to_s
-          @envs[env_name]=Env.new(
+          local_env_name = path.basename.sub(/(\..+)/,'').to_s
+          @envs[local_env_name]=Env.new(
             hiera_root: root, 
             hiera_env_path: env_path, 
-            name: env_name, 
-            hiera_debug_lookups: ENV['MINFRA_DEBUG_HIERA_LOOKUPS'] == 'true', 
+            name: local_env_name, 
+            hiera_debug_lookups: ENV['MINFRA_DEBUG_HIERA_LOOKUPS'] == 'true' && env_name == local_env_name, 
             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,17 +25,16 @@ 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
 
       def l(value, default = nil)
-        debug "hiera: #{value}" if @debug_lookups
-        #        debugger if @env_name == 'production-management' && value == 'env.tags'
         return @cache[value] if @cache.key?(value)
 
         values = value.split('.')
@@ -67,6 +66,7 @@ module Minfra
         result = default if result.nil?
         result = Hashie::Mash.new(result) if result.is_a?(Hash)
         @cache[value] = result
+        debug "hiera: #{value} -> #{result.inspect}" if @debug_lookups
         result
       end
 

data/lib/minfra/cli/patches.rb

@@ -0,0 +1,9 @@
+require 'highline/import'
+module HieraPatch
+  def hiera?
+    false
+  end
+end
+require 'hiera/backend/eyaml/encryptors/gpg'
+
+Hiera::Backend::Eyaml::Encryptors::Gpg.extend(HieraPatch)

data/lib/minfra/cli/templater.rb

@@ -24,7 +24,7 @@ module Minfra
          end
       end
       
-      def self.read(path, params: {}, fallback: nil)
+      def self.read(path, params: {}, helpers: [], fallback: nil)
         p = Pathname.new(path)
         if p.exist?
           content = File.read(path)
@@ -34,7 +34,7 @@ module Minfra
           content = fallback
 
         end
-        render(content, params)
+        render(content, params, helpers: )
       end
 
       def self.render(template, params, helpers: [])

data/lib/minfra/cli/version.rb

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

data/lib/minfra/cli.rb

@@ -7,6 +7,8 @@ require 'ostruct'
 require 'hiera'
 
 require_relative 'cli/core_ext'
+require_relative 'cli/patches'
+
 require_relative 'cli/errors'
 require_relative 'cli/logging'
 require_relative 'cli/templater'
@@ -49,6 +51,7 @@ module Minfra
     end
 
     def self.exec(argv)
+     
       init(argv) unless init?
       cli.install
       cli.run

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: minfra-cli
 version: !ruby/object:Gem::Version
-  version: 4.1.1
+  version: 4.3.0
 platform: ruby
 authors:
 - Peter Schrammel
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-04-10 00:00:00.000000000 Z
+date: 2024-05-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -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,11 +206,11 @@ 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
 - lib/minfra/cli/main_command.rb
+- lib/minfra/cli/patches.rb
 - lib/minfra/cli/plugin.rb
 - lib/minfra/cli/plugins.rb
 - lib/minfra/cli/runner.rb