minfra-cli 0.2.2 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4c095831fd4a669abd1381046091e615395c93e367051ee051bf48c458167d63
-  data.tar.gz: 3b7219fba8adb56249c8be8f249751613c9f9e529d7a8d9341f44c32e69271ac
+  metadata.gz: 3a6dedf2d900fb64c7e8b58684942c15e67199910499d8a9afc9c20459deda7d
+  data.tar.gz: c7f6d2b107c53169ac51830e7962c2b433f5a533d624c0ea18b23eba9eb159e1
 SHA512:
-  metadata.gz: 45aacbd112f2797e1b177f477b9456cb955a20576a11442c8c4799609bbe6a226177d29c3ac1ff27a9b2270a1fd2fd2ac6fe4bd1ab5e813e823ff13bfd1e960c
-  data.tar.gz: 81bd7e7366bf87ca8c048289e74ec3bc2e5819456c6b386063e1831d8465bb2cb4cc18cd573ada93a5aefdd0c5392bba50be02348a31616ff447f60975ab65e2
+  metadata.gz: e17628bc18b689e5033226b6cdc262dc0738423663110dcdd8ab5747c17fddcb04f486ae885b767f7b356ec10aa996a2382694ab897eaf4d945e89a4a5d91e31
+  data.tar.gz: 60b5b1f9055d47386232d8ce7b980f8818e1a028b51673ff9a820c92970457fc587c9b427fa5d439973cfdd5e8dbc766065eb50cf3e25052eda9fc47ef9fdd54

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+# 1.0.0
+ * adding hiera as dependecy
+ * removing self developped inheritance of data
+
 # 0.2.2 Secrets support in charts
 
 # 0.1.0 Initial

data/exe/minfra

@@ -2,5 +2,7 @@
 
 $LOAD_PATH << File.expand_path('../lib', __dir__)
 require 'minfra/cli'
-Minfra::Cli::Main.start(ARGV)
+
+Minfra::Cli.init(ARGV)
+Minfra::Cli.run
 

data/lib/minfra/cli/config.rb

@@ -44,10 +44,12 @@ module Minfra
         @kube_path=@me_path.join('kube')
         @kube_config_path=@kube_path.join('config')
         @kind_config_path=@me_path.join("kind.yaml.erb")
-        @project_minfrarc_path = @base_path.join("config",'minfrarc.rb')
-        require @project_minfrarc_path if @project_minfrarc_path.exist?
-        @me_minfrarc_path = @me_path.join('minfrarc.rb')
-        require @me_minfrarc_path if @me_minfrarc_path.exist?
+
+#        @project_minfrarc_path = @base_path.join("config",'minfrarc.rb')
+#        require @project_minfrarc_path if @project_minfrarc_path.exist?
+#        @me_minfrarc_path = @me_path.join('minfrarc.rb')
+#        require @me_minfrarc_path if @me_minfrarc_path.exist?
+
         if config_path.exist?
           @config = Hashie::Mash.new(JSON.parse(Minfra::Cli::Templater.render(File.read(config_path),{}))) 
         else
@@ -61,11 +63,7 @@ module Minfra
         debug( "loading config env: #{orch_env} #{@orch_env}" )
         return self if defined?(@orch_env)
         @orch_env = orch_env
-        @orch_env_config = @config.environments[@orch_env] || raise(EnvironmentNotFoundError.new("Configuration for orchestration environment '#{@orch_env}' not found. Available orechstration environments: #{@config.environments.keys.inspect}"))
-        @project= @project.
-                  deep_merge(@project.environments[@orch_env]).
-                  deep_merge(@config).
-                  deep_merge(@orch_env_config)
+        @orch_env_config=Hashie::Mash.new
         @orch_env_config['env']=@orch_env
         self
       end

data/lib/minfra/cli/version.rb

@@ -1,5 +1,5 @@
 module Minfra
   module Cli
-    VERSION = '0.2.2'.freeze
+    VERSION = '1.0.0'.freeze
   end
 end

data/lib/minfra/cli.rb

@@ -3,6 +3,7 @@ require 'open3'
 require 'json'
 require 'ostruct'
 require 'orchparty'
+require 'hiera'
 
 require_relative 'cli/logging'
 require_relative 'cli/config'
@@ -25,12 +26,75 @@ module Minfra
   module Cli
     extend Minfra::Cli::Logging
 
