uffizzi_core 2.0.8 → 2.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ad9f3a6a719b85ce7b8ca7e577f9a53d948fd45be0c6691f9b10ad8d8fd2c362
-  data.tar.gz: d1d7268ea5bd02791d247889006561c40624f33d09cc96a2bb2b2cf71f6e0d8f
+  metadata.gz: 0e4678fb73f3c46832c31d239796e6eb99bbe66b58aef0af348d470030139312
+  data.tar.gz: d03ff11d2723b851f01fe597ba96b6e250f68ae2d190905aa70d269bd10f0ff3
 SHA512:
-  metadata.gz: 5beb449c4b58083379aaa6a2d03e4687b4262b7c9c889f75e11b8206ad712c2d46d723de67935ff50ff13a892b839c4659ce14b0c09b565da0b61937af127144
-  data.tar.gz: a9ce4450a1fc753307e23b208fba4dc3bcfc2c33f00de922c158139525d99a8acfdc506a4368c36aeb97ee1074085307bee9af4b7c9546a0b39728e87e4a6b0a
+  metadata.gz: fb063735799a3a24ddc60ee808d30e67bcb90831f3e0058ee93fa0d1cea575f8949b1bc91410d781f4e38baf9cb9b9ecfed387cfe5c58bdeaecaf916a07698cb
+  data.tar.gz: 03311442753ac1af1439287b170280e4d689d827a8dbabbffbc910045131a7ca5d35dbf5ed3dd7945fb49fd0e0d5502d5eba41f2499232887e78e04f7671fc60

data/app/clients/uffizzi_core/controller_client.rb

@@ -39,8 +39,8 @@ class UffizziCore::ControllerClient
     get("/deployments/#{deployment_id}/containers/metrics")
   end
 
-  def deployment_container_logs(deployment_id:, container_name:, limit:)
-    get("/deployments/#{deployment_id}/containers/#{container_name}/logs?limit=#{limit}")
+  def deployment_container_logs(deployment_id:, container_name:, limit:, previous:)
+    get("/deployments/#{deployment_id}/containers/#{container_name}/logs?limit=#{limit}&previous=#{previous}")
   end
 
   def deployment_containers_events(deployment_id:)

data/app/controllers/uffizzi_core/api/cli/v1/projects/deployments/containers/logs_controller.rb

@@ -22,6 +22,6 @@ class UffizziCore::Api::Cli::V1::Projects::Deployments::Containers::LogsControll
   private
 
   def logs_params
-    params.permit(:limit)
+    params.permit(:limit, :previous)
   end
 end

data/app/controllers/uffizzi_core/application_controller.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 class UffizziCore::ApplicationController < ActionController::Base
-  include Pundit
+  include Pundit::Authorization
   include UffizziCore::ResponseService
   include UffizziCore::AuthManagement
   include UffizziCore::AuthorizationConcern
@@ -12,8 +12,10 @@ class UffizziCore::ApplicationController < ActionController::Base
 
   protect_from_forgery with: :exception
   RESCUABLE_EXCEPTIONS = [RuntimeError, TypeError, NameError, ArgumentError, SyntaxError].freeze
-  rescue_from *RESCUABLE_EXCEPTIONS do |exception|
-    render_server_error(exception)
+  unless Rails.env.test?
+    rescue_from *RESCUABLE_EXCEPTIONS do |exception|
+      render_server_error(exception)
+    end
   end
   rescue_from ActiveRecord::RecordNotFound do |exception|
     render_not_found(exception)

data/app/errors/uffizzi_core/registry_not_supported_error.rb

@@ -0,0 +1,4 @@
+# frozen_string_literal: true
+
+class UffizziCore::RegistryNotSupportedError < StandardError
+end

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, type: type.text) unless UffizziCore::CredentialService.correct_credentials?(self)
+    errors.add(:username, :incorrect, type: type.text) unless correct?
   end
 
   def credential_exists?

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

