uffizzi_core 2.0.7 → 2.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b54f2e35d7621917abd739768779233c577d81e336e3912afbea309acc082358
-  data.tar.gz: 5115e2ccb4b5ac60a0774b90b414706af539dd373a7318ed0f6d28e28970b867
+  metadata.gz: ad9f3a6a719b85ce7b8ca7e577f9a53d948fd45be0c6691f9b10ad8d8fd2c362
+  data.tar.gz: d1d7268ea5bd02791d247889006561c40624f33d09cc96a2bb2b2cf71f6e0d8f
 SHA512:
-  metadata.gz: fc8278ac3328a95f833316a109f96e9baf3b377a35b25679bf03447cf17d87a78ba83044127d90b065754834fa3acac0791747495b81b97b61919df53ec910d4
-  data.tar.gz: a05cc0c6cffbe5366b7d896a50bef25bff6a1988b307bea804fe435b7965a86d179250d68b47b979a03132a0bb52427c7af2738b736fa12f006621d4e74f47bb
+  metadata.gz: 5beb449c4b58083379aaa6a2d03e4687b4262b7c9c889f75e11b8206ad712c2d46d723de67935ff50ff13a892b839c4659ce14b0c09b565da0b61937af127144
+  data.tar.gz: a9ce4450a1fc753307e23b208fba4dc3bcfc2c33f00de922c158139525d99a8acfdc506a4368c36aeb97ee1074085307bee9af4b7c9546a0b39728e87e4a6b0a

data/app/forms/uffizzi_core/api/cli/v1/account/credential/create_form.rb

@@ -17,7 +17,7 @@ class UffizziCore::Api::Cli::V1::Account::Credential::CreateForm < UffizziCore::
   end
 
   def check_credential_correctness
-    errors.add(:username, :incorrect) unless UffizziCore::CredentialService.correct_credentials?(self)
+    errors.add(:username, :incorrect, type: type.text) unless UffizziCore::CredentialService.correct_credentials?(self)
   end
 
   def credential_exists?

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

@@ -11,6 +11,15 @@ module UffizziCore::Concerns::Models::Credential
 
     self.table_name = UffizziCore.table_names[:credentials]
 
+    const_set(:CREDENTIAL_TYPES, [
+                'UffizziCore::Credential::Amazon',
+                'UffizziCore::Credential::Azure',
+                'UffizziCore::Credential::DockerHub',
+                'UffizziCore::Credential::DockerRegistry',
+                'UffizziCore::Credential::GithubContainerRegistry',
+                'UffizziCore::Credential::Google',
+              ])
+
     belongs_to :account
 
     before_destroy :remove_token

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

@@ -9,8 +9,8 @@ module UffizziCore::Concerns::Models::Event
 
     self.table_name = UffizziCore.table_names[:events]
 
-    enumerize :state, in: [:queued, :successful, :deployed, :failed, :building, :timeout, :cancelled, :deploying], predicates: true,
-                      scope: true
+    enumerize :state, in: [:waiting, :queued, :successful, :deployed, :failed, :building, :timeout, :cancelled, :deploying],
+                      predicates: true, scope: true
 
     belongs_to :activity_item, touch: true
   end

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

@@ -13,7 +13,6 @@ module UffizziCore::Concerns::Models::Repo
 
     belongs_to :project
     has_one :container, inverse_of: :repo, dependent: :destroy
-    has_many :builds, dependent: :destroy
 
     validates :dockerfile_path, presence: true, if: :dockerfile?
     validates :delete_preview_after, numericality: { greater_than: 0, only_integer: true }, allow_nil: true

data/app/models/uffizzi_core/credential.rb

@@ -2,4 +2,7 @@
 
 class UffizziCore::Credential < UffizziCore::ApplicationRecord
   include UffizziCore::Concerns::Models::Credential
+
+  enumerize :type,
+            in: self::CREDENTIAL_TYPES, i18n_scope: ['enumerize.credential.type']
 end

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

@@ -12,7 +12,6 @@ class UffizziCore::Api::Cli::V1::Projects::DeploymentSerializer < UffizziCore::B
              :preview_url,
              :tag,
              :branch,
-             :commit,
              :image_id,
              :ingress_container_ready,
              :ingress_container_state,
@@ -35,10 +34,6 @@ class UffizziCore::Api::Cli::V1::Projects::DeploymentSerializer < UffizziCore::B
     object.ingress_container&.repo&.branch
   end
 
-  def commit
-    object.ingress_container&.repo&.builds&.deployed&.last&.commit.to_s.slice(0..5)
-  end
-
   def image_id
     object.ingress_container&.repo&.name
   end

data/app/serializers/uffizzi_core/api/cli/v1/projects/deployments/container_serializer.rb

@@ -9,15 +9,7 @@ class UffizziCore::Api::Cli::V1::Projects::Deployments::ContainerSerializer < Uf
 
   def name
     image_name = object.image.split('/').pop
-    commit = object&.repo&.builds&.deployed&.last&.commit
-    container_name = "#{image_name}:#{object.tag}"
-
-    if !commit.nil?
-      short_commit_hash = commit.slice(0..5)
-      container_name = "#{container_name}@#{short_commit_hash}"
-    end
-
-    container_name
+    "#{image_name}:#{object.tag}"
   end
 
   def secret_variables

data/app/services/uffizzi_core/manage_activity_items_service.rb

@@ -56,16 +56,11 @@ class UffizziCore::ManageActivityItemsService
   def build_container_status_items(network_connectivities, containers_replicas)
     containers.map do |container|
       network_connectivity = network_connectivities.detect { |item| item[:id] == container.id }
-      any_container_is_building = containers_replicas.any? do |container_replicas|
-        container_replicas[:items].any? do |item|
-          item[:status] == UffizziCore::Event.state.building
-        end
-      end
       container_replicas = containers_replicas.detect { |item| item[:id] == container.id }
 
       {
         id: container.id,
-        status: build_container_status(container, network_connectivity, container_replicas, any_container_is_building),
+        status: build_container_status(container, network_connectivity, container_replicas),
       }
     end
   end
@@ -74,9 +69,7 @@ class UffizziCore::ManageActivityItemsService
     replicas.any? { |replica| replica[:status] == status }
   end
 
-  def build_container_status(container, network_connectivity, container_replicas, any_container_is_building)
-    return building_container_status(container) if any_container_is_building
-
+  def build_container_status(container, network_connectivity, container_replicas)
     error = replicas_contains_status?(container_replicas[:items], UffizziCore::Event.state.failed)
     container_is_running = replicas_contains_status?(container_replicas[:items], UffizziCore::Event.state.deployed)
     deployed = !error && container_is_running
@@ -91,10 +84,6 @@ class UffizziCore::ManageActivityItemsService
     container_status(error, deployed)
   end
 
-  def building_container_status(_container)
-    UffizziCore::Event.state.deploying
-  end
-
   def container_status(error, deployed)
     return UffizziCore::Event.state.failed if error
     return UffizziCore::Event.state.deployed if deployed

data/app/services/uffizzi_core/repo_service.rb

@@ -32,10 +32,6 @@ class UffizziCore::RepoService
       #{repo.project_id}:#{repo.id}")[0, 10]}"
     end
 
-    def tag(repo)
-      repo&.builds&.deployed&.last&.commit || 'latest'
-    end
-
     def image(repo)
       repo_credential = credential(repo)
 

data/config/locales/en.activerecord.yml

@@ -13,7 +13,7 @@ en:
             password:
               password_blank: Password/Access Token can't be blank
             username:
-              incorrect: We were unable to log you in to docker registry. Please verify that your username and password are correct.
+              incorrect: "We were unable to log you into %{type}. Please verify that your username and password are correct."
             type:
               exist: Credential of that type already exist.
         uffizzi_core/deployment:

data/config/locales/en.yml

@@ -77,3 +77,12 @@ en:
   session:
     unsupported_login_type: This type of login is not supported
     unauthorized: Unauthorized
