uffizzi_core 2.0.3 → 2.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 62fa420959689bef475db8e095621079cc7e96ae0b73decf0282a1d9bec5744e
-  data.tar.gz: 76c69a8e8bfa2c6265dd3bcc7ad065a34e6ac6b3cfe8cc22ac3afcba6d477d1e
+  metadata.gz: 00ba39a6ed0a43804f4225204a8a8bead0bd930b6e41d0af55ed5055b0341148
+  data.tar.gz: d0f0312479a28b67acda70fa8cc9294f8296215942cceb795f065d356ee62f83
 SHA512:
-  metadata.gz: 005451ab5a4349aec3311fddb5257d1513f7d7b1f381375a75c5739c0635aea5d463574d7d6fb20424af76cc6c49e1d9146848fec7235d1a7d3b5c8ab2de5635
-  data.tar.gz: f3ac1a20fdb378b4926438abd9b3814cdedecea4de75fb48bc88f8a7d5b3d076f24becfce10df9edc794f55f6457f76c652a7395606f6b31dd9b56af0b98fc9d
+  metadata.gz: 00ae81e5bd57a538db963bf231ef34c6e57b574238c1374208f5f412918fd47746b694fe5b5a8f511f0d3d121b26037f4e02dc1149fe65c2369de72b4ad65550
+  data.tar.gz: e8a42e3edb430950a2eb641b57633f132e49ed94c2e62d51ed4fe48e37c8e9801f69316ff833e0ecafa37848527e9810c2c397a8eeeae4b82a2f9ade1dd62e18

data/app/controllers/uffizzi_core/api/cli/v1/projects/compose_files_controller.rb

@@ -24,7 +24,7 @@ class UffizziCore::Api::Cli::V1::Projects::ComposeFilesController < UffizziCore:
   # @parameter project_slug(required,path) [string] The project slug
   # @parameter params(required,body) [object <
   #    compose_file: object<path: string, source: string, content: string>,
-  #    dependencies: Array<object<path: string, source: string, content: string>>>]
+  #    dependencies: Array<object<path: string, source: string, content: string, use_kind: string, is_file: boolean>>>]
   #
   # @response [ComposeFile] 201 OK
   # @response 422 A compose file already exists for this project
@@ -72,7 +72,7 @@ class UffizziCore::Api::Cli::V1::Projects::ComposeFilesController < UffizziCore:
   end
 
   def dependencies_params
-    params.permit(dependencies: [:name, :path, :source, :content])
+    params.permit(dependencies: [:path, :source, :content, :use_kind, :is_file])
   end
 
   def create_or_update_compose_file(params)

data/app/controllers/uffizzi_core/api/cli/v1/projects/deployments_controller.rb

@@ -40,7 +40,7 @@ class UffizziCore::Api::Cli::V1::Projects::DeploymentsController < UffizziCore::
   # @parameter project_slug(required,path) [string] The project slug
   # @parameter params(required,body)   [object<
   #    compose_file: object<path: string, source: string, content: string>,
-  #    dependencies: Array<object<path: string, source: string, content: string>>>]
+  #    dependencies: Array<object<path: string, source: string, content: string, use_kind: string, is_file: boolean>>>]
   #
   # @response [Deployment] 201 OK
   # @response [object<errors: object<state: string>>] 422 Unprocessable Entity
@@ -66,7 +66,7 @@ class UffizziCore::Api::Cli::V1::Projects::DeploymentsController < UffizziCore::
   # @parameter project_slug(required,path) [string] The project slug
   # @parameter params(required,body)   [object<
   #    compose_file: object<path: string, source: string, content: string>,
-  #    dependencies: Array<object<path: string, source: string, content: string>>>]
+  #    dependencies: Array<object<path: string, source: string, content: string, use_kind: string, is_file: boolean>>>]
   #
   # @response [Deployment] 201 OK
   # @response [object<errors: object<state: string>>] 422 Unprocessable Entity
@@ -172,7 +172,7 @@ class UffizziCore::Api::Cli::V1::Projects::DeploymentsController < UffizziCore::
   end
 
   def dependencies_params
-    params.permit(dependencies: [:name, :path, :source, :content])
+    params.permit(dependencies: [:path, :source, :content, :use_kind, :is_file])
   end
 
   def metadata_params

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

@@ -12,7 +12,8 @@ class UffizziCore::Api::Cli::V1::ComposeFile::CheckCredentialsForm
 
   def check_containers_credentials
     compose_content = Base64.decode64(compose_file.content)
-    compose_data = UffizziCore::ComposeFileService.parse(compose_content)
+    compose_payload = { compose_file: compose_file }
+    compose_data = UffizziCore::ComposeFileService.parse(compose_content, compose_payload)
 
     UffizziCore::ComposeFileService.containers_credentials(compose_data, credentials)
   rescue UffizziCore::ComposeFile::CredentialError => e

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

@@ -9,14 +9,16 @@ class UffizziCore::Api::Cli::V1::ComposeFile::CliForm
   attribute :compose_repositories, Array
   attribute :content, String
   attribute :source_kind, Symbol
+  attribute :compose_file, UffizziCore::ComposeFile
 
   validates :content, presence: true
-
+  validates :compose_file, presence: true
   validate :check_compose_parsed_data, if: -> { errors[:content].empty? }
 
   def check_compose_parsed_data
     compose_content = Base64.decode64(content)
