minfra-cli 1.13.3 → 2.0.0

data/lib/minfra/cli.rb

@@ -1,9 +1,13 @@
+# frozen_string_literal: true
+
 require 'thor'
 require 'open3'
 require 'json'
 require 'ostruct'
 require 'hiera'
 
+require_relative 'cli/core_ext'
+require_relative 'cli/errors'
 require_relative 'cli/logging'
 require_relative 'cli/templater'
 
@@ -19,137 +23,39 @@ require_relative 'cli/runner'
 require_relative 'cli/helm_runner'
 require_relative 'cli/kubectl_runner'
 require_relative 'cli/plugins'
+require_relative 'cli/plugin'
+require_relative 'cli/hiera_looker'
+require_relative 'cli/env'
+require_relative 'cli/cli_starter'
 
 require 'active_support'
 require 'active_support/core_ext'
 
-require "#{ENV['MINFRA_PATH']}/config/preload.rb" if File.exist?("#{ENV['MINFRA_PATH']}/config/preload.rb")
+require "#{ENV.fetch('MINFRA_PATH', nil)}/config/preload.rb" if File.exist?("#{ENV.fetch('MINFRA_PATH', nil)}/config/preload.rb")
 
 module Minfra
   module Cli
-
     extend Minfra::Cli::Logging
     include Minfra::Cli::Hook
 
