Merge branch 'develop'

Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    uffizzi-cli (2.0.8)
+    uffizzi-cli (2.0.9)
       activesupport
       awesome_print
       faker

lib/uffizzi/cli.rb

@@ -80,7 +80,7 @@ def dispatch(meth, given_args, given_opts, config)
         return Common.show_manual(filename(args)) if show_help?(args, opts)
 
         super
-      rescue StandardError => e
+      rescue Interrupt, StandardError => e
         ci_workflow? ? handle_ci_exceptions(e) : handle_repl_exceptions(e)
       end
 

lib/uffizzi/cli/cluster.rb

@@ -41,13 +41,12 @@ def delete(name)
       run('delete', cluster_name: name)
     end
 
-    method_option :name, type: :string, required: true, aliases: '-n'
     method_option :kubeconfig, type: :string, required: false, aliases: '-k'
     method_option :print, type: :boolean, required: false, aliases: '-p'
     method_option :quiet, type: :boolean, required: false, aliases: '-q'
     desc 'update-kubeconfig', 'Udpate the your kubeconfig'
-    def update_kubeconfig
-      run('update-kubeconfig')
+    def update_kubeconfig(name)
+      run('update-kubeconfig', cluster_name: name)
     end
 
     private
@@ -69,7 +68,7 @@ def run(command, command_args = {})
       when 'delete'
         handle_delete_command(project_slug, command_args)
       when 'update-kubeconfig'
-        handle_update_kubeconfig_command(project_slug)
+        handle_update_kubeconfig_command(project_slug, command_args)
       end
     end
 
@@ -143,8 +142,8 @@ def handle_delete_command(project_slug, command_args)
       end
     end
 
-    def handle_update_kubeconfig_command(project_slug)
-      cluster_name = options[:name]
+    def handle_update_kubeconfig_command(project_slug, command_args)
+      cluster_name = command_args[:cluster_name]
       kubeconfig_path = options[:kubeconfig] || KubeconfigService.default_path
       response = get_cluster(Uffizzi::ConfigFile.read_option(:server), project_slug, cluster_name)
       return Uffizzi::ResponseHelper.handle_failed_response(response) unless Uffizzi::ResponseHelper.ok?(response)
@@ -228,14 +227,21 @@ def handle_succeed_list_response(response)
     end
 
     def handle_succeed_describe_response(response)
-      rendered_options = [:name, :state]
-      cluster = response[:body][:cluster].slice(*rendered_options)
+      cluster_data = response[:body][:cluster]
+      prepared_cluster_data = {
+        name: cluster_data[:name],
+        status: cluster_data[:state],
+        created: Time.strptime(cluster_data[:created_at], '%Y-%m-%dT%H:%M:%S.%N').strftime('%a %b %d %H:%M:%S %Y'),
+        url: cluster_data[:host],
+      }
 
-      if Uffizzi.ui.output_format.nil?
-        cluster = cluster.map { |k, v| "- #{k.to_s.capitalize}: #{v}" }.join("\n").strip
+      rendered_cluster_data = if Uffizzi.ui.output_format.nil?
+        prepared_cluster_data.map { |k, v| "- #{k.to_s.upcase}: #{v}" }.join("\n").strip
+      else
+        prepared_cluster_data
       end
 
-      Uffizzi.ui.say(cluster)
+      Uffizzi.ui.say(rendered_cluster_data)
     end
 
     def handle_succeed_create_response(cluster_data, kubeconfig_path)

lib/uffizzi/services/kubeconfig_service.rb

@@ -4,7 +4,16 @@
 require 'psych'
 
 class KubeconfigService
+  class InvalidKubeconfigError < StandardError
+    def initialize(file_path)
+      msg = "Invalid kubeconfig at path '#{file_path}'"
+
+      super(msg)
+    end
+  end
+
   DEFAULT_KUBECONFIG_PATH = '~/.kube/config'
+  KUBECONFIG_GENERAL_KEYS = ['apiVersion', 'clusters', 'contexts', 'current-context', 'kind', 'users'].freeze
 
   class << self
     include ApiClient