-    self.compose_data = UffizziCore::ComposeFileService.parse(compose_content)
+    compose_payload = { compose_file: compose_file }
+    self.compose_data = UffizziCore::ComposeFileService.parse(compose_content, compose_payload)
   rescue UffizziCore::ComposeFile::ParseError => e
     errors.add(:content, e.message)
   end

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

@@ -45,6 +45,10 @@ class UffizziCore::Api::Cli::V1::Deployment::CreateForm < UffizziCore::Deploymen
              container_config_files_attributes: [
                :config_file_id,
                :mount_path,
+             ],
+             container_host_volume_files_attributes: [
+               :host_volume_file_id,
+               :source_path,
              ] },
          ]
 

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

@@ -44,6 +44,10 @@ class UffizziCore::Api::Cli::V1::Deployment::UpdateForm < UffizziCore::Deploymen
              container_config_files_attributes: [
                :config_file_id,
                :mount_path,
+             ],
+             container_host_volume_files_attributes: [
+               :host_volume_file_id,
+               :source_path,
              ] },
          ]
 

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

@@ -46,6 +46,10 @@ class UffizziCore::Api::Cli::V1::Template::CreateForm < UffizziCore::Template
                container_config_files_attributes: [
                  :config_file_id,
                  :mount_path,
+               ],
+               container_host_volume_files_attributes: [
+                 :host_volume_file_id,
+                 :source_path,
                ] },
            ],
          }

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

@@ -3,6 +3,8 @@
 module UffizziCore::Concerns::Models::ComposeFile
   extend ActiveSupport::Concern
 
+  LOCAL_SOURCE = :local
+
   included do
     include UffizziCore::ComposeFileRepo
     include AASM
@@ -15,6 +17,7 @@ module UffizziCore::Concerns::Models::ComposeFile
 
     has_one :template, dependent: :destroy
     has_many :config_files, dependent: :destroy
+    has_many :host_volume_files, dependent: :destroy
     has_many :deployments, dependent: :nullify
 
     enumerize :kind, in: [:main, :temporary], predicates: true, scope: :shallow, default: :main
@@ -48,6 +51,14 @@ module UffizziCore::Concerns::Models::ComposeFile
       end
     end
 
+    def local_source?
+      repository_id.nil? && branch.nil?
+    end
+
+    def source_kind
+      return LOCAL_SOURCE if local_source?
+    end
+
     private
 
     def main_compose_file_uniqueness

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

@@ -20,6 +20,8 @@ module UffizziCore::Concerns::Models::Container
     has_many :activity_items, dependent: :destroy
     has_many :container_config_files, dependent: :destroy
     has_many :config_files, through: :container_config_files
+    has_many :container_host_volume_files, dependent: :destroy
+    has_many :host_volume_files, through: :container_host_volume_files
 
     attribute :public, :boolean, default: false
     attribute :port, :integer, default: nil
@@ -38,6 +40,7 @@ module UffizziCore::Concerns::Models::Container
 
     accepts_nested_attributes_for :repo
     accepts_nested_attributes_for :container_config_files, allow_destroy: true
+    accepts_nested_attributes_for :container_host_volume_files, allow_destroy: true
 
     validates :variables, 'uffizzi_core/environment_variable_list': true, allow_nil: true
     validates :secret_variables, 'uffizzi_core/environment_variable_list': true, allow_nil: true

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

@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+module UffizziCore::Concerns::Models::ContainerHostVolumeFile
+  extend ActiveSupport::Concern
+
+  included do
+    self.table_name = UffizziCore.table_names[:container_host_volume_files]
+
+    belongs_to :container
+    belongs_to :host_volume_file
+  end
+end

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

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+module UffizziCore::Concerns::Models::HostVolumeFile
+  extend ActiveSupport::Concern
+
+  included do
+    include UffizziCore::HostVolumeFileRepo
+
+    self.table_name = UffizziCore.table_names[:host_volume_files]
+
+    belongs_to :project
+    belongs_to :added_by, class_name: UffizziCore::User.name, foreign_key: :added_by_id, optional: true
+    belongs_to :compose_file, optional: true
+
+    has_many :container_host_volume_files, dependent: :destroy
+
+    validates :source, presence: true
+    validates :path, presence: true
+    validates :payload, presence: true
+    validates :is_file, inclusion: [true, false]
+  end
+end

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

@@ -21,6 +21,7 @@ module UffizziCore::Concerns::Models::Project
     has_many :credentials, through: :account
     has_many :compose_files, dependent: :destroy
     has_many :secrets, dependent: :destroy, as: :resource
+    has_many :host_volume_files, dependent: :destroy
 
     validates :name, presence: true, uniqueness: { scope: :account, message: 'Name already exists' }
     validates :slug, presence: true, uniqueness: { message: 'Project slug already taken' }

data/app/models/uffizzi_core/container_host_volume_file.rb

@@ -0,0 +1,5 @@
+# frozen_string_literal: true
+
+class UffizziCore::ContainerHostVolumeFile < UffizziCore::ApplicationRecord
+  include UffizziCore::Concerns::Models::ContainerHostVolumeFile
+end

data/app/models/uffizzi_core/host_volume_file.rb

@@ -0,0 +1,5 @@
+# frozen_string_literal: true
+
+class UffizziCore::HostVolumeFile < UffizziCore::ApplicationRecord
+  include UffizziCore::Concerns::Models::HostVolumeFile
+end

