uffizzi_core 2.2.18 → 2.2.20

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ac821f837d64d420f64d0820763c1936a5729e58949aec8b7806f5ed6aa30805
-  data.tar.gz: 7b47949da56f4d7416d17ec4e628d0104cbdbd210db37c7a4d25802e96a2614e
+  metadata.gz: c6b90d5ab4a5541985fc4d2759d95026ba31fcebda13efe26d005c90ccd53329
+  data.tar.gz: e92d2ab057e8fc18ae9dbb7520e479acfcef6d4f6c7269cde28e202d8d3f327e
 SHA512:
-  metadata.gz: ceeec356d175119ca83f7da7642ab5607788fefd180a97d0dbbbcc40466e7668de0a70b9982053809b5c701499993648bf13c29a078ce1278e950d6e0931442d
-  data.tar.gz: 4c924c77d4201c61548797f2273b5325caec1bdddb9e89eb5f5bc9cafbcdc3173387e38cb825113a5cc1708f30e9f51ac82343f36d987167f502992968b98589
+  metadata.gz: 6b60359564b861d85210a4c79df1f93882fa58fe51447c16488e40f81854cf71e997c4d9e06ab1d0c0e72ca40b300e95446aff2344675a2dfcf2f6c4bf6da017
+  data.tar.gz: ac60e35f27a030dc11fdca4f1a64da273e343f873322704adae014f83107f3d93a002aeb23f690df5cfdd385dfd7f2fc444c710cf5345de5bc6527438bf4ca76

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

@@ -24,7 +24,8 @@ module UffizziCore::Concerns::Models::Project
     has_many :host_volume_files, dependent: :destroy
     has_many :clusters, dependent: :destroy
 
-    validates :name, presence: true, uniqueness: { scope: :account }
+    validates :name, presence: true
+    validates_uniqueness_of :name, conditions: -> { where(state: :active) }
     validates :slug, presence: true, uniqueness: true
 
     aasm(:state) do

data/app/serializers/uffizzi_core/api/cli/v1/projects/deployment_serializer.rb

@@ -7,19 +7,9 @@ class UffizziCore::Api::Cli::V1::Projects::DeploymentSerializer < UffizziCore::B
   type :deployment
 
   attributes :id,
-             :kind,
              :project_id,
-             :created_at,
-             :updated_at,
              :state,
-             :preview_url,
-             :tag,
-             :branch,
-             :image_id,
-             :ingress_container_ready,
-             :ingress_container_state,
-             :creation_source,
-             :metadata
+             :preview_url
 
   has_many :containers
 
@@ -28,38 +18,4 @@ class UffizziCore::Api::Cli::V1::Projects::DeploymentSerializer < UffizziCore::B
   def containers
     object.containers.active
   end
-
-  def tag
-    object.ingress_container&.tag
-  end
-
-  def branch
-    object.ingress_container&.repo&.branch
-  end
-
-  def image_id
-    object.ingress_container&.repo&.name
-  end
-
-  def ingress_container_ready
-    !!object.ingress_container&.activity_items&.last&.events&.last&.deployed?
-  end
-
-  def ingress_container_state
-    last_event = object.ingress_container&.activity_items&.last&.events&.last
-
-    case last_event&.state
-    when UffizziCore::Event.state.deployed
-      :deployed
-    when UffizziCore::Event.state.failed, UffizziCore::Event.state.timeout, UffizziCore::Event.state.cancelled
-      :failed
-    else
-      state_from_activity_items
-    end
-  end
-
-  def state_from_activity_items
-    activity_items_count = object.ingress_container&.activity_items&.count
-    activity_items_count.to_i > 1 ? :updating : :pending
-  end
 end

data/db/migrate/20230824150022_update_name_constraint_to_projects.rb

@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+class UpdateNameConstraintToProjects < ActiveRecord::Migration[6.1]
+  def change
+    remove_index(:uffizzi_core_projects, [:account_id, :name])
+    add_index(:uffizzi_core_projects, [:account_id, :name], unique: true,
+                                                            where: "state = 'active'",
+                                                            name: 'proj_uniq_name')
+  end
+end

data/lib/uffizzi_core/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: uffizzi_core
 version: !ruby/object:Gem::Version
-  version: 2.2.18
+  version: 2.2.20
 platform: ruby
 authors:
 - Josh Thurman
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-08-28 00:00:00.000000000 Z
+date: 2023-09-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aasm
@@ -1087,6 +1087,7 @@ files:
 - db/migrate/20230613101901_create_clusters.rb
 - db/migrate/20230711101901_add_host_to_clusters.rb
 - db/migrate/20230810140316_add_source_to_uffizzi_core_clusters.rb
+- db/migrate/20230824150022_update_name_constraint_to_projects.rb
 - db/seeds.rb
 - lib/tasks/uffizzi_core_tasks.rake
 - lib/uffizzi_core.rb