uffizzi-cli 2.0.35 → 2.0.36

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2ce4e169f833a82e239af7385a2ad4c46f01d1150d19f85f3feedff4a98e4279
-  data.tar.gz: a4e435c280b9b5658c1b0048f73f78c5b245e8e37a4d5709d15eea8862d99ca9
+  metadata.gz: 72e1e0754278f9e3fc7069a15d1f7963c9aa578a67fdb7495d52f9d633bf1f71
+  data.tar.gz: a1cd9e4a84cba3b3827dfe0bb547ed4f3e734dc8cb9640603f5818937d0abee3
 SHA512:
-  metadata.gz: 9dbbf25f1500a9ad99a4a4ec27a9524d7a7c2ead0ca0231af6949f0dd67663cf687da3ff98336d5473f332d90abd8d55e4c11a0e92358e508e6943c5eefc097a
-  data.tar.gz: b38e45251cb074ed709e0fb169108e23f758af7ba9e3473f01e2db7d67e0964181a8c3a4a2a3093cbd52e2ade39c0d3610da71ec1d42cddaa648075040955286
+  metadata.gz: f2c0a8c7a2c62cb5ae478f2a18c29a90ee4bdcc2c74b6177930510fc40f1032b2bb8d0e7f8e4947ee30760cc963776d32ac6dbb3e18710a784d2d3cbb4dff862
+  data.tar.gz: cbd873c5ef8ab6c8868ee518f34acbada4303f44ef0f30770c1d405ef13b443a9d5431f7593dee81522a6a9b2e1bc1722774f1cce6f20cd16797165391bb9534

data/lib/uffizzi/cli/cluster.rb

@@ -9,6 +9,7 @@ require 'uffizzi/services/preview_service'
 require 'uffizzi/services/command_service'
 require 'uffizzi/services/cluster_service'
 require 'uffizzi/services/kubeconfig_service'
+require 'uffizzi/services/cluster/disconnect_service'
 
 MANUAL = 'manual'
 
@@ -42,7 +43,7 @@ module Uffizzi
     end
 
     desc 'delete [NAME]', 'Delete a cluster'
-    method_option :'delete-config', required: false, type: :boolean, aliases: '-dc'
+    method_option :'delete-config', required: false, type: :boolean, aliases: '-c'
     def delete(name)
       run('delete', cluster_name: name)
     end
@@ -55,6 +56,13 @@ module Uffizzi
       run('update-kubeconfig', cluster_name: name)
     end
 
+    method_option :kubeconfig, type: :string, aliases: '-k'
+    method_option :ask, type: :boolean
+    desc 'disconnect', 'Switch back to original kubeconfig current context'
+    def disconnect
+      run('disconnect')
+    end
+
     private
 
     def run(command, command_args = {})
@@ -75,6 +83,8 @@ module Uffizzi
         handle_delete_command(project_slug, command_args)
       when 'update-kubeconfig'
         handle_update_kubeconfig_command(project_slug, command_args)
+      when 'disconnect'
+        ClusterDisconnectService.handle(options)
       end
     end
 
@@ -191,8 +201,14 @@ module Uffizzi
 
       KubeconfigService.save_to_filepath(kubeconfig_path, parsed_kubeconfig) do |kubeconfig_by_path|
         merged_kubeconfig = KubeconfigService.merge(kubeconfig_by_path, parsed_kubeconfig)
-        current_context = KubeconfigService.get_current_context(parsed_kubeconfig)
-        KubeconfigService.update_current_context(merged_kubeconfig, current_context)
+        new_current_context = KubeconfigService.get_current_context(parsed_kubeconfig)
+        new_kubeconfig = KubeconfigService.update_current_context(merged_kubeconfig, new_current_context)
+
+        next new_kubeconfig if kubeconfig_by_path.nil?
+
+        previous_current_context = KubeconfigService.get_current_context(kubeconfig_by_path)
+        save_previous_current_context(kubeconfig_path, previous_current_context)
+        new_kubeconfig
       end
 
       update_clusters_config(cluster_data[:id], kubeconfig_path: kubeconfig_path)
