uffizzi_core 2.1.18 → 2.1.19

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fd14a19fefa5a0eb7f004a65b25a5c4cb3c517c9a8c7c53248eb5ea510e4d543
-  data.tar.gz: 6f2ec4218d5f41aa53c5ce36eb94ad27c45770019be1ad84f979f67c3c02e416
+  metadata.gz: ba797af235e97eb6e8a82885dfa26e5ef451333937c874c6aaa958bfdc128efc
+  data.tar.gz: abbfad0cbba592e5230c2e2a5ac4ca4b2220e343a6ba36b770d52430a9836fb8
 SHA512:
-  metadata.gz: bb0253b21dab789cd8aa07d3d68bde5ef2936cfeff7294179356e96fbef558a432e69a58398425d858ac19c35bde5de7af703e5743d48e0364fd16592184a955
-  data.tar.gz: a6721ce9a827f50cb533159440c168372e6db339802a4b46564c2a608ce3fb1a9077dfc5c1651bd868ad87e7d18c45dbe9212230b7c16a267b9979e68b08e15d
+  metadata.gz: 6fa933fd65908f6313e68d5f91de1f5f4c7b99d946c9d6f486207677baee8f8518a266875d4cec4f5a95a39f40553595c1d5cd9290ffd37db8bcfa0e1d2fe61a
+  data.tar.gz: 00bd7079d17e53872cf3ff6e3b1ffda37bd445f47930e85737bff4bd1990dcb0f9d286f76e7b027854c6bd4e063f74b3318e3057408904abaead27c627713e6d

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

@@ -9,6 +9,7 @@ class UffizziCore::Api::Cli::V1::Deployment::CreateForm < UffizziCore::Deploymen
            :image,
            :service_name,
            :tag,
+           :full_image_name,
            :port,
            :public,
            :memory_limit,

data/app/forms/uffizzi_core/api/cli/v1/deployment/update_form.rb

@@ -9,6 +9,7 @@ class UffizziCore::Api::Cli::V1::Deployment::UpdateForm < UffizziCore::Deploymen
            :service_name,
            :tag,
            :port,
+           :full_image_name,
            :public,
            :memory_limit,
            :memory_request,

data/app/serializers/uffizzi_core/controller/deploy_containers/container_serializer.rb

@@ -3,8 +3,7 @@
 class UffizziCore::Controller::DeployContainers::ContainerSerializer < UffizziCore::BaseSerializer
   attributes :id,
              :kind,
-             :image,
-             :tag,
+             :full_image_name,
              :variables,
              :secret_variables,
              :memory_limit,
@@ -24,26 +23,6 @@ class UffizziCore::Controller::DeployContainers::ContainerSerializer < UffizziCo
   has_many :container_config_files
   has_many :container_host_volume_files
 
-  def image
-    repo = object.repo
-    case repo.type
-    when
-      UffizziCore::Repo::Google.name,
-      UffizziCore::Repo::Amazon.name,
-      UffizziCore::Repo::Azure.name,
-      UffizziCore::Repo::GithubContainerRegistry.name,
-      UffizziCore::Repo::DockerRegistry.name
-
-      build_registry_image(repo)
-    else
-      object.image
-    end
-  end
-
-  def tag
-    object.tag
-  end
-
   def entrypoint
     object.entrypoint.blank? ? nil : JSON.parse(object.entrypoint)
   end
@@ -65,15 +44,4 @@ class UffizziCore::Controller::DeployContainers::ContainerSerializer < UffizziCo
 
     object.healthcheck.merge('test' => new_command)
   end
-
-  private
-
-  def build_registry_image(repo)
-    credential = UffizziCore::RepoService.credential(repo)
-    return object.image if credential.blank?
-
-    registry_host = URI.parse(credential.registry_url).host
-
-    "#{registry_host}/#{object.image}"
-  end
 end

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

