minfra-cli 4.1.0 → 4.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 559888088dd171a754ae0ccab6b6e8bf9ff0940e5cea2a64da90c83714250e1f
-  data.tar.gz: 212ed7b65798feda2b14a408d2f8066e73b21736ade7eed3a5fe5fafe50adbc6
+  metadata.gz: 6d03bf07a73181fc3684097f17a648f741a090faeb2c978d3811595419c16e6e
+  data.tar.gz: 2a34f444e718d6dea3b8cc667d015a0d7dcbdcea3a642dccef010d249c8c7295
 SHA512:
-  metadata.gz: 68ae0b701280177906cd79fbbebcd18b53380abb023f23ecb94c40b410ca0be47b6b2ffd2a8bad4e11b5f6e1b8430ff6aa4c3f2f1cde92e4e15d222fef001fc8
-  data.tar.gz: b47a78a9681d51bbde838d6d9527a5dfb7eea37f37d5cdcf78d28ab037e2bdfc85aca43ae72c3ddae3b1087ab82930f1d7d4097262f0c940ad79693995bed243
+  metadata.gz: '086bbbf454c3718828da81615cc774944b1e48bb029c51fde17ed222927f80f22d384367968da7c8256eb4b56d175bfca473dd8d8b1a56a69bf0d1a91e18aa11'
+  data.tar.gz: 5d34129f956690ef81f21740903e1ffa1bde883358e5deb01342103971293c942b6e18883d8aee14060bfe0ea1baea0399fd19d5edb57fd32f24251cd63bcb2a

data/CHANGELOG.md

@@ -1,10 +1,16 @@
+# 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
- * Minfra::Cli::Templater can now user helper modules
+ * improvement: Minfra::Cli::Templater can now user helper modules
 # 4.0.0
- * in apply mode of secrets we prefix the name with the chart name
+ * feature: in apply mode of secrets we prefix the name with the chart name
 # 3.1.0
- * overriding backends via MINFRA_HIERA_BACKENDS
- * overriding Yaml Backend to allow :extension: setting
+ * improvement: overriding backends via MINFRA_HIERA_BACKENDS
+ * improvement: overriding Yaml Backend to allow :extension: setting
 # 3.0.2
  * removing complex dns manipulation and hardcoding google servers
 # 3.0.1
@@ -24,7 +30,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/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,12 +144,12 @@ 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

data/lib/minfra/cli/hiera_looker.rb

@@ -31,11 +31,10 @@ module Minfra
         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

@@ -20,12 +20,11 @@ module Minfra
            helpers.each do |helper|
              b.extend helper
            end
-           p b._binding.receiver
            result(b._binding)
          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)
@@ -35,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.0'
+    VERSION = '4.2.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'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: minfra-cli
 version: !ruby/object:Gem::Version
-  version: 4.1.0
+  version: 4.2.0
 platform: ruby
 authors:
 - Peter Schrammel
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-04-09 00:00:00.000000000 Z
+date: 2024-05-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -210,6 +210,7 @@ files:
 - 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