uffizzi_core 2.0.15 → 2.0.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 28934eb7317d49a31d36b7563e17536b0cb9ce375a7c92d4ef7102f2eb3f998f
-  data.tar.gz: f86564b713075d3762622329be0d96333cc6a8a5f7c1f9352a06f26d746c89d4
+  metadata.gz: 725cca20ca80112e168ba374f53dc0fa5cb48ed92339996405610fad6d37e931
+  data.tar.gz: 44034045e9b25197d558202fb336ff7faab8b9f7ac02cea97bbbcbb5cfac711c
 SHA512:
-  metadata.gz: 21f814b2a44d75f89128e33fb067fa56c7f83fda3a5ca7938fc026108b95d6056d405cf38da15730d593756b1479cd297c6c5f66865eb85c8b5c5bbae2a4b23f
-  data.tar.gz: 3cc681f0cde118c45ebf0b07d240f70cb8690a4a4ed399421d1d07f6524fa1de7b214a3ca97a39950584c69bafe0b7166c8482ced38b065fc79441f3c72de83a
+  metadata.gz: 2c417dc4df5d3842a73941775b4f6267bfd41ed19f29db0a5b58496346ef77237a134d3eaf515f6f6cef975c29f0b962cbba82d1e293af36625ccb0e1a02fdda
+  data.tar.gz: 254aff6198f4136c367fcc1e64a58fdcc920bf009d3a3f842ceddf5d42b362eebf9f993c5d261649e60e3d3c6c0394f29e2a2bee0dfc4c2787eba4009dea1409

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/lib/uffizzi_core/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module UffizziCore
-  VERSION = '2.0.15'
+  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.15
+  version: 2.0.16
 platform: ruby
 authors:
 - Josh Thurman
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-12-07 00:00:00.000000000 Z
+date: 2022-12-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aasm