uffizzi-cli 2.0.37 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f2764a609f5446a2b7f1a11ac9ec37619b14f441278dd220142edbab2b106876
-  data.tar.gz: 5f7196a3c7ef61b8d67685d14ce806b7651c9141de0795cb09248455602fed48
+  metadata.gz: 8fc9021c07ec1fbbbd32baab4e37dcdf3eb9b7368843701e9c0a086da8eefefe
+  data.tar.gz: ccf95b0bd9ae6fffa906a15012825a9c9d4b209263e0735ce200d5ba5ca953b8
 SHA512:
-  metadata.gz: 741e72b2f9c8c20c6a1bd7631af35f55b321b785b5defb052ea98cd273df80edc31223527bf30bffd59f5f0f3c0269f771ca6473be61292e8b8e985414bd0a44
-  data.tar.gz: f3f0f3ab58fcda3b73d8ab178a79d79591f8a86e63ae7e5d78b70eb3e6188732fb7e65a3e664bb0ada2cb7d04a0cb4c51281857b2165a833d2baf193fcbf5ca2
+  metadata.gz: aeb135bb03097b24c39b408e10bc31fa995d3cd4da3284eacc07be126b04a5aaf18a02e5cf432e5e9f46a24bb842c79209d3100ec8d0b94efde7f8c9a5b43ae4
+  data.tar.gz: 29d2160ec30fd61f9f5bf96ef24dea226b6388e9ab1bcf47b3c6a66a2b518df17bc9013d5d036dc5f3c6b517e30f2de0015a46d2ce933f8332113943e84a9b54

data/lib/uffizzi/cli/dev.rb

