uffizzi_core 2.1.4 → 2.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 31b523abfb135f26506fe25a9e6a74a90906f8fdb715ed167613d88869c1da7c
-  data.tar.gz: 387de06335635d9830d4120636100b75042fedd59221c16688c5f219c5a5a396
+  metadata.gz: 2fa718cfa69dcdae6e76cb1808c513aa11ed894fdf7afef9bc383cb23c129e00
+  data.tar.gz: 28679dfd137f683e33a71b64cfbfd7a5589588aa24f31f2a1a6f5284fa6b71d1
 SHA512:
-  metadata.gz: 92172c981d9c5883dd1ab8f6dc6f7c708a6a73e94c6dcba9193dd5f95ef1daf894db88172a1eed229a319baba70c8cb5a1058072209e821f884a6505ee116b69
-  data.tar.gz: 938c57b21171b791af729fb02eff4e964836329f4ec218a5b0bf00c208a8ac53e016e9a99b9ffbdf1ffcaa58a7b7e8b4345df1dee6113fa053e5a13f1257f032
+  metadata.gz: 693edec5e777a1d96df5e3bff4a871091eaf89de12ae94d53d17591dff7e8ec8a61d9cbcf6d8088aafef68cdb434398b4fb3aac1c3c46f07ee10a10585712ac4
+  data.tar.gz: 9494c2246be34b70fcbe93f88315df66d08a7b13cb234c1a1552719e66b727093f44ad0f96f11d2b1b24002213fc8c5f00b906f4c7b159c5ad4949bdb4891df1

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

@@ -19,14 +19,6 @@ class UffizziCore::ActivityItemService
       create_item!(activity_item_attributes)
     end
 
-    def disable_deployment!(activity_item)
-      deployment = activity_item.container.deployment
-
-      activity_item.events.create(state: UffizziCore::Event.state.failed)
-
-      UffizziCore::DeploymentService.disable!(deployment)
-    end
-
     def fail_deployment!(activity_item)
       deployment = activity_item.container.deployment
       last_event = activity_item.events.order_by_id.last

data/app/services/uffizzi_core/compose_file/parsers/services/command_parser_service.rb

@@ -7,7 +7,7 @@ class UffizziCore::ComposeFile::Parsers::Services::CommandParserService
 
       case command_data
       when String
-        [command_data]
+        command_data.split
       when Array
         command_data
       else

data/app/services/uffizzi_core/deployment_service.rb

@@ -27,13 +27,13 @@ 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

data/lib/uffizzi_core/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: uffizzi_core
 version: !ruby/object:Gem::Version
-  version: 2.1.4
+  version: 2.1.6
 platform: ruby
 authors:
 - Josh Thurman
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-02-09 00:00:00.000000000 Z
+date: 2023-03-02 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