@@ -319,8 +335,14 @@ module Uffizzi
         merged_kubeconfig = KubeconfigService.merge(kubeconfig_by_path, kubeconfig)
 
         if is_update_current_context
-          current_context = KubeconfigService.get_current_context(kubeconfig)
-          KubeconfigService.update_current_context(merged_kubeconfig, current_context)
+          new_current_context = KubeconfigService.get_current_context(kubeconfig)
+          new_kubeconfig = KubeconfigService.update_current_context(merged_kubeconfig, new_current_context)
+
+          next new_kubeconfig if kubeconfig_by_path.nil?
+
+          previous_current_context = KubeconfigService.get_current_context(kubeconfig_by_path)
+          save_previous_current_context(kubeconfig_path, previous_current_context)
+          new_kubeconfig
         else
           merged_kubeconfig
         end
@@ -359,5 +381,12 @@ module Uffizzi
         ResponseHelper.handle_failed_response(response)
       end
     end
+
+    def save_previous_current_context(kubeconfig_path, current_context)
+      return if kubeconfig_path.nil? || ConfigHelper.previous_current_context_by_path(kubeconfig_path).present?
+
+      previous_current_contexts = Uffizzi::ConfigHelper.set_previous_current_context_by_path(kubeconfig_path, current_context)
+      ConfigFile.write_option(:previous_current_contexts, previous_current_contexts)
+    end
   end
 end

data/lib/uffizzi/cli/project/compose.rb

@@ -79,6 +79,8 @@ module Uffizzi
         else
           ResponseHelper.handle_invalid_compose_response(response)
         end
+      elsif ResponseHelper.not_found?(response)
+        Uffizzi.ui.say('The project does not have a compose file set.')
       else
         ResponseHelper.handle_failed_response(response)
       end

data/lib/uffizzi/helpers/config_helper.rb

@@ -39,11 +39,28 @@ module Uffizzi
         clusters.detect { |c| c[:id] == id }
       end
 
+      def set_previous_current_context_by_path(path, current_context)
+        current_contexts = previous_current_contexts_without(path)
+        current_contexts << { current_context: current_context, kubeconfig_path: path }
+      end
+
+      def previous_current_contexts_without(path)
+        cluster_previous_current_contexts.reject { |c| c[:kubeconfig_path] == path }
+      end
+
+      def previous_current_context_by_path(path)
+        cluster_previous_current_contexts.detect { |c| c[:kubeconfig_path] == path }
+      end
+
       private
 
       def clusters
         read_option_from_config(:clusters) || []
       end
+
+      def cluster_previous_current_contexts
+        read_option_from_config(:previous_current_contexts) || []
+      end
     end
   end
 end

data/lib/uffizzi/services/cluster/disconnect_service.rb

