helm_upgrade_logs 0.3.5 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '0984598273cbd41ca2d6fa3b727f1a5bcb723e771c0fa7ed8acf1a1e6ba0ab5b'
-  data.tar.gz: f44847d139474e405d525500cfbd1fe048d36c60d7452be9c72578c8be5251ce
+  metadata.gz: ff6c87e111837be7e9f2b92df25d6ead153cd3a8ccb277a72b8977eca166b94d
+  data.tar.gz: 7d4551bf7d2edc18a86406c2ff331df08cd8812c63fa7b87eceb99017e3e8b30
 SHA512:
-  metadata.gz: 31c657f1b1c17b07772ea106ee40f7d9dde3b1a272d3d34477c40257ebf7cf013ffe406eb8ff121e9df631f616d7292e5783d00fa2e5bdfadd1cc6a0d8d1f427
-  data.tar.gz: bf1ad1e99ff2d571094d1abf0ac8c2b822a3f63452083b5fa7ecc366454d4f1ccfb732b7a9d1cb93c672f06a27c49f6a35c2a246b6c81420a9cfbec4917bf311
+  metadata.gz: 3f64bf311fad025cde524b78eaf6340db3d61e5fe69fb3dedf6bed64362ed9071c43eb40a721ad74d5a21e517fcc1b69a33398bad9eb4df57f51818cc47a8d73
+  data.tar.gz: f080b4c121a246f8fc5856fdfdc5a917aac5aae6ec430e301d6157e5307defa0c092c335312463e8723878afd0a98a8b4dd8b3a8a985732454b5dcc80a7a34b3

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+## [0.4.0]
+
+- Change to handle params before release name fixing #1
+
+## [0.3.6]
+
+- Handle parsing multiple error messages in `helm_upgrade_logs_error_msg` that are comma separated
+
 ## [0.3.5]
 
 - Fix error where multiple processes being spawned to log the same pod

data/exe/helm_upgrade_logs

@@ -7,7 +7,7 @@ $LOAD_PATH.unshift File.join(File.dirname(__FILE__), "..", "lib")
 require "helm_upgrade_logs"
 UPGRADE_LOG_FOLDER = "helm_upgrade_logs"
 
-@release_name = ARGV.find { |arg| !arg.start_with?("-") }
+@release_name = release_name_from_args(ARGV)
 @namespace = namespace_from_args(ARGV)
 
 @helm_pid = Process.spawn "helm upgrade #{ARGV.join(" ")}"
@@ -79,10 +79,11 @@ puts `ps` if ENV["helm_upgrade_logs_debug"] == "true"
 if ENV["helm_upgrade_logs_error_msg"]
   pod_logs_files = Dir.glob("#{UPGRADE_LOG_FOLDER}/*.log")
   puts "Reading logs from #{pod_logs_files.count} pod logs" if ENV["helm_upgrade_logs_debug"] == "true"
+  error_messages = ENV["helm_upgrade_logs_error_msg"].split(",")
   pod_logs_files.each do |log_file|
     lines = File.readlines log_file
     lines.each_with_index do |line, index|
-      next unless line.include?(ENV["helm_upgrade_logs_error_msg"])
+      next unless error_messages.any? { |error| line.include? error  }
 
       msg = "Helm install error: #{line} from #{log_file} (Line #{index + 1})"
       if ENV["helm_upgrade_logs_ado_error"] == "true"

data/lib/helm_upgrade_logs/version.rb

@@ -2,5 +2,5 @@
 
 module HelmUpgradeLogs
   # @return [String] Version of helm upgrade logs
-  VERSION = "0.3.5"
+  VERSION = "0.4.0"
 end

data/lib/helm_upgrade_logs.rb

@@ -62,6 +62,32 @@ def namespace_from_args(args)
   args[match_index + 1]
 end
 
+def options_with_args
+  %w[--set --ca-file --cert-file --description --history-max --key-file --keyring --output --password --post-renderer
+     --repo --set --set-file --set-string --timeout --username --values --version --kube-apiserver --kube-as-group
+     --kube-as-user --kube-as-file --kube-context --kube-token --kubeconfig --namespace --registry-config
+     --repository-cache --repository-config -n -f -o]
+end  
+
+# @return Release name from command line arguments
+def release_name_from_args(args)
+  arg_list = args.clone
+  
+  loop do
+    option_with_val = false
+    arg_list.each_with_index do |arg, index|
+      if options_with_args.include?(arg_list[index - 1])
+        arg_list.delete_at(index - 1)
+        arg_list.delete_at(index - 1)
+        option_with_val = true
+        break
+      end
+    end
+    break if option_with_val == false
+  end
+  arg_list.find { |arg| !arg.start_with?("-") }
+end
+
 # Add namespace to kube query
 def add_ns(kube_query)
   kube_query += " -n #{@namespace}" if @namespace
@@ -77,5 +103,4 @@ end
 
 module HelmUpgradeLogs
   class Error < StandardError; end
-  # Your code goes here...
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: helm_upgrade_logs
 version: !ruby/object:Gem::Version
-  version: 0.3.5
+  version: 0.4.0
 platform: ruby
 authors:
 - Samuel Garratt
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-06-30 00:00:00.000000000 Z
+date: 2022-11-14 00:00:00.000000000 Z
 dependencies: []
 description: Basic wrapper around helm and kubectl to allow easy debugging of a helm
   release. All arguments after a usual helm upgrade are used as normal