uffizzi_core 2.2.16 → 2.2.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7aeb2490e838cc774c8abea9c3fcba1264d367916b16326844e42e7c95c33b99
-  data.tar.gz: 511f4027d656c51f96043f15c427fcf7fa9e47b199446dc33415fa35e51e734c
+  metadata.gz: ac821f837d64d420f64d0820763c1936a5729e58949aec8b7806f5ed6aa30805
+  data.tar.gz: 7b47949da56f4d7416d17ec4e628d0104cbdbd210db37c7a4d25802e96a2614e
 SHA512:
-  metadata.gz: '0950a88eeea3a7f949777d8f759d9d784e46dbf9e0650dd50aa2db38682967c2adb1e6b1eba626e1220c61eb86075a8ec50379b89f0427ba83d732dda99cc91e'
-  data.tar.gz: d9e10ef11020d139d03e8091e7def3951a73f5ad849bb9df1c3422522613bbb42c03b404ed29acbb5707bd293040c9928ec0dc6a2b9cac4d2dbc5c4d19a89019
+  metadata.gz: ceeec356d175119ca83f7da7642ab5607788fefd180a97d0dbbbcc40466e7668de0a70b9982053809b5c701499993648bf13c29a078ce1278e950d6e0931442d
+  data.tar.gz: 4c924c77d4201c61548797f2273b5325caec1bdddb9e89eb5f5bc9cafbcdc3173387e38cb825113a5cc1708f30e9f51ac82343f36d987167f502992968b98589

data/app/controllers/concerns/uffizzi_core/dependency_injection_concern.rb

@@ -27,6 +27,12 @@ module UffizziCore::DependencyInjectionConcern
     module_class(:volume_parser)
   end
 
+  def ci_module
+    return unless module_exists?(:ci_module)
+
+    module_class(:ci_module)
+  end
+
   def ci_session
     return unless module_exists?(:ci_session)
 
@@ -73,12 +79,6 @@ module UffizziCore::DependencyInjectionConcern
     module_class(:controller_settings)
   end
 
-  def ci_module
-    return unless module_exists?(:ci_module)
-
-    module_class(:ci_module)
-  end
-
   private
 
   def module_exists?(module_name)

data/app/controllers/uffizzi_core/api/cli/v1/accounts/clusters_controller.rb

@@ -0,0 +1,41 @@
+# frozen_string_literal: true
+
+class UffizziCore::Api::Cli::V1::Accounts::ClustersController < UffizziCore::Api::Cli::V1::Accounts::ApplicationController
+  include UffizziCore::DependencyInjectionConcern
+  before_action :authorize_uffizzi_core_api_cli_v1_accounts_clusters
+
+  def index
+    return respond_with(clusters_by_account.includes(:project)) if valid_request_from_ci_workflow?
+
+    clusters = clusters_by_user.or(clusters_by_admin_projects)
+    respond_with(clusters.includes(:project))
+  end
+
+  private
+
+  def valid_request_from_ci_workflow?
+    ci_module.valid_request_from_ci_workflow?(params)
+  end
+
+  def clusters_by_admin_projects
+    projects = UffizziCore::Project
+      .active
+      .joins(:user_projects)
+      .where(account: resource_account)
+      .where(user_projects: { role: UffizziCore::UserProject.role.admin, user: current_user })
+
+    UffizziCore::Cluster.enabled.where(project_id: projects.select(:id))
+  end
+
+  def clusters_by_user
+    UffizziCore::Cluster.enabled.by_projects(account_projects).deployed_by_user(current_user)
+  end
+
+  def clusters_by_account
+    UffizziCore::Cluster.enabled.by_projects(account_projects)
+  end
+
+  def account_projects
+    UffizziCore::Project.active.where(account: resource_account)
+  end
+end

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

@@ -4,7 +4,7 @@ module UffizziCore::Concerns::Models::Cluster
   extend ActiveSupport::Concern
   include UffizziCore::ClusterRepo
 
-  NAMESPACE_PREFIX = 'cluster'
+  NAMESPACE_PREFIX = 'c'
 
   included do
     include AASM
@@ -55,7 +55,7 @@ module UffizziCore::Concerns::Models::Cluster
     end
 
     def namespace
-      [NAMESPACE_PREFIX, id].join('-')
+      [NAMESPACE_PREFIX, id].join
     end
   end
 end

data/app/policies/uffizzi_core/api/cli/v1/accounts/clusters_policy.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class UffizziCore::Api::Cli::V1::Accounts::ClustersPolicy < UffizziCore::ApplicationPolicy
+  def index?
+    context.user_access_module.any_access_to_account?(context.user, context.account)
+  end
+end

data/app/repositories/uffizzi_core/cluster_repo.rb

@@ -7,5 +7,6 @@ module UffizziCore::ClusterRepo
     scope :deployed, -> { where(state: UffizziCore::Cluster::STATE_DEPLOYED) }
     scope :enabled, -> { where.not(state: UffizziCore::Cluster::STATE_DISABLED) }
     scope :deployed_by_user, ->(user) { where(deployed_by: user) }
+    scope :by_projects, ->(projects) { where(project_id: projects.select(:id)) }
   end
 end

data/app/serializers/uffizzi_core/api/cli/v1/accounts/cluster_serializer/project_serializer.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class UffizziCore::Api::Cli::V1::Accounts::ClusterSerializer::ProjectSerializer < UffizziCore::BaseSerializer
+  type :project
+
+  attributes :name
+end

data/app/serializers/uffizzi_core/api/cli/v1/accounts/cluster_serializer.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+class UffizziCore::Api::Cli::V1::Accounts::ClusterSerializer < UffizziCore::BaseSerializer
+  type :cluster
+
+  belongs_to :project
+
+  attributes :name
+end

data/config/routes.rb

@@ -47,6 +47,7 @@ UffizziCore::Engine.routes.draw do
         resources :accounts, only: ['index'] do
           scope module: :accounts do
             resources :projects, only: ['index', 'create']
+            resources :clusters, only: ['index']
             resources :credentials, only: ['index', 'create', 'update', 'destroy'], param: :type do
               member do
                 get :check_credential

data/lib/uffizzi_core/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: uffizzi_core
 version: !ruby/object:Gem::Version
-  version: 2.2.16
+  version: 2.2.18
 platform: ruby
 authors:
 - Josh Thurman
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-08-21 00:00:00.000000000 Z
+date: 2023-08-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aasm
@@ -783,6 +783,7 @@ files:
 - app/controllers/concerns/uffizzi_core/authorization_concern.rb
 - app/controllers/concerns/uffizzi_core/dependency_injection_concern.rb
 - app/controllers/uffizzi_core/api/cli/v1/accounts/application_controller.rb
+- app/controllers/uffizzi_core/api/cli/v1/accounts/clusters_controller.rb
 - app/controllers/uffizzi_core/api/cli/v1/accounts/credentials_controller.rb
 - app/controllers/uffizzi_core/api/cli/v1/accounts/projects_controller.rb
 - app/controllers/uffizzi_core/api/cli/v1/accounts_controller.rb
@@ -926,6 +927,7 @@ files:
 - app/models/uffizzi_core/template.rb
 - app/models/uffizzi_core/user.rb
 - app/models/uffizzi_core/user_project.rb
+- app/policies/uffizzi_core/api/cli/v1/accounts/clusters_policy.rb
 - app/policies/uffizzi_core/api/cli/v1/accounts/credentials_policy.rb
 - app/policies/uffizzi_core/api/cli/v1/accounts/projects_policy.rb
 - app/policies/uffizzi_core/api/cli/v1/accounts_policy.rb
@@ -960,6 +962,8 @@ files:
 - app/repositories/uffizzi_core/user_repo.rb
 - app/responders/uffizzi_core/json_responder.rb
 - app/serializers/uffizzi_core/api/cli/v1/account_serializer.rb
+- app/serializers/uffizzi_core/api/cli/v1/accounts/cluster_serializer.rb
+- app/serializers/uffizzi_core/api/cli/v1/accounts/cluster_serializer/project_serializer.rb
 - app/serializers/uffizzi_core/api/cli/v1/accounts/credential_serializer.rb
 - app/serializers/uffizzi_core/api/cli/v1/accounts/project_serializer.rb
 - app/serializers/uffizzi_core/api/cli/v1/project_serializer.rb