Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[243] Handle error when kubeconfig file is another file #249

Merged
merged 2 commits into from
Jul 24, 2023
Merged

[243] Handle error when kubeconfig file is another file #249

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ba2d34f
[243] Handle error when kubeconfig file is another file
zipofar Jul 10, 2023
fcaf94c
[243] fix error name and msg
zipofar Jul 19, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 22 additions & 0 deletions lib/uffizzi/services/kubeconfig_service.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -85,5 +99,13 @@ def kubeconfig_env_path

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
17 changes: 17 additions & 0 deletions test/uffizzi/cli/cluster_test.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,6 +147,23 @@ def test_update_kubeconfig_if_kubeconfig_is_empty_and_cluster_is_failed
assert_match('is empty', error.message)
end

def test_update_kubeconfig_if_kubeconfig_path_has_invalid_file
@cluster.options = command_options(name: 'uffizzi-test-cluster', 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
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)
Expand Down