uffizzi_core 2.1.16 → 2.1.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9d23221496923c614cfbe72130937262656e0c94ca63520e2b139840dc600ff5
-  data.tar.gz: 4543690c79b6eb09973967d351e3cbd10192f28af4af6f0b61627c5cf58bb059
+  metadata.gz: fd14a19fefa5a0eb7f004a65b25a5c4cb3c517c9a8c7c53248eb5ea510e4d543
+  data.tar.gz: 6f2ec4218d5f41aa53c5ce36eb94ad27c45770019be1ad84f979f67c3c02e416
 SHA512:
-  metadata.gz: bcd475dbad950b94a1cf13fbc5689b20de5e819ac8507229e1c248a08326afa45f9bc322174d5dbf86b1cb173f5b7d05c68bad1e649aad41e022b1bb368e4487
-  data.tar.gz: 86fa458a5f7631abf335dc2709533ecde2639c28b81c811ee051ff9d502e88d68b2507e6f9b6eb7d4bc0c48181570381ffe40d73a2ae37263aed30a4c009c87f
+  metadata.gz: bb0253b21dab789cd8aa07d3d68bde5ef2936cfeff7294179356e96fbef558a432e69a58398425d858ac19c35bde5de7af703e5743d48e0364fd16592184a955
+  data.tar.gz: a6721ce9a827f50cb533159440c168372e6db339802a4b46564c2a608ce3fb1a9077dfc5c1651bd868ad87e7d18c45dbe9212230b7c16a267b9979e68b08e15d

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

@@ -24,12 +24,8 @@ module UffizziCore::Concerns::Models::Deployment
     has_many :activity_items, dependent: :destroy
 
     has_one :ingress_container, -> { where(receive_incoming_requests: true) }, class_name: UffizziCore::Container.name
-
     validates :kind, presence: true
 
-    enumerize :creation_source, in: [:manual, :demo, :continuous_preview, :compose_file_manual, :compose_file_continuous_preview],
-                                predicates: true, scope: true, default: :manual
-
     accepts_nested_attributes_for :containers, allow_destroy: true
 
     after_destroy_commit :clean

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

@@ -9,8 +9,7 @@ module UffizziCore::Concerns::Models::Event
 
     self.table_name = UffizziCore.table_names[:events]
 
-    enumerize :state, in: [:waiting, :queued, :successful, :deployed, :failed, :building, :timeout, :cancelled, :deploying, :failed_build],
-                      predicates: true, scope: true
+    enumerize :state, in: UffizziCore.event_states, predicates: true, scope: true
 
     belongs_to :activity_item, touch: true
   end

data/app/models/uffizzi_core/deployment.rb

@@ -21,4 +21,7 @@
 
 class UffizziCore::Deployment < UffizziCore::ApplicationRecord
   include UffizziCore::Concerns::Models::Deployment
+
+  const_set(:COMPOSE_FILE_MANUAL, :compose_file_manual)
+  validates :creation_source, presence: true
 end

data/app/services/uffizzi_core/deployment_service.rb

@@ -19,7 +19,7 @@ class UffizziCore::DeploymentService
       deployment_form = UffizziCore::Api::Cli::V1::Deployment::CreateForm.new(deployment_attributes)
       deployment_form.assign_dependences!(project, user)
       deployment_form.compose_file = compose_file
-      deployment_form.creation_source = params[:creation_source] || UffizziCore::Deployment.creation_source.compose_file_manual
+      deployment_form.creation_source = params[:creation_source] || UffizziCore::Deployment::COMPOSE_FILE_MANUAL
       deployment_form.metadata = params[:metadata] || {}
 
       run_deployment_creation_tasks(deployment_form) if deployment_form.save
@@ -81,6 +81,8 @@ class UffizziCore::DeploymentService
     end
 
     def fail!(deployment)
+      return if deployment.failed?
+
       deployment.fail!
       compose_file = deployment.compose_file || deployment.template&.compose_file
       return unless compose_file&.kind&.temporary?

data/lib/uffizzi_core/version.rb

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

data/lib/uffizzi_core.rb

@@ -65,4 +65,5 @@ module UffizziCore
   mattr_accessor :user_project_roles, default: [:admin, :developer, :viewer]
   mattr_accessor :account_sources, default: [:manual]
   mattr_accessor :compose_file_kinds, default: [:main, :temporary]
+  mattr_accessor :event_states, default: [:waiting, :queued, :successful, :deployed, :failed, :building, :timeout, :cancelled, :deploying]
 end

metadata

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