uffizzi_core 2.0.24 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a8aafbb5ee5ef2caafb70db7078d6705266858e0f963b8cad7f8d95eae435fbf
-  data.tar.gz: a8cb20e5027724a8fbb374ca6648c3dd28b92f00de8454ecd3e0af58975d254f
+  metadata.gz: c131ada77fc0357b6617553f51247c1b9194635a3b741b6f17b6ac901921c3ff
+  data.tar.gz: 30a013a396f81d5cbfb13932222dbd020fd3b88e94511119266970114ae9d0d8
 SHA512:
-  metadata.gz: 3311070210f6022ac352a003785c871b78ef65e58ddf6e7f614e5d9f1aab3927b1a5fd862ae62cfdbafb23d36655dd03162691ed01cd4e10d97332db3eb4e490
-  data.tar.gz: 792fe71fb5fc50a5e2543b059ba8bfd017c93f5a955c77d7499b7fb3b77e816580ac0a235a68bfe0405b3f7c785c1cac846214675a26a95b0ad55f2fb26c3d7a
+  metadata.gz: 0060c147865cb0bf5f530159e5022dee28b5994d6a20a3b67d235482e1a398fa93228029a44ae22e31fea0c241f723c48f9a51c0597dd4c1b5db62f22083088d
+  data.tar.gz: 91fb0c6c8dc3e3fc8fd1e85ea0de05e0a43597f5c89090f8789bb1c57fb93efcad2bdbb959c4c005179d7d4db959f9da45822a73eb65f1379773492fa885f785

data/app/controllers/uffizzi_core/api/cli/v1/projects/deployments/activity_items_controller.rb

@@ -15,7 +15,7 @@ class UffizziCore::Api::Cli::V1::Projects::Deployments::ActivityItemsController
   # @response 401 Not authorized
   # @response 404 Not found
   def index
-    deployment = resource_project.deployments.existed.find(params[:deployment_id])
+    deployment = resource_project.deployments.enabled.find(params[:deployment_id])
 
     unless deployment.active?
       return render json: { errors: { title: [I18n.t('deployment.invalid_state', id: deployment.id, state: deployment.state)] } },

data/app/controllers/uffizzi_core/api/cli/v1/projects/deployments/containers_controller.rb

@@ -23,7 +23,7 @@ class UffizziCore::Api::Cli::V1::Projects::Deployments::ContainersController <
   end
 
   def k8s_container_description
-    deployment ||= resource_project.deployments.existed.find(params[:deployment_id])
+    deployment ||= resource_project.deployments.enabled.find(params[:deployment_id])
     container = deployment.containers.active.find_by!(service_name: params[:container_name])
     last_state = UffizziCore::ContainerService.last_state(container)
 

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

@@ -168,7 +168,7 @@ class UffizziCore::Api::Cli::V1::Projects::DeploymentsController < UffizziCore::
   end
 
   def deployments
-    @deployments ||= resource_project.deployments.existed
+    @deployments ||= resource_project.deployments.enabled
   end
 
   def deployment_params

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

@@ -20,7 +20,7 @@ module UffizziCore::Concerns::Models::ComposeFile
     has_many :host_volume_files, dependent: :destroy
     has_many :deployments, dependent: :nullify
 
-    enumerize :kind, in: [:main, :temporary], predicates: true, scope: :shallow, default: :main
+    enumerize :kind, in: UffizziCore.compose_file_kinds, predicates: true, scope: :shallow, default: :main
 
     validates :source, presence: true
     validate :main_compose_file_uniqueness, on: :create, if: -> { kind.main? }

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

@@ -27,7 +27,7 @@ module UffizziCore::Concerns::Models::Deployment
 
     validates :kind, presence: true
 
-    enumerize :creation_source, in: [:manual, :continuous_preview, :compose_file_manual, :compose_file_continuous_preview],
+    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

data/app/repositories/uffizzi_core/deployment_repo.rb

@@ -8,7 +8,7 @@ module UffizziCore::DeploymentRepo
       where(name: name)
     }
     scope :with_amazon_repos, -> { includes(containers: [:repo]).where(containers: { repos: { type: UffizziCore::Repo::Amazon.name } }) }
-    scope :existed, -> { where(state: [:active, :failed]) }
+    scope :enabled, -> { where(state: [:active, :failed]) }
     scope :active_for_credential_id, ->(credential_id) {
       active.joins(project: :credentials).merge(UffizziCore::Project.active).where(credentials: { id: credential_id })
     }

data/app/services/uffizzi_core/deployment_service.rb

@@ -12,6 +12,8 @@ class UffizziCore::DeploymentService
   }.freeze
 
   class << self
+    include UffizziCore::DependencyInjectionConcern
+
     def create_from_compose(compose_file, project, user, params)
       deployment_attributes = ActionController::Parameters.new(compose_file.template.payload)
       deployment_form = UffizziCore::Api::Cli::V1::Deployment::CreateForm.new(deployment_attributes)

data/lib/uffizzi_core/version.rb

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

data/lib/uffizzi_core.rb

@@ -64,4 +64,5 @@ module UffizziCore
   mattr_accessor :user_creation_sources, default: [:system, :online_registration, :google, :sso]
   mattr_accessor :user_project_roles, default: [:admin, :developer, :viewer]
   mattr_accessor :account_sources, default: [:manual]
+  mattr_accessor :compose_file_kinds, default: [:main, :temporary]
 end

metadata

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