uffizzi_core 0.4.2 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c77ce0a84cac9c658e95ca303c65b90bed161bdd6c588c18a126dab2e58175ab
-  data.tar.gz: b8c916fd4b1beaf5354d1e4dda147e38d5b4431e7ec0feea880cf36041a445d4
+  metadata.gz: 377c1d90c271757c6d8728d3f4d3dd6c7499b22f606bfbf37c4e6545b074bc90
+  data.tar.gz: 4cbaac6e361d336cd4c13f004e2b76b9df0ac44638f2eeaa2e94afaff203c75b
 SHA512:
-  metadata.gz: 0f1d7cc3cea3c4fda4615d67d8606bd122997ed96260f595358d5942c58222a3c38814466d7c3c6b7005eeaec77cb81bc48436bcff1c73228c0b6354d2897c49
-  data.tar.gz: f9ca337c51fffd381a7c53744e59e60917ecd541fafd63cd94b5a5618dd5f32eab8f70cc6fbe6c153765eb47dbb9011875b5a45efd5882794fc5d6616e10076c
+  metadata.gz: e68d968cd53a9ee833092724977d6b0752988225640488bf3c03af081bbcc00173c9e62a85ccf3403ef174a196bc86edbd4f1065dfc25c93dcbf4029015ee003
+  data.tar.gz: 39cf4ac688207af05cdc2c7cdcc8451d2bcdd00d202e014fe9c275d63c53780868f7f2ad7bd4b1243fe6e2ac18389dde06b24e485d464338d4d776a91c34a849

data/app/controllers/concerns/uffizzi_core/dependency_injection_concern.rb

@@ -7,10 +7,12 @@ module UffizziCore::DependencyInjectionConcern
     UffizziCore::UserAccessService.new(module_class(:rbac))
   end
 
-  def build_parser_module
-    return unless module_exists?(:github)
+  def find_build_parser_module
+    module_class(:build_parser)
+  end
 
-    module_class(:github)
+  def find_volume_parser_module
+    module_class(:volume_parser)
   end
 
   def password_protection_module

data/app/forms/uffizzi_core/api/cli/v1/compose_file/cli_form.rb

@@ -8,6 +8,7 @@ class UffizziCore::Api::Cli::V1::ComposeFile::CliForm
   attribute :compose_dependencies, Array
   attribute :compose_repositories, Array
   attribute :content, String
+  attribute :source_kind, Symbol
 
   validates :content, presence: true
 

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

@@ -19,7 +19,7 @@ class UffizziCore::ComposeFile::Builders::ContainerBuilderService
     secrets = container_data[:secrets] || []
     container_name = container_data[:container_name]
     healthcheck_data = container_data[:healthcheck] || {}
-    volumes = container_data[:volumes] || []
+    volumes_data = container_data[:volumes] || []
 
     env_file_dependencies = UffizziCore::ComposeFile::GithubDependenciesService.env_file_dependencies_for_container(compose_dependencies,
                                                                                                                     container_name)
@@ -46,7 +46,7 @@ class UffizziCore::ComposeFile::Builders::ContainerBuilderService
       service_name: container_name,
       name: container_name,
       healthcheck: healthcheck_data,
-      volumes: volumes,
+      volumes: volumes_data,
     }
   end
   # rubocop:enable Metrics/PerceivedComplexity

data/app/services/uffizzi_core/compose_file/parsers/services/{volumes_service.rb → volumes_parser_service.rb}

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-class UffizziCore::ComposeFile::Parsers::Services::VolumesService
+class UffizziCore::ComposeFile::Parsers::Services::VolumesParserService
   HOST_VOLUME_TYPE = :host
   NAMED_VOLUME_TYPE = :named
   ANONYMOUS_VOLUME_TYPE = :anonymous
@@ -8,15 +8,15 @@ class UffizziCore::ComposeFile::Parsers::Services::VolumesService
   READ_WRITE_OPTION = 'rw'
 
   class << self
-    def parse(volumes, named_volumes_names, service_name)
+    def parse(volumes, volumes_payload)
       return [] if volumes.blank?
 
       volumes.map do |volume|
         volume_data = case volume
                       when String
-                        process_short_syntax(volume, named_volumes_names, service_name)
+                        process_short_syntax(volume, volumes_payload)
                       when Hash
-                        process_long_syntax(volume, named_volumes_names, service_name)
+                        process_long_syntax(volume, volumes_payload)
                       else
                         raise UffizziCore::ComposeFile::ParseError, I18n.t('compose.invalid_type', option: :volumes)
         end
@@ -27,48 +27,49 @@ class UffizziCore::ComposeFile::Parsers::Services::VolumesService
 
     private
 
-    def process_short_syntax(volume_data, named_volumes_names, service_name)
+    def process_short_syntax(volume_data, volumes_payload)
       volume_parts = volume_data.split(':').map(&:strip)
-      has_read_only = volume_parts.include?(READONLY_OPTION)
+      read_only = volume_parts.last.to_s.downcase == READONLY_OPTION
       part1, part2 = volume_parts
       source_path = part1
       target_path = [READONLY_OPTION, READ_WRITE_OPTION].include?(part2.to_s.downcase) ? nil : part2
 
       raise UffizziCore::ComposeFile::ParseError, I18n.t('compose.volume_prop_is_required', prop_name: 'source') if source_path.blank?
 
-      volume_type = volume_type(source_path, target_path)
-
-      check_named_volume_existence(source_path, target_path, named_volumes_names, service_name) if volume_type == NAMED_VOLUME_TYPE
-
-      {
-        source: source_path,
-        target: target_path,
-        type: volume_type,
-        read_only: has_read_only,
-      }
+      build_volume_attributes(source_path, target_path, read_only, volumes_payload)
     end
 