@@ -35,6 +44,11 @@ def update_current_context(kubeconfig, current_context)
     def save_to_filepath(filepath, kubeconfig)
       real_file_path = File.expand_path(filepath)
       target_kubeconfig = File.exist?(real_file_path) ? Psych.safe_load(File.read(real_file_path)) : nil
+
+      if target_kubeconfig.present? && !valid_kubeconfig?(target_kubeconfig)
+        raise InvalidKubeconfigError.new(filepath)
+      end
+
       new_kubeconfig = block_given? ? yield(target_kubeconfig) : merge(target_kubeconfig, kubeconfig)
 
       dir_path = File.dirname(real_file_path)
@@ -43,7 +57,7 @@ def save_to_filepath(filepath, kubeconfig)
     end
 
     def default_path
-      ENV['KUBECONFIG'] || DEFAULT_KUBECONFIG_PATH
+      kubeconfig_env_path || DEFAULT_KUBECONFIG_PATH
     end
 
     private
@@ -78,5 +92,20 @@ def get_current_cluster_name(kubeconfig)
         .detect { |c| c['name'] == kubeconfig['current-context'] }
         .dig('context', 'cluster')
     end
+
+    def kubeconfig_env_path
+      file_paths = ENV['KUBECONFIG']
+      return if file_paths.blank?
+
+      file_paths.split(':').first
+    end
+
+    def valid_kubeconfig?(data)
+      return false unless data.is_a?(Hash)
+
+      data_keys = data.keys.map(&:to_s)
+
+      KUBECONFIG_GENERAL_KEYS.all? { |k| data_keys.include?(k) }
+    end
   end
 end

lib/uffizzi/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Uffizzi
-  VERSION = '2.0.8'
+  VERSION = '2.0.9'
 end

test/fixtures/files/uffizzi/uffizzi_cluster_deployed.json

