uffizzi_core 2.4.2 → 2.4.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a4f5c2d86ee92ff83c49dd7718a12019f197e8d2e417c7e5c76e9a33197f83e5
-  data.tar.gz: 5a11d4eaa466360ad106ffddb7e131b1fd8806ff22a9a54a2e52f36906012e89
+  metadata.gz: fe4138139998d00870f71519ae7d1a04a0e6e67679f3f9bddbd7cd40bb12ac8b
+  data.tar.gz: f9a83213e9471f2521b8a49bb387357bd51c736a8b8a84bc93773d41c779cd17
 SHA512:
-  metadata.gz: eb9bf7edcb71fd558b7df24491e191994bd682bb42b827f6aabecbff228bd6b85696aece31dd3f6618c94c344908d31401b07e711b756036cfb901b70315c3ac
-  data.tar.gz: 2c840a3449f0417bc0df46d82bfc3fe0c1406165a45cf6c2494bd4be330a635be72da34a75cd1128e2bdade78c4e69defe792ad744d96e7bee5992f45a432ab7
+  metadata.gz: 50ca23705bf0074517eceaf9627b79a5f7b9bc1bd36d05badb516d88a8910b3b76d7abf34427cd75a78a6443e75a03cab6f4e1a6f6243d0778162d1a7f8b6dbb
+  data.tar.gz: a294d76a3709fb1030e3fb7acd6539d9b255b2543419fd6fc96903f95b093287a255a50929a2740d69f34db241159b50818b278b36a521f4618f1850a09ed905

data/app/controller_modules/uffizzi_core/api/cli/v1/accounts_controller_module.rb

@@ -0,0 +1,5 @@
+# frozen_string_literal: true
+
+module UffizziCore::Api::Cli::V1::AccountsControllerModule
+  def update; end
+end

data/app/controllers/uffizzi_core/api/cli/v1/accounts_controller.rb

@@ -3,6 +3,8 @@
 # @resource Project
 
 class UffizziCore::Api::Cli::V1::AccountsController < UffizziCore::Api::Cli::V1::ApplicationController
+  include UffizziCore::Api::Cli::V1::AccountsControllerModule
+
   before_action :authorize_uffizzi_core_api_cli_v1_accounts
 
   # Get accounts of current user

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/policies/uffizzi_core/api/cli/v1/accounts_policy.rb

@@ -8,4 +8,8 @@ class UffizziCore::Api::Cli::V1::AccountsPolicy < UffizziCore::ApplicationPolicy
   def show?
     context.user_access_module.any_access_to_account?(context.user, context.account)
   end
+
+  def update?
+    false
+  end
 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/config/routes.rb

@@ -51,7 +51,7 @@ UffizziCore::Engine.routes.draw do
           resource :session, only: ['create']
         end
 
-        resources :accounts, only: ['show'], param: :name
+        resources :accounts, only: ['show', 'update'], param: :name
 
         resources :accounts, only: ['index'] do
           scope module: :accounts do

data/lib/uffizzi_core/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module UffizziCore
-  VERSION = '2.4.2'
+  VERSION = '2.4.4'
 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.4
 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-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aasm
@@ -777,6 +777,7 @@ files:
 - app/contexts/uffizzi_core/project/cluster_context.rb
 - app/contexts/uffizzi_core/project_context.rb
 - app/contexts/uffizzi_core/webhooks_context.rb
+- app/controller_modules/uffizzi_core/api/cli/v1/accounts_controller_module.rb
 - app/controller_modules/uffizzi_core/api/cli/v1/projects/clusters_controller_module.rb
 - app/controller_modules/uffizzi_core/api/cli/v1/projects/deployments_controller_module.rb
 - app/controller_modules/uffizzi_core/api/cli/v1/projects_controller_module.rb