minfra-cli 1.13.2 → 2.0.0

data/lib/orchparty/dsl_parser_kubernetes.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'pathname'
 require 'securerandom'
 module Orchparty
@@ -19,22 +21,21 @@ module Orchparty
 
     class Builder
       def self.build(*args, block)
-        builder = self.new(*args)
+        builder = new(*args)
         builder.instance_eval(&block) if block
         builder._build
       end
 
       def assign_or_merge(node, key, value)
-        if node[key]
-          node[key] = node[key].deep_merge_concat(value)
-        else
-          node[key] = value
-        end
+        node[key] = if node[key]
+                      node[key].deep_merge_concat(value)
+                    else
+                      value
+                    end
       end
     end
 
     class RootBuilder < Builder
-
       def initialize
         @root = AST.root
       end
@@ -63,15 +64,14 @@ module Orchparty
     end
 
     class MixinBuilder < Builder
-
       def initialize(name)
-        @mixin = AST.mixin(name: name)
+        @mixin = AST.mixin(name:)
       end
 
       def template(path)
-        chart_name = "_mixin_temp_name"
+        chart_name = '_mixin_temp_name'
         unless @mixin.services[chart_name]
-          @mixin.services[chart_name] = AST.chart(name: chart_name, _type: "chart" )
+          @mixin.services[chart_name] = AST.chart(name: chart_name, _type: 'chart')
           @mixin._service_order << chart_name
         end
         chart = @mixin.services[chart_name]
@@ -80,15 +80,14 @@ module Orchparty
       end
 
       def service(name, &block)
-
-        chart_name = "_mixin_temp_name"
+        chart_name = '_mixin_temp_name'
         unless @mixin.services[chart_name]
-          @mixin.services[chart_name] = AST.chart(name: chart_name, _type: "chart" )
+          @mixin.services[chart_name] = AST.chart(name: chart_name, _type: 'chart')
           @mixin._service_order << chart_name
         end
         chart = @mixin.services[chart_name]
 
-        result = ServiceBuilder.build(name, "chart-service", block)
+        result = ServiceBuilder.build(name, 'chart-service', block)
 
         name = "chart-#{chart.name}-#{name}"
         @mixin.services[name] = result
@@ -98,15 +97,14 @@ module Orchparty
       end
 
       def helm(name, &block)
-        result = ServiceBuilder.build(name, "helm", block)
+        result = ServiceBuilder.build(name, 'helm', block)
         @mixin.services[name] = result
         @mixin._mixins[name] = result
         self
       end
 
-
       def apply(name, &block)
-        result = ServiceBuilder.build(name, "apply", block)
+        result = ServiceBuilder.build(name, 'apply', block)
         @mixin.services[name] = result
         @mixin._mixins[name] = result
         self
@@ -130,9 +128,8 @@ module Orchparty
     end
 
     class ApplicationBuilder < Builder
-
       def initialize(name)
-        @application = AST.application(name: name)
+        @application = AST.application(name:)
       end
 
       def mix(name)
@@ -160,7 +157,7 @@ module Orchparty
       end
 
       def helm(name, &block)
-        result = ServiceBuilder.build(name, "helm", block)
+        result = ServiceBuilder.build(name, 'helm', block)
         @application.services[name] = result
         @application._service_order << name
         self
@@ -168,37 +165,36 @@ module Orchparty
 
       def label(&block)
         name = SecureRandom.hex
-        result = ServiceWithoutNameBuilder.build("label", block)
+        result = ServiceWithoutNameBuilder.build('label', block)
         @application.services[name] = result
         @application._service_order << name
         self
       end
 
       def apply(name, &block)
-        result = ServiceBuilder.build(name, "apply", block)
+        result = ServiceBuilder.build(name, 'apply', block)
         @application.services[name] = result
         @application._service_order << name
         self
       end
 
       def secret_generic(name, &block)
-        result = ServiceBuilder.build(name, "secret_generic", block)
+        result = ServiceBuilder.build(name, 'secret_generic', block)
         @application.services[name] = result
         @application._service_order << name
         self
       end
 
