uffizzi_core 2.0.16 → 2.0.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 725cca20ca80112e168ba374f53dc0fa5cb48ed92339996405610fad6d37e931
-  data.tar.gz: 44034045e9b25197d558202fb336ff7faab8b9f7ac02cea97bbbcbb5cfac711c
+  metadata.gz: 6aaae335cc42e48af29ed1a1a991bdcf9c0f84fa69ccf984018893e4ed488ccd
+  data.tar.gz: fbd8da9faac2e2744831d080504dbc895cacabf657710bdde8b259e6f28d5af2
 SHA512:
-  metadata.gz: 2c417dc4df5d3842a73941775b4f6267bfd41ed19f29db0a5b58496346ef77237a134d3eaf515f6f6cef975c29f0b962cbba82d1e293af36625ccb0e1a02fdda
-  data.tar.gz: 254aff6198f4136c367fcc1e64a58fdcc920bf009d3a3f842ceddf5d42b362eebf9f993c5d261649e60e3d3c6c0394f29e2a2bee0dfc4c2787eba4009dea1409
+  metadata.gz: cc8abc5881e7cb4cbc52006173183f153b52637b777e7d007323b5dba6fff450712c19a27374d504d348c1b09266ae9db48c187d46e3dddf03fe47485a28f2c6
+  data.tar.gz: d532cb79f81d9a343459b22b1e1684f0551bcad4af7a6518e54ba96a6e28707b60c62438b3bce11d2906de79d70a234bf2fea1370e1b9e6f8596f2d418c25dcd

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

@@ -2,12 +2,19 @@
 
 class UffizziCore::ComposeFile::Parsers::Services::HealthcheckParserService
   REQUIRED_START_COMMANDS = ['NONE', 'CMD', 'CMD-SHELL'].freeze
+  REQUIRED_OPTIONS = ['test', 'disable'].freeze
 
   class << self
     def parse(healthcheck_data)
       return {} if healthcheck_data.blank?
 
-      command = parse_command(healthcheck_data)
+      unless required_options_any?(healthcheck_data)
+        raise UffizziCore::ComposeFile::ParseError,
+              I18n.t('compose.healthcheck_missing_required_option',
+                     required_options: REQUIRED_OPTIONS.join(', '))
+      end
+
+      command = parse_command(healthcheck_data) if healthcheck_data['test'].present?
 
       {
         test: command,
@@ -85,5 +92,9 @@ class UffizziCore::ComposeFile::Parsers::Services::HealthcheckParserService
 
       raise UffizziCore::ComposeFile::ParseError, I18n.t('compose.invalid_bool_value', field: 'disable', value: value)
     end
+
+    def required_options_any?(healthcheck_data)
+      (REQUIRED_OPTIONS & healthcheck_data.keys).present?
+    end
   end
 end

data/app/services/uffizzi_core/compose_file_service.rb

@@ -186,8 +186,9 @@ class UffizziCore::ComposeFileService
     def load_compose_data(compose_content)
       begin
         compose_data = YAML.safe_load(compose_content, aliases: true)
-      rescue Psych::SyntaxError
-        raise UffizziCore::ComposeFile::ParseError, I18n.t('compose.invalid_file')
+      rescue Psych::SyntaxError => e
+        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?
 

data/config/locales/en.yml

@@ -12,7 +12,7 @@ en:
              Uffizzi was unable to deploy a preview of this pull request because the compose file in this branch is invalid.
   compose:
     unsupported_file: Unsupported compose file
-    invalid_file: Invalid compose file
+    invalid_file: 'Syntax error: %{err} at line %{line} column %{column}'
     invalid_config_option: Invalid config option '%{value}' - only a-zA-Z0-9._- characters are allowed
     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.
@@ -69,6 +69,7 @@ en:
     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}'"
     volumes_should_be_array: Volumes '%{volumes}' should be an arra
+    healthcheck_missing_required_option: "One of these options is required: %{required_options}"
   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 = '2.0.16'
+  VERSION = '2.0.17'
 end

metadata

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