uffizzi_core 2.2.8 → 2.2.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: aa1e129072e6e9fec7ec5a98b2a36bbfd1c380ecec75ff6b95eb6deabaaece31
-  data.tar.gz: a537b20a32116e3434fb7490dc400b29967853ba92be2e2703e9af1d78859a61
+  metadata.gz: 9419a80d61cb906e699b4096f7ed6f10fc01f32a6718a977c38387d04af04cb9
+  data.tar.gz: 279eda26ef9283fc173d93f5b7fc166780ffaa51e2dd83b0be7fbea1ba7862cc
 SHA512:
-  metadata.gz: d80fd105f4ce95f38e11121c9e9bb6e8f88f349cff8f7331148cbbbe294f87f4e6ae0c9d56709eeadac738c0c5cf37246ffc07a8a7d4a8806ca704466d1d7afb
-  data.tar.gz: e7cdcda1ac2c4167bf64aa86694c0db87f574b099d3995a68ad774d0f6bc5c04e3a96a8d1f91e83764afca03539f69484c6393fa3e81f44aa5e67a2352be77f0
+  metadata.gz: 646d0199efbd24eddd77def2b0f8a629e16f81b3f6f871a9961b2cde46f37b5609fbc6662eec3f5e74e74a879ddba1cf504776a767c738ab8127eb28a555e9a5
+  data.tar.gz: 98c028198257d7bd268b4c6bfaa7a6663be35530f6ed1218d2108e7d6602a43122538a6c54cec92d5ff0d7c247d2e6f1a50a32885600e43a13554a15d514235a

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

@@ -73,6 +73,12 @@ 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/projects/clusters_controller.rb

@@ -9,8 +9,9 @@ class UffizziCore::Api::Cli::V1::Projects::ClustersController < UffizziCore::Api
 
   def index
     clusters = resource_project.clusters.enabled
+    return respond_with clusters if request_by_admin? || valid_request_from_ci_workflow?
 
-    respond_with clusters
+    respond_with clusters.deployed_by_user(current_user)
   end
 
   def create
@@ -37,7 +38,20 @@ class UffizziCore::Api::Cli::V1::Projects::ClustersController < UffizziCore::Api
   private
 
   def resource_cluster
-    @resource_cluster ||= resource_project.clusters.enabled.find_by!(name: params[:name])
+    active_project_clusters = resource_project.clusters.enabled
+    @resource_cluster ||= if request_by_admin? || valid_request_from_ci_workflow?
+      active_project_clusters.find_by!(name: params[:name])
+    else
+      active_project_clusters.deployed_by_user(current_user).find_by!(name: params[:name])
+    end
+  end
+
+  def request_by_admin?
+    current_user.admin_access_to_project?(resource_project)
+  end
+
+  def valid_request_from_ci_workflow?
+    ci_module.valid_request_from_ci_workflow?(params)
   end
 
   def cluster_params

data/app/jobs/uffizzi_core/cluster/delete_job.rb

@@ -1,7 +1,9 @@
 # frozen_string_literal: true
 
 class UffizziCore::Cluster::DeleteJob < UffizziCore::ApplicationJob
-  sidekiq_options queue: :deployments, retry: 5
+  sidekiq_options queue: :clusters,
+                  lock: :until_executed,
+                  retry: Settings.default_job_retry_count
 
   def perform(id)
     Rails.logger.info("DEPLOYMENT_PROCESS cluster_id=#{id} DeleteJob")

data/app/jobs/uffizzi_core/cluster/deploy_job.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 class UffizziCore::Cluster::DeployJob < UffizziCore::ApplicationJob
-  sidekiq_options queue: :deployments, retry: 5
+  sidekiq_options queue: :clusters, retry: Settings.default_job_retry_count
 
   def perform(id)
     cluster = UffizziCore::Cluster.find(id)

data/app/jobs/uffizzi_core/cluster/manage_deploying_job.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 class UffizziCore::Cluster::ManageDeployingJob < UffizziCore::ApplicationJob
-  sidekiq_options queue: :deployments, retry: 5
+  sidekiq_options queue: :clusters, retry: Settings.default_job_retry_count
 
   def perform(id, try = 1)
     cluster = UffizziCore::Cluster.find(id)

data/app/jobs/uffizzi_core/deployment/delete_job.rb

@@ -1,7 +1,9 @@
 # frozen_string_literal: true
 
 class UffizziCore::Deployment::DeleteJob < UffizziCore::ApplicationJob
-  sidekiq_options queue: :deployments, retry: 5
+  sidekiq_options queue: :disable_deployments,
+                  lock: :until_executed,
+                  retry: Settings.default_job_retry_count
 
   def perform(id)
     Rails.logger.info("DEPLOYMENT_PROCESS deployment_id=#{id} DeleteJob")

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

@@ -24,8 +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, message: 'Name already exists' }
-    validates :slug, presence: true, uniqueness: { message: 'Project slug already taken' }
+    validates :name, presence: true, uniqueness: { scope: :account }
+    validates :slug, presence: true, uniqueness: true
 
     aasm(:state) do
       state :active, initial: true

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

@@ -53,7 +53,7 @@ module UffizziCore::Concerns::Models::User
     end
 
     def admin_access_to_project?(project)
-      projects.by_ids(project).by_accounts(memberships.by_role_admin.select(:account_id)).exists?
+      project.user_projects.where(user_id: id, role: UffizziCore::UserProject.role.admin).exists?
     end
   end
 end

data/app/repositories/uffizzi_core/cluster_repo.rb

@@ -6,5 +6,6 @@ module UffizziCore::ClusterRepo
   included do
     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) }
   end
 end

data/app/services/uffizzi_core/ci_service.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+class UffizziCore::CiService
+  class << self
+    def valid_request_from_ci_workflow?(_params)
+      false
+    end
+  end
+end

data/config/locales/en.activerecord.yml

@@ -6,6 +6,10 @@ en:
           attributes:
             secret:
               not_found: There is no secret with name %{name}
+            name:
+              taken: "A project with the name '%{value}' already exists."
+            slug:
+              taken: "A project slug '%{value}' already taken."
         uffizzi_core/credential:
           attributes:
             registry_url:

data/lib/uffizzi_core/version.rb

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

data/lib/uffizzi_core.rb

@@ -33,6 +33,7 @@ module UffizziCore
     deployment_memory_module: 'UffizziCore::Deployment::MemoryService',
     template_memory_module: 'UffizziCore::Template::MemoryService',
     controller_settings: 'UffizziCore::ControllerSettingsService',
+    ci_module: 'UffizziCore::CiService',
   }
   mattr_accessor :table_names, default: {
     accounts: :uffizzi_core_accounts,

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: uffizzi_core
 version: !ruby/object:Gem::Version
-  version: 2.2.8
+  version: 2.2.10
 platform: ruby
 authors:
 - Josh Thurman
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-07-31 00:00:00.000000000 Z
+date: 2023-08-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aasm
@@ -423,6 +423,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: sidekiq-unique-jobs
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: swagger_yard
   requirement: !ruby/object:Gem::Requirement
@@ -981,6 +995,7 @@ files:
 - app/serializers/uffizzi_core/controller/deploy_containers/host_volume_file_serializer.rb
 - app/services/uffizzi_core/account_service.rb
 - app/services/uffizzi_core/activity_item_service.rb
+- app/services/uffizzi_core/ci_service.rb
 - app/services/uffizzi_core/cluster_service.rb
 - app/services/uffizzi_core/compose_file/builders/container_builder_service.rb
 - app/services/uffizzi_core/compose_file/builders/container_config_files_builder_service.rb