uffizzi_core 0.3.7 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9e55dc8e6b2d5e6cde4394b3f3f526a82e8a0ddc7d0d5ce6aa9e42ad407783c9
-  data.tar.gz: 44fdd5695f09b5a93b146370ebc1076278bc55e89f22029e6f30d07cfa3f2d66
+  metadata.gz: 5a6a5a5e07ef682bca2fc1b22a628cc093282f720f3a98a18ee290d84a05c5fc
+  data.tar.gz: 50e1ec427b2cd4227f357b57707f9151edb2e2db62a77ee8e7f149652bd66e7d
 SHA512:
-  metadata.gz: dbd3510abe5c9919eba8f9abcf35cf9b49b03952d84da0dbe43e12d5615544b1ceaea9125fc877694d56c878d8b372f5777912006c9b361800ed3b02543a5be1
-  data.tar.gz: 2b37022d8b1d9142ab4d9977bbe1adc5e03ae7d5492a60a27df2975ba0d0c7808a3f6c1b7542a8bd4f8f7214a6b753a25036bbbbd836b7dc94a59262aaaa9779
+  metadata.gz: 0b69cbdcaa12a2800e80f5f6784813333b88fffbc1df28792cbc1c07ed78a6ba6e4ee0d7a38372db46ae99d22be36d2ef88377158145829ea2153901542f5f00
+  data.tar.gz: e121d4b060d698b4d3e07256ce7a977ec14d62a727ebd5ed9127b66d4a74ee4d29bf22327084573ae13b6d25d9a2111276610644d1f61fbb078dfa4ef01859a3

data/app/clients/uffizzi_core/docker_registry_client/request_result.rb

@@ -0,0 +1,5 @@
+# frozen_string_literal: true
+
+class UffizziCore::DockerRegistryClient::RequestResult < Hashie::Mash
+  disable_warnings :key
+end

data/app/clients/uffizzi_core/docker_registry_client.rb

@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+class UffizziCore::DockerRegistryClient
+  def initialize(credentials)
+    @registry_url = credentials.registry_url
+    @connection = build_connection(@registry_url, credentials.username, credentials.password)
+  end
+
+  def authenticated?
+    response = @connection.head('/v2/')
+    response.status == 200
+  end
+
+  private
+
+  def build_connection(registry_url, username, password)
+    Faraday.new(registry_url) do |conn|
+      conn.request(:basic_auth, username, password)
+      conn.request(:json)
+      conn.response(:json)
+      conn.adapter(Faraday.default_adapter)
+    end
+  end
+end

data/app/controllers/uffizzi_core/api/cli/v1/account/credentials_controller.rb

@@ -15,7 +15,6 @@ class UffizziCore::Api::Cli::V1::Account::CredentialsController < UffizziCore::A
     render json: { credentials: credentials }, status: :ok
   end
 
-  # rubocop:disable Layout/LineLength
   # Create account credential
   #
   # @path [POST] /api/cli/v1/account/credentials
@@ -25,8 +24,9 @@ class UffizziCore::Api::Cli::V1::Account::CredentialsController < UffizziCore::A
   # @response [object<errors>] 422 Unprocessable entity
   #
   # @example
-  #    type can be one of UffizziCore::Credential::Amazon, UffizziCore::Credential::Azure, UffizziCore::Credential::DockerHub, UffizziCore::Credential::Google, UffizziCore::Credential::GithubContainerRegistry
-  # rubocop:enable Layout/LineLength
+  #    Possible types:
+  #    UffizziCore::Credential::Amazon, UffizziCore::Credential::Azure, UffizziCore::Credential::DockerHub,
+  #    UffizziCore::Credential::DockerRegistry, UffizziCore::Credential::Google, UffizziCore::Credential::GithubContainerRegistry
   def create
     credential_form = UffizziCore::Api::Cli::V1::Account::Credential::CreateForm.new
     credential_form.assign_attributes(credential_params)

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

@@ -37,6 +37,10 @@ module UffizziCore::Concerns::Models::Credential
       type == UffizziCore::Credential::DockerHub.name
     end
 
+    def docker_registry?
+      type == UffizziCore::Credential::DockerRegistry.name
+    end
+
     def azure?
       type == UffizziCore::Credential::Azure.name
     end

data/app/models/uffizzi_core/credential/docker_registry.rb

@@ -0,0 +1,4 @@
+# frozen_string_literal: true
+
+class UffizziCore::Credential::DockerRegistry < UffizziCore::Credential
+end

data/app/models/uffizzi_core/repo/docker_registry.rb