@@ -0,0 +1,71 @@
+# frozen_string_literal: true
+
+require 'uffizzi/helpers/config_helper'
+require 'uffizzi/services/cluster_service'
+require 'uffizzi/services/kubeconfig_service'
+
+class ClusterDisconnectService
+  class << self
+    def handle(options)
+      kubeconfig_path = options[:kubeconfig] || KubeconfigService.default_path
+      is_ask_origin_current_context = options[:ask]
+
+      prev_current_context = Uffizzi::ConfigHelper.previous_current_context_by_path(kubeconfig_path)&.fetch(:current_context, nil)
+      kubeconfig = KubeconfigService.read_kubeconfig(kubeconfig_path)
+
+      if kubeconfig.nil?
+        return Uffizzi.ui.say("Kubeconfig does not exist by path #{kubeconfig_path}")
+      end
+
+      contexts = KubeconfigService.get_cluster_contexts(kubeconfig)
+      current_context = KubeconfigService.get_current_context(kubeconfig)
+
+      if contexts.empty?
+        return Uffizzi.ui.say("No contexts by kubeconfig path #{kubeconfig_path}")
+      end
+
+      if KubeconfigService.find_cluster_contexts_by_name(kubeconfig, prev_current_context).present? &&
+          prev_current_context != current_context &&
+          !is_ask_origin_current_context
+        update_current_context_by_filepath(kubeconfig_path, prev_current_context)
+        say_success(prev_current_context, kubeconfig_path)
+        return
+      end
+
+      new_current_context = ask_context(contexts, current_context)
+      update_current_context_by_filepath(kubeconfig_path, new_current_context)
+      set_previous_current_context_to_config(kubeconfig_path, new_current_context)
+      say_success(new_current_context, kubeconfig_path)
+    end
+
+    private
+
+    def say_success(current_context, kubeconfig_path)
+      Uffizzi.ui.say("Now your current context is '#{current_context}' for kubeconfig path '#{kubeconfig_path}'")
+    end
+
+    def update_current_context_by_filepath(filepath, current_context)
+      KubeconfigService.save_to_filepath(filepath) do |kubeconfig|
+        KubeconfigService.update_current_context(kubeconfig, current_context)
+      end
+    end
+
+    def set_previous_current_context_to_config(kubeconfig_path, current_context)
+      previous_current_contexts = Uffizzi::ConfigHelper.set_previous_current_context_by_path(kubeconfig_path, current_context)
+      Uffizzi::ConfigFile.write_option(:previous_current_contexts, previous_current_contexts)
+    end
+
+    def ask_context(contexts, current_context)
+      context_names = contexts
+        .map { |c| { name: c['name'], value: c['name'] } }
+        .reject { |c| c[:value] == current_context }
+
+      if context_names.empty?
+        return Uffizzi.ui.say_error_and_exit('No other contexts')
+      end
+
+      question = 'Select origin context to switch on:'
+      Uffizzi.prompt.select(question, context_names)
+    end
+  end
+end

data/lib/uffizzi/services/kubeconfig_service.rb

@@ -41,15 +41,25 @@ class KubeconfigService
     end
 
     def get_first_context(kubeconfig)
-      kubeconfig.fetch('contexts', [])[0]
+      get_cluster_contexts(kubeconfig)[0]
     end
 
     def get_current_cluster_name(kubeconfig)
-      kubeconfig['contexts']
+      get_cluster_contexts(kubeconfig)
         .detect { |c| c['name'] == get_current_context(kubeconfig) }
         .dig('context', 'cluster')
     end
 
+    def get_cluster_contexts(kubeconfig)
+      kubeconfig.fetch('contexts', [])
+    end
+
+    def find_cluster_contexts_by_name(kubeconfig, context_name)
+      return if context_name.nil?
+
+      get_cluster_contexts(kubeconfig).detect { |c| c['name'] == context_name }
+    end
+
     def update_current_context(kubeconfig, current_context)
       new_kubeconfig = kubeconfig.deep_dup
       new_kubeconfig['current-context'] = current_context
@@ -57,9 +67,8 @@ class KubeconfigService
       new_kubeconfig
     end
 
-    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
+    def save_to_filepath(filepath, kubeconfig = nil)
+      target_kubeconfig = read_kubeconfig(filepath)
 
       if target_kubeconfig.present? && !valid_kubeconfig?(target_kubeconfig)
         raise InvalidKubeconfigError.new(filepath)
@@ -68,15 +77,31 @@ class KubeconfigService
       new_kubeconfig = block_given? ? yield(target_kubeconfig) : kubeconfig
       return if new_kubeconfig.nil?
 
-      dir_path = File.dirname(real_file_path)
-      FileUtils.mkdir_p(dir_path) unless File.directory?(dir_path)
-      File.write(real_file_path, new_kubeconfig.to_yaml)
+      write_kubeconfig(filepath, new_kubeconfig)
     end
 
     def default_path
       kubeconfig_env_path || Uffizzi.configuration.default_kubeconfig_path
     end
 
+    def read_kubeconfig(filepath)
+      real_file_path = File.expand_path(filepath)
+      kubeconfig = File.exist?(real_file_path) ? Psych.safe_load(File.read(real_file_path)) : nil
+
+      if kubeconfig.present? && !valid_kubeconfig?(kubeconfig)
+        raise InvalidKubeconfigError.new(filepath)
+      end
+
+      kubeconfig
+    end
+
+    def write_kubeconfig(filepath, kubeconfig)
+      real_file_path = File.expand_path(filepath)
+      dir_path = File.dirname(real_file_path)
+      FileUtils.mkdir_p(dir_path) unless File.directory?(dir_path)
+      File.write(real_file_path, kubeconfig.to_yaml)
+    end
+
     private
 
     def cluster_exists_in_kubeconfig?(kubeconfig, cluster_name)