@@ -16,6 +16,6 @@ class UffizziCore::Api::Cli::V1::Account::Credential::UpdateForm < UffizziCore::
   end
 
   def check_credential_correctness
-    errors.add(:username, :incorrect) unless UffizziCore::CredentialService.correct_credentials?(self)
+    errors.add(:username, :incorrect) unless correct?
   end
 end

data/app/forms/uffizzi_core/api/cli/v1/compose_file/check_credentials_form.rb

@@ -15,7 +15,14 @@ class UffizziCore::Api::Cli::V1::ComposeFile::CheckCredentialsForm
     compose_payload = { compose_file: compose_file }
     compose_data = UffizziCore::ComposeFileService.parse(compose_content, compose_payload)
 
-    UffizziCore::ComposeFileService.containers_credentials(compose_data, credentials)
+    containers = compose_data[:containers]
+    containers.map do |container|
+      container_registry_service = UffizziCore::ContainerRegistryService.init_by_container(container)
+      credential = container_registry_service.credential(credentials)
+      next credential if container_registry_service.image_available?(credentials)
+
+      raise UffizziCore::ComposeFile::CredentialError.new(I18n.t('compose.unprocessable_image', value: container_registry_service.type))
+    end
   rescue UffizziCore::ComposeFile::CredentialError => e
     errors.add(:credentials, e.message)
   end

data/app/forms/uffizzi_core/api/cli/v1/compose_file/template_form.rb

@@ -39,6 +39,8 @@ class UffizziCore::Api::Cli::V1::ComposeFile::TemplateForm
       errors.add(SECRETS_ERROR_KEY, template_build_error.message)
     when UffizziCore::ComposeFile::BuildError
       errors.add(TEMPLATE_BUILD_ERROR_KEY, template_build_error.message)
+    when StandardError
+      raise template_build_error
     end
   end
 end

data/app/forms/uffizzi_core/api/cli/v1/template/create_form.rb

@@ -1,72 +1,19 @@
 # frozen_string_literal: true
 
 class UffizziCore::Api::Cli::V1::Template::CreateForm < UffizziCore::Template
-  include UffizziCore::ApplicationForm
-
-  permit :name,
-         payload: {
-           containers_attributes: [
-             :image,
-             :tag,
-             :port,
-             :public,
-             :memory_limit,
-             :memory_request,
-             :entrypoint,
-             :command,
-             :receive_incoming_requests,
-             :continuously_deploy,
-             :service_name,
-             :name,
-             { variables: [:name, :value],
-               additional_subdomains: [],
-               secret_variables: [:name, :value],
-               volumes: [:source, :target, :type, :read_only],
-               healthcheck: [:test, :interval, :timeout, :retries, :start_period, :disable, { test: [] }],
-               repo_attributes: [
-                 :namespace,
-                 :name,
-                 :slug,
-                 :type,
-                 :description,
-                 :repository_id,
-                 :is_private,
-                 :branch,
-                 :kind,
-                 :dockerfile_path,
-                 :dockerfile_context_path,
-                 :deploy_preview_when_pull_request_is_opened,
-                 :delete_preview_when_pull_request_is_closed,
-                 :deploy_preview_when_image_tag_is_created,
-                 :delete_preview_when_image_tag_is_updated,
-                 :share_to_github,
-                 :delete_preview_after,
-                 { args: [:name, :value] },
-               ],
-               container_config_files_attributes: [
-                 :config_file_id,
-                 :mount_path,
-               ],
-               container_host_volume_files_attributes: [
-                 :host_volume_file_id,
-                 :source_path,
-               ] },
-           ],
-         }
-
   validate :check_max_memory_limit
   validate :check_max_memory_request
 
   private
 
   def check_max_memory_limit
-    return if UffizziCore::TemplateService.valid_containers_memory_limit?(self)
+    return if valid_containers_memory_limit?
 
     errors.add(:payload, :max_memory_limit_error, max: project.account.container_memory_limit)
   end
 
   def check_max_memory_request
