uffizzi_core 2.0.14 → 2.0.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f3f418bff9703cbe59f1ee9a69e52f14aa1ad2824a4118ad4b6d97c703347243
-  data.tar.gz: e9d6492698a43db8833b1175c10b95054d2b2c4230ade5aeee0d7ca49640ba1e
+  metadata.gz: 725cca20ca80112e168ba374f53dc0fa5cb48ed92339996405610fad6d37e931
+  data.tar.gz: 44034045e9b25197d558202fb336ff7faab8b9f7ac02cea97bbbcbb5cfac711c
 SHA512:
-  metadata.gz: 981763aac83a419775db0130ac7b984e896fc36a11170c69c9f28d2045e5fd4024f74c3fafc538fa88a955b964377976845a0793b8e373e409ab6e3acc7e0bbd
-  data.tar.gz: 16a2fe83f500ab8e56ce259a978ea6a6318d1de83027edb71f06205156eb8d98fb24b27ab758262b06c2fb7696199e4c40a91da87b71405df94ad37a469430cf
+  metadata.gz: 2c417dc4df5d3842a73941775b4f6267bfd41ed19f29db0a5b58496346ef77237a134d3eaf515f6f6cef975c29f0b962cbba82d1e293af36625ccb0e1a02fdda
+  data.tar.gz: 254aff6198f4136c367fcc1e64a58fdcc920bf009d3a3f842ceddf5d42b362eebf9f993c5d261649e60e3d3c6c0394f29e2a2bee0dfc4c2787eba4009dea1409

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

@@ -31,6 +31,12 @@ module UffizziCore::DependencyInjectionConcern
     module_class(:ingress_parser)
   end
 
+  def notification_module
+    return unless module_exists?(:notification_module)
+
+    module_class(:notification_module)
+  end
+
   private
 
   def module_exists?(module_name)

data/app/jobs/uffizzi_core/config_file/apply_job.rb

@@ -8,6 +8,13 @@ class UffizziCore::ConfigFile::ApplyJob < UffizziCore::ApplicationJob
     when UffizziCore::DeploymentNotFoundError
       Rails.logger.info("DEPLOYMENT_PROCESS ApplyJob retry deployment_id=#{exception.deployment_id} count=#{count}")
       Settings.controller.resource_create_retry_time
+    else
+      if [Settings.default_job_retry_count, Settings.controller.resource_create_retry_count].include?(count)
+        Sentry.capture_exception(exception)
+        :kill
+      else
+        Settings.controller.resource_create_retry_time
+      end
     end
   end
 

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

@@ -8,6 +8,13 @@ class UffizziCore::Deployment::CreateCredentialJob < UffizziCore::ApplicationJob
     when UffizziCore::DeploymentNotFoundError
       Rails.logger.info("DEPLOYMENT_PROCESS CreateCredentialJob retry deployment_id=#{exception.deployment_id} count=#{count}")
       Settings.controller.resource_create_retry_time
+    else
+      if [Settings.default_job_retry_count, Settings.controller.resource_create_retry_count].include?(count)
+        Sentry.capture_exception(exception)
+        :kill
+      else
+        Settings.controller.resource_create_retry_time
+      end
     end
   end
 

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

@@ -8,6 +8,13 @@ class UffizziCore::Deployment::DeployContainersJob < UffizziCore::ApplicationJob
     when UffizziCore::DeploymentNotFoundError
       Rails.logger.info("DEPLOYMENT_PROCESS DeployContainersJob retry deployment_id=#{exception.deployment_id} count=#{count}")
       Settings.controller.resource_create_retry_time
+    else
+      if [Settings.default_job_retry_count, Settings.controller.resource_create_retry_count].include?(count)
+        Sentry.capture_exception(exception)
+        :kill
+      else
+        Settings.controller.resource_create_retry_time
+      end
     end
   end
 

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

@@ -1,13 +1,22 @@
 # frozen_string_literal: true
 
 class UffizziCore::Deployment::ManageDeployActivityItemJob < UffizziCore::ApplicationJob
-  sidekiq_options queue: :deployments, retry: 3
+  sidekiq_options queue: :deployments, retry: Settings.default_job_retry_count
 
   sidekiq_retry_in do |count, exception|
     case exception
     when UffizziCore::Deployment::ImagePullError
       Rails.logger.info("DEPLOYMENT_PROCESS ManageDeployActivityItemJob retry deployment_id=#{exception.deployment_id} count=#{count}")