data/lib/uffizzi/version.rb

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

data/man/uffizzi-cluster-disconnect

@@ -0,0 +1,40 @@
+.\" generated with Ronn-NG/v0.9.1
+.\" http://github.com/apjanke/ronn-ng/tree/0.9.1
+.TH "UFFIZZI\-CLUSTER\-DISCONNECT" "" "September 2023" ""
+.SH "NAME"
+\fBuffizzi\-cluster\-disconnect\fR \- disconnect from current cluster
+.SH "SYNOPSIS"
+.nf
+uffizzi cluster disconnect
+.fi
+.SH "DESCRIPTION"
+.nf
+Switch current context to origin\.
+
+For more information on Uffizzi clusters, see:
+https://docs\.uffizzi\.com/references/cli/
+.fi
+.SH "FLAGS"
+.nf
+\-\-ask
+    Show list available contexts for kubeconfig
+
+\-\-kubeconfig="/path/to/your/kubeconfig"
+    Path to kubeconfig file
+.fi
+.SH "EXAMPLES"
+.nf
+To disconnect from current cluster context to origin context, run:
+
+    $ uffizzi cluster disconnect
+
+To disconnect from current cluster context to origin context
+and set new origin current context, run:
+
+    $ uffizzi cluster disconnect \-\-ask
+
+To disconnect from current cluster context to origin context for current kubeconfig, run:
+
+    $ uffizzi cluster disconnect \-\-kubeconfig="/path/to/your/kubeconfig"
+.fi
+

data/man/uffizzi-cluster-disconnect.ronn

@@ -0,0 +1,32 @@
+uffizzi-cluster-disconnect - disconnect from current cluster context
+====================================================================
+
+## SYNOPSIS
+    uffizzi cluster disconnect
+
+## DESCRIPTION
+    Switch current context to origin.
+
+    For more information on Uffizzi clusters, see:
+    https://docs.uffizzi.com/references/cli/
+
+## FLAGS
+    --ask
+        Show list available contexts for kubeconfig and set new origin current context
+
+    --kubeconfig="/path/to/your/kubeconfig"
+        Path to kubeconfig file
+
+## EXAMPLES
+    To disconnect from current cluster context to origin context, run:
+
+        $ uffizzi cluster disconnect
+
+    To disconnect from current cluster context to origin context
+    and set new origin current context, run:
+
+        $ uffizzi cluster disconnect --ask
+
+    To disconnect from current cluster context to origin context for current kubeconfig, run:
+
+        $ uffizzi cluster disconnect --kubeconfig="/path/to/your/kubeconfig"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: uffizzi-cli
 version: !ruby/object:Gem::Version
-  version: 2.0.35
+  version: 2.0.36
 platform: ruby
 authors:
 - Josh Thurman
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-09-08 00:00:00.000000000 Z
+date: 2023-09-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -445,6 +445,7 @@ files:
 - lib/uffizzi/helpers/project_helper.rb
 - lib/uffizzi/promt.rb
 - lib/uffizzi/response_helper.rb
+- lib/uffizzi/services/cluster/disconnect_service.rb
 - lib/uffizzi/services/cluster_service.rb
 - lib/uffizzi/services/command_service.rb
 - lib/uffizzi/services/compose_file_service.rb
@@ -474,6 +475,8 @@ files:
 - man/uffizzi-cluster-delete.ronn
 - man/uffizzi-cluster-describe
 - man/uffizzi-cluster-describe.ronn
+- man/uffizzi-cluster-disconnect
+- man/uffizzi-cluster-disconnect.ronn
 - man/uffizzi-cluster-list
 - man/uffizzi-cluster-list.ronn
 - man/uffizzi-cluster-update-kubeconfig