Merge branch 'develop'

Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    uffizzi-cli (2.4.3)
+    uffizzi-cli (2.4.4)
       activesupport
       awesome_print
       faker

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
@@ -40,7 +41,12 @@ def controller(hostname)
       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
@@ -189,6 +195,15 @@ def fetch_controller_settings
       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)

lib/uffizzi/cli/uninstall.rb

@@ -26,6 +26,7 @@ def controller
 
       ask_confirmation
       delete_controller_settings
+      unset_account_installation
       InstallService.helm_uninstall!(namespace)
 
       helm_unset_repo
@@ -75,6 +76,15 @@ def delete_controller_settings
       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

lib/uffizzi/clients/api/api_client.rb

@@ -87,6 +87,13 @@ def fetch_account(server, account_name)
     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)

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

lib/uffizzi/version.rb

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

test/fixtures/files/uffizzi/uffizzi_account_success_with_installation.json

@@ -0,0 +1,17 @@
+{
+  "account":
+    {
+      "id": 1,
+      "name": "test",
+      "projects": [
+        {
+          "id": 1,
+          "slug": "uffizzi-test-slug-1"
+        }
+      ],
+      "api_url": "http://app.uffizzi.com",
+      "vclusters_controller_url": "http://controller.uffizzi.com",
+      "product_name": "Starter Plan",
+      "has_installation": "self_hosted_controller"
+    }
+}

test/fixtures/files/uffizzi/uffizzi_account_success_with_one_project.json

@@ -11,6 +11,7 @@
       ],
       "api_url": "http://app.uffizzi.com",
       "vclusters_controller_url": "http://controller.uffizzi.com",
-      "product_name": "Starter Plan"
+      "product_name": "Starter Plan",
+      "has_installation": null
     }
 }

test/support/uffizzi_stub_support.rb

@@ -50,6 +50,12 @@ def stub_uffizzi_account_success(body, account_name)
     stub_request(:get, url).to_return(status: 200, body: body.to_json)
   end
 
+  def stub_update_account_success(body, account_name)
+    url = account_uri(Uffizzi.configuration.server, account_name)
+
+    stub_request(:put, url).to_return(status: 200, body: body.to_json)
+  end
+
   def stub_uffizzi_account_projects_success(body, account_id)
     url = account_projects_uri(Uffizzi.configuration.server, account_id)
 

test/uffizzi/cli/install_test.rb

@@ -17,6 +17,8 @@ def setup
   def test_install
     host = 'my-host.com'
     account_id = 1
+    account_name = 'some_account'
+    Uffizzi::ConfigFile.write_option(:account, { 'id' => account_id, 'name' => account_name })
 
     @mock_shell.promise_execute(/kubectl version/, stdout: '1.23.00')
     @mock_shell.promise_execute(/helm version/, stdout: '3.00')
@@ -55,9 +57,11 @@ def test_install
     @mock_shell.promise_execute(/kubectl get certificaterequests/, stdout: cert_request_answer.to_json)
     @mock_prompt.promise_question_answer('Okay to proceed?', 'y')
 
-    empty_body = json_fixture('files/uffizzi/uffizzi_account_controller_settings_empty.json')
-    stub_get_account_controller_settings_request(empty_body, account_id)
+    empty_controller_settings_body = json_fixture('files/uffizzi/uffizzi_account_controller_settings_empty.json')
+    account_body = json_fixture('files/uffizzi/uffizzi_account_success_with_installation.json')
+    stub_get_account_controller_settings_request(empty_controller_settings_body, account_id)
     stub_create_account_controller_settings_request({}, account_id)
+    stub_update_account_success(account_body, account_name)
 
     @install.options = command_options(email: 'admin@my-domain.com')
     @install.controller(host)
@@ -108,9 +112,10 @@ def test_install_if_settgins_exists
     @mock_prompt.promise_question_answer('Okay to proceed?', 'y')
     @mock_prompt.promise_question_answer('Do you want update the controller settings?', 'y')
 
-    body = json_fixture('files/uffizzi/uffizzi_account_controller_settings.json')
-    stub_get_account_controller_settings_request(body, account_id)
-    stub_update_account_controller_settings_request(body, account_id, body[:controller_settings][0][:id])
+    account_controller_settings_body = json_fixture('files/uffizzi/uffizzi_account_controller_settings.json')
+    stub_get_account_controller_settings_request(account_controller_settings_body, account_id)
+    stub_update_account_controller_settings_request(account_controller_settings_body, account_id,
+                                                    account_controller_settings_body[:controller_settings][0][:id])
 
     @install.options = command_options(email: 'admin@my-domain.com')
     @install.controller(host)

test/uffizzi/cli/uninstall_test.rb

@@ -16,6 +16,8 @@ def setup
 
   def test_uninstall
     account_id = 1
+    account_name = 'some_account'
+    Uffizzi::ConfigFile.write_option(:account, { 'id' => account_id, 'name' => account_name })
 
     @mock_shell.promise_execute(/kubectl version/, stdout: '1.23.00')
     @mock_shell.promise_execute(/helm version/, stdout: '3.00')
@@ -25,9 +27,11 @@ def test_uninstall
     @mock_shell.promise_execute(/helm uninstall/, stdout: 'Helm release is uninstalled')
     @mock_prompt.promise_question_answer('Okay to proceed?', 'y')
 
-    body = json_fixture('files/uffizzi/uffizzi_account_controller_settings.json')
-    stub_get_account_controller_settings_request(body, account_id)
-    stub_delete_account_controller_settings_request(account_id, body[:controller_settings][0][:id])
+    account_controller_settings = json_fixture('files/uffizzi/uffizzi_account_controller_settings.json')
+    account_body = json_fixture('files/uffizzi/uffizzi_account_success_with_one_project.json')
+    stub_get_account_controller_settings_request(account_controller_settings, account_id)
+    stub_delete_account_controller_settings_request(account_id, account_controller_settings[:controller_settings][0][:id])
+    stub_update_account_success(account_body, account_name)
 
     @uninstall.controller