uffizzi_core 2.2.2 → 2.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dbe95387d820ac425ad0e22777c819f16d4585bc68447303acdea82e035211f0
-  data.tar.gz: be6df718ea508614af3f8ec13b91ed676e7efb1497ba0c86c24be29582f56d5f
+  metadata.gz: d9a737645810c1744fe73cfbfb2e0d249d0895d75105065dcec75e7f4dea0844
+  data.tar.gz: a303130b01e8538a78dd5d891c2d8b9a51224c50d25b0ef5cdb830a7de55de2d
 SHA512:
-  metadata.gz: a56c2b2e674534c8774706192ff2f279ee9b755694f92bebed476a8717f4b7f976e267e563aa0189a4ecf9f6c56f4dd0b70f75279ccec7b7a13db614c20dc231
-  data.tar.gz: a9e490414365f05c52147fc17d322c2e52257d20a2a955c9f1a61c159e2fe112a69eb6741c846f772ead653a03dd5689aa1d722f6de957ac50c0754a20f032b3
+  metadata.gz: '043837408678dd986b192992cd149f9ca67c1490b7cc07a49cbbc464302fb717ca27ddbcd1819093e92ea7cc7c095930e349caed34bed2593dac4fc01e00c41f'
+  data.tar.gz: 62e606f4b9e4ef2ccbcdb0f7f73a6acf91970e1697a00f87a03675ce63fc18f84c835e165e45ab47a7b5797db9b278e83654de02e381631832d37e98c6d6de37

data/app/controller_modules/uffizzi_core/api/cli/v1/projects/clusters_controller_module.rb

@@ -5,5 +5,5 @@ module UffizziCore::Api::Cli::V1::Projects::ClustersControllerModule
 
   def update_show_trial_quota_exceeded_warning; end
 
-  def stop_if_deployment_forbidden; end
+  def check_account_quota; end
 end

data/app/controller_modules/uffizzi_core/api/cli/v1/projects/deployments_controller_module.rb

@@ -3,7 +3,7 @@
 module UffizziCore::Api::Cli::V1::Projects::DeploymentsControllerModule
   private
 
-  def stop_if_deployment_forbidden; end
+  def check_account_quota; end
 
   def update_show_trial_quota_exceeded_warning; end
 end

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

@@ -7,6 +7,10 @@ module UffizziCore::DependencyInjectionConcern
     def include_module_if_exists(module_name)
       include(Object.const_get(module_name)) if Object.const_defined?(module_name)
     end
+
+    def prepend_module_if_exists(module_name)
+      prepend(Object.const_get(module_name)) if Object.const_defined?(module_name)
+    end
   end
 
   def user_access_module

data/app/controllers/uffizzi_core/api/cli/v1/projects/clusters_controller.rb

@@ -4,7 +4,7 @@ class UffizziCore::Api::Cli::V1::Projects::ClustersController < UffizziCore::Api
   include UffizziCore::Api::Cli::V1::Projects::ClustersControllerModule
 
   before_action :authorize_uffizzi_core_api_cli_v1_projects_clusters
-  before_action :stop_if_deployment_forbidden, only: [:create]
+  before_action :check_account_quota, only: [:create]
   after_action :update_show_trial_quota_exceeded_warning, only: [:create, :destroy]
 
   def index

data/app/controllers/uffizzi_core/api/cli/v1/projects/deployments_controller.rb

@@ -6,7 +6,7 @@ class UffizziCore::Api::Cli::V1::Projects::DeploymentsController < UffizziCore::
   include UffizziCore::Api::Cli::V1::Projects::DeploymentsControllerModule
 
   before_action :authorize_uffizzi_core_api_cli_v1_projects_deployments
-  before_action :stop_if_deployment_forbidden, only: :create
+  before_action :check_account_quota, only: :create
   after_action :update_show_trial_quota_exceeded_warning, only: :destroy
 
   # Get a list of active deployements for a project
@@ -133,6 +133,7 @@ class UffizziCore::Api::Cli::V1::Projects::DeploymentsController < UffizziCore::
   # @response 401 Not authorized
   def destroy
     UffizziCore::DeploymentService.disable!(deployment)
