uffizzi_core 0.1.15 → 0.2.1

data/app/models/uffizzi_core/invitation.rb

@@ -1,27 +1,5 @@
 # frozen_string_literal: true
 
 class UffizziCore::Invitation < UffizziCore::ApplicationRecord
-  include AASM
-  include UffizziCore::StateMachineConcern
-  extend Enumerize
-
-  self.table_name = UffizziCore.table_names[:invitations]
-
-  enumerize :role, in: [:admin, :developer, :viewer], predicates: true
-
-  belongs_to :entityable, polymorphic: true
-  belongs_to :invited_by, class_name: UffizziCore::User.name, foreign_key: :invited_by_id
-  belongs_to :invitee, class_name: UffizziCore::User.name, foreign_key: :invitee_id, optional: true
-
-  validates :email, presence: true, 'uffizzi_core/email': true
-  validates :token, presence: true, uniqueness: true
-
-  aasm(:status) do
-    state :pending, initial: true
-    state :accepted
-
-    event :accept do
-      transitions from: :pending, to: :accepted
-    end
-  end
+  include UffizziCore::Concerns::Models::Invitation
 end

data/app/models/uffizzi_core/membership.rb

@@ -1,16 +1,5 @@
 # frozen_string_literal: true
 
 class UffizziCore::Membership < UffizziCore::ApplicationRecord
-  include UffizziCore::MembershipRepo
-  extend Enumerize
-
-  self.table_name = UffizziCore.table_names[:memberships]
-
-  enumerize :role, in: [:admin, :developer, :viewer], predicates: true
-  validates :role, presence: true
-
-  belongs_to :account
-  belongs_to :user
-
-  validates :role, presence: true
+  include UffizziCore::Concerns::Models::Membership
 end

data/app/models/uffizzi_core/payment.rb

@@ -1,11 +1,5 @@
 # frozen_string_literal: true
 
 class UffizziCore::Payment < UffizziCore::ApplicationRecord
-  self.table_name = UffizziCore.table_names[:payments]
-
-  belongs_to :account
-
-  scope :succeeded, -> { where(status: :succeeded) }
-  scope :pending, -> { where(status: :pending) }
-  scope :failed, -> { where(status: :failed) }
+  include UffizziCore::Concerns::Models::Payment
 end

data/app/models/uffizzi_core/price.rb

@@ -1,9 +1,5 @@
 # frozen_string_literal: true
 
 class UffizziCore::Price < UffizziCore::ApplicationRecord
-  include UffizziCore::PriceRepo
-
-  self.table_name = UffizziCore.table_names[:prices]
-
-  belongs_to :product
+  include UffizziCore::Concerns::Models::Price
 end

data/app/models/uffizzi_core/product.rb

@@ -1,11 +1,5 @@
 # frozen_string_literal: true
 
 class UffizziCore::Product < UffizziCore::ApplicationRecord
-  include UffizziCore::ProductRepo
-
-  self.table_name = UffizziCore.table_names[:products]
-
-  has_one :price, dependent: :destroy
-
-  UffizziCore::Product.inheritance_column = :sti
+  include UffizziCore::Concerns::Models::Product
 end

data/app/models/uffizzi_core/project.rb

@@ -10,58 +10,5 @@
 # @property deployments [object<id: integer, domain: string>]
 
 class UffizziCore::Project < UffizziCore::ApplicationRecord
-  include AASM
-  include UffizziCore::StateMachineConcern
-  include UffizziCore::ProjectRepo
-
-  self.table_name = UffizziCore.table_names[:projects]
-
-  belongs_to :account
-
-  has_many :repos
-  has_many :deployments, dependent: :destroy
-  has_many :user_projects, dependent: :destroy
-  has_many :users, through: :user_projects
-  has_many :invitations, as: :entityable
-  has_many :config_files, dependent: :destroy
-  has_many :templates, dependent: :destroy
-  has_many :credentials, through: :account
-  has_many :compose_files, dependent: :destroy
-  has_many :secrets, dependent: :destroy, as: :resource
-
-  validates :name, presence: true, uniqueness: { scope: :account, message: 'Name already exists' }
-  validates :slug, presence: true, uniqueness: { message: 'Project slug already taken' }
-
-  aasm(:state) do
-    state :active, initial: true
-    state :disabled
-
-    event :activate do
-      transitions from: [:disabled], to: :active
-    end
-
-    event :disable, after: :after_disable do
-      transitions from: [:active], to: :disabled
-    end
-  end
-
-  def after_disable
-    update(name: "#{name} deleted #{DateTime.current.strftime('%H:%M:%S-%m%d%Y')}")
-    update(slug: "#{slug} deleted #{DateTime.current.strftime('%H:%M:%S-%m%d%Y')}")
-    disable_deployments
-  end
-
-  def active_deployments
-    deployments.active
-  end
-
-  def disable_deployments
-    active_deployments.each do |deployment|
-      UffizziCore::DeploymentService.disable!(deployment)
-    end
-  end
-
-  def compose_file
-    compose_files.main.first
-  end
+  include UffizziCore::Concerns::Models::Project
 end

