uffizzi_core 2.0.13 → 2.0.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1ce237a7f1c46dcb9abbe62124bae678aa95e5a91a371da56c1358295dfaf035
-  data.tar.gz: a5afbb4dbe4b8bd0df78b4f7abb8f402dee2a0122ec409a004b344abadf560c7
+  metadata.gz: 28934eb7317d49a31d36b7563e17536b0cb9ce375a7c92d4ef7102f2eb3f998f
+  data.tar.gz: f86564b713075d3762622329be0d96333cc6a8a5f7c1f9352a06f26d746c89d4
 SHA512:
-  metadata.gz: 3c96a8dbd89bf163574a28c4d5d01f884a64d4f82f5f665c6322e1030fe33107976410d418478f997824fd2b1d9be4b568e34efa6dcd7c6963d5aa8a309b9be5
-  data.tar.gz: c60515fe9eff88d86a9b5a3d8bd30617a56e33271e671d02a52737e369ee09bdf17a83ab7e9a378f4d7c21161e0e0bad6ee24340b50a952f65471a0208b5100a
+  metadata.gz: 21f814b2a44d75f89128e33fb067fa56c7f83fda3a5ca7938fc026108b95d6056d405cf38da15730d593756b1479cd297c6c5f66865eb85c8b5c5bbae2a4b23f
+  data.tar.gz: 3cc681f0cde118c45ebf0b07d240f70cb8690a4a4ed399421d1d07f6524fa1de7b214a3ca97a39950584c69bafe0b7166c8482ced38b065fc79441f3c72de83a

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/lib/uffizzi_core/concerns/models/account.rb

@@ -16,8 +16,6 @@ module UffizziCore::Concerns::Models::Account
     validates :kind, presence: true
     validates :domain, uniqueness: true, if: :domain
 
-    belongs_to :owner, class_name: UffizziCore::User.name, foreign_key: :owner_id
-
     has_many :memberships, dependent: :destroy
     has_many :users, through: :memberships
     has_many :credentials, dependent: :destroy

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/models/uffizzi_core/account.rb

@@ -2,4 +2,6 @@
 
 class UffizziCore::Account < UffizziCore::ApplicationRecord
   include UffizziCore::Concerns::Models::Account
+
+  belongs_to :owner, class_name: UffizziCore::User.name, foreign_key: :owner_id
 end

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

@@ -6,7 +6,7 @@ class UffizziCore::UserAccessService
   delegate :admin_access_to_account?, :developer_access_to_account?, :viewer_access_to_account?,
            :admin_or_developer_access_to_account?, :any_access_to_account?, :admin_access_to_project?,
            :developer_access_to_project?, :viewer_access_to_project?, :admin_or_developer_access_to_project?,
-           :any_access_to_project?, :global_admin?, to: :@user_access_module
+           :any_access_to_project?, :global_admin?, :valid_token?, to: :@user_access_module
 
   def initialize(user_access_module)
     @user_access_module = user_access_module

data/lib/uffizzi_core/version.rb

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

metadata

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