-    return if UffizziCore::TemplateService.valid_containers_memory_request?(self)
+    return if valid_containers_memory_request?
 
     errors.add(:payload, :max_memory_request_error, max: project.account.container_memory_limit)
   end

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

@@ -44,28 +44,24 @@ module UffizziCore::Concerns::Models::Credential
       end
     end
 
-    def github_container_registry?
-      type == UffizziCore::Credential::GithubContainerRegistry.name
+    UffizziCore::ContainerRegistryService.sources.each do |t|
+      define_method :"#{t}?" do
+        type == "UffizziCore::Credential::#{t.to_s.camelize}"
+      end
     end
 
-    def docker_hub?
-      type == UffizziCore::Credential::DockerHub.name
-    end
+    def correct?
+      credential = self
+      return false unless credential
 
-    def docker_registry?
-      type == UffizziCore::Credential::DockerRegistry.name
-    end
+      container_registry_service = UffizziCore::ContainerRegistryService.init_by_subclass(credential.type)
+      status = container_registry_service.credential_correct?(credential)
 
-    def azure?
-      type == UffizziCore::Credential::Azure.name
-    end
-
-    def google?
-      type == UffizziCore::Credential::Google.name
-    end
+      if credential.persisted? && credential.active? && !status
+        Rails.logger.warn("Wrong credential: credential_correct? credential_id=#{credential.id}")
+      end
 
-    def amazon?
-      type == UffizziCore::Credential::Amazon.name
+      status
     end
 
     private

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

@@ -19,5 +19,21 @@ module UffizziCore::Concerns::Models::Template
 
     validates :name, presence: true
     validates :name, uniqueness: { scope: :project }, if: -> { compose_file.blank? || compose_file.kind.main? }
+
+    def valid_containers_memory_limit?
+      containers_attributes = payload['containers_attributes']
+      container_memory_limit = project.account.container_memory_limit
+      return true if container_memory_limit.nil?
+
+      containers_attributes.all? { |container| container['memory_limit'].to_i <= container_memory_limit }
+    end
+
+    def valid_containers_memory_request?
+      containers_attributes = payload['containers_attributes']
+      container_memory_limit = project.account.container_memory_limit
+      return true if container_memory_limit.nil?
+
+      containers_attributes.all? { |container| container['memory_request'].to_i <= container_memory_limit }
+    end
   end
 end

data/app/serializers/uffizzi_core/controller/create_credential/credential_serializer.rb

@@ -11,7 +11,7 @@ class UffizziCore::Controller::CreateCredential::CredentialSerializer < UffizziC
 
   def password
     if object.amazon?
-      UffizziCore::Amazon::CredentialService.access_token(object)
+      UffizziCore::ContainerRegistry::AmazonService.access_token(object)
     else
       object.password
     end

data/app/services/uffizzi_core/activity_item_service.rb

@@ -37,17 +37,8 @@ class UffizziCore::ActivityItemService
       container = activity_item.container
       repo = container.repo
       credential = UffizziCore::RepoService.credential(repo)
-
-      digest = case repo.type
-               when UffizziCore::Repo::DockerHub.name
-                 UffizziCore::DockerHubService.digest(credential, activity_item.image, activity_item.tag)
-               when UffizziCore::Repo::Azure.name
-                 UffizziCore::AzureService.digest(credential, activity_item.image, activity_item.tag)
-               when UffizziCore::Repo::Google.name
-                 UffizziCore::GoogleService.digest(credential, activity_item.image, activity_item.tag)
-               when UffizziCore::Repo::Amazon.name
-                 UffizziCore::AmazonService.digest(credential, activity_item.image, activity_item.tag)
-      end
+      container_registry_service = UffizziCore::ContainerRegistryService.init_by_subclass(repo.type)
+      digest = container_registry_service.digest(credential, activity_item.image, activity_item.tag)
 
       activity_item.update!(digest: digest)
 

data/app/services/uffizzi_core/compose_file/builders/container_builder_service.rb

@@ -21,13 +21,11 @@ class UffizziCore::ComposeFile::Builders::ContainerBuilderService
     healthcheck_data = container_data[:healthcheck] || {}
     volumes_data = container_data[:volumes] || []
 