data/app/repositories/uffizzi_core/host_volume_file_repo.rb

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+module UffizziCore::HostVolumeFileRepo
+  extend ActiveSupport::Concern
+
+  included do
+    scope :by_deployment, ->(deployment) {
+      joins(:container_host_volume_files)
+        .where(container_host_volume_files: { container: deployment.containers })
+        .distinct
+    }
+
+    scope :by_source, ->(source) {
+      where(source: source)
+    }
+  end
+end

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

@@ -0,0 +1,5 @@
+# frozen_string_literal: true
+
+class UffizziCore::Controller::DeployContainers::ComposeFileSerializer < UffizziCore::BaseSerializer
+  attributes :source_kind
+end

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

@@ -0,0 +1,5 @@
+# frozen_string_literal: true
+
+class UffizziCore::Controller::DeployContainers::ContainerSerializer::ContainerHostVolumeFileSerializer < UffizziCore::BaseSerializer
+  attributes :host_volume_file_id, :source_path
+end

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

@@ -22,6 +22,7 @@ class UffizziCore::Controller::DeployContainers::ContainerSerializer < UffizziCo
              :additional_subdomains
 
   has_many :container_config_files
+  has_many :container_host_volume_files
 
   def image
     repo = object.repo

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

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+class UffizziCore::Controller::DeployContainers::HostVolumeFileSerializer < UffizziCore::BaseSerializer
+  attributes :id, :source, :path, :payload, :is_file
+
+  def payload
+    Base64.encode64(object.payload)
+  end
+end

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

@@ -25,9 +25,12 @@ class UffizziCore::ComposeFile::Builders::ContainerBuilderService
                                                                                                                     container_name)
     configs_dependencies = UffizziCore::ComposeFile::GithubDependenciesService.configs_dependencies_for_container(compose_dependencies,
                                                                                                                   container_name)
+    host_volumes_dependencies = UffizziCore::ComposeFile::GithubDependenciesService.host_volumes_dependencies_for_container(
+      compose_dependencies, container_name
+    )
     is_ingress = ingress_container?(container_name, ingress_data)
     repo_attributes = repo_attributes(container_data, continuous_preview_global_data)
-    additional_subdomains = is_ingress ? ingress_data[:additional_subdomains] : []
+    additional_subdomains = is_ingress ? ingress_data.fetch(:additional_subdomains, []) : []
 
     {
       tag: tag(image_data, repo_attributes),
@@ -43,12 +46,13 @@ class UffizziCore::ComposeFile::Builders::ContainerBuilderService
       repo_attributes: repo_attributes,
       continuously_deploy: continuously_deploy(deploy_data),
       receive_incoming_requests: is_ingress,
-      container_config_files_attributes: config_files(configs_data, configs_dependencies),
+      container_config_files_attributes: container_config_files_attributes(configs_data, configs_dependencies),
       service_name: container_name,
       name: container_name,
       healthcheck: healthcheck_data,
       volumes: volumes_data,
       additional_subdomains: additional_subdomains,
+      container_host_volume_files_attributes: container_host_volume_files_attributes(volumes_data, host_volumes_dependencies),
     }
   end
   # rubocop:enable Metrics/PerceivedComplexity
@@ -226,10 +230,17 @@ class UffizziCore::ComposeFile::Builders::ContainerBuilderService
     variables_builder.build_secret_attributes(secrets)
   end
 
-  def config_files(config_files_data, dependencies)
-    builder = UffizziCore::ComposeFile::Builders::ConfigFilesBuilderService.new(project)
+  def container_config_files_attributes(config_files_data, dependencies)
+    UffizziCore::ComposeFile::Builders::ContainerConfigFilesBuilderService.build_attributes(config_files_data, dependencies, project)
+  end
+
+  def container_host_volume_files_attributes(volumes_data, host_volumes_dependencies)
+    host_volumes_data = volumes_data.select do |v|
+      v[:type] == UffizziCore::ComposeFile::Parsers::Services::VolumesParserService::HOST_VOLUME_TYPE
+    end
 
-    builder.build_attributes(config_files_data, dependencies)
+    UffizziCore::ComposeFile::Builders::ContainerHostVolumeFilesBuilderService
+      .build_attributes(host_volumes_data, host_volumes_dependencies, project)
   end
 
   def docker_builder(type)

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

@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+class UffizziCore::ComposeFile::Builders::ContainerConfigFilesBuilderService
+  class << self
+    def build_attributes(config_files_data, dependencies, project)
+      return [] if config_files_data.empty?
+
+      config_file_sources = dependencies.pluck(:source)
+      config_files = project.config_files.with_creation_source(UffizziCore::ConfigFile.creation_source.compose_file)
+        .by_source(config_file_sources)
+
+      config_files_data.map do |config_file_data|
+        detected_dependency = dependencies.detect { |dependency| dependency[:path] == config_file_data[:source] }
+        detected_config_file = config_files.detect { |config_file| config_file.source == detected_dependency[:source] }
+
+        if detected_config_file.nil?
+          raise UffizziCore::ComposeFile::BuildError, I18n.t('compose.config_file_not_found', name: config_file_data[:source])
+        end
+
+        {
+          mount_path: config_file_data[:target],
+          config_file_id: detected_config_file.id,
+        }
+      end
+    end
+  end
+end

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