@@ -33,6 +33,7 @@ class UffizziCore::ComposeFile::Builders::ContainerBuilderService
     {
       tag: tag(image_data, repo_attributes),
       port: port(container_name, ingress_data),
+      full_image_name: full_image_name(image_data, build_data, repo_attributes),
       image: image(container_data, image_data, build_data, credentials),
       public: is_ingress,
       entrypoint: entrypoint(container_data),
@@ -134,6 +135,12 @@ class UffizziCore::ComposeFile::Builders::ContainerBuilderService
     container_registry.image_name(credentials)
   end
 
+  def full_image_name(image_data, build_data, repo_attributes)
+    return image_data[:full_image_name] if image_data.present?
+
+    "#{build_data[:account_name]}/#{build_data[:repository_name]}:#{repo_attributes[:branch]}"
+  end
+
   def ingress_container?(container_name, ingress)
     ingress[:container_name] == container_name
   end

data/app/services/uffizzi_core/compose_file/parsers/services/image_parser_service.rb

@@ -1,104 +1,41 @@
 # frozen_string_literal: true
 
+require 'docker_distribution'
+
 class UffizziCore::ComposeFile::Parsers::Services::ImageParserService
+  DEFAULT_TAG = Settings.compose.default_tag
   class << self
     def parse(value)
       return {} if value.blank?
 
-      image_path, tag = get_image_path_and_tag(value)
-      raise_parse_error(value) if image_path.blank?
-
-      tag = Settings.compose.default_tag if tag.blank?
-
-      formatted_image_path = image_path.downcase
-      if url?(formatted_image_path)
-        host, namespace, name = parse_image_url(formatted_image_path)
-      else
-        namespace, name = parse_docker_hub_image(formatted_image_path)
-      end
+      parsed_image = DockerDistribution::Normalize.parse_docker_ref(value)
+      image_path = parsed_image.path
+      namespace, name = get_namespace_and_name(image_path)
+      full_image_name = "#{[parsed_image.domain, parsed_image.path].compact.join('/')}:#{parsed_image.tag}"
 
       {
-        registry_url: host,
+        registry_url: parsed_image.domain,
         namespace: namespace,
         name: name,
-        tag: tag,
+        tag: parsed_image.tag,
+        full_image_name: full_image_name,
       }
+    rescue DockerDistribution::NameContainsUppercase
+      raise_parse_error(I18n.t('compose.image_name_contains_uppercase_value', value: value))
+    rescue DockerDistribution::ReferenceInvalidFormat, DockerDistribution::ParseNormalizedNamedError
+      raise_parse_error(I18n.t('compose.invalid_image_value', value: value))
     end
 
     private
 
-    def raise_parse_error(value)
-      raise UffizziCore::ComposeFile::ParseError, I18n.t('compose.invalid_image_value', value: value)
-    end
-
-    def get_image_path_and_tag(value)
-      image_path_parts = value.split(':')
-
-      case image_path_parts.size
-      when 1
-        image_path_parts[0]
-      when 2
-        uri_pattern = /\A\w[\w.-]+:\d+\//
-        tag_pattern = /:\w[\w.-]*\z/
-        if uri_pattern.match?(value)
-          "#{image_path_parts[0]}:#{image_path_parts[1]}"
-        elsif tag_pattern.match?(value)
-          [image_path_parts[0], image_path_parts[1]]
-        else
-          raise_parse_error(value)
-        end
-      when 3
-        ["#{image_path_parts[0]}:#{image_path_parts[1]}", image_path_parts[2]]
-      else
-        raise_parse_error(value)
-      end
-    end
-
-    def url?(image_path)
-      uri = URI(add_https_if_needed(image_path))
-      uri.host.present? && uri.host =~ /(localhost(:\d+)?|\w+\.(\w+\.)*\w+)/ && uri.path.present?
-    rescue URI::InvalidURIError
-      false
-    end
-
-    def add_https_if_needed(image_path)
-      image_path.start_with?('https://') ? image_path : "https://#{image_path}"
-    end
-
-    def parse_image_url(image_path)
-      uri = URI(add_https_if_needed(image_path))
-      host = "#{uri.host}:#{uri.port}"
-      path = uri.path.delete_prefix('/')
-      namespace, name = get_namespace_and_name(path)
-      [host, namespace, name]
-    end
-
-    def get_namespace_and_name(path)
-      path_parts = path.rpartition('/')
-
-      if path_parts.first.empty?
-        [nil, path_parts.last]
-      else
-        [path_parts.first, path_parts.last]
-      end
-    end
-
-    def parse_docker_hub_image(image_name)
-      if contains_account_name?(image_name)
-        namespace = image_name.split('/').first
-        name = image_name.split('/', 2).last.delete_suffix('/')
-      else
-        namespace = Settings.docker_hub.public_namespace
-        name = image_name
-      end
-
-      [namespace, name]
+    def raise_parse_error(message)
+      raise UffizziCore::ComposeFile::ParseError, message
     end
 
-    def contains_account_name?(image_name)
-      image_name_parts = image_name.split('/')
+    def get_namespace_and_name(image_path)
+      return [nil, image_path] unless image_path.index('/').present?
 
-      image_name_parts.count > 1
+      image_path.split('/')
     end
   end
 end

data/app/services/uffizzi_core/compose_file_service.rb

@@ -190,7 +190,7 @@ class UffizziCore::ComposeFileService
         err = [e.problem, e.context].compact.join(' ')
         raise UffizziCore::ComposeFile::ParseError, I18n.t('compose.invalid_file', err: err, line: e.line, column: e.column)
       end
-      raise UffizziCore::ComposeFile::ParseError, I18n.t('compose.unsupported_file') if compose_data.nil?
+      raise UffizziCore::ComposeFile::ParseError, I18n.t('compose.unsupported_file') if compose_data.nil? || compose_data.is_a?(String)
 
       compose_data
     end

data/app/services/uffizzi_core/container_registry_service.rb

@@ -11,9 +11,8 @@ class UffizziCore::ContainerRegistryService
 
     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(:docker_hub, container) if registry_url.include?('docker.io')
       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')
@@ -71,7 +70,7 @@ class UffizziCore::ContainerRegistryService
   end
 
   def image_name(credentials)
-    if image_data[:registry_url].present? && [:google, :github_container_registry, :docker_registry].exclude?(type)
+    if image_data[:registry_url].present? && [:google, :github_container_registry, :docker_registry, :docker_hub].exclude?(type)
       return image_data[:name]
     end
 

data/config/locales/en.yml

@@ -19,6 +19,7 @@ en:
     invalid_service_name: "Invalid service name '%{value}': a service name must consist of lower case alphanumeric characters, ''-'', and must start and end with an alphanumeric character"
     no_ingress: Service ingress has not been defined.
     invalid_image_value: Invalid image value '%{value}'
+    image_name_contains_uppercase_value: Image name '%{value}' contains uppercase characters
     unprocessable_image: Invalid credential '%{value} or image does not exist'
     invalid_repo_type: Unsupported repo type
     repo_not_found: The specified repository doesn't exist '%{name}'

data/db/migrate/20230406154451_add_full_image_name_to_container.rb

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

data/lib/uffizzi_core/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: uffizzi_core
 version: !ruby/object:Gem::Version
-  version: 2.1.18
+  version: 2.1.19
 platform: ruby
 authors:
 - Josh Thurman
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-04-10 00:00:00.000000000 Z
+date: 2023-04-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aasm
@@ -137,6 +137,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.61'
+- !ruby/object:Gem::Dependency
+  name: docker_distribution
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: dotenv
   requirement: !ruby/object:Gem::Requirement
@@ -1029,6 +1043,7 @@ files:
 - db/migrate/20220927113647_add_additional_subdomains_to_containers.rb
 - db/migrate/20230111000000_add_state_to_memberships.rb
 - db/migrate/20230306142513_add_last_deploy_at_to_deployments.rb
+- db/migrate/20230406154451_add_full_image_name_to_container.rb
 - db/seeds.rb
 - lib/tasks/uffizzi_core_tasks.rake
 - lib/uffizzi_core.rb