-    env_file_dependencies = UffizziCore::ComposeFile::GithubDependenciesService.env_file_dependencies_for_container(compose_dependencies,
-                                                                                                                    container_name)
-    configs_dependencies = UffizziCore::ComposeFile::GithubDependenciesService.configs_dependencies_for_container(compose_dependencies,
-                                                                                                                  container_name)
-    host_volumes_dependencies = UffizziCore::ComposeFile::GithubDependenciesService.host_volumes_dependencies_for_container(
-      compose_dependencies, container_name
-    )
+    github_deps_service = UffizziCore::ComposeFile::GithubDependenciesService
+
+    env_file_dependencies = github_deps_service.env_file_dependencies_for_container(compose_dependencies, container_name)
+    configs_dependencies = github_deps_service.configs_dependencies_for_container(compose_dependencies, container_name)
+    host_volumes_dependencies = github_deps_service.host_volumes_dependencies_for_container(compose_dependencies, container_name)
     is_ingress = ingress_container?(container_name, ingress_data)
     repo_attributes = repo_attributes(container_data, continuous_preview_global_data)
     additional_subdomains = is_ingress ? ingress_data.fetch(:additional_subdomains, []) : []
@@ -59,6 +57,10 @@ class UffizziCore::ComposeFile::Builders::ContainerBuilderService
 
   private
 
+  def container_registry(container_data)
+    @container_registry ||= UffizziCore::ContainerRegistryService.init_by_container(container_data)
+  end
+
   def repo_attributes(container_data, continuous_preview_global_data)
     repo_attributes = build_repo_attributes(container_data)
     continuous_preview_container_data = container_data[:'x-uffizzi-continuous-preview'] || container_data[:'x-uffizzi-continuous-previews']
@@ -66,6 +68,20 @@ class UffizziCore::ComposeFile::Builders::ContainerBuilderService
     set_continuous_preview_attributes_to_repo(repo_attributes, continuous_preview_global_data.to_h, continuous_preview_container_data.to_h)
   end
 