+    deployment.deployment_events.create!(deployment_state: deployment.state, message: 'Destroyed by CLI')
 
     head :no_content
   end

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

@@ -22,6 +22,7 @@ module UffizziCore::Concerns::Models::Deployment
     has_many :credentials, through: :project
     has_many :containers, dependent: :destroy, index_errors: true
     has_many :activity_items, dependent: :destroy
+    has_many :deployment_events, dependent: :destroy
 
     has_one :ingress_container, -> { where(receive_incoming_requests: true) }, class_name: UffizziCore::Container.name
     validates :kind, presence: true

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

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+module UffizziCore::Concerns::Models::DeploymentEvent
+  extend ActiveSupport::Concern
+
+  included do
+    self.table_name = UffizziCore.table_names[:deployment_events]
+
+    belongs_to :deployment
+  end
+end

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

@@ -51,6 +51,7 @@ module UffizziCore::Concerns::Models::Project
     def disable_deployments
       active_deployments.each do |deployment|
         UffizziCore::DeploymentService.disable!(deployment)
+        deployment.deployment_events.create!(deployment_state: deployment.state, message: 'Disabled after project was disabled')
       end
     end
 

data/app/models/uffizzi_core/deployment_event.rb

@@ -0,0 +1,5 @@
+# frozen_string_literal: true
+
+class UffizziCore::DeploymentEvent < UffizziCore::ApplicationRecord
+  include UffizziCore::Concerns::Models::DeploymentEvent
+end

data/app/serializers/uffizzi_core/api/cli/v1/short_project_serializer.rb

@@ -2,6 +2,8 @@
 
 class UffizziCore::Api::Cli::V1::ShortProjectSerializer < UffizziCore::BaseSerializer
   type :project
+  belongs_to :account, serializer: UffizziCore::Api::Cli::V1::ProjectSerializer::AccountSerializer
 
+  # account_id supports CLI versions < 2.0.5
   attributes :name, :slug, :account_id
 end

data/app/services/uffizzi_core/activity_item_service.rb

@@ -54,7 +54,10 @@ class UffizziCore::ActivityItemService
       return handle_failed_status(activity_item, deployment) if failed?(status)
 
       if deployed?(status) && UffizziCore::ContainerService.ingress_container?(container)
-        return deployment.update(last_deploy_at: last_event.created_at)
+        deployment.update!(last_deploy_at: last_event.created_at)
+        deployment.deployment_events.create!(deployment_state: status)
+
+        return
       end
 
       return unless [UffizziCore::Event.state.building, UffizziCore::Event.state.deploying].include?(status)

data/app/services/uffizzi_core/deployment_service.rb

@@ -1,6 +1,9 @@
 # frozen_string_literal: true
 
 class UffizziCore::DeploymentService
+  include UffizziCore::DependencyInjectionConcern
+  prepend_module_if_exists('UffizziCore::DeploymentServiceModule')
+
   MIN_TARGET_PORT_RANGE = 37_000
   MAX_TARGET_PORT_RANGE = 39_999
 
@@ -39,12 +42,8 @@ class UffizziCore::DeploymentService
         deployment.containers.destroy_all
         deployment.compose_file.destroy! if deployment.compose_file&.kind&.temporary?
         deployment.activate unless deployment.active?
-        params = {
-          containers: deployment_form.containers,
-          compose_file_id: compose_file.id,
-          metadata: deployment_form.metadata,
-        }
-        deployment.update!(params)
+        new_params = params_for_update_deployment(deployment_form, compose_file)
+        deployment.update!(new_params)
       end
 
       deployment
@@ -56,10 +55,15 @@ class UffizziCore::DeploymentService
         update_controller_container_names(deployment)
       end
 
-      case deployment_process_status(deployment)
+      status = deployment_process_status(deployment)
+
+      case status
       when DEPLOYMENT_PROCESS_STATUSES[:building]
         Rails.logger.info("DEPLOYMENT_PROCESS deployment_id=#{deployment.id} repeat deploy_containers")
         UffizziCore::Deployment::DeployContainersJob.perform_in(1.minute, deployment.id, true)
