uffizzi-cli 2.4.9 → 2.4.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 744480393ee81d335802bcb1008333c1e6c9b6f9870d7710dfff294698a1eb7a
-  data.tar.gz: cf43c7519e0621f9be3fbb18d9fd89fd0cf2a6ea0dc56d0b41662428e6d4b46c
+  metadata.gz: 30f7c016d8af15ece13fcf170ef4b0cb244aba87837567b042e4d2d2cfba9512
+  data.tar.gz: 17ecf2ed0ba109eb515ad05695b92d0bccfe7ac535bd923e14d091ddc5feb814
 SHA512:
-  metadata.gz: ef39ee4ce26c553068d279f3960ba924b7458fbf439a4ffd0abbed363fa359cbf9707df59e8ee439ff06f091894836f67d7bcdb8f2c78879caa7b52120e2dfb2
-  data.tar.gz: 6c0471f16b076c5c8dedd2b714416c6514e03f9ee96b6d6aead5d5fca19556ac6f09e73b44a050ef07f7cdcfd3a72d9bb2b14902eda9931b5251830389aacc57
+  metadata.gz: 6482ab9cf846b47402a332de11f054c0c845efa472cf754e627c0b767c2926f5f9e5ffcbf604f34ccaa562fd551124c777e572b28a298cf96982d9cf7f0446c0
+  data.tar.gz: 685212d7f1102ed76976a330499e9ada8e0f9cf2e61a58fd01b65f240d2af66ac27f128c20bdc01d8b0dae06f014f947a7db2dd633481bce7471db616e43b6ee

data/lib/uffizzi/cli/install.rb

@@ -20,9 +20,10 @@ module Uffizzi
     method_option :'node-selector-template', required: false, type: :string
     def controller(hostname)
       Uffizzi::AuthHelper.check_login
+      check_account_can_install
 
-      # 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])
@@ -71,16 +72,16 @@ module Uffizzi
       }
     end
 
-    def wait_ip
+    def wait_endpoint
       spinner = TTY::Spinner.new('[:spinner] Waiting on IP address...', format: :dots)
       spinner.auto_spin
 
-      ip = nil
+      endpoint = nil
       try = 0
 
       loop do
-        ip = InstallService.get_controller_ip(namespace)
-        break if ip.present?
+        endpoint = InstallService.get_controller_endpoint(namespace)
+        break if endpoint.present?
 
         if try == 90
           spinner.error
@@ -94,7 +95,7 @@ module Uffizzi
 
       spinner.success
 
-      ip
+      endpoint
     end
 
     def build_helm_values(params)
@@ -182,7 +183,18 @@ module Uffizzi
 
     def create_controller_settings(params)
       response = create_account_controller_settings(server, account_id, params)
-      Uffizzi::ResponseHelper.handle_failed_response(response) unless Uffizzi::ResponseHelper.created?(response)
+      unless Uffizzi::ResponseHelper.created?(response)
+        Uffizzi::ResponseHelper.handle_failed_response(response)
+        raise Uffizzi::Error.new
+      end
+    end
+
+    def check_account_can_install
+      response = check_can_install(server, account_id)
+      unless Uffizzi::ResponseHelper.ok?(response)
+        Uffizzi::ResponseHelper.handle_failed_response(response)
+        raise Uffizzi::Error.new
+      end
     end
 
     def build_controller_setting_params(uri, installation_options)
@@ -196,10 +208,10 @@ module Uffizzi
     end
 
     def say_success(uri)
-      ip_address = wait_ip
+      endpoint = wait_endpoint
 
       msg = 'Your Uffizzi controller is ready. To configure DNS,'\
-            " create a record for the hostname '*.#{uri.host}' pointing to '#{ip_address}'"
+            " create a record for the hostname '*.#{uri.host}' pointing to '#{endpoint}'"
       Uffizzi.ui.say(msg)
     end
 

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

@@ -44,6 +44,14 @@ module ApiClient
     build_response(response)
   end
 
+  def check_can_install(server, account_id)
+    uri = account_can_install_uri(server, account_id)
+
+    response = http_client.make_get_request(uri)
+
+    build_response(response)
+  end
+
   def fetch_projects(server)
     uri = projects_uri(server)
     response = http_client.make_get_request(uri)

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

@@ -11,6 +11,10 @@ module ApiRoutes
     "#{server}/api/cli/v1/accounts/#{account_name}"
   end
 
+  def account_can_install_uri(server, account_id)
+    "#{server}/api/cli/v1/accounts/#{account_id}/check_can_install"
+  end
+
   def compose_file_uri(server, project_slug)
     "#{server}/api/cli/v1/projects/#{project_slug}/compose_file"
   end

data/lib/uffizzi/services/install_service.rb

@@ -85,7 +85,7 @@ class InstallService
       execute_command(cmd, say: false) { |stdout| stdout.present? && stdout.chop }
     end
 
-    def get_controller_ip(namespace)
+    def get_controller_endpoint(namespace)
       cmd = "kubectl get ingress -n #{namespace} -o json"
       res = execute_command(cmd, say: false)
       ingress = JSON.parse(res)['items'].detect { |i| i['metadata']['name'] = INGRESS_NAME }
@@ -95,7 +95,10 @@ class InstallService
       load_balancers = ingress.dig('status', 'loadBalancer', 'ingress')
       return if load_balancers.blank?
 
-      load_balancers.map { |i| i['ip'] }[0]
+      ip = load_balancers.map { |i| i['ip'] }[0]
+      return ip if ip.present?
+
+      load_balancers.map { |i| i['hostname'] }[0]
     end
 
     def build_controller_host(host)

data/lib/uffizzi/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: uffizzi-cli
 version: !ruby/object:Gem::Version
-  version: 2.4.9
+  version: 2.4.11
 platform: ruby
 authors:
 - Josh Thurman
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-04-02 00:00:00.000000000 Z
+date: 2024-08-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport