uffizzi-cli 2.0.36 → 2.0.37

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 72e1e0754278f9e3fc7069a15d1f7963c9aa578a67fdb7495d52f9d633bf1f71
-  data.tar.gz: a1cd9e4a84cba3b3827dfe0bb547ed4f3e734dc8cb9640603f5818937d0abee3
+  metadata.gz: f2764a609f5446a2b7f1a11ac9ec37619b14f441278dd220142edbab2b106876
+  data.tar.gz: 5f7196a3c7ef61b8d67685d14ce806b7651c9141de0795cb09248455602fed48
 SHA512:
-  metadata.gz: f2c0a8c7a2c62cb5ae478f2a18c29a90ee4bdcc2c74b6177930510fc40f1032b2bb8d0e7f8e4947ee30760cc963776d32ac6dbb3e18710a784d2d3cbb4dff862
-  data.tar.gz: cbd873c5ef8ab6c8868ee518f34acbada4303f44ef0f30770c1d405ef13b443a9d5431f7593dee81522a6a9b2e1bc1722774f1cce6f20cd16797165391bb9534
+  metadata.gz: 741e72b2f9c8c20c6a1bd7631af35f55b321b785b5defb052ea98cd273df80edc31223527bf30bffd59f5f0f3c0269f771ca6473be61292e8b8e985414bd0a44
+  data.tar.gz: f3f0f3ab58fcda3b73d8ab178a79d79591f8a86e63ae7e5d78b70eb3e6188732fb7e65a3e664bb0ada2cb7d04a0cb4c51281857b2165a833d2baf193fcbf5ca2

data/lib/uffizzi/auth_helper.rb

@@ -8,6 +8,8 @@ module Uffizzi
       end
 
       def sign_out
+        return unless Uffizzi::ConfigFile.exists?
+
         Uffizzi::ConfigFile.unset_option(:cookie)
         Uffizzi::ConfigFile.unset_option(:account)
         Uffizzi::ConfigFile.unset_option(:project)

data/lib/uffizzi/cli/cluster.rb

@@ -25,15 +25,15 @@ module Uffizzi
       run('list')
     end
 
-    desc 'create', 'Create a cluster'
+    desc 'create [NAME]', 'Create a cluster'
     method_option :name, type: :string, required: false, aliases: '-n'
     method_option :kubeconfig, type: :string, required: false, aliases: '-k'
     method_option :manifest, type: :string, required: false, aliases: '-m'
-    method_option :'update-current-context', type: :boolean, required: false
+    method_option :'update-current-context', type: :boolean, required: false, default: true
     method_option :output, required: false, type: :string, aliases: '-o', enum: ['json', 'pretty-json']
     method_option :'creation-source', required: false, type: :string
-    def create
-      run('create')
+    def create(name = nil)
+      run('create', { name: name })
     end
 
     desc 'describe [NAME]', 'Describe a cluster'
@@ -43,7 +43,7 @@ module Uffizzi
     end
 
     desc 'delete [NAME]', 'Delete a cluster'
-    method_option :'delete-config', required: false, type: :boolean, aliases: '-c'
+    method_option :'delete-config', required: false, type: :boolean, default: true
     def delete(name)
       run('delete', cluster_name: name)
     end
@@ -76,7 +76,7 @@ module Uffizzi
       when 'list'
         handle_list_command(project_slug)
       when 'create'
-        handle_create_command(project_slug)
+        handle_create_command(project_slug, command_args)
       when 'describe'
         handle_describe_command(project_slug, command_args)
       when 'delete'
@@ -104,9 +104,17 @@ module Uffizzi
       end
     end
 
-    def handle_create_command(project_slug)
+    # rubocop:disable Metrics/PerceivedComplexity
+    def handle_create_command(project_slug, command_args)
       Uffizzi.ui.disable_stdout if Uffizzi.ui.output_format
-      cluster_name = options[:name] || ClusterService.generate_name
+
+      if options[:name]
+        msg = 'DEPRECATION WARNING: The --name option is deprecated and will be removed in the newer versions.' \
+              ' Please use a positional argument instead: uffizzi cluster create my-awesome-name'
+        Uffizzi.ui.say(msg)
+      end
+
+      cluster_name = command_args[:name] || options[:name] || ClusterService.generate_name
       creation_source = options[:"creation-source"] || MANUAL
 
       unless ClusterService.valid_name?(cluster_name)
@@ -133,6 +141,7 @@ module Uffizzi
     rescue SystemExit, Interrupt, SocketError
       handle_interrupt_creation(cluster_name, ConfigFile.read_option(:server), project_slug)
     end
+    # rubocop:enable Metrics/PerceivedComplexity
 
     def handle_describe_command(project_slug, command_args)
       cluster_data = fetch_cluster_data(project_slug, command_args[:cluster_name])
@@ -150,7 +159,7 @@ module Uffizzi
       kubeconfig = parse_kubeconfig(cluster_data[:kubeconfig])
 
       handle_delete_cluster(project_slug, cluster_name)
-      exclude_kubeconfig(cluster_data[:id], kubeconfig)
+      exclude_kubeconfig(cluster_data[:id], kubeconfig) if kubeconfig.present?
     end
 
     def exclude_kubeconfig(cluster_id, kubeconfig)
@@ -308,7 +317,7 @@ module Uffizzi
     end
 
     def handle_succeed_create_response(cluster_data)
-      kubeconfig_path = options[:kubeconfig]
+      kubeconfig_path = options[:kubeconfig] || KubeconfigService.default_path
       is_update_current_context = options[:'update-current-context']
       parsed_kubeconfig = parse_kubeconfig(cluster_data[:kubeconfig])
       rendered_cluster_data = render_cluster_data(cluster_data)
@@ -365,6 +374,8 @@ module Uffizzi
     end
 
     def parse_kubeconfig(kubeconfig)
+      return if kubeconfig.nil?
+
       Psych.safe_load(Base64.decode64(kubeconfig))
     end
 

data/lib/uffizzi/cli/login.rb

@@ -21,7 +21,7 @@ module Uffizzi
 
     def run
       AuthHelper.sign_out if AuthHelper.signed_in?
-      return perform_email_login if @options[:email]
+      return perform_email_login unless @options[:email].nil?
 
       perform_browser_login
     end
@@ -45,7 +45,7 @@ module Uffizzi
     def perform_browser_login
       session_id = SecureRandom.uuid
       response = create_access_token(@server, session_id)
-      return handle_failed_response(response) unless ResponseHelper.created?(response)
+      return ResponseHelper.handle_failed_response(response) unless ResponseHelper.created?(response)
 
       url = browser_sign_in_url(@server, session_id)
       open_browser(url)
@@ -68,7 +68,7 @@ module Uffizzi
       token = response[:body][:access_token]
       Uffizzi::Token.delete
       Uffizzi::Token.write(token)
-      Uffizzi.ui.say('Login successfull')
+      Uffizzi.ui.say('Login successful')
 
       set_current_account_and_project
     end
@@ -84,7 +84,7 @@ module Uffizzi
       ConfigFile.write_option(:server, @server)
       ConfigFile.write_option(:username, username)
       ConfigFile.write_option(:cookie, response[:headers])
-      Uffizzi.ui.say('Login successfull')
+      Uffizzi.ui.say('Login successful')
 
       if ENV.fetch('CI_PIPELINE_RUN', false)
         account = response[:body][:user][:default_account]

data/lib/uffizzi/cli.rb

@@ -19,7 +19,7 @@ module Uffizzi
     desc 'login [OPTIONS]', 'Login to Uffizzi to view and manage your previews'
     method_option :server, required: false, aliases: '-s'
     method_option :username, required: false, aliases: '-u'
-    method_option :email, required: false, aliases: '-e'
+    method_option :email, required: false, aliases: '-e', lazy_default: ''
     def login
       require_relative 'cli/login'
       Login.new(options).run
@@ -121,7 +121,7 @@ module Uffizzi
         when Thor::Error
           raise exception
         when Interrupt
-          raise Uffizzi::CliError.new('The command was interrupted')
+          nil
         when StandardError
           raise Uffizzi::CliError.new(exception.message)
         else

data/lib/uffizzi/helpers/login_helper.rb

@@ -16,13 +16,14 @@ module Uffizzi
 
       def set_server(options)
         config_server = ConfigFile.exists? ? Uffizzi::ConfigHelper.read_option_from_config(:server) : nil
-        server_address = (options[:server] || config_server || Uffizzi.ui.ask('Server:')).sub(/\/+$/, '')
+        server_address = options[:server] || config_server || Uffizzi.configuration.default_server.to_s
         server_address.start_with?('http:', 'https:') ? server_address : "https://#{server_address}"
       end
 
       def set_username(options)
         config_username = ConfigFile.exists? ? Uffizzi::ConfigHelper.read_option_from_config(:username) : nil
-        options[:username] || config_username || Uffizzi.ui.ask('Username:')
+        options_username = options[:email].present? ? options[:email] : nil
+        options_username || config_username || Uffizzi.ui.ask('Username:')
       end
 
       def set_password

data/lib/uffizzi/services/cluster_service.rb

@@ -8,6 +8,7 @@ class ClusterService
   CLUSTER_STATE_DEPLOYED = 'deployed'
   CLUSTER_STATE_FAILED_DEPLOY_NAMESPACE = 'failed_deploy_namespace'
   CLUSTER_STATE_FAILED = 'failed'
+  CLUSTER_NAME_MAX_LENGTH = 15
 
   class << self
     include ApiClient
@@ -42,7 +43,7 @@ class ClusterService
     end
 
     def generate_name
-      name = [Faker::Name.first_name, Faker::Name.last_name].map(&:downcase).join('-')
+      name = Faker::Internet.domain_word[0..CLUSTER_NAME_MAX_LENGTH]
 
       return name if valid_name?(name)
 

data/lib/uffizzi/version.rb

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

data/man/uffizzi-cluster-create

@@ -5,19 +5,21 @@
 \fBuffizzi\-cluster\-create\fR \- create a cluster
 .SH "SYNOPSIS"
 .nf
-uffizzi cluster create
+uffizzi cluster create [CLUSTER_NAME]
 .fi
 .SH "DESCRIPTION"
 .nf
-Creates a new cluster\.
+Creates a new cluster\. If no CLUSTER_NAME is specified,
+the cluster is created with the auto generated name\.
 
 For more information on Uffizzi clusters, see:
 https://docs\.uffizzi\.com/references/cli/
 .fi
 .SH "FLAGS"
 .nf
-\-\-name=CLUSTER\-NAME
-    Set cluster 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\.
 
 \-\-kubeconfig="/path/to/your/kubeconfig"
     Path to kubeconfig file
@@ -27,6 +29,7 @@ https://docs\.uffizzi\.com/references/cli/
 
 \-\-update\-current\-context
     Update current\-context in kubeconfig file
+    Default is true
 
 \-\-output=pretty\-json
 \-\-output=json
@@ -40,10 +43,10 @@ To create a cluster with the auto generated name, run:
 
 To create a cluster with name, run:
 
-    $ uffizzi cluster create \-\-name="my\-cluster"
+    $ uffizzi cluster create my\-cluster
 
 To create a cluster from a manifests directory, run:
 
-    $ uffizzi cluster create \-\-name="my\-cluster" \-\-manifest=manifests/
+    $ uffizzi cluster create my\-cluster \-\-manifest=manifests/
 .fi
 

data/man/uffizzi-cluster-create.ronn

@@ -2,17 +2,19 @@ uffizzi-cluster-create - create a cluster
 ================================================================
 
 ## SYNOPSIS
-    uffizzi cluster create
+    uffizzi cluster create [CLUSTER_NAME]
 
 ## DESCRIPTION
-    Creates a new cluster.
+    Creates a new cluster. If no CLUSTER_NAME is specified,
+    the cluster is created with the auto generated name.
 
     For more information on Uffizzi clusters, see:
     https://docs.uffizzi.com/references/cli/
 
 ## FLAGS
-    --name=CLUSTER-NAME
-        Set cluster 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.
 
     --kubeconfig="/path/to/your/kubeconfig"
         Path to kubeconfig file
@@ -22,6 +24,7 @@ uffizzi-cluster-create - create a cluster
 
     --update-current-context
         Update current-context in kubeconfig file
+        Default is true
 
     --output=pretty-json
     --output=json
@@ -34,8 +37,8 @@ uffizzi-cluster-create - create a cluster
 
     To create a cluster with name, run:
 
-        $ uffizzi cluster create --name="my-cluster"
+        $ uffizzi cluster create my-cluster
 
     To create a cluster from a manifests directory, run:
 
-        $ uffizzi cluster create --name="my-cluster" --manifest=manifests/
+        $ uffizzi cluster create my-cluster --manifest=manifests/

data/man/uffizzi-cluster-delete

@@ -1,6 +1,6 @@
 .\" generated with Ronn-NG/v0.9.1
 .\" http://github.com/apjanke/ronn-ng/tree/0.9.1
-.TH "UFFIZZI\-CLUSTER\-DELETE" "" "August 2023" ""
+.TH "UFFIZZI\-CLUSTER\-DELETE" "" "September 2023" ""
 .SH "NAME"
 \fBuffizzi\-cluster\-delete\fR \- delete a cluster
 .SH "SYNOPSIS"
@@ -23,6 +23,12 @@ https://docs\.uffizzi\.com/references/cli/
 [CLUSTER_NAME]
     Name for the cluster you want to delete\.
 .fi
+.SH "FLAGS"
+.nf
+\-\-delete\-config=false
+    Delete cluster from kubeconfig\.
+    Default is true\.
+.fi
 .SH "EXAMPLES"
 .nf
 The following command deletes the cluster with CLUSTER_NAME my\-cluster:

data/man/uffizzi-cluster-delete.ronn

@@ -18,6 +18,11 @@ uffizzi-cluster-delete - delete a cluster
     [CLUSTER_NAME]
         Name for the cluster you want to delete.
 
+## FLAGS
+    --delete-config=false
+        Delete cluster from kubeconfig.
+        Default is true.
+
 ## EXAMPLES
     The following command deletes the cluster with CLUSTER_NAME my-cluster:
 

data/man/uffizzi-cluster-disconnect

@@ -2,7 +2,7 @@
 .\" 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
+\fBuffizzi\-cluster\-disconnect\fR \- disconnect from current cluster context
 .SH "SYNOPSIS"
 .nf
 uffizzi cluster disconnect
@@ -17,7 +17,7 @@ https://docs\.uffizzi\.com/references/cli/
 .SH "FLAGS"
 .nf
 \-\-ask
-    Show list available contexts for kubeconfig
+    Show list available contexts for kubeconfig and set new origin current context
 
 \-\-kubeconfig="/path/to/your/kubeconfig"
     Path to kubeconfig file

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: uffizzi-cli
 version: !ruby/object:Gem::Version
-  version: 2.0.36
+  version: 2.0.37
 platform: ruby
 authors:
 - Josh Thurman
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-09-11 00:00:00.000000000 Z
+date: 2023-09-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport