uffizzi_core 2.1.10 → 2.1.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 23709086570ed3f71d5441b405a89e549ef018701ee69860bf1e52a599b261f3
-  data.tar.gz: 2253edd2072ab0f28d6634cda6f1f67d2dbfdd38afed8f6be641f653290663dc
+  metadata.gz: 566a4ac7c7432c2799c5ec99b9254b891b57f1dc824871ea08618c185a23b943
+  data.tar.gz: e873366901b73043ce453bcbec7573a6901f9652a7c06eb0d2de2e5de3c91902
 SHA512:
-  metadata.gz: dbee92e8db6aedcd94d2d4cd795556782c23015858ed58bfaf28f2a99881e19944295402e6c95695f2d0e7c77b8138ce9e48d5902b02361d94e98d74a146a70f
-  data.tar.gz: d430e40efbebcca7db9cdd92f84a27cb9632535b17d15ca48461463b9dc3997b1c017fa563525f76b37c92c4d6a11177cea19cda6606498aa72194c85a329de0
+  metadata.gz: 8f0104e86fea8ab38eeeb8b41a3b154967a1d04d7adffd923dec5aadeea9a079eb9b22c37a65b3741a3f5663359bae80c03ba3adceafe749f90e3daa7bc7fbb8
+  data.tar.gz: f8720202fdb34be5d0445bee562f1a76c72b133d5ad41a46d1c99dbbb53e74be51726804043c291dae6d1d7b650b757ab22e41e53bbadeaa63b2e2cad75136d7

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

@@ -4,6 +4,8 @@ module UffizziCore::Concerns::Models::Membership
   extend ActiveSupport::Concern
 
   included do
+    include AASM
+    include UffizziCore::StateMachineConcern
     include UffizziCore::MembershipRepo
     extend Enumerize
 
@@ -16,5 +18,18 @@ module UffizziCore::Concerns::Models::Membership
     belongs_to :user
 
     validates :role, presence: true
+
+    aasm(:state) do
+      state :active, initial: true
+      state :blocked
+
+      event :activate do
+        transitions from: [:blocked], to: :active
+      end
+
+      event :block do
+        transitions from: [:active], to: :blocked
+      end
+    end
   end
 end

data/app/repositories/uffizzi_core/membership_repo.rb

@@ -5,5 +5,6 @@ module UffizziCore::MembershipRepo
 
   included do
     scope :by_role_admin, -> { by_role(UffizziCore::Membership.role.admin) }
+    scope :by_account, ->(account) { where(account_id: account.id) }
   end
 end

data/app/services/uffizzi_core/activity_item_service.rb

@@ -55,6 +55,10 @@ class UffizziCore::ActivityItemService
         notification_module.notify_about_failed_deployment(deployment) if notification_module.present?
       end
 
+      if deployed?(status) && UffizziCore::ContainerService.ingress_container?(container)
+        deployment.update(last_deploy_at: last_event.created_at)
+      end
+
       return unless [UffizziCore::Event.state.building, UffizziCore::Event.state.deploying].include?(status)
 
       UffizziCore::Deployment::ManageDeployActivityItemJob.perform_in(5.seconds, activity_item.id)
@@ -79,5 +83,9 @@ class UffizziCore::ActivityItemService
     def failed?(status)
       status == UffizziCore::Event.state.failed
     end
+
+    def deployed?(status)
+      status == UffizziCore::Event.state.deployed
+    end
   end
 end

data/app/services/uffizzi_core/container_registry/azure_service.rb

@@ -10,6 +10,8 @@ class UffizziCore::ContainerRegistry::AzureService
       client(credential).authenticated?
     end
 
+    def digest(*); end
+
     private
 
     def client(c)

data/app/services/uffizzi_core/container_registry/docker_registry_service.rb

@@ -14,6 +14,8 @@ class UffizziCore::ContainerRegistry::DockerRegistryService
       client(credential).authenticated?
     end
 
+    def digest(*); end
+
     private
 
     def client(credential)

data/app/services/uffizzi_core/container_registry/github_container_registry_service.rb

@@ -10,6 +10,8 @@ class UffizziCore::ContainerRegistry::GithubContainerRegistryService
       client(credential).authenticated?
     end
 
+    def digest(*); end
+
     private
 
     def client(c)

data/app/services/uffizzi_core/container_service.rb

@@ -55,6 +55,10 @@ class UffizziCore::ContainerService
       end.first
     end
 
+    def ingress_container?(container)
+      container.receive_incoming_requests?
+    end
+
     private
 
     def container_status(container, pods)

data/db/migrate/20230111000000_add_state_to_memberships.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class AddStateToMemberships < ActiveRecord::Migration[6.1]
+  def change
+    add_column(:uffizzi_core_memberships, :state, :string)
+  end
+end

data/db/migrate/20230306142513_add_last_deploy_at_to_deployments.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+class AddLastDeployAtToDeployments < ActiveRecord::Migration[6.1]
+  def up
+    add_column :uffizzi_core_deployments, :last_deploy_at, :datetime
+
+    UffizziCore::Deployment.where(last_deploy_at: nil).update_all('last_deploy_at = updated_at')
+  end
+
+  def down
+    remove_column :uffizzi_core_deployments, :last_deploy_at
+  end
+end

data/lib/uffizzi_core/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: uffizzi_core
 version: !ruby/object:Gem::Version
-  version: 2.1.10
+  version: 2.1.12
 platform: ruby
 authors:
 - Josh Thurman
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-03-09 00:00:00.000000000 Z
+date: 2023-03-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aasm
@@ -1027,6 +1027,8 @@ files:
 - db/migrate/20220901110752_create_host_volume_files.rb
 - db/migrate/20220901165313_create_container_host_volume_files.rb
 - db/migrate/20220927113647_add_additional_subdomains_to_containers.rb
+- db/migrate/20230111000000_add_state_to_memberships.rb
+- db/migrate/20230306142513_add_last_deploy_at_to_deployments.rb
 - db/seeds.rb
 - lib/tasks/uffizzi_core_tasks.rake
 - lib/uffizzi_core.rb