Merge branch 'develop'

UffizziCloud · Jan 26, 2023 · 337b0e8 · 337b0e8
2 parents e6523ec + 44d1c9b
commit 337b0e8
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 12 deletions.
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -1,7 +1,7 @@
 PATH
   remote: core
   specs:
-    uffizzi_core (2.0.24)
+    uffizzi_core (2.0.25)
       aasm
       actionpack (~> 6.1.0)
       active_model_serializers
@@ -109,8 +109,8 @@ GEM
     ast (2.4.2)
     awesome_print (1.9.2)
     aws-eventstream (1.2.0)
-    aws-partitions (1.697.0)
-    aws-sdk-core (3.169.0)
+    aws-partitions (1.700.0)
+    aws-sdk-core (3.170.0)
       aws-eventstream (~> 1, >= 1.0.2)
       aws-partitions (~> 1, >= 1.651.0)
       aws-sigv4 (~> 1.5)
@@ -247,7 +247,7 @@ GEM
     mini_portile2 (2.8.0)
     minitest (5.15.0)
     msgpack (1.4.5)
-    multipart-post (2.2.3)
+    multipart-post (2.3.0)
     nio4r (2.5.8)
     nokogiri (1.13.3)
       mini_portile2 (~> 2.8.0)

diff --git a/core/Gemfile.lock b/core/Gemfile.lock
@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    uffizzi_core (2.0.24)
+    uffizzi_core (2.0.25)
       aasm
       actionpack (~> 6.1.0)
       active_model_serializers
@@ -108,8 +108,8 @@ GEM
       activerecord (>= 5.2.6)
     awesome_print (1.9.2)
     aws-eventstream (1.2.0)
-    aws-partitions (1.697.0)
-    aws-sdk-core (3.169.0)
+    aws-partitions (1.700.0)
+    aws-sdk-core (3.170.0)
       aws-eventstream (~> 1, >= 1.0.2)
       aws-partitions (~> 1, >= 1.651.0)
       aws-sigv4 (~> 1.5)
@@ -220,7 +220,7 @@ GEM
       faraday (>= 0.9.0)
     faraday_middleware (1.2.0)
       faraday (~> 1.0)
-    globalid (1.0.1)
+    globalid (1.1.0)
       activesupport (>= 5.0)
     hash_diff (1.1.1)
     hashdiff (1.0.1)
@@ -262,7 +262,7 @@ GEM
       minitest
       power_assert (>= 1.1)
     mocha (1.13.0)
-    multipart-post (2.2.3)
+    multipart-post (2.3.0)
     net-imap (0.3.4)
       date
       net-protocol

diff --git a/core/app/lib/uffizzi_core/concerns/models/compose_file.rb b/core/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? }

diff --git a/core/app/lib/uffizzi_core/concerns/models/deployment.rb b/core/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

diff --git a/core/lib/uffizzi_core.rb b/core/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
diff --git a/core/lib/uffizzi_core/version.rb b/core/lib/uffizzi_core/version.rb
@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module UffizziCore
-  VERSION = '2.0.24'
+  VERSION = '2.0.25'
 end