uffizzi_core 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9e845782f77d940f0bf244d792b59cab89df2712937e6b77f3bec3bc62653f3b
-  data.tar.gz: eb8a760d66cbdc40b7e441a783870483ca3c72ffe8fa212e4ee93aa9c9718bf1
+  metadata.gz: 169a9ec674c81b791babc5049b74c807a9150da4534980f6b6eb2188b3b12771
+  data.tar.gz: c3365c36312f14cf56a3d8c71b293939d667369b8a6df9da67925620127b514e
 SHA512:
-  metadata.gz: 4e6093cb8c244cf7c22044add288ee501c94968436407d2138c32763806266d4877d6c915464cc988d868e91ac0ae50e47fac05408e7e2d432638bfd15929a0e
-  data.tar.gz: 29c118eb1355950bf9ce5c590e4562490dec59fc1ca9cbbb4028d504f2a28b7cc155fd471f74948796a0f213cabe4c68330921dd9a6caa24ac41247e3f139bf6
+  metadata.gz: f8af4f54965d0557094566deb6d3bea447ede3071891aa4bd7d00139b3795a9644fd6b8d71a346b8b6aeff113cc578bdde3f4f64e45d21bb31f5d59b531e15e9
+  data.tar.gz: aa2b7c6fce6745775164119324cd7298cd2382246764026c4aa4bf6ebba3f1c8c390eba3cd3a9bde9b512fb1ec3607da5fee8c376bcac79e953d9efaccd7d811

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/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/config/locales/en.yml

@@ -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.1'
 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.1
 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-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aasm