uffizzi_core 2.1.3 → 2.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4a920d00be62a50b051ef96fecaa9d3e9ca1009e366fc2521efd215dc5193f0a
-  data.tar.gz: 6ddcda3a07b729fad5d43afcc97d729aaa392accbf3288b5bafcfc963305c357
+  metadata.gz: 5ee784d18da14d2c52e81eb198cf5618e13be8922a87d8eb83a5d981d8e4d1d1
+  data.tar.gz: b269cb27d6b2f4a7d74ae56ef412a1adf394b14dcc9c6b41db245cca31d20d6d
 SHA512:
-  metadata.gz: c4d4dfbf12d26127991891c84f15c5b978f317ebf22e0826381a32e588c3fb3ba31b7511d1ee97b65bcc4982303638580fc602d4ba72cd5f8d61185e46715510
-  data.tar.gz: 389889aa1a60bb76568e8b4775ea2ba76514c1a980a275f15433c4feae90144c3d66d15360cf813bd68c5f0f080485e4245d80c838661d2f7930c765e353bdf5
+  metadata.gz: a3927916bb55e90af147c152f7bb86065f0eadbb75ec677e0a1aa69fb395e5c4b1f9d3764e57e9aea3ebb3006d7cf2365f8c444e84561f122670ba3ff72c978a
+  data.tar.gz: be4cc536ed1bd57888096be85723eb56446f24d760c387baa3f13e6891972f47fd641f41fcd14048465184be13241cea0473b65a79a60d4662464e59fc1bb71b

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

@@ -1,5 +1,9 @@
 # frozen_string_literal: true
 
 module UffizziCore::Api::Cli::V1::Projects::DeploymentsControllerModule
-  def check_account_state; end
+  private
+
+  def stop_if_deployment_forbidden; end
+
+  def update_show_trial_quota_exceeded_warning; end
 end

data/app/controller_modules/uffizzi_core/api/cli/v1/projects_controller_module.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+module UffizziCore::Api::Cli::V1::ProjectsControllerModule
+  private
+
+  def update_show_trial_quota_exceeded_warning; end
+end

data/app/controllers/uffizzi_core/api/cli/v1/application_controller.rb

@@ -2,4 +2,12 @@
 
 class UffizziCore::Api::Cli::V1::ApplicationController < UffizziCore::ApplicationController
   before_action :authenticate_request!
+
+  def resource_project
+    @resource_project ||= current_user.projects.find_by!(slug: params[:slug])
+  end
+
+  def resource_account
+    @resource_account ||= resource_project.account
+  end
 end

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

@@ -6,7 +6,8 @@ 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 :check_account_state, only: [:create, :update]
+  before_action :stop_if_deployment_forbidden, only: :create
+  after_action :update_show_trial_quota_exceeded_warning, only: :destroy
 
   # Get a list of active deployements for a project
   #

data/app/controllers/uffizzi_core/api/cli/v1/projects_controller.rb

@@ -3,7 +3,10 @@
 # @resource Project
 
 class UffizziCore::Api::Cli::V1::ProjectsController < UffizziCore::Api::Cli::V1::ApplicationController
+  include UffizziCore::Api::Cli::V1::ProjectsControllerModule
+
   before_action :authorize_uffizzi_core_api_cli_v1_projects
+  after_action :update_show_trial_quota_exceeded_warning, only: :destroy
 
   # Get projects of current user
   #
@@ -48,12 +51,9 @@ class UffizziCore::Api::Cli::V1::ProjectsController < UffizziCore::Api::Cli::V1:
     params.require(:project)
   end
 
-  def resource_project
-    @resource_project ||= current_user.projects.find_by(slug: params[:slug])
-  end
-
   def policy_context
-    account = resource_project&.account || current_user.default_account
+    current_project = current_user.projects.find_by(slug: params[:slug])
+    account = current_project&.account || current_user.default_account
 
     UffizziCore::AccountContext.new(current_user, user_access_module, account, params)
   end

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

@@ -43,7 +43,7 @@ module UffizziCore::Concerns::Models::Deployment
       state :failed
       state :disabled
 
-      event :activate do
+      event :activate, after: :after_activate do
         transitions from: [:disabled], to: :active
       end
 
@@ -56,6 +56,10 @@ module UffizziCore::Concerns::Models::Deployment
       end
     end
 
+    def after_activate
+      update!(disabled_at: nil)
+    end
+
     def after_disable
       clean
       update!(disabled_at: Time.now)

data/app/services/uffizzi_core/deployment_service.rb

@@ -27,23 +27,22 @@ class UffizziCore::DeploymentService
       deployment_form
     end
 
-    def update_from_compose(compose_file, project, user, deployment, metadata)
+    def update_from_compose(compose_file, project, user, deployment, metadata = {})
       deployment_attributes = ActionController::Parameters.new(compose_file.template.payload)
 
       deployment_form = UffizziCore::Api::Cli::V1::Deployment::UpdateForm.new(deployment_attributes)
       deployment_form.assign_dependences!(project, user)
       deployment_form.compose_file = compose_file
-      deployment_form.metadata = metadata || {}
+      deployment_form.metadata = metadata
 
       ActiveRecord::Base.transaction do
         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,
-          creation_source: UffizziCore::Deployment.creation_source.compose_file_manual,
           metadata: deployment_form.metadata,
-          state: :active,
         }
         deployment.update!(params)
       end

data/lib/uffizzi_core/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: uffizzi_core
 version: !ruby/object:Gem::Version
-  version: 2.1.3
+  version: 2.1.5
 platform: ruby
 authors:
 - Josh Thurman
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-02-07 00:00:00.000000000 Z
+date: 2023-02-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aasm
@@ -749,6 +749,7 @@ files:
 - app/contexts/uffizzi_core/project_context.rb
 - app/contexts/uffizzi_core/webhooks_context.rb
 - app/controller_modules/uffizzi_core/api/cli/v1/projects/deployments_controller_module.rb
+- app/controller_modules/uffizzi_core/api/cli/v1/projects_controller_module.rb
 - app/controllers/concerns/uffizzi_core/auth_management.rb
 - app/controllers/concerns/uffizzi_core/authorization_concern.rb
 - app/controllers/concerns/uffizzi_core/dependency_injection_concern.rb