+  def build_repo_attributes(container_data)
+    container_registry = container_registry(container_data)
+    repo_type = container_registry.repo_type.name
+    raise UffizziCore::ComposeFile::BuildError, I18n.t('compose.invalid_repo_type') if repo_type.blank?
+
+    image_data = container_registry.image_data
+    if container_registry.image_available?(credentials)
+      docker_repo_builder = UffizziCore::ComposeFile::Builders::DockerRepoBuilderService.new(repo_type)
+      return docker_repo_builder.build_attributes(image_data)
+    end
+
+    raise UffizziCore::ComposeFile::BuildError, I18n.t('compose.unprocessable_image', value: container_registry.type)
+  end
+
   def set_continuous_preview_attributes_to_repo(repo_attributes, global_data, container_data)
     condition_attributes = [
       :deploy_preview_when_pull_request_is_opened,
@@ -78,16 +94,17 @@ class UffizziCore::ComposeFile::Builders::ContainerBuilderService
     condition_attributes.each do |attribute|
       repo_attributes[attribute] = select_continuous_preview_attribute(global_data[attribute], container_data[attribute], false)
     end
-    repo_attributes[:delete_preview_after] =
-      select_continuous_preview_attribute(global_data.dig(:delete_preview_after, :value),
-                                          container_data.dig(:delete_preview_after, :value), nil)
+
+    global = global_data.dig(:delete_preview_after, :value)
+    local = container_data.dig(:delete_preview_after, :value)
+    repo_attributes[:delete_preview_after] = select_continuous_preview_attribute(global, local, nil)
 
     repo_attributes
   end
 
   def select_continuous_preview_attribute(global_attribute, local_attribute, default_attribute)
-    return local_attribute if !local_attribute.nil?
-    return global_attribute if !global_attribute.nil?
+    return local_attribute if local_attribute.present?
+    return global_attribute if global_attribute.present?
 
     default_attribute
   end
@@ -104,24 +121,15 @@ class UffizziCore::ComposeFile::Builders::ContainerBuilderService
 
   def image(container_data, image_data, build_data, credentials)
     if image_data.present?
-      image_name(container_data, image_data, credentials)
+      container_registry(container_data).image_name(credentials)
     else
       "#{build_data[:account_name]}/#{build_data[:repository_name]}"
     end
   end
 
-  def image_name(container_data, image_data, credentials)
-    if image_data[:registry_url].present? &&
-        !UffizziCore::ComposeFile::ContainerService.google?(container_data) &&
-        !UffizziCore::ComposeFile::ContainerService.github_container_registry?(container_data) &&
-        !UffizziCore::ComposeFile::ContainerService.docker_registry?(container_data)
-      image_data[:name]
-    elsif UffizziCore::ComposeFile::ContainerService.docker_registry?(container_data) &&
-        credential_by_scope(credentials, :docker_registry).nil?
-      [image_data[:registry_url], image_data[:namespace], image_data[:name]].compact.join('/')
-    else
-      "#{image_data[:namespace]}/#{image_data[:name]}"
-    end
+  def image_name(container_data)
+    container_registry = container_registry(container_data)
+    container_registry.image_name(credentials)
   end
 
   def ingress_container?(container_name, ingress)
@@ -130,13 +138,11 @@ class UffizziCore::ComposeFile::Builders::ContainerBuilderService
 
   def entrypoint(container_data)
     entrypoint = container_data[:entrypoint]
-
     entrypoint.present? ? entrypoint.to_s : nil
   end
 
   def command(container_data)
     command = container_data[:command]
-
     command.present? ? command.to_s : nil
   end
 
@@ -169,59 +175,12 @@ class UffizziCore::ComposeFile::Builders::ContainerBuilderService
     memory_value
   end
 
-  def build_repo_attributes(container_data)
-    repo_type = repo_type(container_data)
-    image_data = container_data[:image]
-
-    case repo_type
-    when UffizziCore::Repo::DockerHub.name
-      build_docker_repo_attributes(image_data, credentials, :docker_hub, UffizziCore::Repo::DockerHub.name)
-    when UffizziCore::Repo::DockerRegistry.name
-      build_docker_repo_attributes(image_data, credentials, :docker_registry, UffizziCore::Repo::DockerRegistry.name)
-    when UffizziCore::Repo::Azure.name
-      build_docker_repo_attributes(image_data, credentials, :azure, UffizziCore::Repo::Azure.name)
-    when UffizziCore::Repo::Google.name
-      build_docker_repo_attributes(image_data, credentials, :google, UffizziCore::Repo::Google.name)
-    when UffizziCore::Repo::GithubContainerRegistry.name
-      build_docker_repo_attributes(image_data, credentials, :github_container_registry, UffizziCore::Repo::GithubContainerRegistry.name)
-    when UffizziCore::Repo::Amazon.name
-      build_docker_repo_attributes(image_data, credentials, :amazon, UffizziCore::Repo::Amazon.name)
-    else
-      raise UffizziCore::ComposeFile::BuildError, I18n.t('compose.invalid_repo_type')
-    end
-  end
-
-  def repo_type(container_data)
-    if UffizziCore::ComposeFile::ContainerService.azure?(container_data)
-      UffizziCore::Repo::Azure.name
-    elsif UffizziCore::ComposeFile::ContainerService.docker_hub?(container_data)
-      UffizziCore::Repo::DockerHub.name
-    elsif UffizziCore::ComposeFile::ContainerService.docker_registry?(container_data)
-      UffizziCore::Repo::DockerRegistry.name
-    elsif UffizziCore::ComposeFile::ContainerService.google?(container_data)
-      UffizziCore::Repo::Google.name
-    elsif UffizziCore::ComposeFile::ContainerService.github_container_registry?(container_data)
-      UffizziCore::Repo::GithubContainerRegistry.name
-    elsif UffizziCore::ComposeFile::ContainerService.amazon?(container_data)
-      UffizziCore::Repo::Amazon.name
-    end
-  end
-
   def continuously_deploy(deploy_data)
     return :disabled if deploy_data[:auto] == false
 
     :enabled
   end
 
-  def build_docker_repo_attributes(image_data, credentials, scope, repo_type)
-    credential = credential_by_scope(credentials, scope)
-    if UffizziCore::ComposeFile::ContainerService.image_available?(credential, image_data, scope)
-      return docker_builder(repo_type).build_attributes(image_data)
-    end
-
-    raise UffizziCore::ComposeFile::BuildError, I18n.t('compose.unprocessable_image', value: scope)
-  end
-
   def variables(variables_data, dependencies)
     variables_builder.build_attributes(variables_data, dependencies)
   end
@@ -243,15 +202,7 @@ class UffizziCore::ComposeFile::Builders::ContainerBuilderService
       .build_attributes(host_volumes_data, host_volumes_dependencies, project)
   end
 
-  def docker_builder(type)
-    @docker_builder ||= UffizziCore::ComposeFile::Builders::DockerRepoBuilderService.new(type)
-  end
-
   def variables_builder
     @variables_builder ||= UffizziCore::ComposeFile::Builders::VariablesBuilderService.new(project)
   end
-
-  def credential_by_scope(credentials, scope)
-    credentials.send(scope).first
-  end
 end

data/app/services/uffizzi_core/compose_file/container_service.rb

@@ -2,48 +2,6 @@
 
 class UffizziCore::ComposeFile::ContainerService
   class << self
-    def azure?(container)
-      registry_url = container.dig(:image, :registry_url)
-
-      registry_url.present? && registry_url.include?('azurecr.io')
-    end
-
-    def google?(container)
-      registry_url = container.dig(:image, :registry_url)
-
-      registry_url.present? && registry_url.include?('gcr.io')
-    end
-
-    def amazon?(container)
-      registry_url = container.dig(:image, :registry_url)
-
-      registry_url.present? && registry_url.include?('amazonaws.com')
-    end
-
-    def docker_hub?(container)
-      registry_url = container.dig(:image, :registry_url)
-      repository_url = container.dig(:build, :repository_url)
-
-      registry_url.nil? && repository_url.nil?
-    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 github_container_registry?(container)
-      registry_url = container.dig(:image, :registry_url)
-
-      registry_url.present? && registry_url.include?('ghcr.io')
-    end
-
     def has_secret?(container, secret)
       container['secret_variables'].any? { |container_secret| container_secret['name'] == secret['name'] }
     end
@@ -54,35 +12,5 @@ class UffizziCore::ComposeFile::ContainerService
 
       container
     end
-
-    def credential_for_container(container, credentials)
-      if UffizziCore::ComposeFile::ContainerService.azure?(container)
-        detect_credential(container, credentials, :azure)
-      elsif UffizziCore::ComposeFile::ContainerService.docker_hub?(container)
-        detect_credential(container, credentials, :docker_hub)
-      elsif UffizziCore::ComposeFile::ContainerService.google?(container)
-        detect_credential(container, credentials, :google)
-      end
-    end
-
-    def detect_credential(container, credentials, type)
-      credential = credentials.detect { |item| item.send("#{type}?") }
-
-      return credential if image_available?(credential, container[:image], type)
-
-      raise UffizziCore::ComposeFile::CredentialError.new(I18n.t('compose.unprocessable_image', value: type))
-    end
-
-    def image_available?(credential, image_data, type)
-      case type
-      when :docker_hub
-        UffizziCore::DockerHubService.image_available?(credential, image_data)
-      when :docker_registry
-        UffizziCore::DockerRegistryService.image_available?(credential, image_data)
-      else
-        # TODO check image availability in other registry types
-        credential.present?
-      end
-    end
   end
 end

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/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)

