uffizzi_core 0.1.15 → 0.2.1

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

@@ -0,0 +1,73 @@
+# frozen_string_literal: true
+
+class UffizziCore::ComposeFile::Parsers::Services::HealthcheckParserService
+  REQUIRED_START_COMMANDS = ['NONE', 'CMD', 'CMD-SHELL'].freeze
+
+  class << self
+    def parse(healthcheck_data)
+      return {} if healthcheck_data.blank?
+
+      command = parse_command(healthcheck_data)
+
+      {
+        test: command,
+        interval: parse_time(healthcheck_data['interval']),
+        timeout: parse_time(healthcheck_data['timeout']),
+        retries: parse_retries(healthcheck_data['retries']),
+        start_period: parse_time(healthcheck_data['start_period']),
+        disable: parse_disable_option(healthcheck_data['disable'], command),
+      }
+    end
+
+    private
+
+    def parse_command(healthcheck_data)
+      command = healthcheck_data['test']
+      raise UffizziCore::ComposeFile::ParseError, I18n.t('compose.string_or_array_error', option: :test) if command.nil?
+
+      case command
+      when Array
+        start_command = command.first
+        raise UffizziCore::ComposeFile::ParseError unless REQUIRED_START_COMMANDS.include?(start_command)
+
+        command
+      when String
+        command
+      else
+        raise UffizziCore::ComposeFile::ParseError, I18n.t('compose.invalid_type', option: :test)
+      end
+    end
+
+    def parse_retries(value)
+      raise UffizziCore::ComposeFile::ParseError, I18n.t('compose.invalid_integer', option: :retries) unless value.is_a?(Integer)
+    end
+
+    def parse_time(value)
+      tokens = {
+        's' => 1,
+        'm' => 60,
+        'h' => (60 * 60),
+        'd' => (60 * 60 * 24),
+      }
+
+      time_parts = value.scan(/(\d+)(\w)/).compact
+
+      time_parts.reduce(0) do |acc, part|
+        amount, measure = part
+        acc += amount.to_i * tokens[measure]
+
+        acc
+      rescue StandardError
+        raise UffizziCore::ComposeFile::ParseError, I18n.t('compose.invalid_time_interval')
+      end
+    end
+
+    def parse_disable_option(value, command)
+      return true if command.is_a?(Array) && command.first == 'NONE'
+      return false if value.nil?
+      return value if value.in?([true, false])
+
+      raise UffizziCore::ComposeFile::ParseError, I18n.t('compose.invalid_bool_value', field: 'disable', value: value)
+    end
+  end
+end

data/app/services/uffizzi_core/compose_file/{services_options/image_service.rb → parsers/services/image_parser_service.rb}

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

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

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

data/app/services/uffizzi_core/compose_file/{services_options_service.rb → parsers/services_parser_service.rb}

@@ -1,7 +1,9 @@
 # frozen_string_literal: true
 
-class UffizziCore::ComposeFile::ServicesOptionsService
+class UffizziCore::ComposeFile::Parsers::ServicesParserService
   class << self
+    include UffizziCore::DependencyInjectionConcern
+
     def parse(services, global_configs_data, global_secrets_data, compose_payload)
       raise UffizziCore::ComposeFile::ParseError, I18n.t('compose.no_services') if services.nil? || services.keys.empty?
 
@@ -18,32 +20,34 @@ class UffizziCore::ComposeFile::ServicesOptionsService
 
     private
 
-    def prepare_service_data(service_name, service_data, global_configs_data, global_secrets_data, _compose_payload)
+    def prepare_service_data(service_name, service_data, global_configs_data, global_secrets_data, compose_payload)
       options_data = {}
       service_data.each_pair do |key, value|
         service_key = key.to_sym
 
         options_data[service_key] = case service_key
                                     when :image
-                                      UffizziCore::ComposeFile::ServicesOptions::ImageService.parse(value)
+                                      UffizziCore::ComposeFile::Parsers::Services::ImageParserService.parse(value)
                                     when :build
-                                      raise UffizziCore::ComposeFile::ParseError, I18n.t('compose.not_implemented', option: :build)
+                                      check_and_parse_build_option(value, compose_payload)
                                     when :env_file
-                                      UffizziCore::ComposeFile::ServicesOptions::EnvFileService.parse(value)
+                                      UffizziCore::ComposeFile::Parsers::Services::EnvFileParserService.parse(value)
                                     when :environment
-                                      UffizziCore::ComposeFile::ServicesOptions::EnvironmentService.parse(value)
+                                      UffizziCore::ComposeFile::Parsers::Services::EnvironmentParserService.parse(value)
                                     when :configs