+        unless repeated
+          deployment.deployment_events.create!(deployment_state: status)
+        end
       when DEPLOYMENT_PROCESS_STATUSES[:deploying]
         Rails.logger.info("DEPLOYMENT_PROCESS deployment_id=#{deployment.id} start deploying into controller")
 
@@ -67,6 +71,7 @@ class UffizziCore::DeploymentService
         containers_with_variables = add_default_deployment_variables!(containers, deployment)
 
         UffizziCore::ControllerService.deploy_containers(deployment, containers_with_variables)
+        deployment.deployment_events.create!(deployment_state: status)
       else
         Rails.logger.info("DEPLOYMENT_PROCESS deployment_id=#{deployment.id} deployment has builds errors, stopping")
       end
@@ -84,6 +89,7 @@ class UffizziCore::DeploymentService
       return if deployment.failed?
 
       deployment.fail!
+      deployment.deployment_events.create!(deployment_state: deployment.state)
       compose_file = deployment.compose_file || deployment.template&.compose_file
       return unless compose_file&.kind&.temporary?
 
@@ -230,5 +236,13 @@ class UffizziCore::DeploymentService
         container.variables.push(*envs)
       end
     end
+
+    def params_for_update_deployment(deployment_form, compose_file)
+      {
+        containers: deployment_form.containers,
+        compose_file_id: compose_file.id,
+        metadata: deployment_form.metadata,
+      }
+    end
   end
 end

data/db/migrate/20230531135739_create_deployment_events.rb

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+class CreateDeploymentEvents < ActiveRecord::Migration[6.1]
+  def change
+    create_table :uffizzi_core_deployment_events do |t|
+      t.string :deployment_state
+      t.string :message
+      t.timestamps
+      t.references :deployment, null: false,
+                                index: { name: :uf_core_dep_events_on_dep },
+                                foreign_key: { to_table: :uffizzi_core_deployments }
+    end
+  end
+end

data/lib/uffizzi_core/version.rb

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

data/lib/uffizzi_core.rb

@@ -61,6 +61,7 @@ module UffizziCore
     users_roles: :uffizzi_core_users_roles,
     host_volume_files: :uffizzi_core_host_volume_files,
     container_host_volume_files: :uffizzi_core_container_host_volume_files,
+    deployment_events: :uffizzi_core_deployment_events,
   }
   mattr_accessor :user_creation_sources, default: [:system, :online_registration, :google, :sso]
   mattr_accessor :user_project_roles, default: [:admin, :developer, :viewer]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: uffizzi_core
 version: !ruby/object:Gem::Version
-  version: 2.2.2
+  version: 2.2.4
 platform: ruby
 authors:
 - Josh Thurman
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-07-07 00:00:00.000000000 Z
+date: 2023-07-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aasm
@@ -847,6 +847,7 @@ files:
 - app/lib/uffizzi_core/concerns/models/coupon.rb
 - app/lib/uffizzi_core/concerns/models/credential.rb
 - app/lib/uffizzi_core/concerns/models/deployment.rb
+- app/lib/uffizzi_core/concerns/models/deployment_event.rb
 - app/lib/uffizzi_core/concerns/models/event.rb
 - app/lib/uffizzi_core/concerns/models/host_volume_file.rb
 - app/lib/uffizzi_core/concerns/models/membership.rb
@@ -890,6 +891,7 @@ files:
 - app/models/uffizzi_core/database.rb
 - app/models/uffizzi_core/database_offering.rb
 - app/models/uffizzi_core/deployment.rb
+- app/models/uffizzi_core/deployment_event.rb
 - app/models/uffizzi_core/event.rb
 - app/models/uffizzi_core/host_volume_file.rb
 - app/models/uffizzi_core/membership.rb
@@ -1059,6 +1061,7 @@ files:
 - db/migrate/20230111000000_add_state_to_memberships.rb
 - db/migrate/20230306142513_add_last_deploy_at_to_deployments.rb
 - db/migrate/20230406154451_add_full_image_name_to_container.rb
+- db/migrate/20230531135739_create_deployment_events.rb
 - db/migrate/20230613101901_create_clusters.rb
 - db/seeds.rb
 - lib/tasks/uffizzi_core_tasks.rake