uffizzi_core 2.0.7 → 2.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b54f2e35d7621917abd739768779233c577d81e336e3912afbea309acc082358
-  data.tar.gz: 5115e2ccb4b5ac60a0774b90b414706af539dd373a7318ed0f6d28e28970b867
+  metadata.gz: 0e4678fb73f3c46832c31d239796e6eb99bbe66b58aef0af348d470030139312
+  data.tar.gz: d03ff11d2723b851f01fe597ba96b6e250f68ae2d190905aa70d269bd10f0ff3
 SHA512:
-  metadata.gz: fc8278ac3328a95f833316a109f96e9baf3b377a35b25679bf03447cf17d87a78ba83044127d90b065754834fa3acac0791747495b81b97b61919df53ec910d4
-  data.tar.gz: a05cc0c6cffbe5366b7d896a50bef25bff6a1988b307bea804fe435b7965a86d179250d68b47b979a03132a0bb52427c7af2738b736fa12f006621d4e74f47bb
+  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) 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

@@ -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
@@ -35,28 +44,24 @@ module UffizziCore::Concerns::Models::Credential
       end
     end
 
-    def github_container_registry?
-      type == UffizziCore::Credential::GithubContainerRegistry.name
-    end
-
-    def docker_hub?
-      type == UffizziCore::Credential::DockerHub.name
+    UffizziCore::ContainerRegistryService.sources.each do |t|
+      define_method :"#{t}?" do
+        type == "UffizziCore::Credential::#{t.to_s.camelize}"
+      end
     end
 
-    def docker_registry?
-      type == UffizziCore::Credential::DockerRegistry.name
-    end
+    def correct?
+      credential = self
+      return false unless credential
 
-    def azure?
-      type == UffizziCore::Credential::Azure.name
-    end
+      container_registry_service = UffizziCore::ContainerRegistryService.init_by_subclass(credential.type)
+      status = container_registry_service.credential_correct?(credential)
 
-    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/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/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/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/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