@@ -0,0 +1,4 @@
+# frozen_string_literal: true
+
+class UffizziCore::Repo::DockerRegistry < UffizziCore::Repo
+end

data/app/repositories/uffizzi_core/credential_repo.rb

@@ -6,6 +6,7 @@ module UffizziCore::CredentialRepo
   included do
     scope :by_type, ->(type) { where(type: type) }
     scope :docker_hub, -> { by_type(UffizziCore::Credential::DockerHub.name) }
+    scope :docker_registry, -> { by_type(UffizziCore::Credential::DockerRegistry.name) }
     scope :azure, -> { by_type(UffizziCore::Credential::Azure.name) }
     scope :google, -> { by_type(UffizziCore::Credential::Google.name) }
     scope :amazon, -> { by_type(UffizziCore::Credential::Amazon.name) }
@@ -13,6 +14,7 @@ module UffizziCore::CredentialRepo
     scope :deployable, -> {
       by_type([
                 UffizziCore::Credential::DockerHub.name,
+                UffizziCore::Credential::DockerRegistry.name,
                 UffizziCore::Credential::Azure.name,
                 UffizziCore::Credential::Google.name,
                 UffizziCore::Credential::Amazon.name,

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

@@ -24,13 +24,16 @@ class UffizziCore::Controller::DeployContainers::ContainerSerializer < UffizziCo
 
   def image
     repo = object.repo
-    credential = UffizziCore::RepoService.credential(repo)
-
     case repo.type
-    when UffizziCore::Repo::Google.name, UffizziCore::Repo::Amazon.name, UffizziCore::Repo::Azure.name,
-        UffizziCore::Repo::GithubContainerRegistry.name
-      registry_host = URI.parse(credential.registry_url).host
+    when
+      UffizziCore::Repo::Google.name,
+      UffizziCore::Repo::Amazon.name,
+      UffizziCore::Repo::Azure.name,
+      UffizziCore::Repo::GithubContainerRegistry.name,
+      UffizziCore::Repo::DockerRegistry.name
 
+      credential = UffizziCore::RepoService.credential(repo)
+      registry_host = URI.parse(credential.registry_url).host
       "#{registry_host}/#{object.image}"
     else
       object.image

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

@@ -107,7 +107,8 @@ class UffizziCore::ComposeFile::Builders::ContainerBuilderService
   def image_name(container_data, image_data)
     if image_data[:registry_url].present? &&
         !UffizziCore::ComposeFile::ContainerService.google?(container_data) &&
-        !UffizziCore::ComposeFile::ContainerService.github_container_registry?(container_data)
+        !UffizziCore::ComposeFile::ContainerService.github_container_registry?(container_data) &&
+        !UffizziCore::ComposeFile::ContainerService.docker_registry?(container_data)
       image_data[:name]
     else
       "#{image_data[:namespace]}/#{image_data[:name]}"
@@ -166,6 +167,8 @@ class UffizziCore::ComposeFile::Builders::ContainerBuilderService
     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
@@ -184,6 +187,8 @@ class UffizziCore::ComposeFile::Builders::ContainerBuilderService
       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)

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

@@ -27,6 +27,15 @@ class UffizziCore::ComposeFile::ContainerService
       registry_url.nil? && repository_url.nil?
     end
 
+    def docker_registry?(container)
+      registry_url = container.dig(:image, :registry_url)
+      registry_domain_regexp = /(\w+\.\w{2,})(?::\d+)?\z/
+      registry_domain = registry_url.match(registry_domain_regexp)&.to_a&.last
+      return false if registry_url.nil? || 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)
 

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

@@ -2,24 +2,23 @@
 
 class UffizziCore::ComposeFile::Parsers::Services::ImageParserService
   class << self
-    def parse(image)
-      return {} if image.blank?
+    def parse(value)
+      return {} if value.blank?
 
-      image_parts = image.downcase.split(':')
-      raise UffizziCore::ComposeFile::ParseError, I18n.t('compose.invalid_image_value', value: image) if image_parts.count > 2
+      parse_error = UffizziCore::ComposeFile::ParseError, I18n.t('compose.invalid_image_value', value: value)
+      image_path, tag = get_image_path_and_tag(value, parse_error)
+      raise parse_error if image_path.blank?
 
-      image_name, tag = image_parts
       tag = Settings.compose.default_tag if tag.blank?
-      raise UffizziCore::ComposeFile::ParseError, I18n.t('compose.invalid_image_value', value: image) if image_name.blank?
 
-      if valid_image_url?(image_name)
-        url, namespace, name = parse_image_url(image_name)
+      if url?(image_path)
+        host, namespace, name = parse_image_url(image_path)
       else
-        namespace, name = parse_docker_hub_image(image_name)
+        namespace, name = parse_docker_hub_image(image_path)
       end
 
       {
-        registry_url: url,
+        registry_url: host,
         namespace: namespace,
         name: name,
         tag: tag,
@@ -28,44 +27,55 @@ class UffizziCore::ComposeFile::Parsers::Services::ImageParserService
 
     private
 
-    def valid_image_url?(image_name)
-      url = prepare_image_url(image_name)
-
-      URI(url).host.present? && URI(url).host =~ /\w+\.\w+/ && URI(url).path.present?
-    end
-
-    def prepare_image_url(image_name)
-      if image_name.start_with?('https://')
-        image_name
+    def get_image_path_and_tag(value, parse_error)
+      image_path_parts = value.downcase.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
+        end
+      when 3
+        ["#{image_path_parts[0]}:#{image_path_parts[1]}", image_path_parts[2]]
       else
-        "https://#{image_name}"
+        raise parse_error
       end
     end
 
-    def parse_image_url(image_name)
-      prepared_url = prepare_image_url(image_name)
-
-      uri = URI(prepared_url)
-      url = uri.host
-      path = uri.path.delete_suffix('/').delete_prefix('/')
+    def url?(image_path)
+      uri = URI(add_https_if_needed(image_path))
+      uri.host.present? && uri.host =~ /\w+\.(\w+\.)*\w+/ && uri.path.present?
+    rescue URI::InvalidURIError
+      false
+    end
 
-      namespace, name = parse_image_path(path)
+    def add_https_if_needed(image_path)
+      image_path.start_with?('https://') ? image_path : "https://#{image_path}"
+    end
 
-      [url, namespace, name]
+    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 parse_image_path(path)
-      path_parts = path.split('/', 2)
+    def get_namespace_and_name(path)
+      path_parts = path.rpartition('/')
 
-      if path_parts.count == 1
-        namespace = nil
-        name = path_parts.first
+      if path_parts.first.empty?
+        [nil, path_parts.last]
       else
-        namespace = path_parts.first
-        name = path_parts.last
+        [path_parts.first, path_parts.last]
       end
-
-      [namespace, name]
     end
 
     def parse_docker_hub_image(image_name)

data/app/services/uffizzi_core/compose_file_service.rb

@@ -66,12 +66,28 @@ class UffizziCore::ComposeFileService
     end
 
     def update_secret!(compose_file, secret)
-      compose_file.template.payload['containers_attributes'].map do |container|
-        if UffizziCore::ComposeFile::ContainerService.has_secret?(container, secret)
-          container = UffizziCore::ComposeFile::ContainerService.update_secret(container, secret)
+      compose_file.template.payload['containers_attributes'].each do |container|
+        next unless UffizziCore::ComposeFile::ContainerService.has_secret?(container, secret)
+
+        UffizziCore::ComposeFile::ContainerService.update_secret(container, secret)
+        next if compose_file.payload['errors'].blank?
+
+        compose_file_errors = compose_file.payload['errors'].presence
+        secrets_errors = compose_file_errors[UffizziCore::ComposeFile::ErrorsService::SECRETS_ERROR_KEY].presence
+        new_secrets_errors = secrets_errors.reject { |secret_errors| secret_errors.include?(secret.name) }
+
+        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),
+                                                                         compose_file.content)
+          next
         end
 