-                                      UffizziCore::ComposeFile::ServicesOptions::ConfigsService.parse(value, global_configs_data)
+                                      UffizziCore::ComposeFile::Parsers::Services::ConfigsParserService.parse(value, global_configs_data)
                                     when :secrets
-                                      UffizziCore::ComposeFile::ServicesOptions::SecretsService.parse(value, global_secrets_data)
+                                      UffizziCore::ComposeFile::Parsers::Services::SecretsParserService.parse(value, global_secrets_data)
                                     when :deploy
-                                      UffizziCore::ComposeFile::ServicesOptions::DeployService.parse(value)
+                                      UffizziCore::ComposeFile::Parsers::Services::DeployParserService.parse(value)
                                     when :entrypoint
-                                      UffizziCore::ComposeFile::ServicesOptions::EntrypointService.parse(value)
+                                      UffizziCore::ComposeFile::Parsers::Services::EntrypointParserService.parse(value)
                                     when :command
-                                      UffizziCore::ComposeFile::ServicesOptions::CommandService.parse(value)
+                                      UffizziCore::ComposeFile::Parsers::Services::CommandParserService.parse(value)
+                                    when :healthcheck
+                                      UffizziCore::ComposeFile::Parsers::Services::HealthcheckParserService.parse(value)
                                     when :'x-uffizzi-continuous-preview', :'x-uffizzi-continuous-previews'
-                                      UffizziCore::ComposeFile::ContinuousPreviewOptionsService.parse(value)
+                                      UffizziCore::ComposeFile::Parsers::ContinuousPreviewParserService.parse(value)
         end
       end
 
@@ -51,5 +55,11 @@ class UffizziCore::ComposeFile::ServicesOptionsService
 
       options_data
     end
+
+    def check_and_parse_build_option(value, compose_payload)
+      raise UffizziCore::ComposeFile::ParseError, I18n.t('compose.not_implemented', option: :build) unless build_parser_module
+
+      build_parser_module.parse(value, compose_payload)
+    end
   end
 end

data/app/services/uffizzi_core/compose_file/{variables_service.rb → parsers/variables_parser_service.rb}

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-module UffizziCore::ComposeFile::VariablesService
+module UffizziCore::ComposeFile::Parsers::VariablesParserService
   def parse_variable_from_string(str)
     variable_parts = str.split('=', 2)
 

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

@@ -1,12 +1,12 @@
 # frozen_string_literal: true
 
 class UffizziCore::ComposeFile::TemplateService
-  def initialize(github_form, project, user)
+  def initialize(cli_form, project, user)
     @project = project
     @user = user
-    @compose_dependencies = github_form.compose_dependencies
-    @compose_data = github_form.compose_data
-    @compose_repositories = github_form.compose_repositories
+    @compose_dependencies = cli_form.compose_dependencies
+    @compose_data = cli_form.compose_data
+    @compose_repositories = cli_form.compose_repositories
   end
 
   def create_template(compose_file_form)

data/app/services/uffizzi_core/compose_file_service.rb

@@ -17,16 +17,20 @@ module UffizziCore::ComposeFileService
     def parse(compose_content, compose_payload = {})
       compose_data = load_compose_data(compose_content)
       check_config_options_format(compose_data)
-      configs_data = UffizziCore::ComposeFile::ConfigsOptionsService.parse(compose_data['configs'])
-      secrets_data = UffizziCore::ComposeFile::SecretsOptionsService.parse(compose_data['secrets'])
-      containers_data = UffizziCore::ComposeFile::ServicesOptionsService.parse(compose_data['services'], configs_data, secrets_data,
-                                                                               compose_payload)
+      configs_data = UffizziCore::ComposeFile::Parsers::ConfigsParserService.parse(compose_data['configs'])
+      secrets_data = UffizziCore::ComposeFile::Parsers::SecretsParserService.parse(compose_data['secrets'])
+      containers_data = UffizziCore::ComposeFile::Parsers::ServicesParserService.parse(
+        compose_data['services'],
+        configs_data,
+        secrets_data,
+        compose_payload,
+      )
 
       continuous_preview_option = UffizziCore::ComposeFile::ConfigOptionService.continuous_preview_option(compose_data)
-      continuous_preview_data = UffizziCore::ComposeFile::ContinuousPreviewOptionsService.parse(continuous_preview_option)
+      continuous_preview_data = UffizziCore::ComposeFile::Parsers::ContinuousPreviewParserService.parse(continuous_preview_option)
 
       ingress_option = UffizziCore::ComposeFile::ConfigOptionService.ingress_option(compose_data)
