minfra-cli 1.6.1 → 1.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0cee136b8311f1099c78490bfcf6da7be65e5fd8dc0cb029e8dc3828646e6631
-  data.tar.gz: 46d3929cc27282bc0ed1ac63c4db00c64a7e55e6dbd311319a29dff7d68ab403
+  metadata.gz: 7266c109d03ea557a04e8219a7029de66167299ba21b918b85d8bb3161913203
+  data.tar.gz: 7097c3ced9f56d9d6d88a86ef02679a0e449b677ad74e9acb663c4fefab1c29e
 SHA512:
-  metadata.gz: 469d14ac4671707412d214cd24d7c682bbd5ea62a1ee23dc87d0512eab1ec4ca51223751cfab73c2e96f96ccdba20f25f1394b32d61dd57a231862c1ff3fa25b
-  data.tar.gz: 70f3bc9ea2ec6f6509d709a6c68969453335f47063086063194cb616aa5db6131b8af69377fe935c329f25df8cbd0096e9fbb9ae44fbfd9035c8be1640b1982a
+  metadata.gz: 46facd2f0d2783b7f57cbda7370ab0316b0363aa362765386951b3c7129de0156662100747d1f06aa46e7fe4bfbc7e441563cdadcf5e39e6a808537f7a6661dc
+  data.tar.gz: 87e9f9de9e9e5f3fd20cbc31f9dc651f4eb3fb8f4a460bdf967304a0bd0ae791ab4837526c18d6e98791a3edb829d9397efb2f553e389d971899a28a585108f9

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+# 1.7.0
+ * rewrite of hooks system
+ * deprecation of me/kind.yaml.erb (breaking change as config/kind.yaml.erb the whole config object is passed
+ * improving Minfra::Cli::Runner to stream output
+# 1.6.2
+ * fixing templater 
+ * generating Chart.yaml only once with the namespaces name
 # 1.6.1
  * adding minfra_path to hiera scope
  * fixing state preparation when state dir not yet there

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    minfra-cli (1.0.1)
+    minfra-cli (1.7.0)
       activesupport (~> 6.1)
       erubis (~> 2.7)
       hashie (~> 3.5)
@@ -15,13 +15,13 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (6.1.7)
+    activesupport (6.1.7.2)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
       tzinfo (~> 2.0)
       zeitwerk (~> 2.3)
-    concurrent-ruby (1.1.10)
+    concurrent-ruby (1.2.0)
     diff-lcs (1.5.0)
     domain_name (0.5.20190701)
       unf (>= 0.0.5, < 1.0.0)
@@ -33,7 +33,7 @@ GEM
       optimist
     hiera-eyaml-gpg (0.7.4)
       hiera-eyaml (>= 1.3.8)
-    highline (2.0.3)
+    highline (2.1.0)
     http-accept (1.7.0)
     http-cookie (1.0.5)
       domain_name (~> 0.5)
@@ -42,7 +42,7 @@ GEM
     mime-types (3.4.1)
       mime-types-data (~> 3.2015)
     mime-types-data (3.2022.0105)
-    minitest (5.16.3)
+    minitest (5.17.0)
     netrc (0.11.0)
     optimist (3.0.1)
     rake (12.3.3)
@@ -67,12 +67,12 @@ GEM
     table_print (1.5.6)
     thor (1.2.1)
     timecop (0.9.5)
-    tzinfo (2.0.5)
+    tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
     unf (0.1.4)
       unf_ext
     unf_ext (0.0.8.2)
-    zeitwerk (2.6.0)
+    zeitwerk (2.6.6)
 
 PLATFORMS
   ruby

data/lib/minfra/cli/command.rb

@@ -3,33 +3,11 @@ module Minfra
     class Command < Thor
       include Common
       include Logging
-      include Hook
 
-      attr_reader :minfra_config
-      no_commands do
-        def invoke_command(*args)
-            begin
-              subcommand_name = args.first.name.to_sym
-              with_hook(subcommand_name) do
-                @minfra_config = Minfra::Cli.config
-                @minfra_config.load(options['environment']) if options['environment']
-                @cli_args = args[1]
-               super(*args)
-              end
-            rescue Minfra::Cli::Config::ConfigNotFoundError => err
-              STDERR.puts(err.message)
-              STDERR.puts "please run 'minfra setup dev'"
-              exit 1
-            rescue Minfra::Cli::Config::EnvironmentNotFoundError => err
-              STDERR.puts(err.message)
-              exit 1
-            end
-        end
-        def cli_args
-          @args
-        end
-
-      end
+      private
+      def minfra_config
+        Minfra::Cli.config
+      end  
     end
   end
 end

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

@@ -6,7 +6,7 @@ module Minfra
       desc "describe", "get some info about your config (if it's setup)"
       option :environment, required: false, aliases: ['-e']
       def describe
-        pp @minfra_config.describe(options[:environment])
+        pp minfra_config.describe(options[:environment])
       end
 
       desc "create", "create your development cluster"
@@ -18,8 +18,8 @@ module Minfra
       def upgrade
         info "Destroying existing dev cluster.."
         destroy
-        Runner.run("mv #{@minfra_config.base_path.join('me','kind.yaml.erb')} #{@minfra_config.base_path.join('me','kind_old_' + Time.now.strftime("%Y_%m_%dT%H_%M_%SZ") + '.yaml.erb')}", print_stdout: true)
-        Runner.run("mv #{@minfra_config.base_path.join('me', 'kube', 'config')} #{@minfra_config.base_path.join('me', 'kube', 'config_old_' + Time.now.strftime("%Y_%m_%dT%H_%M_%SZ"))}", print_stdout: true)
+        Runner.run("mv #{minfra_config.base_path.join('me','kind.yaml.erb')} #{minfra_config.base_path.join('me','kind_old_' + Time.now.strftime("%Y_%m_%dT%H_%M_%SZ") + '.yaml.erb')}", print_stdout: true)
+        Runner.run("mv #{minfra_config.base_path.join('me', 'kube', 'config')} #{minfra_config.base_path.join('me', 'kube', 'config_old_' + Time.now.strftime("%Y_%m_%dT%H_%M_%SZ"))}", print_stdout: true)
         Runner.run('yes | minfra setup dev', print_stdout: true) # On an existing cluster this should only ask for recreating the files that we moved previously
         info "Creating a new dev cluster.."
         create

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

@@ -40,7 +40,10 @@ module Minfra
 
         info "step: creating '#{kind_name}' kind cluster (can take some minutes)"
         kind_kube_path=Runner.run('echo $KUBECONFIG').to_s.strip
-        info run(%{KIND_EXPERIMENTAL_DOCKER_NETWORK=#{kind_name} kind create cluster --name "#{kind_name}" --config #{@config.kind_config_path}})
+        kind_config=Templater.read(config.base_path.join('config','kind.yaml.erb'), params: {config: config})
+        File.write(config.kind_config_path, kind_config)
+                                 
+        run(%{KIND_EXPERIMENTAL_DOCKER_NETWORK=#{kind_name} kind create cluster --name "#{kind_name}" --config #{@config.kind_config_path}})
 
         info "step: configuring kind"
         run %{docker exec #{kind_name}-control-plane bash -c "sed -e '/nameserver 127.0.0.11/ s/^#*/#/'  /etc/resolv.conf | cat - >> /etc/resolv.conf"}
@@ -105,7 +108,7 @@ module Minfra
 
 
         run_cmd(["cd #{stack.release_path}",
-                 "git --no-pager diff #{stack.compose_path}",
+                 "git --no-pager diff #{stack.release_path}",
         ], :bash, silence: true)
 
         errors = stack.check_plan
@@ -118,17 +121,12 @@ module Minfra
         end
 
         unless test
-          unless @config.dev?
+          unless @config.dev? || options[:force]==true
             unless Ask.boolean("Are the changes ok?")
               exit_error("Deployment aborted!")
             end
           end
 
-#          deploy_cmd = bash_cmd
-#          deploy_cmd << "#{env_cmd} orchparty #{method} -c #{cluster} -f #{stack.stack_rb_path}  -a #{stack.name}"
-
-          reason_message = tag_changed_to(release_path: stack.release_path) if reason_message.blank?
-
           message =  "deploying stack #{stack.name}: #{reason_message}."
           Minfra::Cli::Document.document(@config,"started #{message}")
           orch=Orchparty::App.new(cluster_name: cluster, 
@@ -239,16 +237,6 @@ module Minfra
 
       private
 
-      def tag_changed_to(release_path:)
-        return '' if @config.dev? # We don't use messages in dev
-
-        diff = run_cmd("cd #{release_path} && git --no-pager diff --unified=0 tags.json").split %r{(\d{4}_\d{2}_\d{2}T\d{2}_\d{2}_\d{2}Z)}
-
-        raise ArgumentError.new "#{release_path}/tags.json has not changed - supply message" if diff.empty?
-
-        diff[3]
-      end
-
       def init(stack_name, env, deployment, explicit_cluster)
         template = Minfra::Cli::StackM::KubeStackTemplate.new(stack_name,
                                                         config,

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

@@ -64,12 +64,12 @@ module Minfra
         end
           
         cmd = %{docker build #{"--target #{target}" if target} -t #{p.repo_name}:latest #{p.app_dir}}
-        # Runner.run(cmd) # this gives us no output ... don't like that
-        puts "running: #{cmd}"
-        `#{cmd}` || exit(1)
+        res = Runner.run(cmd)
+        exit(1) if res.error?
+        
         unless options[:noload]
           debug("loading int KIND")
-          Runner.run(%{kind load docker-image #{p.repo_name}:latest --name #{@minfra_config.name}})
+          Runner.run(%{kind load docker-image #{p.repo_name}:latest --name #{minfra_config.name}})
         end  
       end
 
@@ -103,7 +103,7 @@ module Minfra
 
       private
       def run_pre_repo
-        Runner.run(%{#{@minfra_config.base_path.join('hooks','pre_repo.sh')}})
+        Runner.run(%{#{minfra_config.base_path.join('hooks','pre_repo.sh')}})
       end
     end
   end

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

@@ -17,13 +17,7 @@ module Minfra
         ensure_path_and_template(config.config_path, config.base_path.join('config','me_config.json.erb'))
         config.init!
         config.load('dev')
-        templates_path=Minfra::Cli.root_path.join("templates")
-        ensure_path_and_template(config.kube_config_path, templates_path.join('kube_config.yaml.erb'))
-        ensure_path_and_template(config.kind_config_path, config.base_path.join('config','kind.yaml.erb'),
-                                 {ip: config.project.kind.panel.ip,
-                                  name: config.project.name,
-                                  host_path: config.base_path
-                                 })
+        
       end
 
       def ensure_path_and_template(dest_path, template_path, params={})

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

@@ -10,7 +10,7 @@ module Minfra
       desc "describe","get information about a stack"
       option :environment, aliases: ['-e']
       def describe
-        pp @minfra_config.describe(options["environment"])
+        pp minfra_config.describe(options["environment"])
       end
 
       desc "dashboard <stack_name>", "openening a dashboard for a stack"
@@ -30,6 +30,7 @@ module Minfra
       option :install, type: :boolean
       option :test, type: :boolean
       option :opts
+      option :force, type: :boolean
       def deploy(stack_name, message='')
         kube.deploy(stack_name, message)
       end
@@ -111,7 +112,7 @@ module Minfra
 
        private
        def kube
-         Kube.new(options, @minfra_config)
+         Kube.new(options, minfra_config)
        end
     end
   end

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

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
-
 module Minfra
   module Cli
     class Tag
@@ -15,13 +14,7 @@ module Minfra
         @format = format if format
 
         info 'Creating tag.'
-        debug "Using .tags folder..."
-#        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)
-#        info 'Pushing tag to remote.'
-#        run_cmd(cmd_push, :system)
         run_cmd(cmd_push_tag, :system)
       end
 
@@ -68,14 +61,6 @@ module Minfra
         "#{git_current_branch}-REL-#{@now.strftime(@format)}"
       end
 
-      def write_tag_folder_file(message)
-        File.write("#{@tags_folder}/#{tag_name}", "#{message}\n")
-      end
-
-      def write_tag_file(_message)
-        File.write(@tags_file.to_s, "#{tag_name}\n")
-      end
-
       def run_cmd(cmd, _how = :system)
         Runner.run(cmd)
       end

data/lib/minfra/cli/config.rb

@@ -42,7 +42,7 @@ module Minfra
         @status_path = @base_path.join('state')
         @kube_path=@me_path.join('kube')
         @kube_config_path=@kube_path.join('config')
-        @kind_config_path=@me_path.join("kind.yaml.erb")
+        @kind_config_path=@me_path.join("kind.yaml")
 
 #        @project_minfrarc_path = @base_path.join("config",'minfrarc.rb')
 #        require @project_minfrarc_path if @project_minfrarc_path.exist?

data/lib/minfra/cli/hook.rb

@@ -1,43 +1,79 @@
 # no support for around hooks yet
 
+class Thor
+  class Command
+    def run(instance, args = [])
+      arity = nil
+
+      if private_method?(instance)
+        instance.class.handle_no_command_error(name)
+      elsif public_method?(instance)
+        hooks=instance.instance_variable_get(:@_invocations).values.flatten
+        arity = instance.method(name).arity
+        Minfra::Cli.call_before_hooks(instance,hooks)
+        instance.__send__(name, *args)
+        Minfra::Cli.call_after_hooks(instance,hooks)
+      elsif local_method?(instance, :method_missing)
+        #Minfra::Cli.call_before_hooks(instance,hooks)
+        instance.__send__(:method_missing, name.to_sym, *args)
+        #Minfra::Cli.call_after_hooks(instance,hooks)
+      else
+        instance.class.handle_no_command_error(name)
+      end
+    rescue ArgumentError => e
+      handle_argument_error?(instance, e, caller) ? instance.class.handle_argument_error(self, e, args, arity) : (raise e)
+    rescue NoMethodError => e
+      handle_no_method_error?(instance, e, caller) ? instance.class.handle_no_command_error(name) : (raise e)
+    end
+  end
+end
+
 module Minfra
   module Cli
     module Hook
       class Hook
-        def initialize(type, name, block)
+        def initialize(type, names, block)
           @type=type
-          @name=name
+          @names=names
           @block=block
         end
 
-        def match?(type, name)
-         @type == type && @name == name
+        def match?(type, names)
+         @type == type && @names == names.map(&:to_sym)
         end
 
         def exec (obj)
           obj.instance_eval(&@block)
         end
-
       end
 
       class Hooker
+        include Logging
         def initialize(klass)
           @klass=klass
           @hooks=[]
         end
 
-        def register_before(name, block)
-          @hooks << Hook.new(:before, name, block)
+        def register_before(names, block)
+          @hooks << Hook.new(:before, names, block)
         end
 
-        def register_after(name, block)
-          @hooks << Hook.new(:after, name, block)
+        def register_after(names, block)
+          @hooks << Hook.new(:after, names, block)
         end
 
-        def call(obj, name, &block)
-          @hooks.select do |h| h.match?(:before, name) end.each do |h| h.exec(obj) end
-          obj.instance_eval(&block)
-          @hooks.select do |h| h.match?(:after, name) end.each do |h| h.exec(obj) end
+        def call_before_hooks(obj, names)
+          @hooks.select do |h| h.match?(:before, names) end.each do |h| 
+            debug("Hook before: #{names.join(',')}")
+            h.exec(obj) 
+          end
+        end
+
+        def call_after_hooks(obj,names)
+          @hooks.select do |h| h.match?(:after, names) end.each do |h| 
+            debug("Hook  after: #{names.join(',')}")
+            h.exec(obj) 
+          end
         end
       end
 
@@ -46,19 +82,22 @@ module Minfra
       end
 
       module ClassMethods
-        def hooks
-          @hooker||=Hooker.new(self)
+        def after_hook(*names,&block)
+          hooks.register_after(names, block)
         end
-        def after_hook(name,&block)
-          hooks.register_after(name, block)
+        def before_hook(*names, &block)
+          hooks.register_before(names, block)
         end
-        def before_hook(name, &block)
-          hooks.register_before(name, block)
+        def call_before_hooks(obj,names)
+          @hooks.call_before_hooks(obj,names)
+        end
+        def call_after_hooks(obj,names)
+          @hooks.call_after_hooks(obj,names)
+        end
+        private
+        def hooks
+          @hooks||=Hooker.new(self)
         end
-      end
-
-      def with_hook(hook_name, &block)
-        self.class.hooks.call(self, hook_name, &block)
       end
     end
   end

data/lib/minfra/cli/main_command.rb

@@ -6,7 +6,7 @@ module Minfra
       option :cluster
       option :stack, required: true
       def kube(*args)
-        kube = Kube.new(options, @minfra_config)
+        kube = Kube.new(options, minfra_config)
         kube.kubectl_command(args)
       end
 

data/lib/minfra/cli/runner.rb

@@ -4,13 +4,27 @@ module Minfra
   module Cli
     class Runner
       class Result
-        attr_reader :stdout, :stderr
-        def initialize(stdout,stderr, status)
-          @stderr=stderr
-          @stdout=stdout
-          @status=status
+        include Logging
+        
+        attr_writer :status
+        
+        def initialize
+          @stderr_lines=[]
+          @stdout_lines=[]
+          @status=nil
         end
-
+        
+        def add(line, stream=:stdout)
+          line.chomp!
+          if stream == :stdout
+            @stdout_lines << line
+            debug line
+          else
+            @stderr_lines << line
+            error line
+          end
+        end
+           
         def success?
           @status.success?
         end
@@ -19,8 +33,16 @@ module Minfra
           !success?
         end
 
+        def stdout
+          @stdout_lines.join("\n")
+        end
+        
+        def stderr
+          @stderr_lines.join("\n")
+        end  
+        
         def to_s
-          @stdout.to_s
+          stdout
         end
       end
 
@@ -36,24 +58,37 @@ module Minfra
       end
 
       def run
-        debug(@cmd)
+        debug("running: #{@cmd}")
         res=nil
         begin
-          res=Result.new(*Open3.capture3(@cmd))
+          res=Result.new
+          # see: http://stackoverflow.com/a/1162850/83386
+          Open3.popen3(@cmd) do |stdin, stdout, stderr, thread|
+            # read each stream from a new thread
+            { :stdout => stdout, :stderr => stderr }.each do |key, stream|
+              Thread.new do
+                until (raw_line = stream.gets).nil? do
+                  res.add(raw_line, key)
+                end
+              end
+            end
+            thread.join # don't exit until the external process is done
+            res.status = thread.value
+          end
         rescue
-        end  
-        if res&.error?
-          STDERR.puts "command failed: #{@cmd}"
-          STDERR.puts res.stdout
-          STDERR.puts res.stderr
         end
-        if exit_on_error && res&.error?
-          STDERR.puts "exiting on error"
+        
+        if res.error?
+          error "command failed: #{@cmd}"
+          info  res.stdout
+          error res.stderr
+        end
+        if exit_on_error && res.error?
+          info "exiting on error"
           exit 1
         end
         res
       end
-
     end
   end
 end

data/lib/minfra/cli/templater.rb

@@ -14,7 +14,7 @@ module Minfra
             raise "file #{path} not found"
           end
         end  
-        render(template, params)
+        render(content, params)
       end
       
       def self.render(template, params)

data/lib/minfra/cli/version.rb

@@ -1,5 +1,5 @@
 module Minfra
   module Cli
-    VERSION = '1.6.1'.freeze
+    VERSION = '1.7.0'.freeze
   end
 end

data/lib/minfra/cli.rb

@@ -5,13 +5,14 @@ require 'ostruct'
 require 'hiera'
 
 require_relative 'cli/logging'
+require_relative 'cli/templater'
+
 require 'orchparty'
 require_relative 'cli/config'
 require_relative 'cli/version'
 require_relative 'cli/hook'
 require_relative 'cli/common'
 require_relative 'cli/command'
-require_relative 'cli/templater'
 require_relative 'cli/ask'
 require_relative 'cli/document'
 require_relative 'cli/runner'
@@ -26,6 +27,7 @@ module Minfra
   module Cli
 
     extend Minfra::Cli::Logging
+    include Minfra::Cli::Hook
 
     def self.logger
       @logger
@@ -144,16 +146,5 @@ module Minfra
       end
     end
 
-    def self.subcommand(name)
-      @subcommands[name.to_sym]&.command
-    end
-
-    def self.before_hook(subcommand, command, &block)
-      subcommand(subcommand).before_hook(command, &block)
-    end
-
-    def self.after_hook(subcommand, command, &block)
-      subcommand(subcommand).after_hook(command, &block)
-    end
   end
 end

data/lib/orchparty/kubernetes_application.rb

@@ -179,7 +179,7 @@ module Orchparty
       end
 
       def install(chart)
-        info("Install: #{chart}")
+        info("Install: #{chart.name}")
         build_chart(chart) do |chart_path|
           @out_io.puts system("helm install --create-namespace --namespace #{namespace} --kube-context #{cluster_name} #{chart.name} #{chart_path}")
         end
@@ -211,11 +211,6 @@ module Orchparty
       
       def run(templates_path:, params:, output_chart_path:, chart: )
 
-        generate_chart_yaml(
-          templates_path: templates_path,
-          output_chart_path: output_chart_path,
-          chart_name: chart.name,
-        )
         
         File.open(File.join(output_chart_path, 'values.yaml'),'a') do |helm_values|
           params.each do |app_name, subparams|
@@ -265,16 +260,6 @@ module Orchparty
         params._used_vars
       end
 
-      def generate_chart_yaml(templates_path:, output_chart_path:, chart_name: )
-        template_path = File.join(templates_path, 'Chart.yaml.erb')
-        output_path = File.join(output_chart_path, 'Chart.yaml')
-
-        template = Erubis::Eruby.new(File.read(template_path))
-        template.filename = template_path
-        params = Hashie::Mash.new(chart_name: chart_name)
-        document = template.result(CleanBinding.new.get_binding(params))
-        File.write(output_path, document)
-      end
     end
   end
 end
@@ -311,11 +296,18 @@ class KubernetesApplication
 
   private
   def prepare
+    
     output_chart_path = @status_dir.join('helm')
     output_chart_path.rmtree if output_chart_path.exist?
     output_chart_path.mkpath
     templates_path = file_path.join('../../chart-templates').expand_path #don't ask. the whole concept of multiple charts in an app stinks...
     
+    generate_chart_yaml(
+          templates_path: templates_path,
+          output_chart_path: output_chart_path,
+          chart_name: namespace,
+    )
+
     info("generating base helm structure from: #{output_chart_path} from #{templates_path}")
     system("mkdir -p #{File.join(output_chart_path, 'templates')}")
 
@@ -324,6 +316,14 @@ class KubernetesApplication
     system("cp #{File.join(templates_path, 'templates/_helpers.tpl')} #{File.join(output_chart_path, 'templates/_helpers.tpl')}")
 
   end
+
+  def generate_chart_yaml(templates_path:, output_chart_path:, chart_name: )
+    template_path = File.join(templates_path, 'Chart.yaml.erb')
+    output_path = File.join(output_chart_path, 'Chart.yaml')
+
+    res=Minfra::Cli::Templater.read(template_path, params: {chart_name: chart_name})
+    File.write(output_path, res)
+  end
   
   def combine_charts(app_config)
     services = app_config._service_order.map(&:to_s)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: minfra-cli
 version: !ruby/object:Gem::Version
-  version: 1.6.1
+  version: 1.7.0
 platform: ruby
 authors:
 - Peter Schrammel
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-01-03 00:00:00.000000000 Z
+date: 2023-02-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor