uffizzi-cli 2.4.3 → 2.4.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 12aba3a7c9cb35a284582d4d15614c2c54bc3e79320ae57484cdc838f5e427f7
-  data.tar.gz: d55fe3842347380c8c3a26bef9db40a95cd83ecb2a3fa3d7ff31ecc2b9322394
+  metadata.gz: 1ef83eb18cf4f320ac6b596cc3b2d9ba72b6ed5a60e90e7dc54f61fa1e042630
+  data.tar.gz: 0a93840aa290162c4dc58a8ff3614fac4d58d988bd5296da5614db69524d0b43
 SHA512:
-  metadata.gz: 8750abc88b5ef8deb83d2a60edde1ff06866ec1d4404aae56518b970d3ec78b300ed69fd3f2675b0f2a96fd5c09dd937038c5a45d856a90f49fa8bfdc0400c84
-  data.tar.gz: 7ca46fbf05024d1e0cfa9eb969502453f8439cc0e7e80f25d711d48a4a3782b13b3331969fb1a626fdbd17eb13d717f17778e35832f3749abbf03e1825167e16
+  metadata.gz: 215e24c7486176be02a14265492195334b096c20458f3ab926cb4bc76a82955f3f05f5ead2f9d812ca622a07e28d8747b580e47a8ac7f50c7a017c4674addb21
+  data.tar.gz: ad0e2178d3ad1d440d8b29cc2e1abc031b2ee5bdb5a6ac7119db36d287d69c7b8ae648ea817013c7fc1ad1d96dcd575ed0df956b6ed24f9da993acc41ccae577

data/lib/uffizzi/cli/install.rb

@@ -3,6 +3,7 @@
 require 'uffizzi'
 require 'uffizzi/config_file'
 require 'uffizzi/services/kubeconfig_service'
+require 'uffizzi/services/account_service'
 
 module Uffizzi
   class Cli::Install < Thor
@@ -10,7 +11,7 @@ module Uffizzi
 
     default_task :controller
 
-    desc 'controller [HOSTNMAE]', 'Install uffizzi controller to cluster'
+    desc 'controller [HOSTNAME]', 'Install uffizzi controller to cluster'
     method_option :namespace, type: :string
     method_option :email, type: :string, required: true
     method_option :context, type: :string
@@ -19,14 +20,14 @@ module Uffizzi
     def controller(hostname)
       Uffizzi::AuthHelper.check_login
 
-      InstallService.kubectl_exists?
-      InstallService.helm_exists?
+      # InstallService.kubectl_exists?
+      # InstallService.helm_exists?
 
       if options[:context].present? && options[:context] != InstallService.kubeconfig_current_context
         InstallService.set_current_context(options[:context])
       end
 
-      ask_confirmation
+      ask_confirmation(options[:namespace])
 
       uri = parse_hostname(hostname)
       installation_options = build_installation_options(uri)
@@ -40,7 +41,12 @@ module Uffizzi
       Uffizzi.ui.say('Helm release is deployed')
 
       controller_setting_params = build_controller_setting_params(uri, installation_options)
-      create_controller_settings(controller_setting_params) if existing_controller_setting.blank?
+
+      if existing_controller_setting.blank?
+        create_controller_settings(controller_setting_params)
+        set_account_installation
+      end
+
       Uffizzi.ui.say('Controller settings are saved')
       say_success(uri)
     end
@@ -153,16 +159,8 @@ module Uffizzi
       update_controller_settings(existing_controller_setting[:id], controller_setting_params)
     end
 
-    def ask_confirmation
-      msg = "\r\n"\
-            'This command will install Uffizzi into the default namespace of'\
-            " the '#{InstallService.kubeconfig_current_context}' context."\
-            "\r\n"\
-            "To install in a different place, use options '--namespace' and/or '--context'."\
-            "\r\n\r\n"\
-            "After installation, new environments created for account '#{account_name}' will be deployed to this host cluster."\
-            "\r\n\r\n"
-
+    def ask_confirmation(namespace)
+      msg = namespace.present? ? custom_namespace_installation_message(namespace) : default_installation_message
       Uffizzi.ui.say(msg)
 
       question = 'Okay to proceed?'
@@ -189,6 +187,15 @@ module Uffizzi
       response.dig(:body, :controller_settings)
     end
 
+    def set_account_installation
+      params = {
+        installation_type: AccountService::SELF_HOSTED_CONTROLLER_INSTALLATION_TYPE,
+      }
+
+      response = update_account(server, account_name, params)
+      Uffizzi::ResponseHelper.handle_failed_response(response) unless Uffizzi::ResponseHelper.ok?(response)
+    end
+
     def update_controller_settings(controller_setting_id, params)
       response = update_account_controller_settings(server, account_id, controller_setting_id, params)
       Uffizzi::ResponseHelper.handle_failed_response(response) unless Uffizzi::ResponseHelper.ok?(response)
@@ -248,5 +255,25 @@ module Uffizzi
     def existing_controller_setting
       @existing_controller_setting ||= fetch_controller_settings[0]
     end
+
+    def default_installation_message
+      "\r\n"\
+      "This command will install Uffizzi into the 'default' namespace of"\
+      " the '#{InstallService.kubeconfig_current_context}' context."\
+      "\r\n"\
+      "To install in a different place, use options '--namespace' and/or '--context'."\
+      "\r\n\r\n"\
+      "After installation, new environments created for account '#{account_name}' will be deployed to this host cluster."\
+      "\r\n\r\n"
+    end
+
+    def custom_namespace_installation_message(namespace)
+      "\r\n"\
+      "This command will install Uffizzi into the '#{namespace}' namespace of"\
+      " the '#{InstallService.kubeconfig_current_context}' context."\
+      "\r\n\r\n"\
+      "After installation, new environments created for account '#{account_name}' will be deployed to this host cluster."\
+      "\r\n\r\n"
+    end
   end
 end

data/lib/uffizzi/cli/uninstall.rb

@@ -11,7 +11,7 @@ module Uffizzi
 
     default_task :controller
 
-    desc 'controller [HOSTNMAE]', 'Install uffizzi controller to cluster'
+    desc 'controller [HOSTNAME]', 'Install uffizzi controller to cluster'
     method_option :namespace, type: :string
     method_option :context, type: :string
     def controller
@@ -26,6 +26,7 @@ module Uffizzi
 
       ask_confirmation
       delete_controller_settings
+      unset_account_installation
       InstallService.helm_uninstall!(namespace)
 
       helm_unset_repo
@@ -75,6 +76,15 @@ module Uffizzi
       end
     end
 
+    def unset_account_installation
+      params = {
+        installation_type: nil,
+      }
+
+      response = update_account(server, account_name, params)
+      Uffizzi::ResponseHelper.handle_failed_response(response) unless Uffizzi::ResponseHelper.ok?(response)
+    end
+
     def namespace
       options[:namespace] || InstallService::DEFAULT_NAMESPACE
     end

data/lib/uffizzi/clients/api/api_client.rb

@@ -87,6 +87,13 @@ module ApiClient
     build_response(response)
   end
 
+  def update_account(server, account_name, params)
+    uri = account_uri(server, account_name)
+    response = http_client.make_put_request(uri, params)
+
+    build_response(response)
+  end
+
   def create_project(server, account_id, params)
     uri = create_projects_uri(server, account_id)
     response = http_client.make_post_request(uri, params)

data/lib/uffizzi/services/account_service.rb

@@ -0,0 +1,5 @@
+# frozen_string_literal: true
+
+class AccountService
+  SELF_HOSTED_CONTROLLER_INSTALLATION_TYPE = 'self_hosted_controller'
+end

data/lib/uffizzi/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: uffizzi-cli
 version: !ruby/object:Gem::Version
-  version: 2.4.3
+  version: 2.4.5
 platform: ruby
 authors:
 - Josh Thurman
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-12-21 00:00:00.000000000 Z
+date: 2024-02-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -450,6 +450,7 @@ files:
 - lib/uffizzi/helpers/project_helper.rb
 - lib/uffizzi/promt.rb
 - lib/uffizzi/response_helper.rb
+- lib/uffizzi/services/account_service.rb
 - lib/uffizzi/services/cluster/common_service.rb
 - lib/uffizzi/services/cluster/create_service.rb
 - lib/uffizzi/services/cluster/delete_service.rb