uffizzi_core 2.2.17 → 2.2.20

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1d3b178c7d7bce30c0cd87bda9813bfdf2bd85f709c4e6df2be4bc6fd9eb122f
-  data.tar.gz: f2fe1361d970cb81bc1a3f0255adfe99344f2f1223bf0ce516c473cadb665ece
+  metadata.gz: c6b90d5ab4a5541985fc4d2759d95026ba31fcebda13efe26d005c90ccd53329
+  data.tar.gz: e92d2ab057e8fc18ae9dbb7520e479acfcef6d4f6c7269cde28e202d8d3f327e
 SHA512:
-  metadata.gz: fe5021345449605c2912612c2ed94d4707ce237d900fdbac0b12d3cb4f59cb56160aa207754e8c1235a76d82f39b918368bcbee8335fcd9763c406f466f738fe
-  data.tar.gz: c54a203cf23359e6c9d0c2f61002818dde50b63b73590f1da64a135f8787008d1df12962a0575254e89e4ede14171478cc340d932a6db52e939110dd92f5b953
+  metadata.gz: 6b60359564b861d85210a4c79df1f93882fa58fe51447c16488e40f81854cf71e997c4d9e06ab1d0c0e72ca40b300e95446aff2344675a2dfcf2f6c4bf6da017
+  data.tar.gz: ac60e35f27a030dc11fdca4f1a64da273e343f873322704adae014f83107f3d93a002aeb23f690df5cfdd385dfd7f2fc444c710cf5345de5bc6527438bf4ca76

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

@@ -24,7 +24,8 @@ module UffizziCore::Concerns::Models::Project
     has_many :host_volume_files, dependent: :destroy
     has_many :clusters, dependent: :destroy
 
-    validates :name, presence: true, uniqueness: { scope: :account }
+    validates :name, presence: true
+    validates_uniqueness_of :name, conditions: -> { where(state: :active) }
     validates :slug, presence: true, uniqueness: true
 
     aasm(:state) do

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/app/serializers/uffizzi_core/api/cli/v1/projects/deployment_serializer.rb

@@ -7,19 +7,9 @@ class UffizziCore::Api::Cli::V1::Projects::DeploymentSerializer < UffizziCore::B
   type :deployment
 
   attributes :id,
-             :kind,
              :project_id,
-             :created_at,
-             :updated_at,
              :state,
-             :preview_url,
-             :tag,
-             :branch,
-             :image_id,
-             :ingress_container_ready,
-             :ingress_container_state,
-             :creation_source,
-             :metadata
+             :preview_url
 
   has_many :containers
 
@@ -28,38 +18,4 @@ class UffizziCore::Api::Cli::V1::Projects::DeploymentSerializer < UffizziCore::B
   def containers
     object.containers.active
   end
-
-  def tag
-    object.ingress_container&.tag
-  end
-
-  def branch
-    object.ingress_container&.repo&.branch
-  end
-
-  def image_id
-    object.ingress_container&.repo&.name
-  end
-
-  def ingress_container_ready
-    !!object.ingress_container&.activity_items&.last&.events&.last&.deployed?
-  end
-
-  def ingress_container_state
-    last_event = object.ingress_container&.activity_items&.last&.events&.last
-
-    case last_event&.state
-    when UffizziCore::Event.state.deployed
-      :deployed
-    when UffizziCore::Event.state.failed, UffizziCore::Event.state.timeout, UffizziCore::Event.state.cancelled
-      :failed
-    else
-      state_from_activity_items
-    end
-  end
-
-  def state_from_activity_items
-    activity_items_count = object.ingress_container&.activity_items&.count
-    activity_items_count.to_i > 1 ? :updating : :pending
-  end
 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/db/migrate/20230824150022_update_name_constraint_to_projects.rb

@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+class UpdateNameConstraintToProjects < ActiveRecord::Migration[6.1]
+  def change
+    remove_index(:uffizzi_core_projects, [:account_id, :name])
+    add_index(:uffizzi_core_projects, [:account_id, :name], unique: true,
+                                                            where: "state = 'active'",
+                                                            name: 'proj_uniq_name')
+  end
+end

data/lib/uffizzi_core/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: uffizzi_core
 version: !ruby/object:Gem::Version
-  version: 2.2.17
+  version: 2.2.20
 platform: ruby
 authors:
 - Josh Thurman
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-08-22 00:00:00.000000000 Z
+date: 2023-09-06 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
@@ -1083,6 +1087,7 @@ files:
 - db/migrate/20230613101901_create_clusters.rb
 - db/migrate/20230711101901_add_host_to_clusters.rb
 - db/migrate/20230810140316_add_source_to_uffizzi_core_clusters.rb
+- db/migrate/20230824150022_update_name_constraint_to_projects.rb
 - db/seeds.rb
 - lib/tasks/uffizzi_core_tasks.rake
 - lib/uffizzi_core.rb