@@ -2,6 +2,8 @@
   "cluster": {
     "name": "uffizzi-test-cluster-vcluster",
     "state": "deployed",
+    "created_at": "2023-07-15T15:33:41.590Z",
+    "host": "some-host.cluster.com",
     "kubeconfig": "YXBpVmVyc2lvbjogdjEKY2x1c3RlcnM6Ci0gY2x1c3RlcjoKICAgIGNlcnRpZmljYXRlLWF1dGhvcml0eS1kYXRhOiBMUzB0TFMxQ1JVZEpUaUJEUlZKVVNVWkpRMEZVUlMwdExTMHRDazFKU1VKa2VrTkRRVkl5WjBGM1NVSkJaMGxDUVVSQlMwSm5aM0ZvYTJwUFVGRlJSRUZxUVdwTlUwVjNTSGRaUkZaUlVVUkVRbWh5VFROTmRHTXlWbmtLWkcxV2VVeFhUbWhSUkVVeVQwUlpORTVFUlhkTlJFRjNTR2hqVGsxcVRYZE9ha1V4VFZSUk1VNXFVWGRYYUdOT1RYcE5kMDVxUlhsTlZGRXhUbXBSZHdwWGFrRnFUVk5GZDBoM1dVUldVVkZFUkVKb2NrMHpUWFJqTWxaNVpHMVdlVXhYVG1oUlJFVXlUMFJaTkU1RVJYZE5SRUYzVjFSQlZFSm5ZM0ZvYTJwUENsQlJTVUpDWjJkeGFHdHFUMUJSVFVKQ2QwNURRVUZTZEhac2FqUjJlakl4T0VSMWVFdFNkVlp6Y0VFNVZ6WkpNSHBTTkZweEwxcHVTWEk0T0hsaGJYVUtVMHRZUlRsa1QzbGtlRlZzWVRWeVUyVjBXVkUyTmsxeGFtWkJlVFp4TkhSbFpXWXdjMjFwVkhGYWVtdHZNRWwzVVVSQlQwSm5UbFpJVVRoQ1FXWTRSUXBDUVUxRFFYRlJkMFIzV1VSV1VqQlVRVkZJTDBKQlZYZEJkMFZDTDNwQlpFSm5UbFpJVVRSRlJtZFJWVFpIWWxGU05rbHhNVTFrU2twS2FFdHVkREZVQ25FMU1XWkNhSGQzUTJkWlNVdHZXa2w2YWpCRlFYZEpSRk5CUVhkU1VVbG9RVWs1Y0N0UlRXWjJibU5UZFRnd1JrUnBjblZ6U1ZsUEswNW9aSFZ4TjNNS2QyOHdNRFJWYzJ4NmJYTkhRV2xCZUdKNVZVUTVSMDQzYjJKbVMzWTNTa3g1TDAxMFFUbFhMMDU2T0dFdlVrNDBaSFJaYWxWdk5qYzVRVDA5Q2kwdExTMHRSVTVFSUVORlVsUkpSa2xEUVZSRkxTMHRMUzBLCiAgICBzZXJ2ZXI6IGh0dHBzOi8vbG9jYWxob3N0Ojg0NDMKICBuYW1lOiBteS12Y2x1c3Rlcgpjb250ZXh0czoKLSBjb250ZXh0OgogICAgY2x1c3RlcjogbXktdmNsdXN0ZXIKICAgIG5hbWVzcGFjZTogZGVmYXVsdAogICAgdXNlcjogbXktdmNsdXN0ZXIKICBuYW1lOiBteS12Y2x1c3RlcgpjdXJyZW50LWNvbnRleHQ6IG15LXZjbHVzdGVyCmtpbmQ6IENvbmZpZwpwcmVmZXJlbmNlczoge30KdXNlcnM6Ci0gbmFtZTogbXktdmNsdXN0ZXIKICB1c2VyOgogICAgY2xpZW50LWNlcnRpZmljYXRlLWRhdGE6IExTMHRMUzFDUlVkSlRpQkRSVkpVU1VaSlEwRlVSUzB0TFMwdENrMUpTVUpyYWtORFFWUmxaMEYzU1VKQlowbEpRMkZqWmpCRksySnNTRzkzUTJkWlNVdHZXa2w2YWpCRlFYZEpkMGw2UldoTlFqaEhRVEZWUlVGM2Qxa0tZWHBPZWt4WFRuTmhWMVoxWkVNeGFsbFZRWGhPYW1jeVQwUlJlRTFFUVhkTlFqUllSRlJKZWsxRVdYaE9WRVV3VGxSWk1FMUdiMWhFVkVrd1RVUlplQXBPUkVVd1RsUlpNRTFHYjNkTlJFVllUVUpWUjBFeFZVVkRhRTFQWXpOc2VtUkhWblJQYlRGb1l6TlNiR051VFhoR1ZFRlVRbWRPVmtKQlRWUkVTRTQxQ21NelVteGlWSEJvV2tjeGNHSnFRbHBOUWsxSFFubHhSMU5OTkRsQlowVkhRME54UjFOTk5EbEJkMFZJUVRCSlFVSkVjMHBJTWtsck5XMUlPVkJVVW1VS2NuQmxlbFJHZVZWWk1GaGxRbVJxSzFkTE9HMVZNWE51U21KTWJGbG9ibEJHU201dlpFbG1lVVJ6UzFaVmJ6bHFiRmhTYlZweGFtOWhUMUI0UzNZMFFncGFaVXd2UWpWdGFsTkVRa2ROUVRSSFFURlZaRVIzUlVJdmQxRkZRWGRKUm05RVFWUkNaMDVXU0ZOVlJVUkVRVXRDWjJkeVFtZEZSa0pSWTBSQmFrRm1Da0puVGxaSVUwMUZSMFJCVjJkQ1VVbDBaRUZIUm1SSWVEZzBUbFZRYTBWTllUSTNXRWxIWkdoS1ZFRkxRbWRuY1docmFrOVFVVkZFUVdkT1NrRkVRa2NLUVdsRlFYaHZSVU5EV0haNFJrWnhhSEpaYUZoeVZFMURWVlprVFVkaUsybFVZbkYyU1hKVE1TOVlaRFI2ZUhORFNWRkVXRzV5WmxOd2NsY3phVkJHVVFwa01XMUJiVzlLVkROVGQybHZUVTR4UlZCb00ya3lhMHRCVUdWcWNXYzlQUW90TFMwdExVVk9SQ0JEUlZKVVNVWkpRMEZVUlMwdExTMHRDaTB0TFMwdFFrVkhTVTRnUTBWU1ZFbEdTVU5CVkVVdExTMHRMUXBOU1VsQ1pIcERRMEZTTW1kQmQwbENRV2RKUWtGRVFVdENaMmR4YUd0cVQxQlJVVVJCYWtGcVRWTkZkMGgzV1VSV1VWRkVSRUpvY2swelRYUlpNbmh3Q2xwWE5UQk1WMDVvVVVSRk1rOUVXVFJPUkVWM1RVUkJkMGhvWTA1TmFrMTNUbXBGTVUxVVVURk9hbEYzVjJoalRrMTZUWGRPYWtWNVRWUlJNVTVxVVhjS1YycEJhazFUUlhkSWQxbEVWbEZSUkVSQ2FISk5NMDEwV1RKNGNGcFhOVEJNVjA1b1VVUkZNazlFV1RST1JFVjNUVVJCZDFkVVFWUkNaMk54YUd0cVR3cFFVVWxDUW1kbmNXaHJhazlRVVUxQ1FuZE9RMEZCVVZVM2NGUXllRkp3U2pBd1lVdEVUMXB2WVZaWVZqSXZhR0Z1TDJsRGEzZ3pZM2t3WWpOUmF6aHpDalZTWTBSVlNFNURXVGRPUVZOaEt6VlNRekZNVGpOd1VFTm9hREl5WkRWSGNEWXhiVTVvUzBaYWNtMXNiekJKZDFGRVFVOUNaMDVXU0ZFNFFrRm1PRVVLUWtGTlEwRnhVWGRFZDFsRVZsSXdWRUZSU0M5Q1FWVjNRWGRGUWk5NlFXUkNaMDVXU0ZFMFJVWm5VVlZEVEZoUlFtaFlVamhtVDBSV1JEVkNSRWQwZFFveGVVSnVXVk5WZDBObldVbExiMXBKZW1vd1JVRjNTVVJUUVVGM1VsRkphRUZLVFc5SGRISlllWEF2ZWtwNWNYRTROVkZEV1VaVVpWb3dTVzF3TnpJNENrbFRRMDVSZFNzelQwVmpSMEZwUW1OdWFYZERVMGRWT1c1M09VTmpkRWRvUlZWeFQyWlROUzlhVVRKSU5sUk5RMGxqWmxseFVFVk5XWGM5UFFvdExTMHRMVVZPUkNCRFJWSlVTVVpKUTBGVVJTMHRMUzB0Q2c9PQogICAgY2xpZW50LWtleS1kYXRhOiBMUzB0TFMxQ1JVZEpUaUJGUXlCUVVrbFdRVlJGSUV0RldTMHRMUzB0Q2sxSVkwTkJVVVZGU1VJM1ZGaE1NblpMVVdZNFRVNXhhR3B2VUhKdVJrTkhPVEZyVldSa2NYcGhPQ3M0WkRsSVpERTVVemR2UVc5SFEwTnhSMU5OTkRrS1FYZEZTRzlWVVVSUlowRkZUM2RyWmxscFZHMVpaakE1VGtZMmRXdzNUazFZU2xKcVVtUTBSakpRTlZseWVWcFVWM2xqYkhOMVZtbEhZemhWYldWb01BcG9MMGxQZDNCV1Uyb3lUMVprUjFwdGNVOW9ielF2UlhFdlowWnNOSFk0U0cxUlBUMEtMUzB0TFMxRlRrUWdSVU1nVUZKSlZrRlVSU0JMUlZrdExTMHRMUW89Cg=="
   }
 }

