uffizzi-cli 2.4.10 → 2.4.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 208b6ac1dfb59b5b76aac7cc0b4a21c8b4c725e8e843958fe10b98bdd50ec43f
-  data.tar.gz: 7335a86326e93a84dbf67f31b3182d18a6fbf88a9e4ce4a4c04af265c68f3809
+  metadata.gz: fa50e209ee9414f0a1c978580419bebfc0a4b7bf708caae3ed0a3d0de6f6fcbe
+  data.tar.gz: '09539ddf6332d0c0ec8b2d3d6a88dddc3fb3212930a2e9d3ab26f16603c69b5e'
 SHA512:
-  metadata.gz: 5302d2e8db9c5afb7c2550d45a15125d98efd472f8ae6902739b6900260719d213b1c71d79050e70018ad4381849155a2cc0730ae89d9af1f7268e10f08af7ab
-  data.tar.gz: fbaf9bdba63f98ce1811d70e1388f9823baa32bf6bb28469e6e48a41d41d8b4e477b99addef053b290acfdc606f7ae5600c4ba77c2a5db4fed7356bca28c158c
+  metadata.gz: 596a54a49aa5bf51fc5dcc9ef69bde3fade802e33096c01f5420d2b6f9f0e7be7a9da594e59c61598442d39ed8029cc0dc6168e47294c1b6df09b56ca53957f6
+  data.tar.gz: 79ee7a703def19f480511a39388d4f89ff1d711ef25176118d444548bec21a94933018a6dd37cbb3948efc362e73188dd8637ea1d6bd44a254a421e315252606

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])
@@ -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)

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/env_variables_service.rb

@@ -7,7 +7,7 @@ require 'base64'
 class EnvVariablesService
   class << self
     def substitute_env_variables(compose_file_data)
-      compose_file_data.gsub(/\${1,2}\{?([?:\-_A-Za-z0-9]+)\}?/) do |variable|
+      compose_file_data.gsub(/(?<![^ \t\n])\${1,2}\{?([?:\-_A-Za-z0-9]+)\}?/) do |variable|
         next variable if variable.start_with?('$$')
 
         variable_content = variable.match(/[?:\-_A-Za-z0-9]+/).to_s

data/lib/uffizzi/version.rb

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

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: uffizzi-cli
 version: !ruby/object:Gem::Version
-  version: 2.4.10
+  version: 2.4.12
 platform: ruby
 authors:
 - Josh Thurman
 - Grayson Adkins
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-06-26 00:00:00.000000000 Z
+date: 2025-02-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -621,7 +621,7 @@ metadata:
   homepage_uri: https://uffizzi.com
   source_code_uri: https://github.com/UffizziCloud/uffizzi_cli
   changelog_uri: https://github.com/UffizziCloud/uffizzi_cli/blob/master/CHANGELOG.md
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -636,8 +636,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.5
-signing_key: 
+rubygems_version: 3.4.20
+signing_key:
 specification_version: 4
 summary: uffizzi-cli
 test_files: []