data/lib/uffizzi_core/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module UffizziCore
-  VERSION = '2.0.8'
+  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.8
+  version: 2.0.9
 platform: ruby
 authors:
 - Josh Thurman
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-10-31 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
@@ -946,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
@@ -981,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/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

data/app/services/uffizzi_core/credential_service.rb

@@ -1,45 +0,0 @@
-# frozen_string_literal: true
-
-class UffizziCore::CredentialService
-  class << self
-    def correct_credentials?(credential)
-      status = case credential.type
-               when UffizziCore::Credential::DockerHub.name
-                 UffizziCore::DockerHub::CredentialService.credential_correct?(credential)
-               when UffizziCore::Credential::DockerRegistry.name
-                 UffizziCore::DockerRegistry::CredentialService.credential_correct?(credential)
-               when UffizziCore::Credential::GithubContainerRegistry.name
-                 UffizziCore::GithubContainerRegistry::CredentialService.credential_correct?(credential)
-               when UffizziCore::Credential::Azure.name
-                 UffizziCore::Azure::CredentialService.credential_correct?(credential)
-               when UffizziCore::Credential::Google.name
-                 UffizziCore::Google::CredentialService.credential_correct?(credential)
-               when UffizziCore::Credential::Amazon.name
-                 UffizziCore::Amazon::CredentialService.credential_correct?(credential)
-               else
-                 false
-      end
-
-      if credential.persisted? && credential.active? && !status
-        Rails.logger.warn("Wrong credential: credential_correct? credential_id=#{credential.id}")
-      end
-
-      status
-    end
-
-    def update_expired_credentials
-      currect_date = DateTime.now
-      credentials = UffizziCore::Credential::Amazon.active.where('updated_at < ?', currect_date - 10.hours)
-
-      credentials.each do |credential|
-        deployments = UffizziCore::Deployment.where(project_id: credential.account.projects.select(:id)).with_amazon_repos
-
-        deployments.each do |deployment|
-          UffizziCore::Deployment::CreateCredentialJob.perform_async(deployment.id, credential.id)
-        end
-
-        credential.update(updated_at: currect_date)
-      end
-    end
-  end
-end

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

@@ -1,15 +0,0 @@
-# frozen_string_literal: true
-
-class UffizziCore::DockerHub::CredentialService
-  class << self
-    def credential_correct?(credential)
-      client(credential).authentificated?
-    end
-
-    private
-
-    def client(credential)
-      UffizziCore::DockerHubClient.new(credential)
-    end
-  end
-end

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

@@ -1,21 +0,0 @@
-# frozen_string_literal: true
-
-class UffizziCore::DockerRegistry::CredentialService
-  class << self
-    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
-  end
-end

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

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

data/app/services/uffizzi_core/google_service.rb

@@ -1,21 +0,0 @@
-# frozen_string_literal: true
-
-class UffizziCore::GoogleService
-  class << self
-    def digest(credential, image, tag)
-      response = registry_client(credential).manifests(image: image, tag: tag)
-
-      response.headers['docker-content-digest']
-    end
-
-    private
-
-    def registry_client(credential)
-      UffizziCore::GoogleRegistryClient.new(
-        registry_url: credential.registry_url,
-        username: credential.username,
-        password: credential.password,
-      )
-    end
-  end
-end

data/app/services/uffizzi_core/template_service.rb

@@ -1,21 +0,0 @@
-# frozen_string_literal: true
-
-class UffizziCore::TemplateService
-  class << self
-    def valid_containers_memory_limit?(template)
-      containers_attributes = template.payload['containers_attributes']
-      container_memory_limit = template.project.account.container_memory_limit
-      return true if container_memory_limit.nil?
-
-      containers_attributes.all? { |container| container['memory_limit'].to_i <= container_memory_limit }
-    end
-
-    def valid_containers_memory_request?(template)
-      containers_attributes = template.payload['containers_attributes']
-      container_memory_limit = template.project.account.container_memory_limit
-      return true if container_memory_limit.nil?
-
-      containers_attributes.all? { |container| container['memory_request'].to_i <= container_memory_limit }
-    end
-  end
-end