minfra-cli 2.1.0 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5429a3e13b8387b6c3e011eaa2513ac5963ef30c4a14f9458e882a7df0507753
-  data.tar.gz: 2dbdd6e4e0f4c3cbade95033f52af2480a7a0b421508a68066e1a87ab6049109
+  metadata.gz: ec0639d81eca018b238482b84cc895bdb32ee7a1b5bb3d1d6696f1b042f61e23
+  data.tar.gz: b84403ebad45d5c4d12d2107c5c6c11e9f0ccfdaaa30a814144e9e2204e863d4
 SHA512:
-  metadata.gz: 188ce70ec6fabf9b6d72ddfc0855ce499e63c92bc079d525e044dec3c21b49d5a6c2aba1576a869c5126ef3a27f14bc7aa1e7222b1deff49e8cc35c645cda621
-  data.tar.gz: 877789c92138b28e33314592464fc5650765729a90ea8d84388c9ca10ea4065dd5988fbfbc9b047ebf0604d28552e38243d5407a52ee7cf9ae18f03b075b8e19
+  metadata.gz: 0c0da44b29f119c3cab74943f00e1371ce313fab2ecf05fc6f9e34eb5d64b90399cb985b2b48065904af01d905669ac4437ae0a627277b4a21bf53dab253b27e
+  data.tar.gz: 3459bae4cda6ec35edb67b31885bfe894faf4b973d13f53c17df1a055728667fb5c33ea45cce4aa95a28f601c0dea25e7000eb072258cc7fc9fcd1f0da722a63

data/CHANGELOG.md

@@ -1,9 +1,19 @@
+# 3.0.0
+ * change: debug output on template errors
+ Incompatibility
+ * change: used_vars are turned into true yaml types when creating the value file
+# 2.2.0
+ * fixing: should not modify l('env.roles')
+ * cleanup: removing template testing --debug flag, causing noise
+ * cleanup: removing Documentation hooks
+ * fixing: hiera lookup retrying on gpg memory error exceptions
+ * adding: gpgme dependency
 # 2.1.0
- * add :all hook
- * fixing setup dev
- * colored errors
- * wrapping hiera lookup errors of gpg
- * adding HIERA_DEBUG_LOOKUPS=true
+ * adding: :all hook
+ * fixing: setup dev
+ * adding: colored errors and warnings
+ * change: wrapping hiera lookup errors of gpg
+ * adding: HIERA_DEBUG_LOOKUPS=true
 # 2.0.1
  Refactorings
  * installing into Kernel only when 'exec' not at 'init' time

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