test/fixtures/files/uffizzi/uffizzi_cluster_deploying.json

@@ -2,6 +2,8 @@
   "cluster": {
     "name": "uffizzi-test-cluster",
     "state": "deploying",
-    "kubeconfig": ""
+    "kubeconfig": "",
+    "created_at": "2023-07-15T15:33:41.590Z",
+    "host": ""
   }
 }

test/fixtures/files/uffizzi/uffizzi_cluster_describe.json

@@ -1,6 +1,9 @@
 {
   "cluster":{
     "name":"uffizzi-test-cluster-1",
-    "state": "deployed"
+    "state": "deployed",
+    "kubeconfig": "YXBpVmVyc2lvbjogdjEKY2x1c3RlcnM6Ci0gY2x1c3RlcjoKICAgIGNlcnRpZmljYXRlLWF1dGhvcml0eS1kYXRhOiBMUzB0TFMxQ1JVZEpUaUJEUlZKVVNVWkpRMEZVUlMwdExTMHRDazFKU1VKa2VrTkRRVkl5WjBGM1NVSkJaMGxDUVVSQlMwSm5aM0ZvYTJwUFVGRlJSRUZxUVdwTlUwVjNTSGRaUkZaUlVVUkVRbWh5VFROTmRHTXlWbmtLWkcxV2VVeFhUbWhSUkVVeVQwUlpORTVFUlhkTlJFRjNTR2hqVGsxcVRYZE9ha1V4VFZSUk1VNXFVWGRYYUdOT1RYcE5kMDVxUlhsTlZGRXhUbXBSZHdwWGFrRnFUVk5GZDBoM1dVUldVVkZFUkVKb2NrMHpUWFJqTWxaNVpHMVdlVXhYVG1oUlJFVXlUMFJaTkU1RVJYZE5SRUYzVjFSQlZFSm5ZM0ZvYTJwUENsQlJTVUpDWjJkeGFHdHFUMUJSVFVKQ2QwNURRVUZTZEhac2FqUjJlakl4T0VSMWVFdFNkVlp6Y0VFNVZ6WkpNSHBTTkZweEwxcHVTWEk0T0hsaGJYVUtVMHRZUlRsa1QzbGtlRlZzWVRWeVUyVjBXVkUyTmsxeGFtWkJlVFp4TkhSbFpXWXdjMjFwVkhGYWVtdHZNRWwzVVVSQlQwSm5UbFpJVVRoQ1FXWTRSUXBDUVUxRFFYRlJkMFIzV1VSV1VqQlVRVkZJTDBKQlZYZEJkMFZDTDNwQlpFSm5UbFpJVVRSRlJtZFJWVFpIWWxGU05rbHhNVTFrU2twS2FFdHVkREZVQ25FMU1XWkNhSGQzUTJkWlNVdHZXa2w2YWpCRlFYZEpSRk5CUVhkU1VVbG9RVWs1Y0N0UlRXWjJibU5UZFRnd1JrUnBjblZ6U1ZsUEswNW9aSFZ4TjNNS2QyOHdNRFJWYzJ4NmJYTkhRV2xCZUdKNVZVUTVSMDQzYjJKbVMzWTNTa3g1TDAxMFFUbFhMMDU2T0dFdlVrNDBaSFJaYWxWdk5qYzVRVDA5Q2kwdExTMHRSVTVFSUVORlVsUkpSa2xEUVZSRkxTMHRMUzBLCiAgICBzZXJ2ZXI6IGh0dHBzOi8vbG9jYWxob3N0Ojg0NDMKICBuYW1lOiBteS12Y2x1c3Rlcgpjb250ZXh0czoKLSBjb250ZXh0OgogICAgY2x1c3RlcjogbXktdmNsdXN0ZXIKICAgIG5hbWVzcGFjZTogZGVmYXVsdAogICAgdXNlcjogbXktdmNsdXN0ZXIKICBuYW1lOiBteS12Y2x1c3RlcgpjdXJyZW50LWNvbnRleHQ6IG15LXZjbHVzdGVyCmtpbmQ6IENvbmZpZwpwcmVmZXJlbmNlczoge30KdXNlcnM6Ci0gbmFtZTogbXktdmNsdXN0ZXIKICB1c2VyOgogICAgY2xpZW50LWNlcnRpZmljYXRlLWRhdGE6IExTMHRMUzFDUlVkSlRpQkRSVkpVU1VaSlEwRlVSUzB0TFMwdENrMUpTVUpyYWtORFFWUmxaMEYzU1VKQlowbEpRMkZqWmpCRksySnNTRzkzUTJkWlNVdHZXa2w2YWpCRlFYZEpkMGw2UldoTlFqaEhRVEZWUlVGM2Qxa0tZWHBPZWt4WFRuTmhWMVoxWkVNeGFsbFZRWGhPYW1jeVQwUlJlRTFFUVhkTlFqUllSRlJKZWsxRVdYaE9WRVV3VGxSWk1FMUdiMWhFVkVrd1RVUlplQXBPUkVVd1RsUlpNRTFHYjNkTlJFVllUVUpWUjBFeFZVVkRhRTFQWXpOc2VtUkhWblJQYlRGb1l6TlNiR051VFhoR1ZFRlVRbWRPVmtKQlRWUkVTRTQxQ21NelVteGlWSEJvV2tjeGNHSnFRbHBOUWsxSFFubHhSMU5OTkRsQlowVkhRME54UjFOTk5EbEJkMFZJUVRCSlFVSkVjMHBJTWtsck5XMUlPVkJVVW1VS2NuQmxlbFJHZVZWWk1GaGxRbVJxSzFkTE9HMVZNWE51U21KTWJGbG9ibEJHU201dlpFbG1lVVJ6UzFaVmJ6bHFiRmhTYlZweGFtOWhUMUI0UzNZMFFncGFaVXd2UWpWdGFsTkVRa2ROUVRSSFFURlZaRVIzUlVJdmQxRkZRWGRKUm05RVFWUkNaMDVXU0ZOVlJVUkVRVXRDWjJkeVFtZEZSa0pSWTBSQmFrRm1Da0puVGxaSVUwMUZSMFJCVjJkQ1VVbDBaRUZIUm1SSWVEZzBUbFZRYTBWTllUSTNXRWxIWkdoS1ZFRkxRbWRuY1docmFrOVFVVkZFUVdkT1NrRkVRa2NLUVdsRlFYaHZSVU5EV0haNFJrWnhhSEpaYUZoeVZFMURWVlprVFVkaUsybFVZbkYyU1hKVE1TOVlaRFI2ZUhORFNWRkVXRzV5WmxOd2NsY3phVkJHVVFwa01XMUJiVzlLVkROVGQybHZUVTR4UlZCb00ya3lhMHRCVUdWcWNXYzlQUW90TFMwdExVVk9SQ0JEUlZKVVNVWkpRMEZVUlMwdExTMHRDaTB0TFMwdFFrVkhTVTRnUTBWU1ZFbEdTVU5CVkVVdExTMHRMUXBOU1VsQ1pIcERRMEZTTW1kQmQwbENRV2RKUWtGRVFVdENaMmR4YUd0cVQxQlJVVVJCYWtGcVRWTkZkMGgzV1VSV1VWRkVSRUpvY2swelRYUlpNbmh3Q2xwWE5UQk1WMDVvVVVSRk1rOUVXVFJPUkVWM1RVUkJkMGhvWTA1TmFrMTNUbXBGTVUxVVVURk9hbEYzVjJoalRrMTZUWGRPYWtWNVRWUlJNVTVxVVhjS1YycEJhazFUUlhkSWQxbEVWbEZSUkVSQ2FISk5NMDEwV1RKNGNGcFhOVEJNVjA1b1VVUkZNazlFV1RST1JFVjNUVVJCZDFkVVFWUkNaMk54YUd0cVR3cFFVVWxDUW1kbmNXaHJhazlRVVUxQ1FuZE9RMEZCVVZVM2NGUXllRkp3U2pBd1lVdEVUMXB2WVZaWVZqSXZhR0Z1TDJsRGEzZ3pZM2t3WWpOUmF6aHpDalZTWTBSVlNFNURXVGRPUVZOaEt6VlNRekZNVGpOd1VFTm9hREl5WkRWSGNEWXhiVTVvUzBaYWNtMXNiekJKZDFGRVFVOUNaMDVXU0ZFNFFrRm1PRVVLUWtGTlEwRnhVWGRFZDFsRVZsSXdWRUZSU0M5Q1FWVjNRWGRGUWk5NlFXUkNaMDVXU0ZFMFJVWm5VVlZEVEZoUlFtaFlVamhtVDBSV1JEVkNSRWQwZFFveGVVSnVXVk5WZDBObldVbExiMXBKZW1vd1JVRjNTVVJUUVVGM1VsRkphRUZLVFc5SGRISlllWEF2ZWtwNWNYRTROVkZEV1VaVVpWb3dTVzF3TnpJNENrbFRRMDVSZFNzelQwVmpSMEZwUW1OdWFYZERVMGRWT1c1M09VTmpkRWRvUlZWeFQyWlROUzlhVVRKSU5sUk5RMGxqWmxseFVFVk5XWGM5UFFvdExTMHRMVVZPUkNCRFJWSlVTVVpKUTBGVVJTMHRMUzB0Q2c9PQogICAgY2xpZW50LWtleS1kYXRhOiBMUzB0TFMxQ1JVZEpUaUJGUXlCUVVrbFdRVlJGSUV0RldTMHRMUzB0Q2sxSVkwTkJVVVZGU1VJM1ZGaE1NblpMVVdZNFRVNXhhR3B2VUhKdVJrTkhPVEZyVldSa2NYcGhPQ3M0WkRsSVpERTVVemR2UVc5SFEwTnhSMU5OTkRrS1FYZEZTRzlWVVVSUlowRkZUM2RyWmxscFZHMVpaakE1VGtZMmRXdzNUazFZU2xKcVVtUTBSakpRTlZseWVWcFVWM2xqYkhOMVZtbEhZemhWYldWb01BcG9MMGxQZDNCV1Uyb3lUMVprUjFwdGNVOW9ielF2UlhFdlowWnNOSFk0U0cxUlBUMEtMUzB0TFMxRlRrUWdSVU1nVUZKSlZrRlVSU0JMUlZrdExTMHRMUW89Cg==",
+    "created_at": "2023-07-15T15:33:41.590Z",
+    "host": "some-host.cluster.com"
   }
 }