@@ -0,0 +1,30 @@
+# frozen_string_literal: true
+
+class UffizziCore::ComposeFile::Builders::ContainerHostVolumeFilesBuilderService
+  class << self
+    def build_attributes(container_host_volumes_data, host_volumes_dependencies, project)
+      return [] if container_host_volumes_data.empty?
+
+      host_volume_files = project
+        .host_volume_files
+        .by_source(host_volumes_dependencies.pluck(:source))
+
+      container_host_volumes_data.map do |container_host_volume_data|
+        detected_dependency = host_volumes_dependencies.detect do |dependency|
+          dependency[:raw_source] == container_host_volume_data[:source]
+        end
+        detected_host_volume_file = host_volume_files.detect { |host_volume_file| host_volume_file.source == detected_dependency[:source] }
+
+        if detected_host_volume_file.nil?
+          raise UffizziCore::ComposeFile::BuildError,
+                I18n.t('compose.host_volume_file_not_found', name: container_host_volume_data[:source])
+        end
+
+        {
+          source_path: container_host_volume_data[:source],
+          host_volume_file_id: detected_host_volume_file.id,
+        }
+      end
+    end
+  end
+end

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

@@ -33,13 +33,9 @@ class UffizziCore::ComposeFile::Builders::TemplateBuilderService
 
   def build_containers_attributes(containers_data, ingress_data, continuous_preview_global_data, compose_dependencies)
     containers_data.map do |container_data|
-      container_attributes(container_data, ingress_data, continuous_preview_global_data, compose_dependencies)
-    end
-  end
+      builder = UffizziCore::ComposeFile::Builders::ContainerBuilderService.new(credentials, project, repositories)
 
-  def container_attributes(containers_data, ingress_data, continuous_preview_global_data, compose_dependencies)
-    builder = UffizziCore::ComposeFile::Builders::ContainerBuilderService.new(credentials, project, repositories)
-
-    builder.build_attributes(containers_data, ingress_data, continuous_preview_global_data, compose_dependencies)
+      builder.build_attributes(container_data, ingress_data, continuous_preview_global_data, compose_dependencies)
+    end
   end
 end

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

@@ -3,14 +3,21 @@
 class UffizziCore::ComposeFile::DependenciesService
   ENV_FILE_TYPE = 'env_file'
   CONFIG_TYPE = 'config'
+  VOLUME_TYPE = 'volume'
+  DEPENDENCY_CONFIG_USE_KIND = 'config_map'
+  DEPENDENCY_VOLUME_USE_KIND = 'volume'
 
   class << self
     def build_dependencies(compose_data, compose_path, dependencies_params)
+      config_dependencies_params = dependencies_params.select { |d| d[:use_kind] == DEPENDENCY_CONFIG_USE_KIND }
+      volume_dependencies_params = dependencies_params.select { |d| d[:use_kind] == DEPENDENCY_VOLUME_USE_KIND }
+
       dependencies = compose_data[:containers].map do |container|
-        env_file_dependencies = build_env_files_dependencies(container, compose_path, dependencies_params)
-        configs_dependencies = build_configs_dependencies(container, compose_path, dependencies_params)
+        env_file_dependencies = build_env_files_dependencies(container, compose_path, config_dependencies_params)
+        configs_dependencies = build_configs_dependencies(container, compose_path, config_dependencies_params)
+        volumes_dependencies = build_volumes_dependencies(container, compose_path, volume_dependencies_params)
 
-        env_file_dependencies + configs_dependencies
+        env_file_dependencies + configs_dependencies + volumes_dependencies
       end
 
       dependencies.compact.flatten
@@ -40,6 +47,28 @@ class UffizziCore::ComposeFile::DependenciesService
       end
     end
 
+    def build_volumes_dependencies(container, compose_path, raw_dependencies)
+      container_volumes = container[:volumes]
+      return [] unless container_volumes.present?
+
+      container_volumes
+        .select { |c| c[:type] == UffizziCore::ComposeFile::Parsers::Services::VolumesParserService::HOST_VOLUME_TYPE }
+        .map do |container_volume|
+          detected_raw_dependency = raw_dependencies.detect { |raw_dependency| raw_dependency[:source] == container_volume[:source] }
+          builded_source = build_source_path(compose_path, detected_raw_dependency[:source])
+
+          {
+            content: detected_raw_dependency[:content],
+            path: detected_raw_dependency[:path],
+            container_name: container[:container_name],
+            source: builded_source,
+            raw_source: detected_raw_dependency[:source],
+            type: VOLUME_TYPE,
+            is_file: detected_raw_dependency[:is_file],
+          }
+        end
+    end
+
     def base_file_params(dependency, container)
       {
         content: dependency[:content],
@@ -52,5 +81,9 @@ class UffizziCore::ComposeFile::DependenciesService
       prepared_compose_path = Pathname.new(compose_path).basename.to_s
       "#{prepared_compose_path}/#{dependency_path}"
     end
+
+    def host_volume_binary_content(dependency)
+      Base64.decode64(dependency[:content])
+    end
   end
 end

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

@@ -3,6 +3,7 @@
 class UffizziCore::ComposeFile::GithubDependenciesService
   ENV_FILE_TYPE = 'env_file'
   CONFIG_TYPE = 'config'
+  VOLUME_TYPE = 'volume'
 
   class << self
     def filename(dependency)
@@ -23,10 +24,18 @@ class UffizziCore::ComposeFile::GithubDependenciesService
       configs_dependencies(dependencies).select { |dependency| dependency[:container_name] == container_name }
     end
 
+    def host_volumes_dependencies_for_container(dependencies, container_name)
+      dependencies.select { |dependency| dependency[:type] == VOLUME_TYPE && dependency[:container_name] == container_name }
+    end
+
     def configs_dependencies(dependencies)
       dependencies.select { |dependency| dependency[:type] == CONFIG_TYPE }
     end
 
+    def select_dependencies_by_type(dependencies, type)
+      dependencies.select { |dependency| dependency[:type].to_s == type.to_s }
+    end
+
     def build_source_path(compose_path, dependency_path, repository_id, branch)
       prepared_compose_path = Pathname.new(compose_path).basename.to_s
       base_source = "#{prepared_compose_path}/#{dependency_path}"

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

@@ -0,0 +1,40 @@
+# frozen_string_literal: true
+
+class UffizziCore::ComposeFile::HostVolumeFilesService
+  class << self
+    def bulk_create(compose_file_form, compose_dependencies)
+      volumes_dependencies = UffizziCore::ComposeFile::GithubDependenciesService
+        .select_dependencies_by_type(compose_dependencies, UffizziCore::ComposeFile::DependenciesService::VOLUME_TYPE)
+
+      errors = []
+      volumes_dependencies.each do |volume_dependency|
+        new_errors = create(compose_file_form, volume_dependency)
+        errors << new_errors if new_errors
+      end
+
+      errors
+    end
+
+    def create(compose_file_form, volume_dependency)
+      source = volume_dependency[:source]
+      host_volume_file = compose_file_form.project.host_volume_files.find_or_initialize_by(source: source)
+      attributes = {
+        payload: UffizziCore::ComposeFile::DependenciesService.host_volume_binary_content(volume_dependency),
+        source: source,
+        path: volume_dependency[:path],
+        is_file: volume_dependency[:is_file],
+      }
+
+      host_volume_file.assign_attributes(attributes)
+      host_volume_file.project = compose_file_form.project
+      host_volume_file.added_by = compose_file_form.added_by
+      host_volume_file.compose_file = compose_file_form
+
+      return host_volume_file.errors if host_volume_file.invalid?
+
+      host_volume_file.save
+
+      nil
+    end
+  end
+end

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

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-class UffizziCore::ComposeFile::Parsers::VolumesParserService
+class UffizziCore::ComposeFile::Parsers::NamedVolumesParserService
   VALID_VOLUME_NAME_REGEX = /^[a-zA-Z0-9._-]+$/.freeze
 
   class << self

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

@@ -8,26 +8,30 @@ class UffizziCore::ComposeFile::Parsers::Services::VolumesParserService
   READ_WRITE_OPTION = 'rw'
 
   class << self
-    def parse(volumes, volumes_payload)
+    def parse(volumes, additional_data)
       return [] if volumes.blank?
 
+      if volumes.is_a?(String)
+        raise UffizziCore::ComposeFile::ParseError, I18n.t('compose.volumes_should_be_array', volumes: volumes)
+      end
+
       volumes.map do |volume|
         volume_data = case volume
                       when String
-                        process_short_syntax(volume, volumes_payload)
+                        process_short_syntax(volume, additional_data)
                       when Hash
-                        process_long_syntax(volume, volumes_payload)
+                        process_long_syntax(volume, additional_data)
                       else
                         raise UffizziCore::ComposeFile::ParseError, I18n.t('compose.invalid_type', option: :volumes)
         end
 
         volume_data
-      end
+      end.uniq
     end
 
     private
 
-    def process_short_syntax(volume_data, volumes_payload)
+    def process_short_syntax(volume_data, additional_data)
       volume_parts = volume_data.split(':').map(&:strip)
       read_only = volume_parts.last.to_s.downcase == READONLY_OPTION
       part1, part2 = volume_parts
@@ -36,10 +40,10 @@ class UffizziCore::ComposeFile::Parsers::Services::VolumesParserService
 
       raise UffizziCore::ComposeFile::ParseError, I18n.t('compose.volume_prop_is_required', prop_name: 'source') if source_path.blank?
 
-      build_volume_attributes(source_path, target_path, read_only, volumes_payload)
+      build_volume_attributes(source_path, target_path, read_only, additional_data)
     end
 
-    def process_long_syntax(volume_data, volumes_payload)
+    def process_long_syntax(volume_data, additional_data)
       source_path = volume_data['source'].to_s.strip
       target_path = volume_data['target'].to_s.strip
       read_only = volume_data['read_only'].present?
@@ -47,7 +51,7 @@ class UffizziCore::ComposeFile::Parsers::Services::VolumesParserService
       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?
 
-      build_volume_attributes(source_path, target_path, read_only, volumes_payload)
+      build_volume_attributes(source_path, target_path, read_only, additional_data)
     end
 
     def build_volume_attributes(source_path, target_path, read_only, params = {})
@@ -70,10 +74,7 @@ class UffizziCore::ComposeFile::Parsers::Services::VolumesParserService
     end
 
     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
-
+      return HOST_VOLUME_TYPE if path?(source_path) && path?(target_path)
       return ANONYMOUS_VOLUME_TYPE if path?(source_path) && target_path.blank?
       return NAMED_VOLUME_TYPE if source_path.present? && !path?(source_path) && path?(target_path)
 
@@ -81,7 +82,7 @@ class UffizziCore::ComposeFile::Parsers::Services::VolumesParserService
     end
 
     def path?(path)
-      /^(\/|\.\/|~\/)/.match?(path)
+      path.to_s.start_with?('/', './', '../')
     end
 
     def validate_named_volume(source_path, target_path, named_volumes_names, service_name)

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

@@ -70,12 +70,12 @@ class UffizziCore::ComposeFile::Parsers::ServicesParserService
       build_parser_module.parse(value, compose_payload)
     end
 
-    def parse_volumes(value, volumes_payload)
+    def parse_volumes(volumes, additional_data)
       volume_parser_module = find_volume_parser_module
 
-      return UffizziCore::ComposeFile::Parsers::Services::VolumesParserService.parse(value, volumes_payload) unless volume_parser_module
+      return UffizziCore::ComposeFile::Parsers::Services::VolumesParserService.parse(volumes, additional_data) unless volume_parser_module
 
-      volume_parser_module.parse(value, volumes_payload)
+      volume_parser_module.parse(volumes, additional_data)
     end
   end
 end

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

@@ -42,7 +42,7 @@ class UffizziCore::ComposeFile::TemplateService
     attributes = compose_file_template_form.template_attributes
     source = compose_file_template_form.source
     template = compose_file_form.template
-    template = @project.templates.find_or_initialize_by(name: source) if !template.present?
+    template = @project.templates.find_or_initialize_by(name: source) if template.blank?
     template.assign_attributes(attributes)
     template_form = template.becomes(UffizziCore::Api::Cli::V1::Template::CreateForm)
     template_form.project = @project

data/app/services/uffizzi_core/compose_file_service.rb

@@ -21,7 +21,7 @@ class UffizziCore::ComposeFileService
       check_config_options_format(compose_data)
       configs_data = UffizziCore::ComposeFile::Parsers::ConfigsParserService.parse(compose_data['configs'])
       secrets_data = UffizziCore::ComposeFile::Parsers::SecretsParserService.parse(compose_data['secrets'])
-      named_volume_names = UffizziCore::ComposeFile::Parsers::VolumesParserService.parse(compose_data['volumes'])
+      named_volume_names = UffizziCore::ComposeFile::Parsers::NamedVolumesParserService.parse(compose_data['volumes'])
       containers_data = UffizziCore::ComposeFile::Parsers::ServicesParserService.parse(
         compose_data['services'],
         configs_data,
@@ -132,6 +132,7 @@ class UffizziCore::ComposeFileService
     def process_compose_file(compose_file_form, params)
       cli_form = UffizziCore::Api::Cli::V1::ComposeFile::CliForm.new
       cli_form.content = compose_file_form.content
+      cli_form.compose_file = compose_file_form.becomes(UffizziCore::ComposeFile)
       return [compose_file_form, cli_form.errors] if cli_form.invalid?
 
       dependencies = params[:dependencies].to_a
@@ -188,8 +189,10 @@ class UffizziCore::ComposeFileService
         end
 
         config_files_service = UffizziCore::ComposeFile::ConfigFilesService.new(compose_file_form)
-        errors = config_files_service.create_config_files(cli_form.compose_dependencies)
-        raise ActiveRecord::Rollback if errors.present?
+        config_file_errors = config_files_service.create_config_files(cli_form.compose_dependencies)
+        host_volume_file_errors = UffizziCore::ComposeFile::HostVolumeFilesService
+          .bulk_create(compose_file_form, cli_form.compose_dependencies)
+        raise ActiveRecord::Rollback if config_file_errors.present? || host_volume_file_errors.present?
 
         project = compose_file_form.project
         user = compose_file_form.added_by

data/app/services/uffizzi_core/controller_service.rb

@@ -45,14 +45,25 @@ class UffizziCore::ControllerService
       containers = containers.map do |container|
         UffizziCore::Controller::DeployContainers::ContainerSerializer.new(container).as_json(include: '**')
       end
+
       credentials = deployment.credentials.deployable.map do |credential|
         UffizziCore::Controller::DeployContainers::CredentialSerializer.new(credential).as_json
       end
 
+      host_volume_files = UffizziCore::HostVolumeFile.by_deployment(deployment).map do |host_volume_file|
+        UffizziCore::Controller::DeployContainers::HostVolumeFileSerializer.new(host_volume_file).as_json
+      end
+
+      compose_file = if deployment.compose_file.present?
+        UffizziCore::Controller::DeployContainers::ComposeFileSerializer.new(deployment.compose_file).as_json
+      end
+
       body = {
         containers: containers,
         credentials: credentials,
         deployment_url: deployment.preview_url,
+        compose_file: compose_file,
+        host_volume_files: host_volume_files,
       }
 
       if password_protection_module.present?

data/app/services/uffizzi_core/deployment_service.rb

@@ -63,9 +63,9 @@ class UffizziCore::DeploymentService
         Rails.logger.info("DEPLOYMENT_PROCESS deployment_id=#{deployment.id} start deploying into controller")
 
         containers = deployment.active_containers
-        containers = add_default_deployment_variables!(containers, deployment)
+        containers_with_variables = add_default_deployment_variables!(containers, deployment)
 
-        UffizziCore::ControllerService.deploy_containers(deployment, containers)
+        UffizziCore::ControllerService.deploy_containers(deployment, containers_with_variables)
       else
         Rails.logger.info("DEPLOYMENT_PROCESS deployment_id=#{deployment.id} deployment has builds errors, stopping")
       end

data/config/locales/en.yml

@@ -33,6 +33,7 @@ en:
     image_build_no_specified: Service '%{value}' has neither an image nor a build context specified. At least one must be provided.
     build_context_no_specified: The context option should be specified
     config_file_not_found: Config file not found '%{name}'
+    host_volume_file_not_found: Host volume file not found '%{name}'
     invalid_context: Invalid context value '%{value}'
     invalid_bool_value: Invalid %{field} value '%{value}'. The value should be `true` or `false`
     invalid_delete_after_postfix: The postfix of the delete_preview_after value should be `h`
@@ -64,10 +65,10 @@ en:
     volume_path_is_invalid: The path '%{path}' is invalid
     volume_prop_is_required: The '%{prop_name}' is a required property
     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 '/'
     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
   secrets:
     duplicates_exists: Secret with key %{secrets} already exist.
     invalid_key_length: A secret key must be no longer than 256 characters.

data/db/migrate/20220901110752_create_host_volume_files.rb

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+class CreateHostVolumeFiles < ActiveRecord::Migration[6.1]
+  def change
+    create_table :uffizzi_core_host_volume_files do |t|
+      t.string :source
+      t.string :path
+      t.boolean :is_file
+      t.binary :payload
+      t.bigint :added_by_id
+      t.timestamps
+
+      t.references :project, null: false,
+                             foreign_key: true,
+                             index: { name: :index_host_volume_file_on_project_id },
+                             foreign_key: { to_table: :uffizzi_core_projects }
+      t.references :compose_file, null: false,
+                                  foreign_key: true,
+                                  index: { name: :index_host_volume_file_on_compose_file_id },
+                                  foreign_key: { to_table: :uffizzi_core_compose_files }
+    end
+  end
+end

data/db/migrate/20220901165313_create_container_host_volume_files.rb

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+class CreateContainerHostVolumeFiles < ActiveRecord::Migration[6.1]
+  def change
+    create_table :uffizzi_core_container_host_volume_files do |t|
+      t.string :source_path
+      t.timestamps
+      t.references :container, null: false,
+                               foreign_key: true,
+                               index: { name: :uf_core_cont_h_v_on_cont },
+                               foreign_key: { to_table: :uffizzi_core_containers }
+      t.references :host_volume_file, null: false,
+                                      foreign_key: true,
+                                      index: { name: :uf_core_cont_h_v_on_h_v_file },
+                                      foreign_key: { to_table: :uffizzi_core_host_volume_files }
+    end
+  end
+end

data/lib/uffizzi_core/version.rb

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

data/lib/uffizzi_core.rb

@@ -58,6 +58,8 @@ module UffizziCore
     user_projects: :uffizzi_core_user_projects,
     users: :uffizzi_core_users,
     users_roles: :uffizzi_core_users_roles,
+    host_volume_files: :uffizzi_core_host_volume_files,
+    container_host_volume_files: :uffizzi_core_container_host_volume_files,
   }
   mattr_accessor :user_creation_sources, default: [:system, :online_registration, :google, :sso]
   mattr_accessor :user_project_roles, default: [:admin, :developer, :viewer]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: uffizzi_core
 version: !ruby/object:Gem::Version
-  version: 2.0.3
+  version: 2.0.4
 platform: ruby
 authors:
 - Josh Thurman
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-10-10 00:00:00.000000000 Z
+date: 2022-10-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aasm
@@ -563,6 +563,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: hash_diff
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.1'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -802,10 +816,12 @@ files:
 - app/lib/uffizzi_core/concerns/models/config_file.rb
 - app/lib/uffizzi_core/concerns/models/container.rb
 - app/lib/uffizzi_core/concerns/models/container_config_file.rb
+- app/lib/uffizzi_core/concerns/models/container_host_volume_file.rb
 - app/lib/uffizzi_core/concerns/models/coupon.rb
 - app/lib/uffizzi_core/concerns/models/credential.rb
 - app/lib/uffizzi_core/concerns/models/deployment.rb
 - app/lib/uffizzi_core/concerns/models/event.rb
+- app/lib/uffizzi_core/concerns/models/host_volume_file.rb
 - app/lib/uffizzi_core/concerns/models/membership.rb
 - app/lib/uffizzi_core/concerns/models/payment.rb
 - app/lib/uffizzi_core/concerns/models/price.rb
@@ -834,6 +850,7 @@ files:
 - app/models/uffizzi_core/config_file.rb
 - app/models/uffizzi_core/container.rb
 - app/models/uffizzi_core/container_config_file.rb
+- app/models/uffizzi_core/container_host_volume_file.rb
 - app/models/uffizzi_core/continuous_preview.rb
 - app/models/uffizzi_core/coupon.rb
 - app/models/uffizzi_core/credential.rb
@@ -848,6 +865,7 @@ files:
 - app/models/uffizzi_core/database_offering.rb
 - app/models/uffizzi_core/deployment.rb
 - app/models/uffizzi_core/event.rb
+- app/models/uffizzi_core/host_volume_file.rb
 - app/models/uffizzi_core/membership.rb
 - app/models/uffizzi_core/payment.rb
 - app/models/uffizzi_core/price.rb
@@ -887,6 +905,7 @@ files:
 - app/repositories/uffizzi_core/credential_repo.rb
 - app/repositories/uffizzi_core/deployment_repo.rb
 - app/repositories/uffizzi_core/event_repo.rb
+- app/repositories/uffizzi_core/host_volume_file_repo.rb
 - app/repositories/uffizzi_core/membership_repo.rb
 - app/repositories/uffizzi_core/price_repo.rb
 - app/repositories/uffizzi_core/product_repo.rb
@@ -920,17 +939,21 @@ files:
 - app/serializers/uffizzi_core/controller/apply_config_file/config_file_serializer.rb
 - app/serializers/uffizzi_core/controller/create_credential/credential_serializer.rb
 - app/serializers/uffizzi_core/controller/create_deployment/deployment_serializer.rb
+- app/serializers/uffizzi_core/controller/deploy_containers/compose_file_serializer.rb
 - app/serializers/uffizzi_core/controller/deploy_containers/container_serializer.rb
 - app/serializers/uffizzi_core/controller/deploy_containers/container_serializer/container_config_file_serializer.rb
 - app/serializers/uffizzi_core/controller/deploy_containers/container_serializer/container_config_file_serializer/config_file_serializer.rb
+- app/serializers/uffizzi_core/controller/deploy_containers/container_serializer/container_host_volume_file_serializer.rb
 - app/serializers/uffizzi_core/controller/deploy_containers/credential_serializer.rb
+- app/serializers/uffizzi_core/controller/deploy_containers/host_volume_file_serializer.rb
 - app/services/uffizzi_core/account_service.rb
 - app/services/uffizzi_core/activity_item_service.rb
 - app/services/uffizzi_core/amazon/credential_service.rb
 - app/services/uffizzi_core/amazon_service.rb
 - app/services/uffizzi_core/azure/credential_service.rb
-- app/services/uffizzi_core/compose_file/builders/config_files_builder_service.rb
 - app/services/uffizzi_core/compose_file/builders/container_builder_service.rb
+- app/services/uffizzi_core/compose_file/builders/container_config_files_builder_service.rb
+- app/services/uffizzi_core/compose_file/builders/container_host_volume_files_builder_service.rb
 - app/services/uffizzi_core/compose_file/builders/docker_repo_builder_service.rb
 - app/services/uffizzi_core/compose_file/builders/template_builder_service.rb
 - app/services/uffizzi_core/compose_file/builders/variables_builder_service.rb
@@ -940,9 +963,11 @@ files:
 - app/services/uffizzi_core/compose_file/dependencies_service.rb
 - app/services/uffizzi_core/compose_file/errors_service.rb
 - app/services/uffizzi_core/compose_file/github_dependencies_service.rb
+- app/services/uffizzi_core/compose_file/host_volume_files_service.rb
 - app/services/uffizzi_core/compose_file/parsers/configs_parser_service.rb
 - app/services/uffizzi_core/compose_file/parsers/continuous_preview_parser_service.rb
 - app/services/uffizzi_core/compose_file/parsers/ingress_parser_service.rb
+- app/services/uffizzi_core/compose_file/parsers/named_volumes_parser_service.rb
 - app/services/uffizzi_core/compose_file/parsers/secrets_parser_service.rb
 - app/services/uffizzi_core/compose_file/parsers/services/command_parser_service.rb
 - app/services/uffizzi_core/compose_file/parsers/services/configs_parser_service.rb
@@ -956,7 +981,6 @@ files:
 - 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
 - app/services/uffizzi_core/compose_file/template_service.rb
 - app/services/uffizzi_core/compose_file_service.rb
 - app/services/uffizzi_core/container_service.rb
@@ -1001,6 +1025,8 @@ files:
 - db/migrate/20220525113412_rename_name_to_uffizzi_containers.rb
 - db/migrate/20220704135629_add_disabled_at_to_deployments.rb
 - db/migrate/20220805164628_add_metadata_to_deployment.rb
+- db/migrate/20220901110752_create_host_volume_files.rb
+- db/migrate/20220901165313_create_container_host_volume_files.rb
 - db/migrate/20220927113647_add_additional_subdomains_to_containers.rb
 - db/seeds.rb
 - lib/tasks/uffizzi_core_tasks.rake

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

@@ -1,31 +0,0 @@
-# frozen_string_literal: true
-
-class UffizziCore::ComposeFile::Builders::ConfigFilesBuilderService
-  attr_accessor :project
-
-  def initialize(project)
-    @project = project
-  end
-
-  def build_attributes(config_files_data, dependencies)
-    return [] if config_files_data.empty?
-
-    config_file_sources = dependencies.pluck(:source)
-    config_files = project.config_files.with_creation_source(UffizziCore::ConfigFile.creation_source.compose_file)
-      .by_source(config_file_sources)
-
-    config_files_data.map do |config_file_data|
-      detected_dependency = dependencies.detect { |dependency| dependency[:path] == config_file_data[:source] }
-      detected_config_file = config_files.detect { |config_file| config_file.source == detected_dependency[:source] }
-
-      if detected_config_file.nil?
-        raise UffizziCore::ComposeFile::BuildError, I18n.t('compose.config_file_not_found', name: config_file_data[:source])
-      end
-
-      {
-        mount_path: config_file_data[:target],
-        config_file_id: detected_config_file.id,
-      }
-    end
-  end
-end