-    def self.logger
-      @logger
-    end
-    
-    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
-
-     @logger=Logger.new(STDERR)
-     logger.level=ENV["MINFRA_LOGGING_LEVEL"] || @config.project.minfra.logging_level || 'warn'
-
-     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?
-
-     @logger.debug("Minfra: loglevel: #{@logger.level}, env: #{@config.orch_env}")
-     
-     hiera_init
-
-     @plugins = Minfra::Cli::Plugins.load
-     @plugins.prepare
-     
-     Minfra::Cli.scan
-     require_relative 'cli/main_command'
-     Minfra::Cli.resolve
-
-
-     
-    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
-      hiera_main_path=@hiera_root.join("hieradata/#{config.project.minfra.hiera.env_path}/#{env}.eyaml")
-      raise("unknown environment #{env}, I expact a file at #{hiera_main_path}") unless hiera_main_path.exist? 
-
-      scope={ "minfra_path" => ENV["MINFRA_PATH"], "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)
-
-       values=value.split(".")
-       fst_value=values.shift
+    cattr_accessor :logger, :config, :subcommands,:cli
 
-       if special_lookups[fst_value]
-         lookup_type={ merge_behavior: special_lookups[fst_value]["merge"].to_sym }
-       else
-         lookup_type=:deep
-       end
-
-       result=hiera.lookup(fst_value, default, scope, nil, lookup_type)
-       if !values.empty? && result.kind_of?(Hash) # we return nil or the scalar value and only drill down on hashes
-         result=result.dig(*values)
-       end
-
-       result=Hashie::Mash.new(result) if result.kind_of?(Hash)
-       cache[value] = result
-       result
-      end
-      Kernel.define_method(:l!) do |value,default=nil|
-        v=l(value,default)
-        raise("Value not found! #{value}") if v.nil?
-        v
-      end  
+    def self.init?
+      !!cli
     end
 
-
-    def self.config
-      @config
-    end
-    
-    def self.scan
-      #loading built in commands
-      root_path.join("lib/minfra/cli/commands").each_child do |command_path|
-        require command_path if command_path.to_s.match(/\.rb$/) && !command_path.to_s.match(/\#/)
-      end
-      @plugins.setup
-    end
-    
-    def self.plugins
-      @plugins
+    def self.init(argv = [])
+      self.subcommands ||= {}
+      self.cli = CliStarter.new(argv)
     end
 
-    def self.register(subcommand,info,command)
-      #debug("Registered command #{subcommand}")
-      @subcommands ||= {}
-      @subcommands[subcommand.to_sym]= OpenStruct.new(name: subcommand, info: info, command: command)
+    def self.exec(argv)
+      init(argv) unless init?
+      cli.run
     end
 
-    def self.resolve
-      @subcommands.values.each do |sub|
-        Minfra::Cli::Main.desc(sub.name,sub.info)
-        Minfra::Cli::Main.subcommand(sub.name,sub.command)
-      end
+    def self.register(subcommand, info, command)
+      self.subcommands[subcommand.to_sym] = OpenStruct.new(name: subcommand, info:, command:)
     end
-
   end
 end

data/lib/orchparty/ast.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'hashie'
 
 module Orchparty
@@ -13,14 +15,12 @@ module Orchparty
         binding
       end
 
-      def inspect(indent=0)
-        start="\n"
+      def inspect(indent = 0)
+        start = "\n"
         each_pair do |name, ast|
-          begin
-            start << "#{'  ' * indent}#{name}: #{ast.inspect(indent+1)}\n"
-          rescue ArgumentError
-            start << "#{'  ' * indent}#{name}: #{ast.inspect}\n"
-          end  
+          start << "#{'  ' * indent}#{name}: #{ast.inspect(indent + 1)}\n"
+        rescue ArgumentError
+          start << "#{'  ' * indent}#{name}: #{ast.inspect}\n"
         end
         start
       end
@@ -39,28 +39,27 @@ module Orchparty
     end
 
     def self.mixin(args = {})
-      Node.new({services: {}, _mixins: {}, volumes: {}, _variables: {}, networks: {}, _service_order: []}).merge(args)
+      Node.new({ services: {}, _mixins: {}, volumes: {}, _variables: {}, networks: {}, _service_order: [] }).merge(args)
     end
 
     def self.application(args = {})
-      Node.new({services: {}, _mixins: {}, _mix:[], volumes: {}, _variables: {}, networks: {}, _service_order: []}).merge(args)
+      Node.new({ services: {}, _mixins: {}, _mix: [], volumes: {}, _variables: {}, networks: {}, _service_order: [] }).merge(args)
     end
 
     def self.all(args = {})
-      Node.new(_mix:[], _variables: {}).merge(args)
+      Node.new(_mix: [], _variables: {}).merge(args)
     end
 
     def self.application_mixin(args = {})
-      Node.new(_mix:[], _variables: {}).merge(args)
+      Node.new(_mix: [], _variables: {}).merge(args)
     end
 
     def self.service(args = {})
-      Node.new(_mix:[], _variables: {}).merge(args)
+      Node.new(_mix: [], _variables: {}).merge(args)
     end
 
     def self.chart(args = {})
-      Node.new(_mix:[], _variables: {}, _services: []).merge(args)
+      Node.new(_mix: [], _variables: {}, _services: []).merge(args)
     end
-
   end
 end

data/lib/orchparty/cli.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'orchparty'
 require 'gli'
 
@@ -11,57 +13,57 @@ class OrchPartyApp
 
   subcommand_option_handling :normal
 
-  desc "install kubernetes application"
+  desc 'install kubernetes application'
   command :print do |com|
-    com.flag [:cluster_name,:c,'cluster-name'], required: true, :desc => 'The cluster to install the app'
-    com.flag [:filename,:f,'file-name'], required: true, :desc => 'The Orchparty input file'
-    com.flag [:application,:a], required: true, :desc => 'The application that should be installed'
-    com.switch :"force-variable-definition", :default_value => false, :desc => "Raises an Error if the input contains a not defined variable"
-    com.flag [:method,:m], required: true, :desc => 'method to print upgrade/install'
+    com.flag [:cluster_name, :c, 'cluster-name'], required: true, desc: 'The cluster to install the app'
+    com.flag [:filename, :f, 'file-name'], required: true, desc: 'The Orchparty input file'
+    com.flag %i[application a], required: true, desc: 'The application that should be installed'
+    com.switch :'force-variable-definition', default_value: false, desc: 'Raises an Error if the input contains a not defined variable'
+    com.flag %i[method m], required: true, desc: 'method to print upgrade/install'
     com.action do |_, args|
-      Orchparty.print(cluster_name: args[:c], application_name: args[:a], force_variable_definition: args["force-variable-definition"], file_name: args[:f], method: args[:m])
+      Orchparty.print(cluster_name: args[:c], application_name: args[:a], force_variable_definition: args['force-variable-definition'], file_name: args[:f], method: args[:m])
     end
   end
 
-  desc "install kubernetes application"
+  desc 'install kubernetes application'
   command :install do |com|
-    com.flag [:cluster_name,:c,'cluster-name'], required: true, :desc => 'The cluster to install the app'
-    com.flag [:filename,:f,'file-name'], required: true, :desc => 'The Orchparty input file'
-    com.flag [:application,:a], required: true, :desc => 'The application that should be installed'
-    com.switch :"force-variable-definition", :default_value => false, :desc => "Raises an Error if the input contains a not defined variable"
+    com.flag [:cluster_name, :c, 'cluster-name'], required: true, desc: 'The cluster to install the app'
+    com.flag [:filename, :f, 'file-name'], required: true, desc: 'The Orchparty input file'
+    com.flag %i[application a], required: true, desc: 'The application that should be installed'
+    com.switch :'force-variable-definition', default_value: false, desc: 'Raises an Error if the input contains a not defined variable'
     com.action do |_, args|
-      Orchparty.install(cluster_name: args[:c], application_name: args[:a], force_variable_definition: args["force-variable-definition"], file_name: args[:f])
+      Orchparty.install(cluster_name: args[:c], application_name: args[:a], force_variable_definition: args['force-variable-definition'], file_name: args[:f])
     end
   end
 
-  desc "upgrade kubernetes application"
+  desc 'upgrade kubernetes application'
   command :upgrade do |com|
-    com.flag [:cluster_name,:c,'cluster-name'], required: true, :desc => 'The cluster to install the app'
-    com.flag [:filename,:f,'file-name'], required: true, :desc => 'The Orchparty input file'
-    com.flag [:application,:a], required: true, :desc => 'The application that should be installed'
-    com.switch :"force-variable-definition", :default_value => false, :desc => "Raises an Error if the input contains a not defined variable"
+    com.flag [:cluster_name, :c, 'cluster-name'], required: true, desc: 'The cluster to install the app'
+    com.flag [:filename, :f, 'file-name'], required: true, desc: 'The Orchparty input file'
+    com.flag %i[application a], required: true, desc: 'The application that should be installed'
+    com.switch :'force-variable-definition', default_value: false, desc: 'Raises an Error if the input contains a not defined variable'
     com.action do |_, args|
-      Orchparty.upgrade(cluster_name: args[:c], application_name: args[:a], force_variable_definition: args["force-variable-definition"], file_name: args[:f])
+      Orchparty.upgrade(cluster_name: args[:c], application_name: args[:a], force_variable_definition: args['force-variable-definition'], file_name: args[:f])
     end
   end
 
-  desc "Compiles a Orchparty input file to a orchestration framework configuration"
+  desc 'Compiles a Orchparty input file to a orchestration framework configuration'
   command :generate do |com|
     Orchparty.plugins.each do |name, plugin|
-        com.desc plugin.desc
-        com.command(name) do |plugin_command|
-          plugin_command.flag [:filename,:f,'file-name'], required: true, :desc => 'The Orchparty input file'
-          plugin_command.flag [:application,:a], required: true, :desc => 'The application that should be compiled'
-          plugin_command.switch :"force-variable-definition", :default_value => false, :desc => "Raises an Error if the input contains a not defined variable"
-          plugin.define_flags(plugin_command)
-          plugin_command.action do |global_options,plugin_options,args|
-            options = plugin_options.delete(GLI::Command::PARENT)
-            options[:application] = plugin_options[:application]
-            options[:filename] = plugin_options[:filename]
-            options[:force_variable_definition] = plugin_options[:"force-variable-definition"]
-            Orchparty.generate(name, options, plugin_options)
-          end
+      com.desc plugin.desc
+      com.command(name) do |plugin_command|
+        plugin_command.flag [:filename, :f, 'file-name'], required: true, desc: 'The Orchparty input file'
+        plugin_command.flag %i[application a], required: true, desc: 'The application that should be compiled'
+        plugin_command.switch :'force-variable-definition', default_value: false, desc: 'Raises an Error if the input contains a not defined variable'
+        plugin.define_flags(plugin_command)
+        plugin_command.action do |_global_options, plugin_options, _args|
+          options = plugin_options.delete(GLI::Command::PARENT)
+          options[:application] = plugin_options[:application]
+          options[:filename] = plugin_options[:filename]
+          options[:force_variable_definition] = plugin_options[:'force-variable-definition']
+          Orchparty.generate(name, options, plugin_options)
         end
+      end
     end
   end
 end

data/lib/orchparty/context.rb

@@ -1,22 +1,22 @@
+# frozen_string_literal: true
+
 module Orchparty
-    class Context < ::Hashie::Mash
-      include Hashie::Extensions::DeepMerge
-      include Hashie::Extensions::DeepMergeConcat
-      include Hashie::Extensions::MethodAccess
-      include Hashie::Extensions::Mash::KeepOriginalKeys
+  class Context < ::Hashie::Mash
+    include Hashie::Extensions::DeepMerge
+    include Hashie::Extensions::DeepMergeConcat
+    include Hashie::Extensions::MethodAccess
+    include Hashie::Extensions::Mash::KeepOriginalKeys
 
+    def method_missing(name, *args)
+      raise "#{name} not declared for #{application.name}.#{service.name}" if @_force_variable_definition && !key?(name) && !key?(name.to_s)
 
-     def method_missing(name, *args)
-       raise "#{name} not declared for #{application.name}.#{service.name}" if @_force_variable_definition && !key?(name)  && !key?(name.to_s)
-       super
-     end
+      super
+    end
 
-     def _force_variable_definition=(v)
-       @_force_variable_definition = v
-     end
+    attr_writer :_force_variable_definition
 
-      def context
-        self
-      end
+    def context
+      self
     end
+  end
 end

data/lib/orchparty/dsl_parser.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'pathname'
 module Orchparty
   class DSLParser
@@ -17,7 +19,7 @@ module Orchparty
 
   class Builder
     def self.build(*args, block)
-      builder = self.new(*args)
+      builder = new(*args)
       builder.instance_eval(&block)
       builder._build
     end
@@ -35,7 +37,6 @@ module Orchparty
   end
 
   class RootBuilder < Builder
-
     def initialize
       @root = AST.root
     end
@@ -64,9 +65,8 @@ module Orchparty
   end
 
   class MixinBuilder < Builder
-
     def initialize(name)
-      @mixin = AST.mixin(name: name)
+      @mixin = AST.mixin(name:)
     end
 
     def service(name, &block)
@@ -99,9 +99,8 @@ module Orchparty
   end
 
   class ApplicationBuilder < Builder
-
     def initialize(name)
-      @application = AST.application(name: name)
+      @application = AST.application(name:)
     end
 
     def mix(name)
@@ -143,7 +142,6 @@ module Orchparty
   end
 
   class HashBuilder < Builder
-
     def method_missing(_, *values, &block)
       if block_given?
         value = HashBuilder.build(block)
@@ -180,7 +178,6 @@ module Orchparty
   end
 
   class CommonBuilder < Builder
-
     def initialize(node)
       @node = node
     end
@@ -191,7 +188,7 @@ module Orchparty
 
     def method_missing(name, *values, &block)
       if block_given?
-        assign_or_merge(@node, name,  HashBuilder.build(block))
+        assign_or_merge(@node, name, HashBuilder.build(block))
       else
         assign_or_merge(@node, name, values.first)
       end
@@ -221,9 +218,8 @@ module Orchparty
   end
 
   class ServiceBuilder < CommonBuilder
-
     def initialize(name)
-      super AST.service(name: name)
+      super AST.service(name:)
     end
   end
 end