test/uffizzi/cli/cluster_test.rb

@@ -43,7 +43,7 @@ def test_list_clusters
   end
 
   def test_update_kubeconfig_if_kubeconfig_exists_with_another_cluster
-    @cluster.options = command_options(name: 'uffizzi-test-cluster', kubeconfig: @kubeconfig_path)
+    @cluster.options = command_options(kubeconfig: @kubeconfig_path)
 
     cluster_get_body = json_fixture('files/uffizzi/uffizzi_cluster_deployed.json')
     stubbed_uffizzi_cluster_get_request = stub_get_cluster_request(cluster_get_body, @project_slug)
@@ -60,7 +60,7 @@ def test_update_kubeconfig_if_kubeconfig_exists_with_another_cluster
 
     File.write(@kubeconfig_path, kubeconfig_from_filesystem.to_yaml)
 
-    @cluster.update_kubeconfig
+    @cluster.update_kubeconfig('cluster_name')
 
     assert_requested(stubbed_uffizzi_cluster_get_request)
 
@@ -72,7 +72,7 @@ def test_update_kubeconfig_if_kubeconfig_exists_with_another_cluster
   end
 
   def test_update_kubeconfig_if_kubeconfig_exists_with_same_cluster_but_another_values
-    @cluster.options = command_options(name: 'uffizzi-test-cluster', kubeconfig: @kubeconfig_path)
+    @cluster.options = command_options(kubeconfig: @kubeconfig_path)
 
     cluster_get_body = json_fixture('files/uffizzi/uffizzi_cluster_deployed.json')
     stubbed_uffizzi_cluster_get_request = stub_get_cluster_request(cluster_get_body, @project_slug)