data/app/models/uffizzi_core/rating.rb

@@ -1,20 +1,5 @@
 # frozen_string_literal: true
 
 class UffizziCore::Rating < UffizziCore::ApplicationRecord
-  include AASM
-
-  self.table_name = UffizziCore.table_names[:ratings]
-
-  aasm(:state) do
-    state :active, initial: true
-    state :disabled
-
-    event :activate do
-      transitions from: [:disabled], to: :active
-    end
-
-    event :disable do
-      transitions from: [:active], to: :disabled
-    end
-  end
+  include UffizziCore::Concerns::Models::Rating
 end

data/app/models/uffizzi_core/repo.rb

@@ -1,29 +1,5 @@
 # frozen_string_literal: true
 
 class UffizziCore::Repo < UffizziCore::ApplicationRecord
-  extend Enumerize
-  include UffizziCore::RepoRepo
-
-  self.table_name = UffizziCore.table_names[:repos]
-
-  enumerize :kind, in: [:buildpacks18, :dockerfile, :dotnet, :gatsby, :barestatic], predicates: true
-
-  belongs_to :project
-  has_one :container, inverse_of: :repo, dependent: :destroy
-  has_many :builds, dependent: :destroy
-
-  validates :dockerfile_path, presence: true, if: :dockerfile?
-  validates :delete_preview_after, numericality: { greater_than: 0, only_integer: true }, allow_nil: true
-
-  def docker_hub?
-    type == UffizziCore::Repo::DockerHub.name
-  end
-
-  def azure?
-    type == UffizziCore::Repo::Azure.name
-  end
-
-  def google?
-    type == UffizziCore::Repo::Google.name
-  end
+  include UffizziCore::Concerns::Models::Repo
 end

data/app/models/uffizzi_core/role.rb

@@ -1,17 +1,5 @@
 # frozen_string_literal: true
 
 class UffizziCore::Role < UffizziCore::ApplicationRecord
-  self.table_name = UffizziCore.table_names[:roles]
-
-  has_and_belongs_to_many :users, join_table: UffizziCore.table_names[:users_roles]
-
-  belongs_to :resource,
-             polymorphic: true,
-             optional: true
-
-  validates :resource_type,
-            inclusion: { in: Rolify.resource_types },
-            allow_nil: true
-
-  scopify
+  include UffizziCore::Concerns::Models::Role
 end

data/app/models/uffizzi_core/secret.rb

@@ -1,9 +1,5 @@
 # frozen_string_literal: true
 
 class UffizziCore::Secret < ApplicationRecord
-  self.table_name = UffizziCore.table_names[:secrets]
-
-  belongs_to :resource, polymorphic: true
-
-  validates :name, presence: true, uniqueness: { scope: :resource }
+  include UffizziCore::Concerns::Models::Secret
 end

data/app/models/uffizzi_core/template.rb

@@ -1,19 +1,5 @@
 # frozen_string_literal: true
 
 class UffizziCore::Template < UffizziCore::ApplicationRecord
-  include UffizziCore::TemplateRepo
-  extend Enumerize
-
-  self.table_name = UffizziCore.table_names[:templates]
-
-  belongs_to :added_by, class_name: UffizziCore::User.name, foreign_key: :added_by_id
-  belongs_to :project, touch: true
-  belongs_to :compose_file, optional: true
-
-  has_many :deployments, dependent: :nullify
-
-  enumerize :creation_source, in: [:manual, :compose_file, :system], predicates: true, scope: true
-
-  validates :name, presence: true
-  validates :name, uniqueness: { scope: :project }, if: -> { compose_file.blank? || compose_file.kind.main? }
+  include UffizziCore::Concerns::Models::Template
 end

data/app/models/uffizzi_core/user.rb

@@ -1,62 +1,5 @@
 # frozen_string_literal: true
 
 class UffizziCore::User < ActiveRecord::Base