-      ingress_data = UffizziCore::ComposeFile::IngressOptionsService.parse(ingress_option, compose_data['services'])
+      ingress_data = UffizziCore::ComposeFile::Parsers::IngressParserService.parse(ingress_option, compose_data['services'])
 
       {
         containers: containers_data,

data/app/services/uffizzi_core/deployment_service.rb

@@ -14,7 +14,6 @@ module UffizziCore::DeploymentService
   class << self
     def create_from_compose(compose_file, project, user)
       deployment_attributes = ActionController::Parameters.new(compose_file.template.payload)
-
       deployment_form = UffizziCore::Api::Cli::V1::Deployment::CreateForm.new(deployment_attributes)
       deployment_form.assign_dependences!(project, user)
       deployment_form.compose_file = compose_file

data/app/services/uffizzi_core/user_generator_service.rb

@@ -6,6 +6,12 @@ class UffizziCore::UserGeneratorService
   DEFAULT_ACCOUNT_NAME = 'default'
 
   class << self
+    def safe_generate(email, password, project_name)
+      generate(email, password, project_name)
+    rescue ActiveRecord::RecordInvalid => e
+      puts e.message
+    end
+
     def generate(email, password, project_name)
       user_attributes = build_user_attributes(email, password)
       project_attributes = build_project_attributes(project_name)
@@ -31,19 +37,17 @@ class UffizziCore::UserGeneratorService
 
       if email.present?
         user_attributes[:email] = email
-      else
+      elsif IO::console.present?
         IO::console.write("Enter User Email (default: #{DEFAULT_USER_EMAIL}): ")
         user_attributes[:email] = IO::console.gets.strip.presence || DEFAULT_USER_EMAIL
       end
 
       user_attributes[:password] = if password.present?
         password
-      else
+      elsif IO::console.present?
         IO::console.getpass('Enter Password: ')
       end
 
-      abort('password can\'t be blank') if user_attributes[:password].blank?
-
       user_attributes
     end
 
@@ -53,9 +57,11 @@ class UffizziCore::UserGeneratorService
       }
       if project_name.present?
         project_attributes[:name] = project_name
-      else
+      elsif IO::console.present?
         IO::console.write("Enter Project Name (default: #{DEFAULT_PROJECT_NAME}): ")
         project_attributes[:name] = IO::console.gets.strip.presence || DEFAULT_PROJECT_NAME
+      else
+        project_attributes[:name] = DEFAULT_PROJECT_NAME
       end
 
       project_attributes[:slug] = prepare_project_slug(project_attributes[:name])

data/config/locales/en.yml

@@ -57,6 +57,7 @@ en:
     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.
     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}'"

data/db/migrate/20220419074956_add_health_check_to_containers.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class AddHealthCheckToContainers < ActiveRecord::Migration[6.1]
+  def change
+    add_column :uffizzi_core_containers, :healthcheck, :jsonb
+  end
+end

data/lib/tasks/uffizzi_core_tasks.rake

@@ -14,6 +14,6 @@ namespace :uffizzi_core do
 
   desc 'Create a new user'
   task create_user: :environment do
-    UffizziCore::UserGeneratorService.generate(ENV['UFFIZZI_USER_EMAIL'], ENV['UFFIZZI_USER_PASSWORD'], ENV['UFFIZZI_PROJECT_NAME'])
+    UffizziCore::UserGeneratorService.safe_generate(ENV['UFFIZZI_USER_EMAIL'], ENV['UFFIZZI_USER_PASSWORD'], ENV['UFFIZZI_PROJECT_NAME'])
   end
 end

data/lib/uffizzi_core/version.rb

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

data/lib/uffizzi_core.rb

@@ -58,4 +58,6 @@ module UffizziCore
     users: :uffizzi_core_users,
     users_roles: :uffizzi_core_users_roles,
   }
+  mattr_accessor :user_creation_sources, default: [:system, :online_registration, :google, :sso]
+  mattr_accessor :user_project_roles, default: [:admin, :developer, :viewer]
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: uffizzi_core
 version: !ruby/object:Gem::Version
-  version: 0.1.15
+  version: 0.2.1
 platform: ruby
 authors:
 - Josh Thurman
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-05-31 00:00:00.000000000 Z
+date: 2022-06-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aasm
@@ -693,6 +693,7 @@ files:
 - app/clients/uffizzi_core/controller_client.rb
 - app/clients/uffizzi_core/controller_client/request_result.rb
 - app/clients/uffizzi_core/docker_hub_client.rb