@@ -87,7 +87,7 @@ def test_update_kubeconfig_if_kubeconfig_exists_with_same_cluster_but_another_va
 
     File.write(@kubeconfig_path, kubeconfig_from_filesystem.to_yaml)
 
-    @cluster.update_kubeconfig
+    @cluster.update_kubeconfig('cluster_name')
 
     assert_requested(stubbed_uffizzi_cluster_get_request)
 
@@ -104,13 +104,11 @@ def test_update_kubeconfig_if_kubeconfig_exists_with_same_cluster_but_another_va
   end
 
   def test_update_kubeconfig_if_kubeconfig_option_is_empty
-    @cluster.options = command_options(name: 'uffizzi-test-cluster')
-
     cluster_get_body = json_fixture('files/uffizzi/uffizzi_cluster_deployed.json')
     stubbed_uffizzi_cluster_get_request = stub_get_cluster_request(cluster_get_body, @project_slug)
     kubeconfig_from_backend = Psych.safe_load(Base64.decode64(cluster_get_body[:cluster][:kubeconfig]))
 
-    @cluster.update_kubeconfig
+    @cluster.update_kubeconfig('cluster_name')
 
     new_file = File.expand_path(KubeconfigService::DEFAULT_KUBECONFIG_PATH)
     kubeconfig_from_file = Psych.safe_load(File.read(new_file))
