uffizzi_core 2.0.7 → 2.0.9

data/app/services/uffizzi_core/compose_file_service.rb

@@ -59,19 +59,6 @@ class UffizziCore::ComposeFileService
       builder.build_attributes(compose_data, compose_dependencies, source)
     end
 
-    def containers_credentials(compose_data, credentials)
-      containers = compose_data[:containers]
-      detected_credentials = containers.map do |container|
-        UffizziCore::ComposeFile::ContainerService.credential_for_container(container, credentials)
-      end
-
-      result = []
-      detected_credentials.compact
-        .group_by { |credential| credential[:id] }
-        .each_pair { |_id, value| result << value.first }
-      result
-    end
-
     def has_secret?(compose_file, secret)
       containers = compose_file.template.payload['containers_attributes']
 
@@ -91,8 +78,7 @@ class UffizziCore::ComposeFileService
 
         if new_secrets_errors.present?
           new_errors = { UffizziCore::ComposeFile::ErrorsService::SECRETS_ERROR_KEY => new_secrets_errors }
-          UffizziCore::ComposeFile::ErrorsService.update_compose_errors!(compose_file,
-                                                                         compose_file_errors.merge(new_errors),
+          UffizziCore::ComposeFile::ErrorsService.update_compose_errors!(compose_file, compose_file_errors.merge(new_errors),
                                                                          compose_file.content)
           next
         end
@@ -117,12 +103,8 @@ class UffizziCore::ComposeFileService
     end
 
     def create_temporary_compose(resource_project, current_user, compose_file_params, dependencies)
-      create_params = {
-        project: resource_project,
-        user: current_user,
-        compose_file_params: compose_file_params,
-        dependencies: dependencies || [],
-      }
+      create_params = { project: resource_project, user: current_user, compose_file_params: compose_file_params,
+                        dependencies: dependencies || [] }
       kind = UffizziCore::ComposeFile.kind.temporary
       UffizziCore::ComposeFileService.create(create_params, kind)
     end
@@ -173,11 +155,7 @@ class UffizziCore::ComposeFileService
     end
 
     def prepare_compose_file_dependencies(compose_dependencies)
-      compose_dependencies.map do |dependency|
-        {
-          path: dependency[:path],
-        }
-      end
+      compose_dependencies.map { |dependency| { path: dependency[:path] } }
     end
 
     def persist!(compose_file_form, cli_form)
@@ -201,6 +179,7 @@ class UffizziCore::ComposeFileService
 
         raise ActiveRecord::Rollback if errors.present?
       end
+
       [compose_file_form, errors]
     end
 
@@ -208,9 +187,8 @@ class UffizziCore::ComposeFileService
       begin
         compose_data = YAML.safe_load(compose_content, aliases: true)
       rescue Psych::SyntaxError
-        raise UffizziCore::ComposeFile::ParseError, 'Invalid compose file'
+        raise UffizziCore::ComposeFile::ParseError, I18n.t('compose.invalid_file')
       end
-
       raise UffizziCore::ComposeFile::ParseError, I18n.t('compose.unsupported_file') if compose_data.nil?
 
       compose_data

data/app/services/uffizzi_core/{amazon/credential_service.rb → container_registry/amazon_service.rb}

@@ -1,7 +1,25 @@
 # frozen_string_literal: true
 
-class UffizziCore::Amazon::CredentialService
+class UffizziCore::ContainerRegistry::AmazonService
   class << self
+    def digest(credential, image, tag)
+      response = client(credential).batch_get_image(image: image, tag: tag)
+      response.images[0].image_id.image_digest
+    rescue StandardError
+      nil
+    end
+
+    def get_region_from_registry_url(url)
+      parsed_url = URI.parse(url)
+      host = parsed_url.host
+      parsed_host = host.split('.')
+      parsed_host[3]
+    end
+
+    def image_available?(credential, _image_data)
+      credential.present?
+    end
+
     def credential_correct?(credential)
       access_token(credential).present?
     end
@@ -19,7 +37,7 @@ class UffizziCore::Amazon::CredentialService
     private
 
     def client(credential)
-      region = UffizziCore::AmazonService.get_region_from_registry_url(credential.registry_url)
+      region = get_region_from_registry_url(credential.registry_url)
 
       UffizziCore::AmazonRegistryClient.new(
         region: region,

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

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+class UffizziCore::ContainerRegistry::AzureService
+  class << self
+    def image_available?(credential, _image_data)
+      credential.present?
+    end
+
+    def credential_correct?(credential)
+      client(credential).authentificated?
+    rescue URI::InvalidURIError, Faraday::ConnectionFailed
+      false
+    end
+
+    private
+
+    def client(c)
+      UffizziCore::AzureRegistryClient.new(registry_url: c.registry_url, username: c.username, password: c.password)
+    end
+  end
+end

data/app/services/uffizzi_core/{docker_hub_service.rb → container_registry/docker_hub_service.rb}

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-class UffizziCore::DockerHubService
+class UffizziCore::ContainerRegistry::DockerHubService
   class << self
     def accounts(credential)
       client = user_client(credential)
@@ -41,10 +41,14 @@ class UffizziCore::DockerHubService
       response.headers['docker-content-digest']
     end
 
+    def credential_correct?(credential)
+      client(credential).authentificated?
+    end
+
     private
 
-    def public_docker_hub_client
-      @public_docker_hub_client ||= UffizziCore::DockerHubClient.new
+    def client(credential)
+      UffizziCore::DockerHubClient.new(credential)
     end
 
     def not_found?(response)

data/app/services/uffizzi_core/{docker_registry_service.rb → container_registry/docker_registry_service.rb}

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-class UffizziCore::DockerRegistryService
+class UffizziCore::ContainerRegistry::DockerRegistryService
   class << self
     def image_available?(credential, image_data)
       client_params = build_client_params(credential, image_data)
@@ -10,8 +10,22 @@ class UffizziCore::DockerRegistryService
       response.status < 400
     end
 
+    def credential_correct?(credential)
+      client(credential).authenticated?
+    end
+
     private
 
+    def client(credential)
+      params = {
+        registry_url: credential.registry_url,
+        username: credential.username,
+        password: credential.password,
+      }
+
+      UffizziCore::DockerRegistryClient.new(params)
+    end
+
     def build_client_params(credential, image_data)
       registry_url = credential&.registry_url || image_data[:registry_url]
       new_registry_url = registry_url.start_with?('https://', 'http://') ? registry_url : "https://#{registry_url}"

data/app/services/uffizzi_core/{github_container_registry/credential_service.rb → container_registry/github_container_registry_service.rb}

@@ -1,7 +1,11 @@
 # frozen_string_literal: true
 
-class UffizziCore::GithubContainerRegistry::CredentialService
+class UffizziCore::ContainerRegistry::GithubContainerRegistryService
   class << self
+    def image_available?(credential, _image_data)
+      credential.present?
+    end
+
     def credential_correct?(credential)
       client(credential).authentificated?
     rescue URI::InvalidURIError, Faraday::ConnectionFailed
@@ -16,9 +20,8 @@ class UffizziCore::GithubContainerRegistry::CredentialService
 
     private
 
-    def client(credential)
-      UffizziCore::GithubContainerRegistryClient.new(registry_url: credential.registry_url, username: credential.username,
-                                                     password: credential.password)
+    def client(c)
+      UffizziCore::GithubContainerRegistryClient.new(registry_url: c.registry_url, username: c.username, password: c.password)
     end
   end
 end

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

@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+class UffizziCore::ContainerRegistry::GoogleService
+  class << self
+    def digest(credential, image, tag)
+      response = client(credential).manifests(image: image, tag: tag)
+
+      response.headers['docker-content-digest']
+    end
+
+    def image_available?(credential, _image_data)
+      credential.present?
+    end
+
+    def credential_correct?(credential)
+      client(credential).authentificated?
+    rescue URI::InvalidURIError, Faraday::ConnectionFailed
+      false
+    end
+
+    private
+
+    def client(c)
+      UffizziCore::GoogleRegistryClient.new(registry_url: c.registry_url, username: c.username, password: c.password)
+    end
+  end
+end

data/app/services/uffizzi_core/container_registry_service.rb

@@ -0,0 +1,91 @@
+# frozen_string_literal: true
+
+class UffizziCore::ContainerRegistryService
+  attr_accessor :type, :container_data
+
+  class << self
+    def init_by_subclass(credential_type)
+      type = credential_type.demodulize.underscore
+      new(type.to_sym)
+    end
+
+    def init_by_container(container)
+      registry_url = container.dig(:image, :registry_url)
+      repository_url = container.dig(:build, :repository_url)
+
+      return new(:docker_hub, container) if registry_url.blank? && repository_url.blank?
+      return new(:azure, container) if registry_url.include?('azurecr.io')
+      return new(:google, container) if registry_url.include?('gcr.io')
+      return new(:amazon, container) if registry_url.include?('amazonaws.com')
+      return new(:github_container_registry, container) if registry_url.include?('ghcr.io')
+      return new(:docker_registry, container) if docker_registry?(container)
+    end
+
+    def docker_registry?(container)
+      registry_url = container.dig(:image, :registry_url)
+      return false if registry_url.nil?
+
+      registry_domain_regexp = /(\w+\.\w{2,})(?::\d+)?\z/
+      registry_domain = registry_url.match(registry_domain_regexp)&.to_a&.last
+      return false if registry_domain.nil?
+
+      ['amazonaws.com', 'azurecr.io', 'gcr.io', 'ghcr.io'].exclude?(registry_domain)
+    end
+
+    def sources
+      [:azure, :google, :amazon, :github_container_registry, :docker_registry, :docker_hub, *additional_sources]
+    end
+
+    def additional_sources
+      []
+    end
+  end
+
+  def initialize(type, container_data = {})
+    @type = type
+    @container_data = container_data
+
+    raise ::UffizziCore::RegistryNotSupportedError unless self.class.sources.include?(type)
+  end
+
+  def digest(credential, image, tag)
+    service.digest(credential, image, tag)
+  end
+
+  def service
+    @service ||= "UffizziCore::ContainerRegistry::#{type.to_s.camelize}Service".safe_constantize
+  end
+
+  def repo_type
+    @repo_type ||= "UffizziCore::Repo::#{type.to_s.camelize}".safe_constantize
+  end
+
+  def credential_correct?(credential)
+    service.credential_correct?(credential)
+  end
+
+  def image_data
+    @image_data ||= container_data[:image]
+  end
+
+  def image_name(credentials)
+    if image_data[:registry_url].present? && [:google, :github_container_registry, :docker_registry].exclude?(type)
+      return image_data[:name]
+    end
+
+    if type == :docker_registry && credential(credentials).nil?
+      return [image_data[:registry_url], image_data[:namespace], image_data[:name]].compact.join('/')
+    end
+
+    "#{image_data[:namespace]}/#{image_data[:name]}"
+  end
+
+  def credential(credentials_scope)
+    credentials_scope.send(type).first
+  end
+
+  def image_available?(credentials_scope)
+    credential = credential(credentials_scope)
+    service.image_available?(credential, image_data)
+  end
+end

data/app/services/uffizzi_core/logs_service.rb

@@ -23,6 +23,7 @@ class UffizziCore::LogsService
         deployment_id: deployment.id,
         container_name: UffizziCore::ContainerService.pod_name(container),
         limit: query[:limit],
+        previous: query[:previous] || false,
       )
     end
 

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

@@ -9,22 +9,9 @@ class UffizziCore::RepoService
     end
 
     def credential(repo)
+      container_registry_service = UffizziCore::ContainerRegistryService.init_by_subclass(repo.type)
       credentials = repo.project.account.credentials
-
-      case repo.type
-      when UffizziCore::Repo::GithubContainerRegistry.name
-        credentials.github_container_registry.first
-      when UffizziCore::Repo::DockerHub.name
-        credentials.docker_hub.first
-      when UffizziCore::Repo::DockerRegistry.name
-        credentials.docker_registry.first
-      when UffizziCore::Repo::Azure.name
-        credentials.azure.first
-      when UffizziCore::Repo::Google.name
-        credentials.google.first
-      when UffizziCore::Repo::Amazon.name
-        credentials.amazon.first
-      end
+      container_registry_service.credential(credentials)
     end
 
     def image_name(repo)
@@ -32,10 +19,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.9'
 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.9
 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-11-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aasm
@@ -776,6 +776,7 @@ files:
 - app/errors/uffizzi_core/deployment/image_pull_error.rb
 - app/errors/uffizzi_core/deployment/labels_not_found_error.rb
 - app/errors/uffizzi_core/deployment_not_found_error.rb
+- app/errors/uffizzi_core/registry_not_supported_error.rb
 - app/forms/uffizzi_core/api/cli/v1/account/credential/check_credential_form.rb
 - app/forms/uffizzi_core/api/cli/v1/account/credential/create_form.rb
 - app/forms/uffizzi_core/api/cli/v1/account/credential/update_form.rb
@@ -811,7 +812,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 +845,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 +897,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
@@ -949,9 +947,6 @@ files:
 - app/serializers/uffizzi_core/controller/deploy_containers/host_volume_file_serializer.rb
 - app/services/uffizzi_core/account_service.rb
 - app/services/uffizzi_core/activity_item_service.rb
-- app/services/uffizzi_core/amazon/credential_service.rb
-- app/services/uffizzi_core/amazon_service.rb
-- app/services/uffizzi_core/azure/credential_service.rb
 - app/services/uffizzi_core/compose_file/builders/container_builder_service.rb
 - app/services/uffizzi_core/compose_file/builders/container_config_files_builder_service.rb
 - app/services/uffizzi_core/compose_file/builders/container_host_volume_files_builder_service.rb
@@ -984,23 +979,21 @@ files:
 - app/services/uffizzi_core/compose_file/parsers/variables_parser_service.rb
 - app/services/uffizzi_core/compose_file/template_service.rb
 - app/services/uffizzi_core/compose_file_service.rb
+- app/services/uffizzi_core/container_registry/amazon_service.rb
+- app/services/uffizzi_core/container_registry/azure_service.rb
+- app/services/uffizzi_core/container_registry/docker_hub_service.rb
+- app/services/uffizzi_core/container_registry/docker_registry_service.rb
+- app/services/uffizzi_core/container_registry/github_container_registry_service.rb
+- app/services/uffizzi_core/container_registry/google_service.rb
+- app/services/uffizzi_core/container_registry_service.rb
 - app/services/uffizzi_core/container_service.rb
 - app/services/uffizzi_core/controller_service.rb
-- app/services/uffizzi_core/credential_service.rb
 - app/services/uffizzi_core/deployment_service.rb
-- app/services/uffizzi_core/docker_hub/credential_service.rb
-- app/services/uffizzi_core/docker_hub_service.rb
-- app/services/uffizzi_core/docker_registry/credential_service.rb
-- app/services/uffizzi_core/docker_registry_service.rb
-- app/services/uffizzi_core/github_container_registry/credential_service.rb
-- app/services/uffizzi_core/google/credential_service.rb
-- app/services/uffizzi_core/google_service.rb
 - app/services/uffizzi_core/logs_service.rb
 - app/services/uffizzi_core/manage_activity_items_service.rb
 - app/services/uffizzi_core/project_service.rb
 - app/services/uffizzi_core/repo_service.rb
 - app/services/uffizzi_core/response_service.rb
-- app/services/uffizzi_core/template_service.rb
 - app/services/uffizzi_core/token_service.rb
 - app/services/uffizzi_core/user_access_service.rb
 - app/services/uffizzi_core/user_generator_service.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

data/app/services/uffizzi_core/amazon_service.rb

@@ -1,31 +0,0 @@
-# frozen_string_literal: true
-
-class UffizziCore::AmazonService
-  class << self
-    def digest(credential, image, tag)
-      response = client(credential).batch_get_image(image: image, tag: tag)
-      response.images[0].image_id.image_digest
-    rescue StandardError
-      nil
-    end
-
-    def get_region_from_registry_url(url)
-      parsed_url = URI.parse(url)
-      host = parsed_url.host
-      parsed_host = host.split('.')
-      parsed_host[3]
-    end
-
-    private
-
-    def client(credential)
-      region = get_region_from_registry_url(credential.registry_url)
-
-      UffizziCore::AmazonRegistryClient.new(
-        region: region,
-        access_key_id: credential.username,
-        secret_access_key: credential.password,
-      )
-    end
-  end
-end

data/app/services/uffizzi_core/azure/credential_service.rb

@@ -1,18 +0,0 @@
-# frozen_string_literal: true
-
-class UffizziCore::Azure::CredentialService
-  class << self
-    def credential_correct?(credential)
-      client(credential).authentificated?
-    rescue URI::InvalidURIError, Faraday::ConnectionFailed
-      false
-    end
-
-    private
-
-    def client(credential)
-      UffizziCore::AzureRegistryClient.new(registry_url: credential.registry_url, username: credential.username,
-                                           password: credential.password)
-    end
-  end
-end