@@ -101,7 +101,7 @@ module Minfra
         run(%(docker network rm #{kind_name}), exit_on_error: false)
       end
 
-      def deploy(stack_name, reason_message)
+      def deploy(stack_name, _reason_message)
         # TBD: options is global, avoid it!
 
         test = options[:test]
@@ -145,8 +145,6 @@ module Minfra
 
         exit_error('Deployment aborted!') if !(@config.dev? || options[:force] == true) && !Ask.boolean('Are the changes ok?')
 
-        message = "deploying stack #{stack.name}: #{reason_message}."
-        Minfra::Cli::Document.document(@config, "started #{message}")
         orch = Orchparty::App.new(cluster_name: cluster,
                                   application_name: stack.name,
                                   force_variable_definition: false,
@@ -154,7 +152,6 @@ module Minfra
                                   status_dir: stack.release_path,
                                   options:)
         orch.send(method)
-        Minfra::Cli::Document.document(@config, "finished #{message}")
       end
 
       def rollback(stack_name, env, deployment, cluster)

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

@@ -47,9 +47,7 @@ module Minfra
         ARGV.delete('test')
 
         if File.exist?('./bin/run_tests')
-          # config = Config.load('staging')
           project = ProjectInfo.load(Pathname.pwd)
-          # Minfra::Cli::Document.document(config, "Using project specific ./bin/run_tests in #{project.name}")
           debug "Using project specific ./bin/run_tests in #{project.name}"
           system('./bin/run_tests', out: $stdout, err: :out)
         else

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

@@ -35,7 +35,7 @@ module Minfra
       def deploy(stack_name, message = '')
         stacks = l('env.roles') || l('env.stacks') || []
         default_stacks = minfra_config.project.default_stacks || []
-        stacks = stacks.concat(default_stacks)
+        stacks = stacks + default_stacks
         if stacks.include?(stack_name) || options[:force] || options[:test]
           kube.deploy(stack_name, message)
         else

data/lib/minfra/cli/hiera_looker.rb

@@ -39,6 +39,7 @@ module Minfra
                       else
                         :deep
                       end
+        retry_attempts = 0
         begin
           result = @hiera.lookup(fst_value, default, @scope, nil, lookup_type)
         rescue GPGME::Error::NoSecretKey
@@ -50,6 +51,10 @@ module Minfra
         rescue GPGME::Error
           error("Having decrypt problems for hiera key: #{value}, #{$ERROR_INFO.message}")
           raise Errors::ExitError
+        rescue Errno::ENOMEM # see https://github.com/ueno/ruby-gpgme/issues/147
+          retry_attempts += 1
+          sleep 1
+          retry if retry_attempts < 5
         end
         result = result.dig(*values) if !values.empty? && result.is_a?(Hash) # we return nil or the scalar value and only drill down on hashes
         result = default if result.nil?

data/lib/minfra/cli/version.rb

@@ -2,6 +2,6 @@
 
 module Minfra
   module Cli
-    VERSION = '2.1.0'
+    VERSION = '3.0.0'
   end
 end

data/lib/minfra/cli.rb

@@ -18,7 +18,6 @@ require_relative 'cli/hook'
 require_relative 'cli/common'
 require_relative 'cli/command'
 require_relative 'cli/ask'
-require_relative 'cli/document'
 require_relative 'cli/runner'
 require_relative 'cli/helm_runner'
 require_relative 'cli/kubectl_runner'

data/lib/orchparty/kubernetes_application.rb

@@ -188,7 +188,7 @@ module Orchparty
 
       def print_install
         build_chart do |chart_path|
-          cmd = "helm template --namespace #{namespace} --debug --kube-context #{cluster_name} --output-dir #{chart_path.join(
+          cmd = "helm template --namespace #{namespace} --kube-context #{cluster_name} --output-dir #{chart_path.join(
             '..', 'helm_expanded'
           )}   #{service.name} #{chart_path}"
           @out_io.puts `$cmd`
@@ -196,6 +196,7 @@ module Orchparty
 
             debug('Helm: template check: OK')
           else
+            system("#{cmd} --debug")
             error('Helm: template check: FAIL')
           end
         end
@@ -246,7 +247,19 @@ module Orchparty
               output_chart_path: output_chart_path
             )
             used_vars.each do |variable, value|
-              helm_values.puts "#{variable}: \"#{value}\""
+              if value.is_a?(Numeric) && value >= 1000000 # this is bad as conversion is done only in some cases
+                value = value.to_s # see https://github.com/helm/helm/issues/3001
+              end
+              yml = { variable => value}.to_yaml[4..-1]
+              yml = case
+                when yml.match(/!ruby\/object/)
+                  { variable => value.to_s}.to_yaml[4..-1]
+                when yml.match(/!ruby\/array:Hashie::Array/)
+                  { variable => value.to_a}.to_yaml[4..-1]
+                else
+                  yml  
+              end  
+              helm_values.write(yml)
             end
           end
         end

data/minfra-cli.gemspec

@@ -36,5 +36,6 @@ Gem::Specification.new do |spec|
   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"
+  spec.add_runtime_dependency "gpgme", "~>2.0.0"
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: minfra-cli
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 3.0.0
 platform: ruby
 authors:
 - Peter Schrammel
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-01-30 00:00:00.000000000 Z
+date: 2024-02-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -142,6 +142,20 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 0.7.4
+- !ruby/object:Gem::Dependency
+  name: gpgme
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.0.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.0.0
 description: A cli framework for k8s based development and deployment.
 email:
 - peter.schrammel@gmx.de
@@ -187,7 +201,6 @@ files:
 - lib/minfra/cli/common.rb
 - lib/minfra/cli/config.rb
 - lib/minfra/cli/core_ext.rb
-- lib/minfra/cli/document.rb
 - lib/minfra/cli/env.rb
 - lib/minfra/cli/errors.rb
 - lib/minfra/cli/helm_runner.rb

data/lib/minfra/cli/document.rb

@@ -1,22 +0,0 @@
-# frozen_string_literal: true
-
-module Minfra
-  module Cli
-    class Document
-      def self.document(config, message)
-        new(config).document(message)
-      end
-
-      def initialize(config)
-        @config = config
-      end
-
-      def document(_message)
-        return true if @config.dev?
-
-        puts 'TBD: calling documentation hooks'
-        true
-      end
-    end
-  end
-end