-        container
+        compose_file_errors.delete(['secret_variables'])
+        next UffizziCore::ComposeFile::ErrorsService.reset_compose_errors!(compose_file) if compose_file_errors.empty?
+
+        UffizziCore::ComposeFile::ErrorsService.update_compose_errors!(compose_file, compose_file_errors, compose_file.content)
       end
 
       compose_file.template.save!

data/app/services/uffizzi_core/credential_service.rb

@@ -6,6 +6,8 @@ class UffizziCore::CredentialService
       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

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

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

data/app/services/uffizzi_core/project_service.rb

@@ -27,10 +27,11 @@ class UffizziCore::ProjectService
       return unless UffizziCore::ComposeFileService.has_secret?(compose_file, secret)
 
       error_message = I18n.t('compose.project_secret_not_found', secret: secret['name'])
-      error = { UffizziCore::ComposeFile::ErrorsService::SECRETS_ERROR_KEY => [error_message] }
-
-      existing_errors = compose_file.payload['errors'].presence || {}
-      new_errors = existing_errors.merge(error)
+      compose_file_errors = compose_file.payload['errors'] || {}
+      secrets_errors = compose_file_errors[UffizziCore::ComposeFile::ErrorsService::SECRETS_ERROR_KEY].presence || []
+      new_secrets_errors = secrets_errors.append(error_message).uniq
+      error = { UffizziCore::ComposeFile::ErrorsService::SECRETS_ERROR_KEY => new_secrets_errors }
+      new_errors = compose_file_errors.merge(error)
 
       UffizziCore::ComposeFile::ErrorsService.update_compose_errors!(compose_file, new_errors, compose_file.content)
     end