+
+    def self.init(argv)
+     @argv = argv
+     # we'll set the context very early!
+
+     if idx=@argv.index("-e")
+       @config = Config.load(@argv[idx+1])
+       @argv.delete_at(idx)
+       @argv.delete_at(idx)
+     else
+       @config = Config.load('dev')
+     end
+
+     hiera_init
+
+     Minfra::Cli::Plugins.load
+     Minfra::Cli.scan
+     require_relative 'cli/main_command'
+     Minfra::Cli.resolve
+
+     project_minfrarc_path = @config.base_path.join("config",'minfrarc.rb')
+     require project_minfrarc_path if project_minfrarc_path.exist?
+     me_minfrarc_path = @config.me_path.join('minfrarc.rb')
+     require @me_minfrarc_path if me_minfrarc_path.exist?
+     
+    end
+    
+    def self.run
+      Minfra::Cli::Main.start(@argv)
+    end
+
     def self.root_path
       Pathname.new(File.expand_path(File.join(__FILE__, '../../../')))
     end
 
+    def self.hiera_init
+      @hiera_root = Pathname.new("#{ENV["MINFRA_PATH"]}/hiera")
+      hiera = Hiera.new(:config => @hiera_root.join('hiera.yaml').to_s)
+      Hiera.logger=:noop
+      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)
+      
+      node_scope=hiera.lookup("env", {},  scope, nil, :deeper)
+      scope=scope.merge(node_scope)
+      cache={}
+
+      Kernel.define_method(:l) do |value,default=nil|
+       return cache[value] if cache.has_key?(value)
+
+       if special_lookups[value]
+         lookup_type={ merge_behavior: special_lookups[value]["merge"].to_sym }
+       else
+         lookup_type=:native #priority
+       end
+
+       result=hiera.lookup(value, default, scope, nil, lookup_type)
+       result=Hashie::Mash.new(result) if result.kind_of?(Hash)
+       cache[value] = result
+       result
+      end
+    end
+
+
     def self.config
-      @config ||= Config.new
+      @config
     end
     def self.scan
       root_path.join("lib/minfra/cli/commands").each_child do |command_path|
@@ -71,10 +135,3 @@ module Minfra
     end
   end
 end
-
-Minfra::Cli::Plugins.load
-Minfra::Cli.scan
-require_relative 'cli/main_command'
-Minfra::Cli.resolve
-
-

data/lib/orchparty/kubernetes_application.rb

@@ -158,7 +158,7 @@ module Orchparty
 
       def build_chart(chart)
         params = chart._services.map {|s| app_config.services[s.to_sym] }.map{|s| [s.name, s]}.to_h
-        Dir.mktmpdir do |dir|
+        Dir.mktmpdir("#{chart.name}-") do |dir|
           run(templates_path: File.expand_path(chart.template, self.dir_path), params: params, output_chart_path: dir, chart: chart)
           yield dir
         end
@@ -294,7 +294,7 @@ class KubernetesApplication
     services = combine_charts(app_config)
     services.each do |name|
       service = app_config[:services][name]
-      puts "Service: #{name} #{method}"
+      puts "Service: #{name}(#{service._type}) #{method}"
       "::Orchparty::Services::#{service._type.classify}".constantize.new(cluster_name: cluster_name, namespace: namespace, file_path: file_path, app_config: app_config, out_io: @out_io).send(method, service)
     end
   end

data/minfra-cli.gemspec

@@ -33,4 +33,7 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency "hashie", "~>3.5"
   spec.add_runtime_dependency "activesupport", "~> 6.1"
   spec.add_runtime_dependency "erubis", "~> 2.7"
+  spec.add_runtime_dependency "hiera", "3.9.0"
+  spec.add_runtime_dependency "hiera-eyaml", "3.3.0"
+  spec.add_runtime_dependency "hiera-eyaml-gpg", "0.7.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: minfra-cli
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 1.0.0
 platform: ruby
 authors:
 - Peter Schrammel
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-07-05 00:00:00.000000000 Z
+date: 2022-09-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -100,6 +100,48 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.7'
+- !ruby/object:Gem::Dependency
+  name: hiera
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 3.9.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 3.9.0
+- !ruby/object:Gem::Dependency
+  name: hiera-eyaml
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 3.3.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 3.3.0
+- !ruby/object:Gem::Dependency
+  name: hiera-eyaml-gpg
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.7.4
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.7.4
 description: A cli framework for k8s based development and deployment.
 email:
 - peter.schrammel@gmx.de
@@ -188,7 +230,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.1.6
 signing_key: 
 specification_version: 4
 summary: A cli framework for k8s based development and deployment.