uffizzi_core 2.4.2 → 2.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a4f5c2d86ee92ff83c49dd7718a12019f197e8d2e417c7e5c76e9a33197f83e5
-  data.tar.gz: 5a11d4eaa466360ad106ffddb7e131b1fd8806ff22a9a54a2e52f36906012e89
+  metadata.gz: 9ddd0b04cdd1184aac854bda590b5974a82ab9e487372436d2d324fdf0891230
+  data.tar.gz: 227ea9de7c5e0a165a81794e35dca890d07975dedfa75eff818381c3647f4cf6
 SHA512:
-  metadata.gz: eb9bf7edcb71fd558b7df24491e191994bd682bb42b827f6aabecbff228bd6b85696aece31dd3f6618c94c344908d31401b07e711b756036cfb901b70315c3ac
-  data.tar.gz: 2c840a3449f0417bc0df46d82bfc3fe0c1406165a45cf6c2494bd4be330a635be72da34a75cd1128e2bdade78c4e69defe792ad744d96e7bee5992f45a432ab7
+  metadata.gz: 742f5a2aac4a9968eb63eca265d56402e5ed9b56b43a4a48541f67c6408aed38334b5753ea26136bef84a2dbba10d20d0ddcc6f8b86c8487831c66ac30f2760d
+  data.tar.gz: eead9c79725fca592f3d7ecdf4ae4df12a512722d36603200fc20bfb3b34ad46a81c9ace30ff68977195841d6d48ce678107fb61fd9bf5ca1271ad873c5ecd65

data/app/lib/uffizzi_core/concerns/models/deployment.rb

@@ -72,7 +72,7 @@ module UffizziCore::Concerns::Models::Deployment
     end
 
     def preview_url
-      managed_dns_zone = controller_settings_service.deployment(self).managed_dns_zone
+      managed_dns_zone = controller_settings_service.deployment_settings_by_deployment(self).managed_dns_zone
       "#{subdomain}.#{managed_dns_zone}"
     end
 

data/app/serializers/uffizzi_core/api/cli/v1/account_serializer.rb

@@ -1,9 +1,20 @@
 # frozen_string_literal: true
 
 class UffizziCore::Api::Cli::V1::AccountSerializer < UffizziCore::BaseSerializer
+  include UffizziCore::DependencyInjectionConcern
+  include_module_if_exists('UffizziCore::Api::Cli::V1::AccountSerializerModule')
+
   type :account
 
   has_many :projects
 
-  attributes :id, :name
+  attributes :id, :name, :api_url, :vclusters_controller_url
+
+  def api_url
+    Settings.domain
+  end
+
+  def vclusters_controller_url
+    controller_settings_service.vcluster_settings_by_account(object).url
+  end
 end

data/app/serializers/uffizzi_core/controller/create_cluster/cluster_serializer.rb

@@ -7,7 +7,7 @@ class UffizziCore::Controller::CreateCluster::ClusterSerializer < UffizziCore::B
   attributes :name, :manifest, :base_ingress_host, :distro, :image
 
   def base_ingress_host
-    managed_dns_zone = controller_settings_service.vcluster(object).managed_dns_zone
+    managed_dns_zone = controller_settings_service.vcluster_settings_by_vcluster(object).managed_dns_zone
 
     [object.namespace, managed_dns_zone].join('.')
   end

data/app/serializers/uffizzi_core/controller/update_cluster/cluster_serializer.rb

@@ -7,7 +7,7 @@ class UffizziCore::Controller::UpdateCluster::ClusterSerializer < UffizziCore::B
   attributes :name, :manifest, :base_ingress_host
 
   def base_ingress_host
-    managed_dns_zone = controller_settings_service.vcluster(object).managed_dns_zone
+    managed_dns_zone = controller_settings_service.vcluster_settings_by_vcluster(object).managed_dns_zone
 
     [object.namespace, managed_dns_zone].join('.')
   end

data/app/services/uffizzi_core/controller_service.rb

@@ -145,9 +145,9 @@ class UffizziCore::ControllerService
     def controller_client(deployable)
       settings = case deployable
                  when UffizziCore::Deployment
-                   controller_settings_service.deployment(deployable)
+                   controller_settings_service.deployment_settings_by_deployment(deployable)
                  when UffizziCore::Cluster
-                   controller_settings_service.vcluster(deployable)
+                   controller_settings_service.vcluster_settings_by_vcluster(deployable)
                  else
                    raise StandardError, "Deployable #{deployable.class.name} undefined"
       end

data/app/services/uffizzi_core/controller_settings_service.rb

@@ -2,11 +2,15 @@
 
 class UffizziCore::ControllerSettingsService
   class << self
-    def vcluster(_cluster)
+    def vcluster_settings_by_vcluster(_cluster)
       Settings.vcluster_controller
     end
 
-    def deployment(_cluster)
+    def vcluster_settings_by_account(_account)
+      Settings.vcluster_controller
+    end
+
+    def deployment_settings_by_deployment(_deployment)
       Settings.controller.deep_dup.tap do |s|
         s.managed_dns_zone = Settings.app.managed_dns_zone
       end

data/lib/uffizzi_core/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: uffizzi_core
 version: !ruby/object:Gem::Version
-  version: 2.4.2
+  version: 2.4.3
 platform: ruby
 authors:
 - Josh Thurman
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-12-15 00:00:00.000000000 Z
+date: 2023-12-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aasm