uffizzi_core 2.2.9 → 2.2.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a52f42bacbdff043bd159262bcf9e1be15e311be071c06ec724acaec8a685ac4
-  data.tar.gz: 74c425b3eaad9ced453430a6c4799865343e0d5c03c88421a5eede1829e2213b
+  metadata.gz: 69a82783f7a27772ccc8463248c092baa337c91359746d13300b0399e282e7ce
+  data.tar.gz: 0af9485af9df35f0ac7b3e253ec7463cc0b1d7c0303eca45bb341310b80e7d85
 SHA512:
-  metadata.gz: f6afcb69bb62680618cef5d489b195725da5eaa93e098658274142e27c9ea5d9d6d6b5936c6c7bc393b2d47c7278d3c4d5a785ab2af5646f0cdea864ceffaa65
-  data.tar.gz: 437d441bc3b847037a1efc3920031b5e56636c85d8847f3b7ad6991afaafde64f1d2863c01edb607dba4563ea6f1ee097685c2ba0a496e5c8783a9ae7ad20968
+  metadata.gz: cca634776180b812c88a671ac5267019d067d713a41b1445381355e4f8ebc3b9aa14a52820e304682e8c33c75977b2ea10849e353edaf4d2232429576e574045
+  data.tar.gz: ff7118194e445877ca4d8d8d42ef2844977a40e60f91ee51ad181e8f0c5bb3a139d666adecb78acdcbb64e10b628ad7a9cdd846ea9af9ef2d83dd9f4e30d2c2a

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

@@ -61,7 +61,7 @@ module UffizziCore::Concerns::Models::Container
         transitions from: [:disabled], to: :active
       end
 
-      event :disable, after: :clean do
+      event :disable do
         transitions from: [:active], to: :disabled
       end
     end
@@ -76,10 +76,6 @@ module UffizziCore::Concerns::Models::Container
       public && active?
     end
 
-    def clean
-      update(public: false, port: nil)
-    end
-
     def set_defaults
       update_target_port_value
     end

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/app/services/uffizzi_core/controller_service.rb

@@ -1,6 +1,14 @@
 # frozen_string_literal: true
 
 class UffizziCore::ControllerService
+  class InvalidPublicPort < StandardError
+    def initialize(containers)
+      msg = "Deployment with ID #{containers.first.deployment.id} does not have any public port"
+
+      super(msg)
+    end
+  end
+
   class << self
     include UffizziCore::DependencyInjectionConcern
 
@@ -28,6 +36,10 @@ class UffizziCore::ControllerService
     end
 
     def deploy_containers(deployment, containers)
+      check_any_container_has_public_port(containers) do |exists|
+        UffizziCore::DeploymentService.disable!(deployment) unless exists
+      end
+
       containers = containers.map do |container|
         UffizziCore::Controller::DeployContainers::ContainerSerializer.new(container).as_json(include: '**')
       end
@@ -100,6 +112,15 @@ class UffizziCore::ControllerService
 
     private
 
+    def check_any_container_has_public_port(containers)
+      exists = containers.any? { |c| c.port.present? && c.public }
+      yield(exists) if block_given?
+
+      return if exists
+
+      raise InvalidPublicPort.new(containers)
+    end
+
     def request_events(deployment)
       controller_client(deployment).deployment_containers_events(deployment_id: deployment.id)
     end

data/lib/uffizzi_core/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module UffizziCore
-  VERSION = '2.2.9'
+  VERSION = '2.2.11'
 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.9
+  version: 2.2.11
 platform: ruby
 authors:
 - Josh Thurman
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-08-07 00:00:00.000000000 Z
+date: 2023-08-14 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