-
       def wait(&block)
         name = SecureRandom.hex
-        result = ServiceBuilder.build(name, "wait", block)
+        result = ServiceBuilder.build(name, 'wait', block)
         @application.services[name] = result
         @application._service_order << name
         self
       end
 
       def chart(name, &block)
-        @application.services[name] = ChartBuilder.build(name, @application, "chart", block)
+        @application.services[name] = ChartBuilder.build(name, @application, 'chart', block)
         @application._service_order << name
         self
       end
@@ -206,7 +202,7 @@ module Orchparty
       def template(path)
         chart_name = @application.name
         unless @application.services[chart_name]
-          @application.services[chart_name] = AST.chart(name: chart_name, _type: "chart" )
+          @application.services[chart_name] = AST.chart(name: chart_name, _type: 'chart')
           @application._service_order << chart_name
         end
         chart = @application.services[chart_name]
@@ -217,12 +213,12 @@ module Orchparty
       def service(name, &block)
         chart_name = @application.name
         unless @application.services[chart_name]
-          @application.services[chart_name] = AST.chart(name: chart_name, _type: "chart" )
+          @application.services[chart_name] = AST.chart(name: chart_name, _type: 'chart')
           @application._service_order << chart_name
         end
         chart = @application.services[chart_name]
 
-        result = ServiceBuilder.build(name, "chart-service", block)
+        result = ServiceBuilder.build(name, 'chart-service', block)
 
         name = "chart-#{chart.name}-#{name}"
         @application.services[name] = result
@@ -237,7 +233,6 @@ module Orchparty
     end
 
     class HashBuilder < Builder
-
       def method_missing(_, *values, &block)
         if block_given?
           value = HashBuilder.build(block)
@@ -255,11 +250,11 @@ module Orchparty
             key, value = value.first
             begin
               @hash[key.to_sym] = value
-            rescue 
+            rescue StandardError
               warn "Problem with key: #{key} #{value}"
-              raise 
-            end 
-             
+              raise
+            end
+
           else
             @hash ||= AST.array
             @hash << value
@@ -280,7 +275,6 @@ module Orchparty
     end
 
     class CommonBuilder < Builder
-
       def initialize(node)
         @node = node
       end
@@ -291,7 +285,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
@@ -321,16 +315,14 @@ module Orchparty
     end
 
     class ServiceWithoutNameBuilder < CommonBuilder
-
-      def initialize( type)
+      def initialize(type)
         super AST.service(_type: type)
       end
     end
 
     class ServiceBuilder < CommonBuilder
-
       def initialize(name, type)
-        super AST.service(name: name, _type: type)
+        super AST.service(name:, _type: type)
         @node.files = {}
       end
 
@@ -344,32 +336,31 @@ module Orchparty
 
       def file(name, volume, &block)
         result = FileBuilder.build(name, volume, block)
-        @node.files[name]=result
+        @node.files[name] = result
         self
       end
     end
 
     class FileBuilder < CommonBuilder
       def initialize(name, volume)
-        super AST.service(filename: name, volume: volume)
+        super AST.service(filename: name, volume:)
       end
     end
 
     class ServiceMixinBuilder < CommonBuilder
-
       def initialize(name)
-        super AST.service(name: name)
+        super AST.service(name:)
       end
     end
 
     class ChartBuilder < CommonBuilder
       def initialize(name, application, type)
-        super AST.chart(name: name, _type: type )
+        super AST.chart(name:, _type: type)
         @application = application
       end
 
       def service(name, &block)
-        result = ServiceBuilder.build(name, "chart-service", block)
+        result = ServiceBuilder.build(name, 'chart-service', block)
 
         name = "chart-#{@node.name}-#{name}"
         @application.services[name] = result
@@ -390,15 +381,15 @@ module Orchparty
       def secrets(name, deploy: :helm, &block)
         case deploy
         when :helm