data/app/services/uffizzi_core/repo_service.rb

@@ -16,6 +16,8 @@ class UffizziCore::RepoService
         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

data/config/locales/en.activerecord.yml

@@ -21,3 +21,7 @@ en:
             containers:
               max_memory_limit_error: 'Memory limit of containers must be less than %{max}'
               max_memory_request_error: 'Memory request of containers must be less than %{max}'
+        uffizzi_core/user:
+          attributes:
+            email:
+              invalid: Invalid email address

data/lib/uffizzi_core/version.rb

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

data/swagger/v1/swagger.json

@@ -80,7 +80,7 @@
           "default": {
             "description": "Create account credential",
             "examples": {
-              "application/json": "type can be one of UffizziCore::Credential::Amazon, UffizziCore::Credential::Azure, UffizziCore::Credential::DockerHub, UffizziCore::Credential::Google, UffizziCore::Credential::GithubContainerRegistry"
+              "application/json": "Possible types:\nUffizziCore::Credential::Amazon, UffizziCore::Credential::Azure, UffizziCore::Credential::DockerHub,\nUffizziCore::Credential::DockerRegistry, UffizziCore::Credential::Google, UffizziCore::Credential::GithubContainerRegistry"
             }
           },
           "201": {
@@ -1301,16 +1301,8 @@
           }
         ],
         "responses": {
-          "200": {
-            "description": "OK",
-            "schema": {
-              "type": "object",
-              "properties": {
-                "project": {
-                  "$ref": "#/definitions/Project"
-                }
-              }
-            }
+          "204": {
+            "description": "No content"
           },
           "404": {
             "description": "Not Found"
@@ -1339,8 +1331,16 @@
           }
         ],
         "responses": {
-          "204": {
-            "description": "No content"
+          "200": {
+            "description": "OK",
+            "schema": {
+              "type": "object",
+              "properties": {
+                "project": {
+                  "$ref": "#/definitions/Project"
+                }
+              }
+            }
           },
           "404": {
             "description": "Not Found"
@@ -1720,4 +1720,4 @@
       }
     }
   }
-}
+}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: uffizzi_core
 version: !ruby/object:Gem::Version
-  version: 0.3.7
+  version: 0.4.1
 platform: ruby
 authors:
 - Josh Thurman
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-08-02 00:00:00.000000000 Z
+date: 2022-08-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aasm
@@ -695,6 +695,8 @@ files:
 - app/clients/uffizzi_core/docker_hub_client.rb
 - app/clients/uffizzi_core/docker_hub_client/not_authorized_error.rb
 - app/clients/uffizzi_core/docker_hub_client/request_result.rb
+- app/clients/uffizzi_core/docker_registry_client.rb
+- app/clients/uffizzi_core/docker_registry_client/request_result.rb
 - app/clients/uffizzi_core/github_container_registry_client.rb
 - app/clients/uffizzi_core/github_container_registry_client/request_result.rb
 - app/clients/uffizzi_core/google_registry_client.rb
@@ -809,6 +811,7 @@ files:
 - app/models/uffizzi_core/credential/amazon.rb
 - app/models/uffizzi_core/credential/azure.rb
 - app/models/uffizzi_core/credential/docker_hub.rb
+- app/models/uffizzi_core/credential/docker_registry.rb
 - app/models/uffizzi_core/credential/github.rb
 - app/models/uffizzi_core/credential/github_container_registry.rb
 - app/models/uffizzi_core/credential/google.rb
@@ -827,6 +830,7 @@ files:
 - app/models/uffizzi_core/repo/amazon.rb
 - app/models/uffizzi_core/repo/azure.rb
 - app/models/uffizzi_core/repo/docker_hub.rb
+- app/models/uffizzi_core/repo/docker_registry.rb
 - app/models/uffizzi_core/repo/github.rb
 - app/models/uffizzi_core/repo/github_container_registry.rb
 - app/models/uffizzi_core/repo/google.rb
@@ -928,6 +932,7 @@ files:
 - 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/github_container_registry/credential_service.rb
 - app/services/uffizzi_core/google/credential_service.rb
 - app/services/uffizzi_core/google_service.rb