From 221f8ad6c28b31593f2988ec36b7acb8aa50fdfd Mon Sep 17 00:00:00 2001
From: louismariegaborit <lm.gabo@gmail.com>
Date: Mon, 27 Mar 2023 22:18:00 +0200
Subject: [PATCH 1/2] adding --path-temp argument

---
 src/k8s-vault.cr | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/src/k8s-vault.cr b/src/k8s-vault.cr
index 7a4b7e8..00c223b 100644
--- a/src/k8s-vault.cr
+++ b/src/k8s-vault.cr
@@ -78,6 +78,7 @@ module K8sVault
     CLI Options:
       -h | --help | --usage  displays usage
       -d | --debug           enabled debug output
+      --temp-path            path of generated temp file
       example-config         outputs example config
       completion             outputs bash completion code
       exec                   executes K8s-Vault
@@ -183,14 +184,15 @@ module K8sVault
   # Return `nil`
   def self.cleanup : Nil
     K8sVault::Log.debug "cleaning up"
-    File.delete(K8sVault::KUBECONFIG_TEMP) rescue nil
+    File.delete(ENV["KUBECONFIG"]) rescue nil
   end
 
   # Runs everything
   def self.run(options : Array(String))
     kubecontext = "_unset_"
     spawn_shell = false
-
+    kubeconfigTemp = K8sVault::KUBECONFIG_TEMP;
+    
     while options.size > 0
       case options.first
       when "-v", "--version"
@@ -202,6 +204,10 @@ module K8sVault
       when "-d", "--debug"
         K8sVault::Log.debug = true
         options.shift
+      when "--temp-path"
+        options.shift
+        kubeconfigTemp = options.first
+        options.shift
       when "example-config"
         K8sVault.example_config
         exit 0
@@ -271,7 +277,7 @@ module K8sVault
     begin
       config = K8sVault.config(kubecontext: kubecontext)
       # write temp KUBECONFIG
-      File.write(K8sVault::KUBECONFIG_TEMP, config.kubeconfig, perm = 0o0600)
+      File.write(kubeconfigTemp, config.kubeconfig, perm = 0o0600)
     rescue K8sVault::UnconfiguredContextError
       K8sVault::Log.error "\"#{kubecontext}\" context is not found in #{K8sVault::K8SVAULT_CONFIG}"
       cleanup
@@ -319,9 +325,9 @@ module K8sVault
     end
 
     ENV["K8SVAULT"] = "1"
-    ENV["KUBECONFIG"] = K8sVault::KUBECONFIG_TEMP
+    ENV["KUBECONFIG"] = kubeconfigTemp
     ENV["K8SVAULT_CONTEXT"] = kubecontext
-    K8sVault::Log.debug "using KUBECONFIG: #{K8sVault::KUBECONFIG_TEMP}"
+    K8sVault::Log.debug "using KUBECONFIG: #{kubeconfigTemp}"
 
     if spawn_shell
       K8sVault::Log.info "k8s-vault session started"
@@ -332,7 +338,7 @@ module K8sVault
       sleep 3
       cmd = options.first
       options.shift
-      Process.run(cmd, options, {"KUBECONFIG" => K8sVault::KUBECONFIG_TEMP}, output: STDOUT, error: STDERR)
+      Process.run(cmd, options, {"KUBECONFIG" => kubeconfigTemp}, output: STDOUT, error: STDERR)
     end
 
     forwarder.signal(Signal::TERM) rescue nil

From 43a3c4116a35a6737f5f53540179eb37798b3df1 Mon Sep 17 00:00:00 2001
From: louismariegaborit <lm.gabo@gmail.com>
Date: Sat, 8 Apr 2023 22:45:38 +0200
Subject: [PATCH 2/2] don't use ENV["KUBECONFIG"] to delete file

---
 src/k8s-vault.cr | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/k8s-vault.cr b/src/k8s-vault.cr
index 00c223b..88f889e 100644
--- a/src/k8s-vault.cr
+++ b/src/k8s-vault.cr
@@ -182,9 +182,9 @@ module K8sVault
   # Removed temporary KUBECONFIG, if present
   #
   # Return `nil`
-  def self.cleanup : Nil
+  def self.cleanup(kubeconfigTemp : String) : Nil
     K8sVault::Log.debug "cleaning up"
-    File.delete(ENV["KUBECONFIG"]) rescue nil
+    File.delete(kubeconfigTemp) rescue nil
   end
 
   # Runs everything
@@ -192,7 +192,7 @@ module K8sVault
     kubecontext = "_unset_"
     spawn_shell = false
     kubeconfigTemp = K8sVault::KUBECONFIG_TEMP;
-    
+
     while options.size > 0
       case options.first
       when "-v", "--version"
@@ -269,7 +269,7 @@ module K8sVault
 
     # trap CTRL-C
     Signal::INT.trap do
-      cleanup
+      cleanup(kubeconfigTemp)
       exit 0
     end
 
@@ -280,20 +280,20 @@ module K8sVault
       File.write(kubeconfigTemp, config.kubeconfig, perm = 0o0600)
     rescue K8sVault::UnconfiguredContextError
       K8sVault::Log.error "\"#{kubecontext}\" context is not found in #{K8sVault::K8SVAULT_CONFIG}"
-      cleanup
+      cleanup(kubeconfigTemp)
       exit 1
     rescue K8sVault::ConfigParseError
       K8sVault::Log.error "unable to parse config file at #{K8sVault::K8SVAULT_CONFIG}"
-      cleanup
+      cleanup(kubeconfigTemp)
       exit 1
     rescue KCE::Exceptions::ContextMissingError
       K8sVault::Log.error "\"#{kubecontext}\" context is not found in KUBECONFIG (#{K8sVault::KUBECONFIG})"
-      cleanup
+      cleanup(kubeconfigTemp)
       exit 1
     rescue ex
       K8sVault::Log.debug "#{ex.message} (#{ex.class})"
       K8sVault::Log.error "unexpected error"
-      cleanup
+      cleanup(kubeconfigTemp)
       exit 1
     end
 
@@ -314,13 +314,13 @@ module K8sVault
       unless K8sVault.wait_for_connection(port: config.local_port.to_i, timeout: config.k8s_api_timeout.to_i)
         forwarder.signal(Signal::TERM) rescue nil
         forwarder.wait rescue nil
-        K8sVault.cleanup
+        K8sVault.cleanup(kubeconfigTemp)
         exit 1
       end
     rescue ex
       K8sVault::Log.debug "#{ex.message} (#{ex.class})"
       K8sVault::Log.error "failed to establish SSH session"
-      K8sVault.cleanup
+      K8sVault.cleanup(kubeconfigTemp)
       exit 1
     end
 
@@ -343,6 +343,6 @@ module K8sVault
 
     forwarder.signal(Signal::TERM) rescue nil
     forwarder.wait rescue nil
-    K8sVault.cleanup
+    K8sVault.cleanup(kubeconfigTemp)
   end
 end