-        result =  ServiceBuilder.build(name, "chart-secret", block)
-        @application.services[name] = result
-        @application._service_order << name
-        @node._services << name
-        self
+          result = ServiceBuilder.build(name, 'chart-secret', block)
+          @application.services[name] = result
+          @application._service_order << name
+          @node._services << name
+          self
         when :apply
-          result = ServiceBuilder.build(name, "apply", block)
+          result = ServiceBuilder.build(name, 'apply', block)
           file = Tempfile.create(name)
-          result.tmp_file=file.path
+          result.tmp_file = file.path
           file.puts "apiVersion: v1\nkind: Secret\nmetadata:\n  name: #{name}\ntype: Opaque\ndata:"
           result._.each do |key, value|
             file.puts "  #{key}: #{Base64.strict_encode64(value.respond_to?(:call) ? value.call : value)}"
@@ -407,12 +398,11 @@ module Orchparty
           @application.services[name] = result
           @application._service_order << name
         when :none
-          
+
         else
           raise "unknown secret type: #{type}, known tpyes: [helm, apply]"
         end
       end
-      
     end
   end
 end

data/lib/orchparty/kubernetes_application.rb

@@ -149,11 +149,11 @@ module Orchparty
       end
 
       def upgrade_cmd
-        "kubectl --namespace #{namespace} --context #{cluster_name} label --overwrite #{service[:resource]} #{service[:name]} #{service['value']}"
+        install_cmd
       end
 
       def install_cmd
-        "kubectl --namespace #{namespace} --context #{cluster_name} label --overwrite #{service[:resource]} #{service[:name]} #{service['value']}"
+        Minfra::Cli::KubeCtlRunner.new("label --namespace #{namespace} --context #{cluster_name} --overwrite #{service[:resource]} #{service[:name]} #{service['value']}")
       end
     end
 

data/lib/orchparty/plugin.rb

@@ -1,16 +1,17 @@
+# frozen_string_literal: true
+
 module Orchparty
   module Plugin
     @plugins = {}
 
     def self.load_plugin(name)
-      begin
-        require "orchparty/plugins/#{name}"
-        raise "Plugin didn't correctly register itself" unless @plugins[name]
-        @plugins[name]
-      rescue LoadError
-        puts "could not load the plugin #{name}, you might install it as a gem or you need to write it by your self ;)"
-        false
-      end
+      require "orchparty/plugins/#{name}"
+      raise "Plugin didn't correctly register itself" unless @plugins[name]
+
+      @plugins[name]
+    rescue LoadError
+      puts "could not load the plugin #{name}, you might install it as a gem or you need to write it by your self ;)"
+      false
     end
 
     def self.plugins
@@ -21,4 +22,4 @@ module Orchparty
       @plugins[name] = mod
     end
   end
-end
+end

data/lib/orchparty/plugins/env.rb

@@ -1,15 +1,17 @@
+# frozen_string_literal: true
+
 require 'shellwords'
 module Orchparty
   module Plugin
     module Env
       def self.desc
-        "generate environment variables"
+        'generate environment variables'
       end
 
       def self.define_flags(c)
-        c.flag [:output,:o], :desc => 'Set the output file'
-        c.flag [:service,:s], :desc => 'Set the service to generate environment variables from.'
-        c.flag [:seperator,:sep], :desc => 'How to join the environment variables', default_value: "\\n"
+        c.flag %i[output o], desc: 'Set the output file'
+        c.flag %i[service s], desc: 'Set the service to generate environment variables from.'
+        c.flag %i[seperator sep], desc: 'How to join the environment variables', default_value: '\\n'
       end
 
       def self.generate(ast, options)
@@ -22,18 +24,17 @@ module Orchparty
       end
 
       def self.env_output(application, options)
-        if options[:service]
-          services = [ application.services[options[:service]] ]
-        else
-          services = application.services.values
-        end
+        services = if options[:service]
+                     [application.services[options[:service]]]
+                   else
+                     application.services.values
+                   end
 
-        options[:sep] = "\n" if options[:sep] == "\\n"
+        options[:sep] = "\n" if options[:sep] == '\\n'
 