+- app/clients/uffizzi_core/docker_hub_client/not_authorized_error.rb
 - app/clients/uffizzi_core/docker_hub_client/request_result.rb
 - app/clients/uffizzi_core/github_container_registry_client.rb
 - app/clients/uffizzi_core/github_container_registry_client/request_result.rb
@@ -758,9 +759,31 @@ files:
 - app/jobs/uffizzi_core/deployment/delete_job.rb
 - app/jobs/uffizzi_core/deployment/deploy_containers_job.rb
 - app/jobs/uffizzi_core/deployment/manage_deploy_activity_item_job.rb
+- app/lib/uffizzi_core/concerns/models/account.rb
 - app/lib/uffizzi_core/concerns/models/activity_item.rb
+- app/lib/uffizzi_core/concerns/models/build.rb
+- app/lib/uffizzi_core/concerns/models/comment.rb
+- app/lib/uffizzi_core/concerns/models/compose_file.rb
+- 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/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/invitation.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
+- app/lib/uffizzi_core/concerns/models/product.rb
+- app/lib/uffizzi_core/concerns/models/project.rb
+- app/lib/uffizzi_core/concerns/models/rating.rb
 - app/lib/uffizzi_core/concerns/models/repo.rb
+- app/lib/uffizzi_core/concerns/models/role.rb
+- app/lib/uffizzi_core/concerns/models/secret.rb
+- app/lib/uffizzi_core/concerns/models/template.rb
+- app/lib/uffizzi_core/concerns/models/user.rb
+- app/lib/uffizzi_core/concerns/models/user_project.rb
 - app/lib/uffizzi_core/rbac/user_access_service.rb
 - app/mailers/uffizzi_core/application_mailer.rb
 - app/models/concerns/uffizzi_core/hashid_concern.rb
@@ -873,25 +896,26 @@ files:
 - app/services/uffizzi_core/compose_file/builders/variables_builder_service.rb
 - app/services/uffizzi_core/compose_file/config_files_service.rb
 - app/services/uffizzi_core/compose_file/config_option_service.rb
-- app/services/uffizzi_core/compose_file/configs_options_service.rb
 - app/services/uffizzi_core/compose_file/container_service.rb
-- app/services/uffizzi_core/compose_file/continuous_preview_options_service.rb
 - 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/ingress_options_service.rb
-- app/services/uffizzi_core/compose_file/secrets_options_service.rb
-- app/services/uffizzi_core/compose_file/services_options/command_service.rb
-- app/services/uffizzi_core/compose_file/services_options/configs_service.rb
-- app/services/uffizzi_core/compose_file/services_options/deploy_service.rb
-- app/services/uffizzi_core/compose_file/services_options/entrypoint_service.rb
-- app/services/uffizzi_core/compose_file/services_options/env_file_service.rb
-- app/services/uffizzi_core/compose_file/services_options/environment_service.rb
-- app/services/uffizzi_core/compose_file/services_options/image_service.rb
-- app/services/uffizzi_core/compose_file/services_options/secrets_service.rb
-- app/services/uffizzi_core/compose_file/services_options_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/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
+- app/services/uffizzi_core/compose_file/parsers/services/deploy_parser_service.rb
+- app/services/uffizzi_core/compose_file/parsers/services/entrypoint_parser_service.rb
+- app/services/uffizzi_core/compose_file/parsers/services/env_file_parser_service.rb
+- app/services/uffizzi_core/compose_file/parsers/services/environment_parser_service.rb
+- 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_parser_service.rb
+- app/services/uffizzi_core/compose_file/parsers/variables_parser_service.rb
 - app/services/uffizzi_core/compose_file/template_service.rb
-- app/services/uffizzi_core/compose_file/variables_service.rb
 - app/services/uffizzi_core/compose_file_service.rb
 - app/services/uffizzi_core/container_service.rb
 - app/services/uffizzi_core/controller_service.rb
@@ -927,6 +951,7 @@ files:
 - db/migrate/20220329123323_rename_project_secrets_to_secrets.rb
 - db/migrate/20220329124542_add_resource_to_secrets.rb
 - db/migrate/20220329143241_remove_project_ref_from_secrets.rb
+- db/migrate/20220419074956_add_health_check_to_containers.rb
 - db/migrate/20220525113412_rename_name_to_uffizzi_containers.rb
 - db/seeds.rb
 - lib/tasks/uffizzi_core_tasks.rake