-  include AASM
-  include ActiveModel::Validations
-  include UffizziCore::StateMachineConcern
-  include UffizziCore::HashidConcern
-  include UffizziCore::UserRepo
-  extend Enumerize
-
-  self.table_name = UffizziCore.table_names[:users]
-
-  rolify
-
-  has_secure_password
-
-  validates :email, presence: true, 'uffizzi_core/email': true, uniqueness: { case_sensitive: false }
-  validates :password, allow_nil: true, length: { minimum: 8 }, on: :update
-
-  has_many :memberships, dependent: :destroy
-  has_many :accounts, through: :memberships
-  has_many :user_projects
-  has_many :projects, through: :user_projects
-
-  has_one_attached :avatar
-
-  enumerize :creation_source, in: [:system, :online_registration, :google, :sso], predicates: true
-
-  def organizational_account
-    accounts.find_by(kind: UffizziCore::Account.kind.organizational)
-  end
-
-  def active_projects
-    projects.active
-  end
-
-  def deployments
-    UffizziCore::Deployment.where(project_id: active_projects)
-  end
-
-  def full_name
-    "#{first_name} #{last_name}"
-  end
-
-  aasm(:state) do
-    state :initial, initial: true
-    state :active
-    state :disabled
-
-    event :activate do
-      transitions from: [:initial, :disabled], to: :active
-    end
-
-    event :disable do
-      transitions from: [:initial, :active], to: :disabled
-    end
-  end
-
-  def admin_access_to_project?(project)
-    projects.by_ids(project).by_accounts(memberships.by_role_admin.select(:account_id)).exists?
-  end
+  include UffizziCore::Concerns::Models::User
 end

data/app/models/uffizzi_core/user_project.rb

@@ -1,14 +1,5 @@
 # frozen_string_literal: true
 
 class UffizziCore::UserProject < UffizziCore::ApplicationRecord
-  extend Enumerize
-
-  self.table_name = UffizziCore.table_names[:user_projects]
-
-  enumerize :role, in: [:admin, :developer, :viewer], predicates: true
-  validates :role, presence: true
-
-  belongs_to :user
-  belongs_to :project
-  belongs_to :invited_by, class_name: UffizziCore::User.name, foreign_key: :invited_by_id, optional: true
+  include UffizziCore::Concerns::Models::UserProject
 end

data/app/repositories/uffizzi_core/template_repo.rb

@@ -30,7 +30,7 @@ module UffizziCore::TemplateRepo
         ],
       }
 
-      where('payload @> ?', general_query.to_json).where.not('payload @> ?', excluding_query.to_json)
+      where('templates.payload @> ?', general_query.to_json).where.not('templates.payload @> ?', excluding_query.to_json)
     }
 
     scope :by_docker_containers_with_delete_preview_when_image_tag_is_updated, ->(source, image, tag) {
@@ -47,7 +47,7 @@ module UffizziCore::TemplateRepo
         ],
       }
 
