minfra-cli 1.12.0 → 1.12.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2b4880a484c8d4d18875f3b3c355162c0f49eb1fcae69f8a870ee4c5ad8d04d0
-  data.tar.gz: 1d34cb69b8b8e5a5476dcec8d14463d02a00a2fbdc47ccb12f761a93413a3df9
+  metadata.gz: ca90567af36553b84c7a69020e85970c56591d65f7546d1c22c1969cc9bd58f3
+  data.tar.gz: 451949094ac8fe4a3bc502b10ad1f8924f2cb5688da1297594061ab4c4e4780d
 SHA512:
-  metadata.gz: 851fbc24107b2efd086f2e69adaaf2580f1ceed98eee55a71067348d4283360be440b14bf94b586f56a3a5180d0432a76553602cad02b6aef3e2715441bef236
-  data.tar.gz: cffdcda6203c63f9efcc12b7f57dea382caf82f2a2cd8cca605c14b36ef8fe77a82695c72a8cddac31113c311f24fc753de8df7506a03894474d83d360b282ee
+  metadata.gz: 6007ef02b33c582bb9bd002cb4b22adda6dd4e5ec32cf7646beb9597ef03181b8944a463fe5db943c84d19c6ed50c8b324a5bb383cfa975b0f4301e1ffb214d5
+  data.tar.gz: 1908c4e6f95565dc3ebdf2bf371808021166997691c0fcb3514a89b2d47cf379d551b1f5f1934032cfe08afcc180f6f4d75b39d694c584d036f46a5f86aa8f05

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+# 1.12.1
+ * replaced all relevant system calls with new runners (fixed apply and
+   generic_secrets)
 # 1.12.0
  * refactoring Runner
  * adding runner type system (popen is default)

data/lib/minfra/cli/version.rb

@@ -1,5 +1,5 @@
 module Minfra
   module Cli
-    VERSION = '1.12.0'.freeze
+    VERSION = '1.12.1'.freeze
   end
 end

data/lib/orchparty/kubernetes_application.rb

@@ -1,3 +1,6 @@
+# frozen_string_literal: true
+
+require 'English'
 require 'erb'
 require 'erubis'
 require 'open3'
@@ -10,34 +13,32 @@ require 'active_support/core_ext'
 module Orchparty
   module Services
     class Context
-      include ::Minfra::Cli::Logging 
+      include ::Minfra::Cli::Logging
 
-      attr_accessor :cluster_name
-      attr_accessor :namespace
-      attr_accessor :dir_path
-      attr_accessor :app_config
-      attr_accessor :options
+      attr_accessor :cluster_name, :namespace, :dir_path, :app_config, :options
 
-      def initialize(cluster_name: , namespace:, file_path: , app_config:, out_io: STDOUT, app: )
+      def initialize(cluster_name:, namespace:, file_path:, app_config:, app:, out_io: $stdout)
         self.cluster_name = cluster_name
         self.namespace = namespace
         self.dir_path = file_path
         self.app_config = app_config
         @app = app
         @out_io = out_io
-        self.options=options
+        self.options = options
       end
 
-      def template(file_path, helm, flag: "-f ", fix_file_path: nil)
-        return "" unless file_path
+      def template(file_path, helm, flag: '-f ', fix_file_path: nil)
+        return '' unless file_path
+
         puts "Rendering: #{file_path}"
-        file_path = File.join(self.dir_path, file_path)
-        if(file_path.end_with?(".erb"))
+        file_path = File.join(dir_path, file_path)
+
+        if file_path.end_with?('.erb')
           helm.application = OpenStruct.new(cluster_name: cluster_name, namespace: namespace)
           template = Erubis::Eruby.new(File.read(file_path))
           template.filename = file_path
           yaml = template.result(helm.get_binding)
-          file = Tempfile.new("kube-deploy.yaml")
+          file = Tempfile.new('kube-deploy.yaml')
           file.write(yaml)
           file.close
           file_path = file.path
@@ -46,11 +47,11 @@ module Orchparty
       end
 
       def print_install(helm)
-        @out_io.puts "---"
+        @out_io.puts '---'
         @out_io.puts install_cmd(helm, value_path(helm)).cmd
         @out_io.puts upgrade_cmd(helm, value_path(helm)).cmd
-        @out_io.puts "---"
-        @out_io.puts File.read(template(value_path(helm), helm, flag: "")) if value_path(helm)
+        @out_io.puts '---'
+        @out_io.puts File.read(template(value_path(helm), helm, flag: '')) if value_path(helm)
       end
 
       # On 05.02.2021 we have decided that it would be best to print both commands.
