uffizzi_core 2.0.24 → 2.1.0
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/app/controllers/uffizzi_core/api/cli/v1/projects/deployments/activity_items_controller.rb +1 -1
- data/app/controllers/uffizzi_core/api/cli/v1/projects/deployments/containers_controller.rb +1 -1
- data/app/controllers/uffizzi_core/api/cli/v1/projects/deployments_controller.rb +1 -1
- data/app/lib/uffizzi_core/concerns/models/compose_file.rb +1 -1
- data/app/lib/uffizzi_core/concerns/models/deployment.rb +1 -1
- data/app/repositories/uffizzi_core/deployment_repo.rb +1 -1
- data/app/services/uffizzi_core/deployment_service.rb +2 -0
- data/lib/uffizzi_core/version.rb +1 -1
- data/lib/uffizzi_core.rb +1 -0
- metadata +2 -2
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: c131ada77fc0357b6617553f51247c1b9194635a3b741b6f17b6ac901921c3ff
|
4
|
+
data.tar.gz: 30a013a396f81d5cbfb13932222dbd020fd3b88e94511119266970114ae9d0d8
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 0060c147865cb0bf5f530159e5022dee28b5994d6a20a3b67d235482e1a398fa93228029a44ae22e31fea0c241f723c48f9a51c0597dd4c1b5db62f22083088d
|
7
|
+
data.tar.gz: 91fb0c6c8dc3e3fc8fd1e85ea0de05e0a43597f5c89090f8789bb1c57fb93efcad2bdbb959c4c005179d7d4db959f9da45822a73eb65f1379773492fa885f785
|
data/app/controllers/uffizzi_core/api/cli/v1/projects/deployments/activity_items_controller.rb
CHANGED
@@ -15,7 +15,7 @@ class UffizziCore::Api::Cli::V1::Projects::Deployments::ActivityItemsController
|
|
15
15
|
# @response 401 Not authorized
|
16
16
|
# @response 404 Not found
|
17
17
|
def index
|
18
|
-
deployment = resource_project.deployments.
|
18
|
+
deployment = resource_project.deployments.enabled.find(params[:deployment_id])
|
19
19
|
|
20
20
|
unless deployment.active?
|
21
21
|
return render json: { errors: { title: [I18n.t('deployment.invalid_state', id: deployment.id, state: deployment.state)] } },
|
@@ -23,7 +23,7 @@ class UffizziCore::Api::Cli::V1::Projects::Deployments::ContainersController <
|
|
23
23
|
end
|
24
24
|
|
25
25
|
def k8s_container_description
|
26
|
-
deployment ||= resource_project.deployments.
|
26
|
+
deployment ||= resource_project.deployments.enabled.find(params[:deployment_id])
|
27
27
|
container = deployment.containers.active.find_by!(service_name: params[:container_name])
|
28
28
|
last_state = UffizziCore::ContainerService.last_state(container)
|
29
29
|
|
@@ -168,7 +168,7 @@ class UffizziCore::Api::Cli::V1::Projects::DeploymentsController < UffizziCore::
|
|
168
168
|
end
|
169
169
|
|
170
170
|
def deployments
|
171
|
-
@deployments ||= resource_project.deployments.
|
171
|
+
@deployments ||= resource_project.deployments.enabled
|
172
172
|
end
|
173
173
|
|
174
174
|
def deployment_params
|
@@ -20,7 +20,7 @@ module UffizziCore::Concerns::Models::ComposeFile
|
|
20
20
|
has_many :host_volume_files, dependent: :destroy
|
21
21
|
has_many :deployments, dependent: :nullify
|
22
22
|
|
23
|
-
enumerize :kind, in:
|
23
|
+
enumerize :kind, in: UffizziCore.compose_file_kinds, predicates: true, scope: :shallow, default: :main
|
24
24
|
|
25
25
|
validates :source, presence: true
|
26
26
|
validate :main_compose_file_uniqueness, on: :create, if: -> { kind.main? }
|
@@ -27,7 +27,7 @@ module UffizziCore::Concerns::Models::Deployment
|
|
27
27
|
|
28
28
|
validates :kind, presence: true
|
29
29
|
|
30
|
-
enumerize :creation_source, in: [:manual, :continuous_preview, :compose_file_manual, :compose_file_continuous_preview],
|
30
|
+
enumerize :creation_source, in: [:manual, :demo, :continuous_preview, :compose_file_manual, :compose_file_continuous_preview],
|
31
31
|
predicates: true, scope: true, default: :manual
|
32
32
|
|
33
33
|
accepts_nested_attributes_for :containers, allow_destroy: true
|
@@ -8,7 +8,7 @@ module UffizziCore::DeploymentRepo
|
|
8
8
|
where(name: name)
|
9
9
|
}
|
10
10
|
scope :with_amazon_repos, -> { includes(containers: [:repo]).where(containers: { repos: { type: UffizziCore::Repo::Amazon.name } }) }
|
11
|
-
scope :
|
11
|
+
scope :enabled, -> { where(state: [:active, :failed]) }
|
12
12
|
scope :active_for_credential_id, ->(credential_id) {
|
13
13
|
active.joins(project: :credentials).merge(UffizziCore::Project.active).where(credentials: { id: credential_id })
|
14
14
|
}
|
@@ -12,6 +12,8 @@ class UffizziCore::DeploymentService
|
|
12
12
|
}.freeze
|
13
13
|
|
14
14
|
class << self
|
15
|
+
include UffizziCore::DependencyInjectionConcern
|
16
|
+
|
15
17
|
def create_from_compose(compose_file, project, user, params)
|
16
18
|
deployment_attributes = ActionController::Parameters.new(compose_file.template.payload)
|
17
19
|
deployment_form = UffizziCore::Api::Cli::V1::Deployment::CreateForm.new(deployment_attributes)
|
data/lib/uffizzi_core/version.rb
CHANGED
data/lib/uffizzi_core.rb
CHANGED
@@ -64,4 +64,5 @@ module UffizziCore
|
|
64
64
|
mattr_accessor :user_creation_sources, default: [:system, :online_registration, :google, :sso]
|
65
65
|
mattr_accessor :user_project_roles, default: [:admin, :developer, :viewer]
|
66
66
|
mattr_accessor :account_sources, default: [:manual]
|
67
|
+
mattr_accessor :compose_file_kinds, default: [:main, :temporary]
|
67
68
|
end
|
metadata
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: uffizzi_core
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 2.0
|
4
|
+
version: 2.1.0
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Josh Thurman
|
@@ -9,7 +9,7 @@ authors:
|
|
9
9
|
autorequire:
|
10
10
|
bindir: bin
|
11
11
|
cert_chain: []
|
12
|
-
date: 2023-01-
|
12
|
+
date: 2023-01-30 00:00:00.000000000 Z
|
13
13
|
dependencies:
|
14
14
|
- !ruby/object:Gem::Dependency
|
15
15
|
name: aasm
|