@@ -122,31 +120,44 @@ def test_update_kubeconfig_if_kubeconfig_option_is_empty
   end
 
   def test_update_kubeconfig_if_kubeconfig_is_empty_and_cluster_is_deploying
-    @cluster.options = command_options(name: 'uffizzi-test-cluster')
-
     cluster_get_body = json_fixture('files/uffizzi/uffizzi_cluster_deploying.json')
     stub_get_cluster_request(cluster_get_body, @project_slug)
 
     error = assert_raises(MockShell::ExitError) do
-      @cluster.update_kubeconfig
+      @cluster.update_kubeconfig('cluster_name')
     end
 
     assert_match('is empty', error.message)
   end
 
   def test_update_kubeconfig_if_kubeconfig_is_empty_and_cluster_is_failed
-    @cluster.options = command_options(name: 'uffizzi-test-cluster')
-
     cluster_get_body = json_fixture('files/uffizzi/uffizzi_cluster_failed.json')
     stub_get_cluster_request(cluster_get_body, @project_slug)
 
     error = assert_raises(MockShell::ExitError) do
-      @cluster.update_kubeconfig
+      @cluster.update_kubeconfig('cluster_name')
     end
 
     assert_match('is empty', error.message)
   end
 
+  def test_update_kubeconfig_if_kubeconfig_path_has_invalid_file
+    @cluster.options = command_options(kubeconfig: @kubeconfig_path)
+
+    cluster_get_body = json_fixture('files/uffizzi/uffizzi_cluster_deployed.json')
+    stubbed_uffizzi_cluster_get_request = stub_get_cluster_request(cluster_get_body, @project_slug)
+    kubeconfig_from_filesystem = 'some data'
+
+    File.write(@kubeconfig_path, kubeconfig_from_filesystem)
+
+    error = assert_raises(KubeconfigService::InvalidKubeconfigError) do
+      @cluster.update_kubeconfig('cluster_name')
+    end
+
+    assert_requested(stubbed_uffizzi_cluster_get_request)
+    assert_match('Invalid kubeconfig', error.message)
+  end
+
   def test_describe_cluster
     clusters_get_body = json_fixture('files/uffizzi/uffizzi_cluster_describe.json')
     stubbed_uffizzi_cluster_get_request = stub_get_cluster_request(clusters_get_body, @project_slug)