-      where('payload @> ?', general_query.to_json)
+      where('templates.payload @> ?', general_query.to_json)
     }
 
     scope :by_github_containers_with_deploy_preview_when_pull_request_is_opened, ->(repository_id, branch) {
@@ -55,7 +55,7 @@ module UffizziCore::TemplateRepo
         containers_attributes: [
           {
             repo_attributes: {
-              type: Repo::Github.name,
+              type: UffizziCore::Repo::Github.name,
               repository_id: repository_id,
               branch: branch,
               deploy_preview_when_pull_request_is_opened: true,
@@ -64,7 +64,7 @@ module UffizziCore::TemplateRepo
         ],
       }
 
-      where('payload @> ?', query.to_json)
+      where('templates.payload @> ?', query.to_json)
     }
 
     scope :by_github_containers_with_delete_preview_when_pull_request_is_closed, ->(repository_id, branch) {
@@ -72,7 +72,7 @@ module UffizziCore::TemplateRepo
         containers_attributes: [
           {
             repo_attributes: {
-              type: Repo::Github.name,
+              type: UffizziCore::Repo::Github.name,
               repository_id: repository_id,
               branch: branch,
               delete_preview_when_pull_request_is_closed: true,
@@ -81,7 +81,15 @@ module UffizziCore::TemplateRepo
         ],
       }
 
-      where('payload @> ?', query.to_json)
+      where('templates.payload @> ?', query.to_json)
+    }
+
+    scope :by_compose_file_kind, ->(kind) {
+      left_joins(:compose_file).where(compose_files: { kind: kind })
+    }
+
+    scope :without_compose, -> {
+      left_joins(:compose_file).where(compose_files: { id: nil })
     }
   end
 end

data/app/serializers/uffizzi_core/api/cli/v1/projects/deployment_serializer/container_serializer.rb

@@ -19,7 +19,8 @@ class UffizziCore::Api::Cli::V1::Projects::DeploymentSerializer::ContainerSerial
              :public,
              :repo_id,
              :continuously_deploy,
-             :receive_incoming_requests
+             :receive_incoming_requests,
+             :healthcheck
 
   def secret_variables
     return unless object.secret_variables.present?

data/app/serializers/uffizzi_core/api/cli/v1/projects/deployments/container_serializer.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 class UffizziCore::Api::Cli::V1::Projects::Deployments::ContainerSerializer < UffizziCore::BaseSerializer
-  attributes :id, :name, :memory_limit, :memory_request, :continuously_deploy, :variables, :secret_variables
+  attributes :id, :name, :memory_limit, :memory_request, :continuously_deploy, :variables, :secret_variables, :healthcheck
 
   has_many :container_config_files
 

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

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
-# rubocop:disable Metrics/LineLength
+# rubocop:disable Layout/LineLength
 class UffizziCore::Controller::DeployContainers::ContainerSerializer::ContainerConfigFileSerializer::ConfigFileSerializer < UffizziCore::BaseSerializer
-  # rubocop:enable Metrics/LineLength
+  # rubocop:enable Layout/LineLength
 
   attributes :id, :filename, :kind, :payload
 end

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

@@ -15,7 +15,8 @@ class UffizziCore::Controller::DeployContainers::ContainerSerializer < UffizziCo
              :target_port,
              :public,
              :controller_name,
-             :receive_incoming_requests
+             :receive_incoming_requests,
+             :healthcheck
 
   has_many :container_config_files
 
@@ -52,4 +53,18 @@ class UffizziCore::Controller::DeployContainers::ContainerSerializer < UffizziCo
   def command
     object.command.blank? ? nil : JSON.parse(object.command)
   end
+
+  def healthcheck
+    return {} if object.healthcheck.nil?
+
+    command = object.healthcheck['test']
+    new_command = if command.is_a?(Array)
+      items_to_remove = ['CMD', 'CMD-SHELL']
+      command.select { |item| items_to_remove.exclude?(item) }
+    elsif object.healthcheck['test'].is_a?(String)
+      command.split
+    end
+
+    object.healthcheck.merge(test: new_command)
+  end
 end

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

@@ -17,18 +17,14 @@ class UffizziCore::ComposeFile::Builders::ContainerBuilderService
     configs_data = container_data[:configs] || []
     secrets = container_data[:secrets] || []
     container_name = container_data[:container_name]
-    continuous_preview_container_data = container_data[:'x-uffizzi-continuous-preview'] || container_data[:'x-uffizzi-continuous-previews']
+    healthcheck_data = container_data[:healthcheck] || {}
 
     env_file_dependencies = UffizziCore::ComposeFile::GithubDependenciesService.env_file_dependencies_for_container(compose_dependencies,
                                                                                                                     container_name)
     configs_dependencies = UffizziCore::ComposeFile::GithubDependenciesService.configs_dependencies_for_container(compose_dependencies,
                                                                                                                   container_name)
-
     is_ingress = ingress_container?(container_name, ingress_data)
-    repo_attributes = build_repo_attributes(container_data, image_data, build_data, credentials)
-
-    repo_attributes = set_continuous_preview_attributes_to_repo(repo_attributes, continuous_preview_global_data.to_h,
-                                                                continuous_preview_container_data.to_h)
+    repo_attributes = repo_attributes(container_data, continuous_preview_global_data)
 
     {
       tag: tag(image_data, repo_attributes),
@@ -46,11 +42,20 @@ class UffizziCore::ComposeFile::Builders::ContainerBuilderService
       receive_incoming_requests: is_ingress,
       container_config_files_attributes: config_files(configs_data, configs_dependencies),
       service_name: container_name,
+      name: container_name,
+      healthcheck: healthcheck_data,
     }
   end
 
   private
 
+  def repo_attributes(container_data, continuous_preview_global_data)
+    repo_attributes = build_repo_attributes(container_data)
+    continuous_preview_container_data = container_data[:'x-uffizzi-continuous-preview'] || container_data[:'x-uffizzi-continuous-previews']
+
+    set_continuous_preview_attributes_to_repo(repo_attributes, continuous_preview_global_data.to_h, continuous_preview_container_data.to_h)
+  end
+
   def set_continuous_preview_attributes_to_repo(repo_attributes, global_data, container_data)
     condition_attributes = [
       :deploy_preview_when_pull_request_is_opened,
@@ -148,8 +153,9 @@ class UffizziCore::ComposeFile::Builders::ContainerBuilderService
     memory_value
   end
 
-  def build_repo_attributes(container_data, image_data, _build_data, credentials)
+  def build_repo_attributes(container_data)
     repo_type = repo_type(container_data)
+    image_data = container_data[:image]
 
     case repo_type
     when UffizziCore::Repo::DockerHub.name

data/app/services/uffizzi_core/compose_file/{configs_options_service.rb → parsers/configs_parser_service.rb}

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-class UffizziCore::ComposeFile::ConfigsOptionsService
+class UffizziCore::ComposeFile::Parsers::ConfigsParserService
   class << self
     def parse(configs_data)
       return [] if configs_data.nil?

data/app/services/uffizzi_core/compose_file/{continuous_preview_options_service.rb → parsers/continuous_preview_parser_service.rb}

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-class UffizziCore::ComposeFile::ContinuousPreviewOptionsService
+class UffizziCore::ComposeFile::Parsers::ContinuousPreviewParserService
   class << self
     def parse(continuous_preview_data)
       return {} if continuous_preview_data.nil?

data/app/services/uffizzi_core/compose_file/{ingress_options_service.rb → parsers/ingress_parser_service.rb}

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-class UffizziCore::ComposeFile::IngressOptionsService
+class UffizziCore::ComposeFile::Parsers::IngressParserService
   class << self
     def parse(ingress_data, services_data)
       raise UffizziCore::ComposeFile::ParseError, I18n.t('compose.no_ingress') if ingress_data.nil?

data/app/services/uffizzi_core/compose_file/{secrets_options_service.rb → parsers/secrets_parser_service.rb}

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-class UffizziCore::ComposeFile::SecretsOptionsService
+class UffizziCore::ComposeFile::Parsers::SecretsParserService
   class << self
     def parse(secrets_data)
       return [] if secrets_data.nil?

data/app/services/uffizzi_core/compose_file/{services_options/command_service.rb → parsers/services/command_parser_service.rb}

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-class UffizziCore::ComposeFile::ServicesOptions::CommandService
+class UffizziCore::ComposeFile::Parsers::Services::CommandParserService
   class << self
     def parse(command_data)
       return nil if command_data.blank?

data/app/services/uffizzi_core/compose_file/{services_options/configs_service.rb → parsers/services/configs_parser_service.rb}

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-class UffizziCore::ComposeFile::ServicesOptions::ConfigsService
+class UffizziCore::ComposeFile::Parsers::Services::ConfigsParserService
   class << self
     def parse(configs, global_configs_data)
       return [] if configs.nil?

data/app/services/uffizzi_core/compose_file/{services_options/deploy_service.rb → parsers/services/deploy_parser_service.rb}

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-class UffizziCore::ComposeFile::ServicesOptions::DeployService
+class UffizziCore::ComposeFile::Parsers::Services::DeployParserService
   class << self
     def parse(deploy_data)
       return {} if deploy_data.blank?

data/app/services/uffizzi_core/compose_file/{services_options/entrypoint_service.rb → parsers/services/entrypoint_parser_service.rb}

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-class UffizziCore::ComposeFile::ServicesOptions::EntrypointService
+class UffizziCore::ComposeFile::Parsers::Services::EntrypointParserService
   class << self
     def parse(entrypoint_data)
       return nil if entrypoint_data.blank?

data/app/services/uffizzi_core/compose_file/{services_options/env_file_service.rb → parsers/services/env_file_parser_service.rb}

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-class UffizziCore::ComposeFile::ServicesOptions::EnvFileService
+class UffizziCore::ComposeFile::Parsers::Services::EnvFileParserService
   class << self
     def parse(env_file)
       env_files = case env_file

data/app/services/uffizzi_core/compose_file/{services_options/environment_service.rb → parsers/services/environment_parser_service.rb}

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-class UffizziCore::ComposeFile::ServicesOptions::EnvironmentService
-  extend UffizziCore::ComposeFile::VariablesService
+class UffizziCore::ComposeFile::Parsers::Services::EnvironmentParserService
+  extend UffizziCore::ComposeFile::Parsers::VariablesParserService
 
   class << self
     def parse(environment)