uffizzi_core 2.1.22 → 2.1.24

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8e656eb503e61d1df06ee0fa3e494ebe2e0710bf332813c7a5d48b0915e297da
-  data.tar.gz: dd6bc21422c286a60b7ee6f5b42ee476583b9e0240ef5d7c49be8f1fa7150d52
+  metadata.gz: de321ff2e21c9c9b909b4739eb07728d4399801c45d267c5608142d2634f519f
+  data.tar.gz: 4550ded63ea25d6a480c0e9a93964285746fae2d6582e73bb6829eb3a18e9163
 SHA512:
-  metadata.gz: be971d5693d19dc437775321a5897e00abed51e1c3f88878c9370afcbf0accbe90a989002ab75ad18b9eed96cbb4a5c98da80daef57e9042f1c3ac153fb60e24
-  data.tar.gz: 8b771df5c0456e872d3cb89e9f947962b91ab216493193cf95eaf8e711f1d86f923ad1231b4d59ea15b464c47788192c7db44c97dc97d1e467d10a131626bfb4
+  metadata.gz: 3de13bddf08f86c9eb18e7d21b4ccd9ce074815a6716888357f3b93f99f4ed92da9be571296897240f7245e4f4709ff7fd183aab70a915072c15932cd00cae4e
+  data.tar.gz: 8634b6e9021ec0f1a5fa883957a91ddbaa4e367e3d2f0b97da4a108c4b935c552bfb944dd6156ef06fb075395904e3d6ed69b59ea15b7af7611daed24a8b39d5

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

@@ -1,6 +1,14 @@
 # frozen_string_literal: true
 
 module UffizziCore::DependencyInjectionConcern
+  extend ActiveSupport::Concern
+
+  class_methods do
+    def include_module_if_exists(module_name)
+      include(Object.const_get(module_name)) if Object.const_defined?(module_name)
+    end
+  end
+
   def user_access_module
     return unless module_exists?(:rbac)
 

data/app/serializers/uffizzi_core/api/cli/v1/projects/deployment_serializer.rb

@@ -1,6 +1,9 @@
 # frozen_string_literal: true
 
 class UffizziCore::Api::Cli::V1::Projects::DeploymentSerializer < UffizziCore::BaseSerializer
+  include UffizziCore::DependencyInjectionConcern
+  include_module_if_exists('UffizziCore::Api::Cli::V1::Projects::DeploymentSerializerModule')
+
   type :deployment
 
   attributes :id,

data/app/services/uffizzi_core/activity_item_service.rb

@@ -45,18 +45,16 @@ class UffizziCore::ActivityItemService
       deployment = container.deployment
       service = UffizziCore::ManageActivityItemsService.new(deployment)
       container_status_item = service.container_status_item(container)
+      return if container_status_item.nil?
+
       status = container_status_item[:status]
       last_event = activity_item.events.order_by_id.last
-
       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 handle_failed_status(activity_item, deployment) if failed?(status)
 
       if deployed?(status) && UffizziCore::ContainerService.ingress_container?(container)
-        deployment.update(last_deploy_at: last_event.created_at)
+        return deployment.update(last_deploy_at: last_event.created_at)
       end
 
       return unless [UffizziCore::Event.state.building, UffizziCore::Event.state.deploying].include?(status)
@@ -66,6 +64,11 @@ class UffizziCore::ActivityItemService
 
     private
 
+    def handle_failed_status(activity_item, deployment)
+      UffizziCore::ActivityItemService.fail_deployment!(activity_item)
+      notification_module.notify_about_failed_deployment(deployment) if notification_module.present?
+    end
+
     def create_item!(activity_item_attributes)
       activity_item = UffizziCore::ActivityItem.find_by(activity_item_attributes)
       return activity_item unless completed?(activity_item)

data/app/services/uffizzi_core/container_registry/docker_hub_service.rb

@@ -37,6 +37,9 @@ class UffizziCore::ContainerRegistry::DockerHubService
       token = docker_hub_client.get_token(image).result.token
       response = docker_hub_client.digest(image: image, tag: tag, token: token)
       response.headers['docker-content-digest']
+      # FIXME: can't get digest for private image: {"code":"UNAUTHORIZED","message":"authentication required"...}
+    rescue UffizziCore::ContainerRegistryError
+      'unknown'
     end
 
     def credential_correct?(credential)

data/lib/uffizzi_core/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: uffizzi_core
 version: !ruby/object:Gem::Version
-  version: 2.1.22
+  version: 2.1.24
 platform: ruby
 authors:
 - Josh Thurman
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-05-10 00:00:00.000000000 Z
+date: 2023-05-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aasm