uffizzi_core 1.0.0 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9e845782f77d940f0bf244d792b59cab89df2712937e6b77f3bec3bc62653f3b
-  data.tar.gz: eb8a760d66cbdc40b7e441a783870483ca3c72ffe8fa212e4ee93aa9c9718bf1
+  metadata.gz: 520b79e2bc010eab840b4a6c4d31fe236c7b1e1a04714a42319399d904208b09
+  data.tar.gz: 4cdf4a4e66308a13bcb9740ea3aafb63d1de49c128fef7fb4d59731045ac1877
 SHA512:
-  metadata.gz: 4e6093cb8c244cf7c22044add288ee501c94968436407d2138c32763806266d4877d6c915464cc988d868e91ac0ae50e47fac05408e7e2d432638bfd15929a0e
-  data.tar.gz: 29c118eb1355950bf9ce5c590e4562490dec59fc1ca9cbbb4028d504f2a28b7cc155fd471f74948796a0f213cabe4c68330921dd9a6caa24ac41247e3f139bf6
+  metadata.gz: 8e44e43bb064368f55ca82ad30eb989ee8503a65a2daad496f50608d983c39da93543ec8ea6cddeef7cbcf1367bd1916bc929fc7015b5fd0121d6eb987333f2e
+  data.tar.gz: 414e34bec819810a75c0fe13ca4652ab0a26d271f1bedd8d11d9e50f9ebbd918f83209205c5a0a5005f8db2c59889114268a961b8a4a93ea270c43e37b43f498

data/app/clients/uffizzi_core/docker_hub_client.rb

@@ -23,6 +23,15 @@ class UffizziCore::DockerHubClient
     nil
   end
 
+  def repository(namespace:, image:)
+    url = "#{BASE_URL}/v2/repositories/#{namespace}/#{image}"
+
+    response = connection.get(url) do |request|
+      request.headers['Authorization'] = "JWT #{jwt}"
+    end
+    RequestResult.new(status: response.status, result: response.body)
+  end
+
   def public_images(q:, page: 1, per_page: 25)
     url = "#{BASE_URL}/api/content/v1/products/search"
     params = { page_size: per_page, q: q, type: :image, page: page }

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

@@ -17,10 +17,10 @@ class UffizziCore::Api::Cli::V1::Deployment::CreateForm < UffizziCore::Deploymen
            :command,
            :receive_incoming_requests,
            :continuously_deploy,