-    def process_long_syntax(volume_data, named_volumes_names, service_name)
+    def process_long_syntax(volume_data, volumes_payload)
       source_path = volume_data['source'].to_s.strip
       target_path = volume_data['target'].to_s.strip
-      has_read_only = volume_data['read_only'].present?
+      read_only = volume_data['read_only'].present?
 
       raise UffizziCore::ComposeFile::ParseError, I18n.t('compose.volume_prop_is_required', prop_name: 'source') if source_path.blank?
       raise UffizziCore::ComposeFile::ParseError, I18n.t('compose.volume_prop_is_required', prop_name: 'target') if target_path.blank?
 
-      volume_type = volume_type(source_path, target_path)
+      build_volume_attributes(source_path, target_path, read_only, volumes_payload)
+    end
 
-      check_named_volume_existence(source_path, target_path, named_volumes_names, service_name) if volume_type == NAMED_VOLUME_TYPE
+    def build_volume_attributes(source_path, target_path, read_only, params = {})
+      volume_type = build_volume_type(source_path, target_path)
+
+      if volume_type == NAMED_VOLUME_TYPE
+        validate_named_volume(source_path, target_path, params[:named_volumes_names], params[:service_name])
+      end
+
+      if volume_type == ANONYMOUS_VOLUME_TYPE
+        validate_anonymous_volume(source_path)
+      end
 
       {
         source: source_path,
         target: target_path,
         type: volume_type,
-        read_only: has_read_only,
+        read_only: read_only,
       }
     end
 
-    def volume_type(source_path, target_path)
+    def build_volume_type(source_path, target_path)
       if path?(source_path) && path?(target_path)
         raise UffizziCore::ComposeFile::ParseError, I18n.t('compose.volume_type_not_supported', type: HOST_VOLUME_TYPE)
       end
@@ -83,12 +84,26 @@ class UffizziCore::ComposeFile::Parsers::Services::VolumesService
       /^(\/|\.\/|~\/)/.match?(path)
     end
 
-    def check_named_volume_existence(source_path, target_path, named_volumes_names, service_name)
+    def validate_named_volume(source_path, target_path, named_volumes_names, service_name)
+      if path_has_only_root?(target_path)
+        raise UffizziCore::ComposeFile::ParseError, I18n.t('compose.invalid_volume_destination', spec: "#{source_path}:#{target_path}")
+      end
+
       return if named_volumes_names.include?(source_path)
 
       raise UffizziCore::ComposeFile::ParseError, I18n.t('compose.named_volume_not_exists', source_path: source_path,
                                                                                             target_path: target_path,
                                                                                             service_name: service_name)
     end
+
+    def validate_anonymous_volume(path)
+      if path_has_only_root?(path)
+        raise UffizziCore::ComposeFile::ParseError, I18n.t('compose.invalid_volume_destination', spec: path)
+      end
+    end
+
+    def path_has_only_root?(path)
+      path.size == 1 && path.include?('/')
+    end
   end
 end

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

@@ -51,9 +51,9 @@ class UffizziCore::ComposeFile::Parsers::ServicesParserService
                                     when :'x-uffizzi-continuous-preview', :'x-uffizzi-continuous-previews'
                                       UffizziCore::ComposeFile::Parsers::ContinuousPreviewParserService.parse(value)
                                     when :volumes
-                                      UffizziCore::ComposeFile::Parsers::Services::VolumesService.parse(value,
-                                                                                                        global_named_volume_names,
-                                                                                                        service_name)
+                                      parse_volumes(value, named_volumes_names: global_named_volume_names,
+                                                           service_name: service_name,
+                                                           compose_payload: compose_payload)
         end
       end
 
@@ -63,9 +63,19 @@ class UffizziCore::ComposeFile::Parsers::ServicesParserService
     end
 
     def check_and_parse_build_option(value, compose_payload)
+      build_parser_module = find_build_parser_module
+
       raise UffizziCore::ComposeFile::ParseError, I18n.t('compose.not_implemented', option: :build) unless build_parser_module
 
       build_parser_module.parse(value, compose_payload)
     end
+
+    def parse_volumes(value, volumes_payload)
+      volume_parser_module = find_volume_parser_module
+
+      return UffizziCore::ComposeFile::Parsers::Services::VolumesParserService.parse(value, volumes_payload) unless volume_parser_module
+
+      volume_parser_module.parse(value, volumes_payload)
+    end
   end
 end

data/config/locales/en.yml

@@ -66,6 +66,7 @@ en:
     volume_invalid_name: "Volumes value '%{name}' does not match any of the regexes: '^[a-zA-Z0-9._-]+$'"
     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 '/'
   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 = '0.4.2'
+  VERSION = '0.5.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: uffizzi_core
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.5.0
 platform: ruby
 authors:
 - Josh Thurman
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-08-10 00:00:00.000000000 Z
+date: 2022-08-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aasm
@@ -920,7 +920,7 @@ files:
 - app/services/uffizzi_core/compose_file/parsers/services/healthcheck_parser_service.rb
 - app/services/uffizzi_core/compose_file/parsers/services/image_parser_service.rb
 - app/services/uffizzi_core/compose_file/parsers/services/secrets_parser_service.rb
-- app/services/uffizzi_core/compose_file/parsers/services/volumes_service.rb
+- app/services/uffizzi_core/compose_file/parsers/services/volumes_parser_service.rb
 - app/services/uffizzi_core/compose_file/parsers/services_parser_service.rb
 - app/services/uffizzi_core/compose_file/parsers/variables_parser_service.rb
 - app/services/uffizzi_core/compose_file/parsers/volumes_parser_service.rb