-        envs = services.map(&:environment).compact.inject({}) {|a, v| a.merge(v) }
-        envs.map{|k,v| "#{k.to_s}=#{v.is_a?(String) ? v.shellescape : v }"}.join(options[:sep])
+        envs = services.map(&:environment).compact.inject({}) { |a, v| a.merge(v) }
+        envs.map { |k, v| "#{k}=#{v.is_a?(String) ? v.shellescape : v}" }.join(options[:sep])
       end
-
     end
   end
 end

data/lib/orchparty/transformations/all.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Orchparty
   module Transformations
     class All
@@ -5,7 +7,7 @@ module Orchparty
         ast.applications.each do |_, application|
           application.services.transform_values! do |service|
             if application.all.is_a?(Hash)
-              AST.service(application.all.deep_merge_concat(service)) 
+              AST.service(application.all.deep_merge_concat(service))
             else
               service
             end

data/lib/orchparty/transformations/mixin.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Orchparty
   module Transformations
     class Mixin
@@ -15,26 +17,24 @@ module Orchparty
       end
 
       def resolve_chart_name(mixin, application)
-#            warn "ERROR: #{mixin} #{application}"
-            if mixin.services[:_mixin_temp_name]
-              mixin.services[application.name.to_s] = mixin.services.delete("_mixin_temp_name")
-              mixin.services[application.name.to_s][:name] = application.name.to_s
-              mixin._service_order.delete("_mixin_temp_name")
-              mixin._service_order << application.name.to_s
-            end
-            mixin
+        #            warn "ERROR: #{mixin} #{application}"
+        if mixin.services[:_mixin_temp_name]
+          mixin.services[application.name.to_s] = mixin.services.delete('_mixin_temp_name')
+          mixin.services[application.name.to_s][:name] = application.name.to_s
+          mixin._service_order.delete('_mixin_temp_name')
+          mixin._service_order << application.name.to_s
+        end
+        mixin
       end
 
       def transform_application(application, ast)
         application.services = application.services.transform_values! do |service|
           current = AST.service
           service.delete(:_mix).compact.each do |mix|
-            begin
             current = current.deep_merge_concat(resolve_mixin(mix, application, ast))
-            rescue
-              warn "problems with #{mix}"
-              raise
-            end  
+          rescue StandardError
+            warn "problems with #{mix}"
+            raise
           end
           current.deep_merge_concat(service)
         end
@@ -42,17 +42,17 @@ module Orchparty
       end
 
       def resolve_mixin(mix, application, ast)
-        mixin = if mix.include? "."
-          mixin_name, mixin_service_name = mix.split(".")
-          if ast._mixins[mixin_name]
-            ast._mixins[mixin_name]._mixins[mixin_service_name]
-          else
-            warn "ERROR: Could not find mixin '#{mixin_name}'."
-            exit 1
-          end
-        else
-          application._mixins[mix]
-        end
+        mixin = if mix.include? '.'
+                  mixin_name, mixin_service_name = mix.split('.')
+                  if ast._mixins[mixin_name]
+                    ast._mixins[mixin_name]._mixins[mixin_service_name]
+                  else
+                    warn "ERROR: Could not find mixin '#{mixin_name}'."
+                    exit 1
+                  end
+                else
+                  application._mixins[mix]
+                end
         if mixin.nil?
           warn "ERROR: Could not find mixin '#{mix}'."
           exit 1

data/lib/orchparty/transformations/remove_internal.rb

@@ -1,12 +1,13 @@
+# frozen_string_literal: true
 
 module Orchparty
   module Transformations
     class RemoveInternal
       def transform(ast)
         ast.applications.each do |_, application|
-          application.delete_if {|k, _| k.to_s.start_with?("_")}
+          application.delete_if { |k, _| k.to_s.start_with?('_') }
           application.services = application.services.each do |_, service|
-            service.delete_if {|k, _| k.to_s.start_with?("_")}
+            service.delete_if { |k, _| k.to_s.start_with?('_') }
           end
         end
         ast