+  enumerize:
+    credential:
+      type:
+        "UffizziCore::Credential::GithubContainerRegistry": "Github Container Registry"
+        "UffizziCore::Credential::DockerHub": "DockerHub"
+        "UffizziCore::Credential::DockerRegistry": "Docker Registry"
+        "UffizziCore::Credential::Azure": "Azure"
+        "UffizziCore::Credential::Google": "Google"
+        "UffizziCore::Credential::Amazon": "Amazon"

data/lib/uffizzi_core/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: uffizzi_core
 version: !ruby/object:Gem::Version
-  version: 2.0.7
+  version: 2.0.8
 platform: ruby
 authors:
 - Josh Thurman
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-10-26 00:00:00.000000000 Z
+date: 2022-10-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aasm
@@ -811,7 +811,6 @@ files:
 - app/jobs/uffizzi_core/deployment/update_credential_job.rb
 - app/lib/uffizzi_core/concerns/models/account.rb
 - app/lib/uffizzi_core/concerns/models/activity_item.rb
-- app/lib/uffizzi_core/concerns/models/build.rb
 - app/lib/uffizzi_core/concerns/models/comment.rb
 - app/lib/uffizzi_core/concerns/models/compose_file.rb
 - app/lib/uffizzi_core/concerns/models/config_file.rb
@@ -845,7 +844,6 @@ files:
 - app/models/uffizzi_core/activity_item/github.rb
 - app/models/uffizzi_core/activity_item/memory_limit.rb
 - app/models/uffizzi_core/application_record.rb
-- app/models/uffizzi_core/build.rb
 - app/models/uffizzi_core/comment.rb
 - app/models/uffizzi_core/compose_file.rb
 - app/models/uffizzi_core/config_file.rb
@@ -898,7 +896,6 @@ files:
 - app/repositories/uffizzi_core/account_repo.rb
 - app/repositories/uffizzi_core/activity_item_repo.rb
 - app/repositories/uffizzi_core/basic_order_repo.rb
-- app/repositories/uffizzi_core/build_repo.rb
 - app/repositories/uffizzi_core/comment_repo.rb
 - app/repositories/uffizzi_core/compose_file_repo.rb
 - app/repositories/uffizzi_core/config_file_repo.rb

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

@@ -1,47 +0,0 @@
-# frozen_string_literal: true
-
-module UffizziCore::Concerns::Models::Build
-  extend ActiveSupport::Concern
-
-  included do
-    include UffizziCore::BuildRepo
-
-    self.table_name = UffizziCore.table_names[:builds]
-
-    const_set(:BUILDING, 1)
-    const_set(:SUCCESS, 2)
-    const_set(:FAILED, 3)
-    const_set(:TIMEOUT, 4)
-    const_set(:CANCELLED, 5)
-
-    belongs_to :repo
-
-    def successful?
-      status == self.class::SUCCESS
-    end
-
-    def unsuccessful?
-      [self.class::FAILED, self.class::TIMEOUT, self.class::CANCELLED].include?(status)
-    end
-
-    def failed?
-      status == self.class::FAILED
-    end
-
-    def building?
-      status == self.class::BUILDING
-    end
-
-    def timed_out?
-      status == self.class::TIMEOUT
-    end
-
-    def cancelled?
-      status == self.class::CANCELLED
-    end
-
-    def ended?
-      [self.class::SUCCESS, self.class::FAILED, self.class::TIMEOUT, self.class::CANCELLED].include?(status)
-    end
-  end
-end

data/app/models/uffizzi_core/build.rb

@@ -1,5 +0,0 @@
-# frozen_string_literal: true
-
-class UffizziCore::Build < UffizziCore::ApplicationRecord
-  include UffizziCore::Concerns::Models::Build
-end

data/app/repositories/uffizzi_core/build_repo.rb

@@ -1,23 +0,0 @@
-# frozen_string_literal: true
-
-module UffizziCore::BuildRepo
-  extend ActiveSupport::Concern
-
-  included do
-    scope :successful, -> {
-      where(status: UffizziCore::Build::SUCCESS)
-    }
-
-    scope :building, -> {
-      where(status: UffizziCore::Build::BUILDING)
-    }
-
-    scope :queued, -> {
-      where(status: [nil])
-    }
-
-    scope :deployed, -> {
-      where(deployed: true)
-    }
-  end
-end