@@ -0,0 +1,177 @@
+# frozen_string_literal: true
+
+require 'uffizzi/services/command_service'
+require 'uffizzi/services/cluster_service'
+require 'uffizzi/services/kubeconfig_service'
+
+module Uffizzi
+  class Cli::Dev < Thor
+    include ApiClient
+
+    desc 'start [CONFIG]', 'Start dev environment'
+    def start(config_path = 'skaffold.yaml')
+      check_skaffold_existence
+      check_login
+      cluster_id, cluster_name = start_create_cluster
+      kubeconfig = wait_cluster_creation(cluster_name)
+      launch_scaffold(config_path)
+    ensure
+      if defined?(cluster_name).present? && defined?(cluster_id).present?
+        kubeconfig = defined?(kubeconfig).present? ? kubeconfig : nil
+        handle_delete_cluster(cluster_id, cluster_name, kubeconfig)
+      end
+    end
+
+    private
+
+    def check_login
+      raise Uffizzi::Error.new('You are not logged in.') unless Uffizzi::AuthHelper.signed_in?
+      raise Uffizzi::Error.new('This command needs project to be set in config file') unless CommandService.project_set?(options)
+    end
+
+    def start_create_cluster
+      cluster_name = ClusterService.generate_name
+      creation_source = MANUAL
+      params = cluster_creation_params(cluster_name, creation_source)
+      Uffizzi.ui.say('Start creating a cluster')
+      response = create_cluster(ConfigFile.read_option(:server), project_slug, params)
+      return ResponseHelper.handle_failed_response(response) unless ResponseHelper.created?(response)
+
+      cluster_id = response.dig(:body, :cluster, :id)
+      cluster_name = response.dig(:body, :cluster, :name)
+
+      [cluster_id, cluster_name]
+    end
+
+    def wait_cluster_creation(cluster_name)
+      Uffizzi.ui.say('Checking the cluster status...')
+      cluster_data = ClusterService.wait_cluster_deploy(project_slug, cluster_name, ConfigFile.read_option(:oidc_token))
+
+      if ClusterService.failed?(cluster_data[:state])
+        Uffizzi.ui.say_error_and_exit("Cluster with name: #{cluster_name} failed to be created.")
+      end
+
+      handle_succeed_cluster_creation(cluster_data)
+      parse_kubeconfig(cluster_data[:kubeconfig])
+    end
+
+    def handle_succeed_cluster_creation(cluster_data)
+      kubeconfig_path = KubeconfigService.default_path
+      parsed_kubeconfig = parse_kubeconfig(cluster_data[:kubeconfig])
+
+      Uffizzi.ui.say("Cluster with name: #{cluster_data[:name]} was created.")
+
+      save_kubeconfig(parsed_kubeconfig, kubeconfig_path)
+      update_clusters_config(cluster_data[:id], kubeconfig_path: kubeconfig_path)
+    end
+
+    def save_kubeconfig(kubeconfig, kubeconfig_path)
+      KubeconfigService.save_to_filepath(kubeconfig_path, kubeconfig) do |kubeconfig_by_path|
+        merged_kubeconfig = KubeconfigService.merge(kubeconfig_by_path, kubeconfig)
+
+        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
+      end
+    end
+
+    def update_clusters_config(id, params)
+      clusters_config = Uffizzi::ConfigHelper.update_clusters_config_by_id(id, params)
+      ConfigFile.write_option(:clusters, clusters_config)
+    end
+
+    def cluster_creation_params(name, creation_source)
+      oidc_token = Uffizzi::ConfigFile.read_option(:oidc_token)
+
+      {
+        cluster: {
+          name: name,
+          manifest: nil,
+          creation_source: creation_source,
+        },
+        token: oidc_token,
+      }
+    end
+
+    def handle_delete_cluster(cluster_id, cluster_name, kubeconfig)
+      exclude_kubeconfig(cluster_id, kubeconfig) if kubeconfig.present?
+
+      params = {
+        cluster_name: cluster_name,
+        oidc_token: ConfigFile.read_option(:oidc_token),
+      }
+      response = delete_cluster(ConfigFile.read_option(:server), project_slug, params)
+
+      if ResponseHelper.no_content?(response)
+        Uffizzi.ui.say("Cluster #{cluster_name} deleted")
+      else
+        ResponseHelper.handle_failed_response(response)
+      end
+    end
+
+    def exclude_kubeconfig(cluster_id, kubeconfig)
+      cluster_config = Uffizzi::ConfigHelper.cluster_config_by_id(cluster_id)
+      return if cluster_config.nil?
+
+      kubeconfig_path = cluster_config[:kubeconfig_path]
+      ConfigFile.write_option(:clusters, Uffizzi::ConfigHelper.clusters_config_without(cluster_id))
+
+      KubeconfigService.save_to_filepath(kubeconfig_path, kubeconfig) do |kubeconfig_by_path|
+        return if kubeconfig_by_path.nil?
+
+        new_kubeconfig = KubeconfigService.exclude(kubeconfig_by_path, kubeconfig)
+        new_current_context = find_previous_current_context(new_kubeconfig, kubeconfig_path)
+        KubeconfigService.update_current_context(new_kubeconfig, new_current_context)
+      end
+    end
+
+    def find_previous_current_context(kubeconfig, kubeconfig_path)
+      prev_current_context = Uffizzi::ConfigHelper.previous_current_context_by_path(kubeconfig_path)&.fetch(:current_context, nil)
+
+      if KubeconfigService.find_cluster_contexts_by_name(kubeconfig, prev_current_context).present?
+        prev_current_context
+      end
+    end
+
+    def save_previous_current_context(kubeconfig_path, current_context)
+      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
+
+    def parse_kubeconfig(kubeconfig)
+      return if kubeconfig.nil?
+
+      Psych.safe_load(Base64.decode64(kubeconfig))
+    end
+
+    def launch_scaffold(config_path)
+      Uffizzi.ui.say('Start skaffold')
+      cmd = "skaffold dev --filename='#{config_path}'"
+
+      Uffizzi.ui.popen2e(cmd) do |_stdin, stdout_and_stderr, wait_thr|
+        stdout_and_stderr.each { |l| puts l }
+        wait_thr.value
+      end
+    end
+
+    def check_skaffold_existence
+      cmd = 'skaffold version'
+      stdout_str, stderr_str = Uffizzi.ui.capture3(cmd)
+
+      return if stdout_str.present? && stderr_str.blank?
+
+      Uffizzi.ui.say_error_and_exit(stderr_str)
+    rescue StandardError => e
+      Uffizzi.ui.say_error_and_exit(e.message)
+    end
+
+    def project_slug
+      @project_slug ||= ConfigFile.read_option(:project)
+    end
+  end
+end

data/lib/uffizzi/cli.rb

@@ -71,6 +71,10 @@ module Uffizzi
       Disconnect.new.run(credential_type)
     end
 
+    desc 'dev', 'dev'
+    require_relative 'cli/dev'
+    subcommand 'dev', Cli::Dev
+
     map preview: :compose
 
     class << self

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

@@ -9,8 +9,6 @@ class ClusterDisconnectService
     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?