-      15.seconds
+      Settings.controller.resource_create_retry_time
+    when ActiveRecord::RecordNotFound
+      :kill if exception.model.constantize == UffizziCore::ActivityItem
+    else
+      if count == Settings.default_job_retry_count
+        Sentry.capture_exception(exception)
+        :kill
+      else
+        Settings.controller.resource_create_retry_time
+      end
     end
   end
 

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

@@ -8,6 +8,13 @@ class UffizziCore::Deployment::UpdateCredentialJob < UffizziCore::ApplicationJob
     when UffizziCore::DeploymentNotFoundError
       Rails.logger.info("DEPLOYMENT_PROCESS UpdateCredentialJob retry deployment_id=#{exception.deployment_id} count=#{count}")
       Settings.controller.resource_update_retry_time
+    else
+      if [Settings.default_job_retry_count, Settings.controller.resource_update_retry_count].include?(count)
+        Sentry.capture_exception(exception)
+        :kill
+      else
+        Settings.controller.resource_create_retry_time
+      end
     end
   end
 

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

@@ -47,7 +47,7 @@ module UffizziCore::Concerns::Models::Deployment
         transitions from: [:disabled], to: :active
       end
 
-      event :fail, after: :after_fail do
+      event :fail do
         transitions from: [:active], to: :failed
       end
 
@@ -61,10 +61,6 @@ module UffizziCore::Concerns::Models::Deployment
       update!(disabled_at: Time.now)
     end
 
-    def after_fail
-      active_containers.each(&:disable!)
-    end
-
     def clean
       active_containers.each(&:disable!)
       UffizziCore::Deployment::DeleteJob.perform_async(id)

data/app/services/uffizzi_core/activity_item_service.rb

@@ -4,6 +4,8 @@ class UffizziCore::ActivityItemService
   COMPLETED_STATES = ['deployed', 'failed', 'cancelled'].freeze
 
   class << self
+    include UffizziCore::DependencyInjectionConcern
+
     def create_docker_item!(repo, container)
       activity_item_attributes = {
         namespace: repo.namespace,
@@ -27,8 +29,9 @@ class UffizziCore::ActivityItemService
 
     def fail_deployment!(activity_item)
       deployment = activity_item.container.deployment
+      last_event = activity_item.events.order_by_id.last
 
-      activity_item.events.create(state: UffizziCore::Event.state.failed)
+      activity_item.events.create(state: UffizziCore::Event.state.failed) unless last_event&.failed?
 
       UffizziCore::DeploymentService.fail!(deployment)
     end
@@ -55,6 +58,11 @@ class UffizziCore::ActivityItemService
 
       activity_item.events.create(state: status) if last_event&.state != status
 
+      if failed?(status)
+        UffizziCore::ActivityItemService.fail_deployment!(activity_item)
+        notification_module.notify_about_failed_deployment(deployment) if notification_module.present?
+      end
+
       return unless [UffizziCore::Event.state.building, UffizziCore::Event.state.deploying].include?(status)
 
       UffizziCore::Deployment::ManageDeployActivityItemJob.perform_in(5.seconds, activity_item.id)
@@ -75,5 +83,9 @@ class UffizziCore::ActivityItemService
       last_event = activity_item.events.last
       COMPLETED_STATES.include?(last_event.state)
     end
+
+    def failed?(status)
+      status == UffizziCore::Event.state.failed
+    end
   end
 end

data/app/services/uffizzi_core/deployment_service.rb

@@ -135,7 +135,7 @@ class UffizziCore::DeploymentService
     end
 
     def build_deployment_url(deployment)
-      "#{Settings.app.managed_dns_zone}/projects/#{deployment.project_id}/deployments"
+      "#{Settings.app.host}/projects/#{deployment.project_id}/deployments"
     end
 
     def all_containers_have_unique_ports?(containers)

data/lib/uffizzi_core/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: uffizzi_core
 version: !ruby/object:Gem::Version
-  version: 2.0.14
+  version: 2.0.16
 platform: ruby
 authors:
 - Josh Thurman
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-12-01 00:00:00.000000000 Z
+date: 2022-12-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aasm