minfra-cli 1.2.1 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 85c13c7902b1b38e6fa594e7a63f93ad7648f40738e2cc06a1ae1413d898dca1
-  data.tar.gz: 52ac2f1dc8914969b6ddede468dbd3ab02e5597f652862741e9dd011d517c0b8
+  metadata.gz: c6145d8b76367e739eb7b93bcfdcaf22428004ab45de977215e874c8b59da64b
+  data.tar.gz: 8811fbed0e951e862888428e4370cc10d9c4fa199e9d9fa567b847ec1f689383
 SHA512:
-  metadata.gz: ae8cd064ce5d77085284517ce131e67f7153c3f2a42321bedf7f25a599beae30a515b69aca117de5f741127d493628d648bb5a1dc110578795524fb9363dedcf
-  data.tar.gz: '036991cef9ff075acd446ac45fb8d0709ff8048662c3943b31efa98ccd21ce66e3e0c5faebb51f0ebeb7669f2e5ad266d84c71f8de9394fa0a3eca81e64b062c'
+  metadata.gz: 61359dada17608504dac46c3af40fc94e8a7d53f468ca95f6bcec518c9d7c9b32a7a6ff14540286c1fcc9b14d6eee45df4df336e6156a0a8cea8c986c8188fd5
+  data.tar.gz: 9792bf505ded5f51f4955be00f13fae965aaaadf17caa1606f310ebbb600cc145929ab5e39b31c4c0dc707a1de24912dd830f2c6749077db8d42961539a594ce

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+# 1.3.0
+ * deep lookup value like "env.cluster.name"
+# 1.2.2
+ * fixing tagging
 # 1.2.1
  * fixing merge
 # 1.2.0

data/lib/minfra/cli/commands/tag.rb

@@ -16,7 +16,7 @@ module Minfra
 
         info 'Creating tag.'
         debug "Using .tags folder..."
-        write_tag_folder_file(message)
+#        write_tag_folder_file(message)
         #run_cmd(cmd_add_tag_info("#{@tags_folder}/#{tag_name}"), :system)
         #run_cmd(cmd_create_tag_commit, :system)
         run_cmd(cmd_tag_commit(message), :system)

data/lib/minfra/cli/version.rb

@@ -1,5 +1,5 @@
 module Minfra
   module Cli
-    VERSION = '1.2.1'.freeze
+    VERSION = '1.3.0'.freeze
   end
 end

data/lib/minfra/cli.rb

@@ -68,7 +68,6 @@ module Minfra
       env= @config.orch_env
       raise("unknown environment #{env}, I expact a file at hiera/hieradata/environments/#{env}.eyaml") unless @hiera_root.join("hieradata/environments/#{env}.eyaml").exist? 
 
-             
       scope={ "hieraroot" => @hiera_root.to_s, "env" => env}
       special_lookups=hiera.lookup("lookup_options", {},  scope, nil, :priority)
       
@@ -76,15 +75,23 @@ module Minfra
       scope=scope.merge(node_scope)
       cache={}
       Kernel.define_method(:l) do |value,default=nil|
+
        return cache[value] if cache.has_key?(value)
 
+       values=value.split(".")
+       value=values.shift
+
        if special_lookups[value]
          lookup_type={ merge_behavior: special_lookups[value]["merge"].to_sym }
        else
-         lookup_type=:native #priority
+         lookup_type=:deep
        end
 
        result=hiera.lookup(value, default, scope, nil, lookup_type)
+       unless values.empty?
+         result=result.dig(*values)
+       end
+
        result=Hashie::Mash.new(result) if result.kind_of?(Hash)
        cache[value] = result
        result

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: minfra-cli
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.3.0
 platform: ruby
 authors:
 - Peter Schrammel
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-10-25 00:00:00.000000000 Z
+date: 2022-10-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor