From 8e5c1ea60167ace6516a93973c4660c18e845e2d Mon Sep 17 00:00:00 2001 From: Lidia Mokevnina Date: Tue, 18 Jul 2023 10:58:52 +0200 Subject: [PATCH 1/3] [262] added separate api client method for kubeconfig update --- lib/uffizzi/cli/cluster.rb | 2 +- lib/uffizzi/clients/api/api_client.rb | 7 +++++++ lib/uffizzi/clients/api/api_routes.rb | 4 ++++ lib/uffizzi/services/cluster_service.rb | 2 +- 4 files changed, 13 insertions(+), 2 deletions(-) diff --git a/lib/uffizzi/cli/cluster.rb b/lib/uffizzi/cli/cluster.rb index bb22c504..aba444b7 100644 --- a/lib/uffizzi/cli/cluster.rb +++ b/lib/uffizzi/cli/cluster.rb @@ -146,7 +146,7 @@ def handle_delete_command(project_slug, command_args) def handle_update_kubeconfig_command(project_slug) cluster_name = options[:name] kubeconfig_path = options[:kubeconfig] || KubeconfigService.default_path - response = get_cluster(Uffizzi::ConfigFile.read_option(:server), project_slug, cluster_name) + response = get_kubeconfig(Uffizzi::ConfigFile.read_option(:server), project_slug, cluster_name) return Uffizzi::ResponseHelper.handle_failed_response(response) unless Uffizzi::ResponseHelper.ok?(response) cluster_data = response.dig(:body, :cluster) diff --git a/lib/uffizzi/clients/api/api_client.rb b/lib/uffizzi/clients/api/api_client.rb index b30ea44b..28dc7ed1 100644 --- a/lib/uffizzi/clients/api/api_client.rb +++ b/lib/uffizzi/clients/api/api_client.rb @@ -279,6 +279,13 @@ def get_cluster(server, project_slug, cluster_name) build_response(response) end + def get_kubeconfig(server, project_slug, cluster_name) + uri = cluster_kubecongig_uri(server, project_slug, cluster_name) + response = http_client.make_get_request(uri) + + build_response(response) + end + def get_access_token(server, code) uri = access_token_url(server, code) response = http_client.make_get_request(uri) diff --git a/lib/uffizzi/clients/api/api_routes.rb b/lib/uffizzi/clients/api/api_routes.rb index 24e17927..9c3fade5 100644 --- a/lib/uffizzi/clients/api/api_routes.rb +++ b/lib/uffizzi/clients/api/api_routes.rb @@ -108,6 +108,10 @@ def cluster_uri(server, project_slug, cluster_name) "#{server}/api/cli/v1/projects/#{project_slug}/clusters/#{cluster_name}" end + def cluster_kubecongig_uri(server, project_slug, cluster_name) + "#{server}/api/cli/v1/projects/#{project_slug}/clusters/#{cluster_name}/update_kubeconfig" + end + def access_token_url(server, code) "#{server}/api/cli/v1/access_tokens/#{code}" end diff --git a/lib/uffizzi/services/cluster_service.rb b/lib/uffizzi/services/cluster_service.rb index ccb6f17c..b3d214ac 100644 --- a/lib/uffizzi/services/cluster_service.rb +++ b/lib/uffizzi/services/cluster_service.rb @@ -26,7 +26,7 @@ def failed?(cluster_state) def wait_cluster_deploy(project_slug, cluster_name) loop do - response = get_cluster(Uffizzi::ConfigFile.read_option(:server), project_slug, cluster_name) + response = get_kubeconfig(Uffizzi::ConfigFile.read_option(:server), project_slug, cluster_name) return Uffizzi::ResponseHelper.handle_failed_response(response) unless Uffizzi::ResponseHelper.ok?(response) cluster_data = response.dig(:body, :cluster) From 2ab6da910ea77465cf5f1d09b9ea7d226e06d563 Mon Sep 17 00:00:00 2001 From: Lidia Mokevnina Date: Tue, 18 Jul 2023 11:21:38 +0200 Subject: [PATCH 2/3] [262] fixed typo --- lib/uffizzi/clients/api/api_client.rb | 2 +- lib/uffizzi/clients/api/api_routes.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/uffizzi/clients/api/api_client.rb b/lib/uffizzi/clients/api/api_client.rb index 28dc7ed1..6812a2c8 100644 --- a/lib/uffizzi/clients/api/api_client.rb +++ b/lib/uffizzi/clients/api/api_client.rb @@ -280,7 +280,7 @@ def get_cluster(server, project_slug, cluster_name) end def get_kubeconfig(server, project_slug, cluster_name) - uri = cluster_kubecongig_uri(server, project_slug, cluster_name) + uri = cluster_kubeconfig_uri(server, project_slug, cluster_name) response = http_client.make_get_request(uri) build_response(response) diff --git a/lib/uffizzi/clients/api/api_routes.rb b/lib/uffizzi/clients/api/api_routes.rb index 9c3fade5..fb137fd7 100644 --- a/lib/uffizzi/clients/api/api_routes.rb +++ b/lib/uffizzi/clients/api/api_routes.rb @@ -108,7 +108,7 @@ def cluster_uri(server, project_slug, cluster_name) "#{server}/api/cli/v1/projects/#{project_slug}/clusters/#{cluster_name}" end - def cluster_kubecongig_uri(server, project_slug, cluster_name) + def cluster_kubeconfig_uri(server, project_slug, cluster_name) "#{server}/api/cli/v1/projects/#{project_slug}/clusters/#{cluster_name}/update_kubeconfig" end From 87626f319ccc76df47f73df52281e0f976841a05 Mon Sep 17 00:00:00 2001 From: Lidia Mokevnina Date: Tue, 18 Jul 2023 11:41:06 +0200 Subject: [PATCH 3/3] [262] changed endpoint --- lib/uffizzi/clients/api/api_routes.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/uffizzi/clients/api/api_routes.rb b/lib/uffizzi/clients/api/api_routes.rb index fb137fd7..9b34065d 100644 --- a/lib/uffizzi/clients/api/api_routes.rb +++ b/lib/uffizzi/clients/api/api_routes.rb @@ -109,7 +109,7 @@ def cluster_uri(server, project_slug, cluster_name) end def cluster_kubeconfig_uri(server, project_slug, cluster_name) - "#{server}/api/cli/v1/projects/#{project_slug}/clusters/#{cluster_name}/update_kubeconfig" + "#{server}/api/cli/v1/projects/#{project_slug}/clusters/#{cluster_name}/kubeconfig" end def access_token_url(server, code)