data/lib/orchparty/transformations/sort.rb

@@ -1,9 +1,10 @@
+# frozen_string_literal: true
 
 module Orchparty
   module Transformations
     class Sort
       def transform(ast)
-        AST::Node.new ast.deep_sort_by_key_and_sort_array(["command", "entrypoint"]) {|a, b| a.to_s <=> b.to_s }
+        AST::Node.new ast.deep_sort_by_key_and_sort_array(%w[command entrypoint]) { |a, b| a.to_s <=> b.to_s }
       end
     end
   end

data/lib/orchparty/transformations/variable.rb

@@ -1,7 +1,8 @@
+# frozen_string_literal: true
+
 module Orchparty
   module Transformations
     class Variable
-
       def initialize(opts = {})
         @force_variable_definition = opts[:force_variable_definition]
       end
@@ -21,11 +22,11 @@ module Orchparty
       def resolve(application, subject, service)
         subject.deep_transform_values! do |v|
           if v.respond_to?(:call)
-            eval_value(build_context(application: application, service: service), v) 
+            eval_value(build_context(application:, service:), v)
           elsif v.is_a? Array
             v.map do |v|
               if v.respond_to?(:call)
-                eval_value(build_context(application: application, service: service), v) 
+                eval_value(build_context(application:, service:), v)
               else
                 v
               end
@@ -42,10 +43,10 @@ module Orchparty
 
       def build_context(application:, service:)
         variables = application._variables || {}
-        variables = variables.merge({application: application.merge(application._variables)})
+        variables = variables.merge({ application: application.merge(application._variables) })
         if service
           variables = variables.merge(service._variables)
-          variables = variables.merge({service: service.merge(service._variables)})
+          variables = variables.merge({ service: service.merge(service._variables) })
         end
         context = Context.new(variables)
         context._force_variable_definition = @force_variable_definition

data/lib/orchparty/transformations.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'ostruct'
 require 'orchparty/transformations/all'
 require 'orchparty/transformations/variable'

data/lib/orchparty/version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Orchparty
-  VERSION = "2.1.0"
+  VERSION = '2.1.0'
 end

data/lib/orchparty.rb

@@ -12,14 +12,14 @@ require 'orchparty/kubernetes_application'
 require 'hash'
 
 module Orchparty
-
   def self.options
     @@options
   end
+
   def self.options=(opt)
-     @@options=opt
+    @@options = opt
   end
-  
+
   class App
     attr_reader :options
 
@@ -30,9 +30,9 @@ module Orchparty
       @file_name = file_name
       @status_dir = status_dir
       @options = options
-      
-      Orchparty.options=options
-      
+
+      Orchparty.options = options
+
       load_plugins
     end
 
@@ -41,7 +41,7 @@ module Orchparty
     end
 
     def print(method:, out_io:)
-      app(out_io: out_io).print(method)
+      app(out_io:).print(method)
     end
 
     def install
@@ -54,26 +54,26 @@ module Orchparty
 
     private
 
-    def app(out_io: STDOUT)
+    def app(out_io: $stdout)
       parsed = Orchparty::Kubernetes::DSLParser.new(@file_name).parse
       app_config = Transformations.transform_kubernetes(parsed, force_variable_definition: @force_variable_definition).applications[@application_name]
       KubernetesApplication.new(
-        app_config: app_config, 
-        namespace: @application_name, 
-        cluster_name: @cluster_name, 
+        app_config:,
+        namespace: @application_name,
+        cluster_name: @cluster_name,
         file_name: @file_name,
         status_dir: @status_dir,
-        out_io: out_io
+        out_io:
       )
     end
-    
+
     def generate(plugin_name, options, plugin_options)
       plugins[plugin_name].generate(ast(options), plugin_options)
     end
 
     def ast(filename:, application:, force_variable_definition: nil)
       Transformations.transform(Orchparty::DSLParser.new(filename).parse,
-                                force_variable_definition: force_variable_definition).applications[application]
+                                force_variable_definition:).applications[application]
     end
 
     def load_plugins