-           { healthcheck: {} },
            { variables: [:name, :value],
              secret_variables: [:name, :value],
              volumes: [:source, :target, :type, :read_only],
+             healthcheck: [:test, :interval, :timeout, :retries, :start_period, :disable, { test: [] }],
              repo_attributes: [
                :namespace,
                :name,

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

@@ -19,6 +19,7 @@ class UffizziCore::Api::Cli::V1::Deployment::UpdateForm < UffizziCore::Deploymen
            { variables: [:name, :value],
              secret_variables: [:name, :value],
              volumes: [:source, :target, :type, :read_only],
+             healthcheck: [:test, :interval, :timeout, :retries, :start_period, :disable, { test: [] }],
              repo_attributes: [
                :namespace,
                :name,

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

@@ -18,10 +18,10 @@ class UffizziCore::Api::Cli::V1::Template::CreateForm < UffizziCore::Template
              :continuously_deploy,
              :service_name,
              :name,
-             :healthcheck,
              { variables: [:name, :value],
                secret_variables: [:name, :value],
                volumes: [:source, :target, :type, :read_only],
+               healthcheck: [:test, :interval, :timeout, :retries, :start_period, :disable, { test: [] }],
                repo_attributes: [
                  :namespace,
                  :name,

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

@@ -53,7 +53,7 @@ class UffizziCore::Controller::DeployContainers::ContainerSerializer < UffizziCo
   end
 
   def healthcheck
-    return {} if object.healthcheck.nil?
+    return {} if object.healthcheck.blank?
 
     command = object.healthcheck['test']
     new_command = if command.is_a?(Array)
@@ -63,6 +63,6 @@ class UffizziCore::Controller::DeployContainers::ContainerSerializer < UffizziCo
       command.split
     end
 
-    object.healthcheck.merge(test: new_command)
+    object.healthcheck.merge('test' => new_command)
   end
 end

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

@@ -206,9 +206,11 @@ class UffizziCore::ComposeFile::Builders::ContainerBuilderService
 
   def build_docker_repo_attributes(image_data, credentials, scope, repo_type)
     credential = credentials.send(scope).first
-    raise UffizziCore::ComposeFile::BuildError, I18n.t('compose.invalid_credential', value: scope) if credential.nil?
+    if UffizziCore::ComposeFile::ContainerService.image_available?(credential, image_data, scope)
+      return docker_builder(repo_type).build_attributes(image_data)
+    end
 
-    docker_builder(repo_type).build_attributes(image_data)
+    raise UffizziCore::ComposeFile::BuildError, I18n.t('compose.unprocessable_image', value: scope)
   end
 
   def variables(variables_data, dependencies)

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

@@ -55,23 +55,32 @@ class UffizziCore::ComposeFile::ContainerService
 
     def credential_for_container(container, credentials)
       if UffizziCore::ComposeFile::ContainerService.azure?(container)
-        detect_credential(credentials, :azure)
+        detect_credential(container, credentials, :azure)
       elsif UffizziCore::ComposeFile::ContainerService.docker_hub?(container)
-        detect_credential(credentials, :docker_hub)
+        detect_credential(container, credentials, :docker_hub)
       elsif UffizziCore::ComposeFile::ContainerService.google?(container)
-        detect_credential(credentials, :google)
+        detect_credential(container, ecredentials, :google)
       end
     end
 
-    def detect_credential(credentials, type)
+    def detect_credential(container, credentials, type)
       credential = credentials.detect do |item|
         item.send("#{type}?")
       end
 
-      error_message = "Invalid credential: #{type}"
-      raise UffizziCore::ComposeFile::CredentialError.new(error_message) if credential.nil?
+      return credential if image_available?(credential, container[:image], type)
 
-      credential
+      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)
+      else
+        # TODO check image availability in other registry types
+        credential.present?
+      end
     end
   end
 end

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

@@ -11,10 +11,10 @@ class UffizziCore::ComposeFile::Parsers::Services::HealthcheckParserService
 
       {
         test: command,
-        interval: parse_time(healthcheck_data['interval']),
-        timeout: parse_time(healthcheck_data['timeout']),
+        interval: parse_time(:interval, healthcheck_data['interval']),
+        timeout: parse_time(:timeout, healthcheck_data['timeout']),
         retries: parse_retries(healthcheck_data['retries']),
-        start_period: parse_time(healthcheck_data['start_period']),
+        start_period: parse_time(:start_period, healthcheck_data['start_period']),
         disable: parse_disable_option(healthcheck_data['disable'], command),
       }
     end
@@ -28,7 +28,11 @@ class UffizziCore::ComposeFile::Parsers::Services::HealthcheckParserService
       case command
       when Array
         start_command = command.first
-        raise UffizziCore::ComposeFile::ParseError unless REQUIRED_START_COMMANDS.include?(start_command)
+
+        unless REQUIRED_START_COMMANDS.include?(start_command)
+          raise UffizziCore::ComposeFile::ParseError,
+                I18n.t('compose.required_start_commands', available_commands: REQUIRED_START_COMMANDS.join(', '))
+        end
 
         command
       when String
@@ -39,10 +43,22 @@ class UffizziCore::ComposeFile::Parsers::Services::HealthcheckParserService
     end
 
     def parse_retries(value)
-      raise UffizziCore::ComposeFile::ParseError, I18n.t('compose.invalid_integer', option: :retries) unless value.is_a?(Integer)
+      return if value.nil?
+
+      unless value.is_a?(Integer)
+        raise UffizziCore::ComposeFile::ParseError,
+              I18n.t('compose.invalid_retries', value: value)
+      end
+
+      value
     end
 
-    def parse_time(value)
+    def parse_time(key, value)
+      return if value.nil?
+
+      error_message = I18n.t('compose.invalid_time_interval', key: key, value: value)
+      raise UffizziCore::ComposeFile::ParseError, error_message if value.is_a?(Integer)
+
       tokens = {
         's' => 1,
         'm' => 60,
@@ -58,7 +74,7 @@ class UffizziCore::ComposeFile::Parsers::Services::HealthcheckParserService
 
         acc
       rescue StandardError
-        raise UffizziCore::ComposeFile::ParseError, I18n.t('compose.invalid_time_interval')
+        raise UffizziCore::ComposeFile::ParseError, error_message
       end
     end
 

data/app/services/uffizzi_core/docker_hub_service.rb

@@ -11,6 +11,16 @@ class UffizziCore::DockerHubService
       accounts_response.nil? ? [] : accounts_response.namespaces
     end
 
+    def image_available?(credential, image_data)
+      namespace = image_data[:namespace]
+      repo_name = image_data[:name]
+      client = UffizziCore::DockerHubClient.new(credential)
+      response = client.repository(namespace: namespace, image: repo_name)
+      return false if not_found?(response)
+
+      true
+    end
+
     def user_client(credential)
       return @client if @client&.credential&.username == credential.username
 
@@ -36,5 +46,9 @@ class UffizziCore::DockerHubService
     def public_docker_hub_client
       @public_docker_hub_client ||= UffizziCore::DockerHubClient.new
     end
+
+    def not_found?(response)
+      response.status == 404
+    end
   end
 end

data/config/locales/en.yml

@@ -17,7 +17,7 @@ en:
     no_services: Service services has neither an image nor a build context specified. At least one must be provided.
     no_ingress: Service ingress has not been defined.
     invalid_image_value: Invalid image value '%{value}'
-    invalid_credential: Invalid credential '%{value}'
+    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}'
     ingress_port_not_specified: Ingress port not specified
@@ -56,8 +56,8 @@ en:
     project_secret_not_found: Project secret '%{secret}' not found
     continuous_preview_in_service_level: The option '%{option}' is not supported for service-level. Use 'x-uffizzi-continuous-preview' instead
     file_already_exists: A compose file already exists for this project. Run 'uffizzi compose update' to update this file or 'uffizzi compose rm' to remove it. For more options, see 'uffizzi compose --help'
-    invalid_healthcheck_command: "Service '%{name}' defines an invalid healthcheck: when 'test' is a list the first item must be either NONE, CMD or CMD-SHELL"
-    invalid_time_interval: The time interval should be in the following format '{hours}h{minutes}m{seconds}s'. At least one value must be present.
+    invalid_time_interval: "Invalid time interval: '%{key}:%{value}'. The time interval should be in the following format '{hours}h{minutes}m{seconds}s'. At least one value must be present."
+    invalid_retries: "Invalid retries value: 'retries:%{value}'. The value should be an integer."
     string_or_array_error: "'%{option}' contains an invalid type, it should be a string, or an array"
     not_implemented: "'%{option}' option is not implemented"
     infinite_recursion: "Found infinite recursion for key '%{key}'"
@@ -67,6 +67,7 @@ en:
     volume_type_not_supported: Volumes with type '%{type}' does not supported
     named_volume_not_exists: Named volume '%{source_path}:%{target_path}' is used in service '%{service_name}' but no declaration was found in the volumes section.
     invalid_volume_destination: Invalid volume specification '%{spec}' destination can't be '/'
+    required_start_commands: "When 'test' is a list the first item must be one of: '%{available_commands}'"
   secrets:
     duplicates_exists: Secret with key %{secrets} already exist.
     invalid_key_length: A secret key must be no longer than 256 characters.

data/lib/uffizzi_core/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: uffizzi_core
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.2
 platform: ruby
 authors:
 - Josh Thurman
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-08-31 00:00:00.000000000 Z
+date: 2022-09-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aasm