@@ -74,11 +75,15 @@ module Orchparty
       end
 
       def upgrade_cmd(helm, fix_file_path = nil)
-        Minfra::Cli::HelmRunner.new("upgrade --namespace #{namespace} --kube-context #{cluster_name} --version #{helm.version} #{helm.name} #{helm.chart} #{template(value_path(helm), helm, fix_file_path: fix_file_path)}")
+        Minfra::Cli::HelmRunner.new("upgrade --namespace #{namespace} --kube-context #{cluster_name} --version #{helm.version} #{helm.name} #{helm.chart} #{template(
+          value_path(helm), helm, fix_file_path: fix_file_path
+        )}")
       end
 
       def install_cmd(helm, fix_file_path = nil)
-        Minfra::Cli::HelmRunner.new("install --create-namespace --namespace #{namespace} --kube-context #{cluster_name} --version #{helm.version} #{helm.name} #{helm.chart} #{template(value_path(helm), helm, fix_file_path: fix_file_path)}")
+        Minfra::Cli::HelmRunner.new("install --create-namespace --namespace #{namespace} --kube-context #{cluster_name} --version #{helm.version} #{helm.name} #{helm.chart} #{template(
+          value_path(helm), helm, fix_file_path: fix_file_path
+        )}")
       end
     end
 
@@ -88,11 +93,15 @@ module Orchparty
       end
 
       def upgrade_cmd(apply, fix_file_path = nil)
-        "kubectl apply --namespace #{namespace} --context #{cluster_name} #{template(value_path(apply), apply, fix_file_path: fix_file_path)}"
+        Minfra::Cli::KubeCtlRunner.new("apply --namespace #{namespace} --context #{cluster_name} #{template(
+          value_path(apply), apply, fix_file_path: fix_file_path
+        )}")
       end
 
       def install_cmd(apply, fix_file_path = nil)
-        "kubectl apply --namespace #{namespace} --context #{cluster_name} #{template(value_path(apply), apply, fix_file_path: fix_file_path)}"
+        Minfra::Cli::KubeCtlRunner.new("apply --namespace #{namespace} --context #{cluster_name} #{template(
+          value_path(apply), apply, fix_file_path: fix_file_path
+        )}")
       end
     end
 
@@ -101,43 +110,51 @@ module Orchparty
         secret[:from_file]
       end
 
-      def upgrade_cmd(secret, fix_file_path=nil)
-        "kubectl --namespace #{namespace} --context #{cluster_name} create secret generic --dry-run -o yaml #{secret[:name]}  #{template(value_path(secret), secret, flag: "--from-file=", fix_file_path: fix_file_path)} | kubectl --context #{cluster_name} apply -f -"
+      def upgrade_cmd(secret, fix_file_path = nil)
+        Minfra::Cli::KubeCtlRunner.new("--namespace #{namespace} --context #{cluster_name} create secret generic --dry-run -o yaml #{secret[:name]}  #{template(
+          value_path(secret), secret, flag: '--from-file=', fix_file_path: fix_file_path
+        )} | #{apply_cmd(cluster_name).cmd}")
       end
 
-      def install_cmd(secret, fix_file_path=nil)
-        "kubectl --namespace #{namespace} --context #{cluster_name} create secret generic --dry-run -o yaml #{secret[:name]}  #{template(value_path(secret), secret, flag: "--from-file=", fix_file_path: fix_file_path)} | kubectl --context #{cluster_name} apply -f -"
+      def install_cmd(secret, fix_file_path = nil)
+        Minfra::Cli::KubeCtlRunner.new("--namespace #{namespace} --context #{cluster_name} create secret generic --dry-run -o yaml #{secret[:name]}  #{template(
+          value_path(secret), secret, flag: '--from-file=', fix_file_path: fix_file_path
+        )} | #{apply_cmd(cluster_name).cmd}")
+      end
+
+      def apply_cmd(cluster_name)
+        Minfra::Cli::KubeCtlRunner.new("--context #{cluster_name} apply -f -")
       end
     end
 
     class Label < Context
       def print_install(label)
-        @out_io.puts "---"
+        @out_io.puts '---'
         @out_io.puts install_cmd(label)
       end
 
       def print_upgrade(label)
-        @out_io.puts "---"
+        @out_io.puts '---'
         @out_io.puts upgrade_cmd(label)
       end
 
       def upgrade_cmd(label)