@@ -18,12 +16,14 @@ class ClusterDisconnectService
       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
 
+      prev_current_context = Uffizzi::ConfigHelper.previous_current_context_by_path(kubeconfig_path)&.fetch(:current_context, nil)
+      current_context = KubeconfigService.get_current_context(kubeconfig)
+
       if KubeconfigService.find_cluster_contexts_by_name(kubeconfig, prev_current_context).present? &&
           prev_current_context != current_context &&
           !is_ask_origin_current_context

data/lib/uffizzi/shell.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'awesome_print'
+require 'open3'
 
 module Uffizzi
   module UI
@@ -54,6 +55,14 @@ module Uffizzi
         $stdout.stat.pipe?
       end
 
+      def popen2e(command, &block)
+        Open3.popen2e(command, &block)
+      end
+
+      def capture3(command)
+        Open3.capture3(command)
+      end
+
       private
 
       def format_to_json(data)

data/lib/uffizzi/version.rb

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

data/man/uffizzi-cluster-create

@@ -17,7 +17,7 @@ https://docs\.uffizzi\.com/references/cli/
 .fi
 .SH "FLAGS"
 .nf
-\-\- name
+\-\-name
     Option is deprecated and will be removed in the newer versions\.
     Please use a positional argument instead: uffizzi cluster create my\-awesome\-name\.
 

data/man/uffizzi-dev-start

@@ -0,0 +1,29 @@
+.\" generated with Ronn-NG/v0.9.1
+.\" http://github.com/apjanke/ronn-ng/tree/0.9.1
+.TH "UFFIZZI\-DEV\-START" "" "September 2023" ""
+.SH "NAME"
+\fBuffizzi\-dev\-start\fR \- start development environment
+.SH "SYNOPSIS"
+.nf
+uffizzi dev start [SKAFFOLD_CONFIG_FILE_PATH]
+.fi
+.SH "DESCRIPTION"
+.nf
+Creates a new cluster and start skaffold\. If no SKAFFOLD_CONFIG_FILE_PATH is specified,
+the default path will be used\.
+Default SKAFFOLD_CONFIG_FILE_PATH is \'skaffold\.yaml\'
+
+For more information on Uffizzi clusters, see:
+https://docs\.uffizzi\.com/references/cli/
+.fi
+.SH "EXAMPLES"
+.nf
+To start development environment, run:
+
+    $ uffizzi dev start
+
+To start development environment with custom skaffold\.yaml file, run:
+
+    $ uffizzi cluster create /path/to/skaffold\.yaml
+.fi
+

data/man/uffizzi-dev-start.ronn

@@ -0,0 +1,22 @@
+uffizzi-dev-start - start development environment
+================================================================
+
+## SYNOPSIS
+    uffizzi dev start [SKAFFOLD_CONFIG_FILE_PATH]
+
+## DESCRIPTION
+    Creates a new cluster and start skaffold. If no SKAFFOLD_CONFIG_FILE_PATH is specified,
+    the default path will be used.
+    Default SKAFFOLD_CONFIG_FILE_PATH is 'skaffold.yaml'
+
+    For more information on Uffizzi clusters, see:
+    https://docs.uffizzi.com/references/cli/
+
+## EXAMPLES
+    To start development environment, run:
+
+        $ uffizzi dev start
+
+    To start development environment with custom skaffold.yaml file, run:
+
+        $ uffizzi cluster create /path/to/skaffold.yaml

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: uffizzi-cli
 version: !ruby/object:Gem::Version
-  version: 2.0.37
+  version: 2.1.0
 platform: ruby
 authors:
 - Josh Thurman
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-09-19 00:00:00.000000000 Z
+date: 2023-09-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -423,6 +423,7 @@ files:
 - lib/uffizzi/cli/common.rb
 - lib/uffizzi/cli/config.rb
 - lib/uffizzi/cli/connect.rb
+- lib/uffizzi/cli/dev.rb
 - lib/uffizzi/cli/disconnect.rb
 - lib/uffizzi/cli/login.rb
 - lib/uffizzi/cli/login_by_identity_token.rb
@@ -518,6 +519,8 @@ files:
 - man/uffizzi-connect-ghcr
 - man/uffizzi-connect-ghcr.ronn
 - man/uffizzi-connect.ronn
+- man/uffizzi-dev-start
+- man/uffizzi-dev-start.ronn
 - man/uffizzi-disconnect
 - man/uffizzi-disconnect.ronn
 - man/uffizzi-login