minfra-cli 1.2.2 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7cc9eb903029df09bcf00c7658d8262f59803e91a1401d4f7193498ec2be4a83
-  data.tar.gz: f75a3b6f82edba2afb7ffeacb9faf4ec4aadaf4d9f6a3c76465e481d33a84b5c
+  metadata.gz: c6145d8b76367e739eb7b93bcfdcaf22428004ab45de977215e874c8b59da64b
+  data.tar.gz: 8811fbed0e951e862888428e4370cc10d9c4fa199e9d9fa567b847ec1f689383
 SHA512:
-  metadata.gz: fb2439b3b555c6aebb7e12ad6e50b33e4c8fe2253ce367e7c77a5ca6a6094c4e54a6576668d8461236d7208eea93090e85423bd323a5e96686e406b6c1dec334
-  data.tar.gz: b701d0bff17d6639d09cb5dc307856bc07191c9d2d11f8bbef7b90c5fcb49ca86e841c1f50c0740dbbbe24e949d6a73ed63522a6a5f678a79510bb5873e75b0a
+  metadata.gz: 61359dada17608504dac46c3af40fc94e8a7d53f468ca95f6bcec518c9d7c9b32a7a6ff14540286c1fcc9b14d6eee45df4df336e6156a0a8cea8c986c8188fd5
+  data.tar.gz: 9792bf505ded5f51f4955be00f13fae965aaaadf17caa1606f310ebbb600cc145929ab5e39b31c4c0dc707a1de24912dd830f2c6749077db8d42961539a594ce

data/CHANGELOG.md

@@ -1,4 +1,6 @@
-# 1.2. 
+# 1.3.0
+ * deep lookup value like "env.cluster.name"
+# 1.2.2
  * fixing tagging
 # 1.2.1
  * fixing merge

data/lib/minfra/cli/version.rb

@@ -1,5 +1,5 @@
 module Minfra
   module Cli
-    VERSION = '1.2.2'.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.2
+  version: 1.3.0
 platform: ruby
 authors:
 - Peter Schrammel
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-10-29 00:00:00.000000000 Z
+date: 2022-10-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -233,7 +233,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.5
+rubygems_version: 3.1.6
 signing_key: 
 specification_version: 4
 summary: A cli framework for k8s based development and deployment.