-        "kubectl --namespace #{namespace} --context #{cluster_name} label --overwrite #{label[:resource]} #{label[:name]} #{label["value"]}"
+        Minfra::Cli::KubeCtlRunner.new("--namespace #{namespace} --context #{cluster_name} label --overwrite #{label[:resource]} #{label[:name]} #{label['value']}")
       end
 
       def install_cmd(label)
-        "kubectl --namespace #{namespace} --context #{cluster_name} label --overwrite #{label[:resource]} #{label[:name]} #{label["value"]}"
+        Minfra::Cli::KubeCtlRunner.new("--namespace #{namespace} --context #{cluster_name} label --overwrite #{label[:resource]} #{label[:name]} #{label['value']}")
       end
     end
 
     class Wait < Context
       def print_install(wait)
-        @out_io.puts "---"
+        @out_io.puts '---'
         @out_io.puts wait.cmd
       end
 
       def print_upgrade(wait)
-        @out_io.puts "---"
+        @out_io.puts '---'
         @out_io.puts wait.cmd
       end
 
@@ -159,20 +176,19 @@ module Orchparty
         end
       end
 
-
       def print_install(chart)
-        
         build_chart(chart) do |chart_path|
-           cmd="helm template --namespace #{namespace} --debug --kube-context #{cluster_name} --output-dir #{chart_path.join('..','helm_expanded')}   #{chart.name} #{chart_path}"
-           @out_io.puts `$cmd`
-           if system("#{cmd} > /dev/null")
+          cmd = "helm template --namespace #{namespace} --debug --kube-context #{cluster_name} --output-dir #{chart_path.join(
+            '..', 'helm_expanded'
+          )}   #{chart.name} #{chart_path}"
+          @out_io.puts `$cmd`
+          if system("#{cmd} > /dev/null")
 
-            info("helm template check: OK")
+            info('helm template check: OK')
           else
-            error("helm template check: FAIL")
-          end  
+            error('helm template check: FAIL')
+          end
         end
-        
       end
 
       def print_upgrade(chart)
@@ -182,7 +198,7 @@ module Orchparty
       def install(chart)
         info("Install: #{chart.name}")
         build_chart(chart) do |chart_path|
-          res=Minfra::Cli::HelmRunner.new("install --create-namespace --namespace #{namespace} --kube-context #{cluster_name} #{chart.name} #{chart_path}").run
+          res = Minfra::Cli::HelmRunner.new("install --create-namespace --namespace #{namespace} --kube-context #{cluster_name} #{chart.name} #{chart_path}").run
           @out_io.puts res.stdout
         end
       end
@@ -190,44 +206,41 @@ module Orchparty
       def upgrade(chart)
         info("Upgrade: #{chart}")
         build_chart(chart) do |chart_path|
-          res=Minfra::Cli::HelmRunner.new("upgrade --namespace #{namespace} --kube-context #{cluster_name} #{chart.name} #{chart_path}").run
+          res = Minfra::Cli::HelmRunner.new("upgrade --namespace #{namespace} --kube-context #{cluster_name} #{chart.name} #{chart_path}").run
           @out_io.puts res.stdout
         end
       end
+
       private
-      
+
       def build_chart(chart)
         dir = @app.status_dir.join('helm') # duplication
-        
-        params = chart._services.map {|s| app_config.services[s.to_sym] }.map{|s| [s.name, s]}.to_h
-        run(templates_path: File.expand_path(chart.template, self.dir_path), params: params, output_chart_path: dir, chart: chart)
+
+        params = chart._services.map { |s| app_config.services[s.to_sym] }.map { |s| [s.name, s] }.to_h
+        run(templates_path: File.expand_path(chart.template, dir_path), params: params, output_chart_path: dir,
+            chart: chart)
         yield dir
       end
 
-
-
       # remember:
       # this is done for an app
       # that app can have multiple charts with multiple services!
-      
-      def run(templates_path:, params:, output_chart_path:, chart: )
 
-        
-        File.open(File.join(output_chart_path, 'values.yaml'),'a') do |helm_values|
+      def run(templates_path:, params:, output_chart_path:, chart:)
+        File.open(File.join(output_chart_path, 'values.yaml'), 'a') do |helm_values|
           params.each do |app_name, subparams|
             subparams[:chart] = chart
-            used_vars=generate_documents_from_erbs(
+            used_vars = generate_documents_from_erbs(
               templates_path: templates_path,
               app_name: app_name,
               params: subparams,
               output_chart_path: output_chart_path
             )
-            used_vars.each do |variable,value| 
+            used_vars.each do |variable, value|
               helm_values.puts "#{variable}: \"#{value}\""
             end
           end
         end
-        
       end
 
       def generate_documents_from_erbs(templates_path:, app_name:, params:, output_chart_path:)
@@ -237,13 +250,13 @@ module Orchparty
         end
 
         kind = params.fetch(:kind)
-        params._used_vars = {} #here we'll collect all used vars
+        params._used_vars = {} # here we'll collect all used vars
 
         Dir[File.join(templates_path, kind, '*.erb')].each do |template_path|
           info("Rendering Template: #{template_path}")
           template_name = File.basename(template_path, '.erb')
           output_path = File.join(output_chart_path, 'templates', "#{app_name}-#{template_name}")
-          
+
           template = Erubis::Eruby.new(File.read(template_path))
           template.filename = template_path
 
@@ -253,14 +266,13 @@ module Orchparty
           begin
             document = template.result(CleanBinding.new.get_binding(params))
           rescue Exception
-            error "#{template_path} has a problem: #{$!.inspect}"
+            error "#{template_path} has a problem: #{$ERROR_INFO.inspect}"
             raise
           end
           File.write(output_path, document)
         end
         params._used_vars
       end
-
     end
   end
 end
@@ -268,19 +280,16 @@ end
 class KubernetesApplication
   include Minfra::Cli::Logging
 
-  attr_accessor :cluster_name
-  attr_accessor :file_path
-  attr_accessor :namespace
-  attr_accessor :app_config
+  attr_accessor :cluster_name, :file_path, :namespace, :app_config
   attr_reader :status_dir
 
-  def initialize(app_config: [], namespace:, cluster_name:, file_name:, status_dir:, out_io: STDOUT)
-    self.file_path = Pathname.new(file_name).parent.expand_path #path of the stack
+  def initialize(namespace:, cluster_name:, file_name:, status_dir:, app_config: [], out_io: $stdout)
+    self.file_path = Pathname.new(file_name).parent.expand_path # path of the stack
     self.cluster_name = cluster_name
     self.namespace = namespace
     self.app_config = app_config
     @status_dir = status_dir
-    @out_io= out_io
+    @out_io = out_io
   end
 
   def install
@@ -296,17 +305,17 @@ class KubernetesApplication
   end
 
   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...
-    
+    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,
+      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}")
@@ -314,26 +323,26 @@ class KubernetesApplication
 
     system("cp #{File.join(templates_path, 'values.yaml')} #{File.join(output_chart_path, 'values.yaml')}")
     system("cp #{File.join(templates_path, '.helmignore')} #{File.join(output_chart_path, '.helmignore')}")
-    system("cp #{File.join(templates_path, 'templates/_helpers.tpl')} #{File.join(output_chart_path, 'templates/_helpers.tpl')}")
-
+    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: )
+  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})
+    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)
     app_config._service_order.each do |name|
       current_service = app_config[:services][name]
-      if current_service._type == "chart"
-        current_service._services.each do |n|
-          services.delete n.to_s
-        end
+      next unless current_service._type == 'chart'
+
+      current_service._services.each do |n|
+        services.delete n.to_s
       end
     end
     services
@@ -345,14 +354,14 @@ class KubernetesApplication
     services.each do |name|
       service = app_config[:services][name]
       info "Service: #{name}(#{service._type}) #{method}"
-      deployable_class="::Orchparty::Services::#{service._type.classify}".constantize
-      deployable=deployable_class.new(cluster_name: cluster_name, 
-                     namespace: namespace, 
-                     file_path: file_path, 
-                     app_config: app_config, 
-                     out_io: @out_io, 
-                     app: self)
-                     
+      deployable_class = "::Orchparty::Services::#{service._type.classify}".constantize
+      deployable = deployable_class.new(cluster_name: cluster_name,
+                                        namespace: namespace,
+                                        file_path: file_path,
+                                        app_config: app_config,
+                                        out_io: @out_io,
+                                        app: self)
+
       deployable.send(method, service)
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: minfra-cli
 version: !ruby/object:Gem::Version
-  version: 1.12.0
+  version: 1.12.1
 platform: ruby
 authors:
 - Peter Schrammel
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-09-01 00:00:00.000000000 Z
+date: 2023-09-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -239,7 +239,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.10
+rubygems_version: 3.3.7
 signing_key: 
 specification_version: 4
 summary: A cli framework for k8s based development and deployment.