uffizzi_core 0.7.1 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 25654d45dce9f26feb5a3cca55a5891bb389216e749512b2900898bec4a8da0b
-  data.tar.gz: cb7784c03bcffb216adc343ae30e0ef0c51e3038791da4fe0229b86179cdc8e9
+  metadata.gz: 169a9ec674c81b791babc5049b74c807a9150da4534980f6b6eb2188b3b12771
+  data.tar.gz: c3365c36312f14cf56a3d8c71b293939d667369b8a6df9da67925620127b514e
 SHA512:
-  metadata.gz: c3b6ae9974961ae5d39e723264e6c72fa0f4dfa9f99085a6550a98af67afd6ddcbd92f98e7f815ff602bb7f6a3144d2f87ac9d61a58f228099b9dedd537ce6be
-  data.tar.gz: 572bcfcc9d1e3396d721a83a60c703db10c0b3848031e35b63aa26065b67ceb6fc11bb5278fd6b383e4686a5885758d45d69b0a3c3314cda4f6d93fc3a81d93b
+  metadata.gz: f8af4f54965d0557094566deb6d3bea447ede3071891aa4bd7d00139b3795a9644fd6b8d71a346b8b6aeff113cc578bdde3f4f64e45d21bb31f5d59b531e15e9
+  data.tar.gz: aa2b7c6fce6745775164119324cd7298cd2382246764026c4aa4bf6ebba3f1c8c390eba3cd3a9bde9b512fb1ec3607da5fee8c376bcac79e953d9efaccd7d811

data/app/contexts/uffizzi_core/account_context.rb

@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+class UffizziCore::AccountContext
+  attr_reader :user, :user_access_module, :account, :params
+
+  def initialize(user, user_access_module, account, params)
+    @user = user
+    @user_access_module = user_access_module
+    @account = account
+    @params = params
+  end
+end

data/app/contexts/uffizzi_core/base_context.rb

@@ -1,12 +1,11 @@
 # frozen_string_literal: true
 
 class UffizziCore::BaseContext
-  attr_reader :user, :user_access_module, :params, :account
+  attr_reader :user, :user_access_module, :params
 
   def initialize(user, user_access_module, params)
     @user = user
     @user_access_module = user_access_module
-    @account = user.organizational_account
     @params = params
   end
 end

data/app/contexts/uffizzi_core/project_context.rb

@@ -3,10 +3,10 @@
 class UffizziCore::ProjectContext
   attr_reader :user, :user_access_module, :project, :account, :params
 
-  def initialize(user, user_access_module, project, params)
+  def initialize(user, user_access_module, project, account, params)
     @user = user
     @user_access_module = user_access_module
-    @account = user.organizational_account
+    @account = account
     @project = project
     @params = params
   end

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

@@ -15,6 +15,12 @@ module UffizziCore::DependencyInjectionConcern
     module_class(:volume_parser)
   end
 
+  def ci_session
+    return unless module_exists?(:ci_session)
+
+    module_class(:ci_session)
+  end
+
   def password_protection_module
     return unless module_exists?(:password_protection)
 

data/app/controllers/uffizzi_core/api/cli/v1/accounts/application_controller.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+class UffizziCore::Api::Cli::V1::Accounts::ApplicationController < UffizziCore::Api::Cli::V1::ApplicationController
+  def resource_account
+    @resource_account ||= current_user.accounts.find(params[:account_id])
+  end
+
+  def policy_context
+    UffizziCore::AccountContext.new(current_user, user_access_module, resource_account, params)
+  end
+end

data/app/controllers/uffizzi_core/api/cli/v1/{account → accounts}/credentials_controller.rb

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
 # @resource Account/Credential
-class UffizziCore::Api::Cli::V1::Account::CredentialsController < UffizziCore::Api::Cli::V1::Account::ApplicationController
-  before_action :authorize_uffizzi_core_api_cli_v1_account_credentials
+class UffizziCore::Api::Cli::V1::Accounts::CredentialsController < UffizziCore::Api::Cli::V1::Accounts::ApplicationController
+  before_action :authorize_uffizzi_core_api_cli_v1_accounts_credentials
 
   # Get a list of accounts credential
   #

data/app/controllers/uffizzi_core/api/cli/v1/accounts/projects_controller.rb

@@ -0,0 +1,34 @@
+# frozen_string_literal: true
+
+# @resource Project
+
+class UffizziCore::Api::Cli::V1::Accounts::ProjectsController < UffizziCore::Api::Cli::V1::Accounts::ApplicationController
+  before_action :authorize_uffizzi_core_api_cli_v1_accounts_projects
+
+  # Create a project
+  #
+  # @path [POST] /api/cli/v1/accounts/{account_id}/projects
+  # @parameter params(required,body) [object<name: string, slug: string, description: string>]
+  #
+  # @response <object< project: Project>> 200 OK
+  # @response 404 Not Found
+  # @response 401 Not authorized
+  # @response [object<errors: object<password: string >>] 422 Unprocessable entity
+
+  def create
+    project_form = UffizziCore::Api::Cli::V1::Project::CreateForm.new(project_params)
+    project_form.account = current_user.organizational_account
+
+    if project_form.save
+      UffizziCore::ProjectService.add_users_to_project!(project_form, current_user)
+    end
+
+    respond_with project_form
+  end
+
+  private
+
+  def project_params
+    params.require(:project)
+  end
+end

data/app/controllers/uffizzi_core/api/cli/v1/ci/application_controller.rb

@@ -0,0 +1,5 @@
+# frozen_string_literal: true
+
+class UffizziCore::Api::Cli::V1::Ci::ApplicationController < UffizziCore::Api::Cli::V1::ApplicationController
+  before_action :authenticate_request!
+end

data/app/controllers/uffizzi_core/api/cli/v1/ci/sessions_controller.rb

@@ -0,0 +1,36 @@
+# frozen_string_literal: true
+
+# @resource Uffizzi
+
+class UffizziCore::Api::Cli::V1::Ci::SessionsController < UffizziCore::Api::Cli::V1::Ci::ApplicationController
+  skip_before_action :authenticate_request!, only: [:create]
+
+  # Create session
+  #
+  # @path [POST] /api/cli/v1/github/session
+  #
+  # @parameter user(required,body)   [object<token: string >]
+  # @response [object<account_id: string, project_slug: string>] 201 Created successfully
+  # @response [object<errors: object<token: string >>] 422 Unprocessable entity
+  def create
+    return render json: { errors: { title: [I18n.t('session.unsupported_login_type')] } }, status: :unprocessable_entity unless ci_session
+
+    session_data, errors = ci_session.session_data_from_ci(user_params)
+    return render json: { errors: errors }, status: :unprocessable_entity if errors.present?
+
+    sign_in(session_data[:user])
+
+    data = {
+      account_id: session_data[:account_id],
+      project_slug: session_data[:project_slug],
+    }
+
+    render json: data, status: :created
+  end
+
+  private
+
+  def user_params
+    params.require(:user).permit(:token)
+  end
+end

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

@@ -5,7 +5,11 @@ class UffizziCore::Api::Cli::V1::Projects::ApplicationController < UffizziCore::
     @resource_project ||= current_user.projects.find_by!(slug: params[:project_slug])
   end
 
+  def resource_account
+    @resource_account ||= resource_project.account
+  end
+
   def policy_context
-    UffizziCore::ProjectContext.new(current_user, user_access_module, resource_project, params)
+    UffizziCore::ProjectContext.new(current_user, user_access_module, resource_project, resource_account, params)
   end
 end

data/app/controllers/uffizzi_core/api/cli/v1/projects/deployments/activity_items_controller.rb

@@ -15,7 +15,14 @@ class UffizziCore::Api::Cli::V1::Projects::Deployments::ActivityItemsController
   # @response 401 Not authorized
   # @response 404 Not found
   def index
-    activity_items = resource_deployment
+    deployment = resource_project.deployments.existed.find(params[:deployment_id])
+
+    unless deployment.active?
+      return render json: { errors: { title: [I18n.t('deployment.invalid_state', state: deployment.state)] } },
+                    status: :unprocessable_entity
+    end
+
+    activity_items = deployment
       .activity_items
       .page(page)
       .per(per_page)

data/app/controllers/uffizzi_core/api/cli/v1/projects_controller.rb

@@ -25,30 +25,7 @@ class UffizziCore::Api::Cli::V1::ProjectsController < UffizziCore::Api::Cli::V1:
   # @response 404 Not Found
   # @response 401 Not authorized
   def show
-    project = current_user.projects.find_by!(slug: params[:slug])
-
-    respond_with project
-  end
-
-  # Create a project
-  #
-  # @path [POST] /api/cli/v1/projects
-  # @parameter params(required,body) [object<name: string, slug: string, description: string>]
-  #
-  # @response <object< project: Project>> 200 OK
-  # @response 404 Not Found
-  # @response 401 Not authorized
-  # @response [object<errors: object<password: string >>] 422 Unprocessable entity
-
-  def create
-    project_form = UffizziCore::Api::Cli::V1::Project::CreateForm.new(project_params)
-    project_form.account = current_user.organizational_account
-
-    if project_form.save
-      UffizziCore::ProjectService.add_users_to_project!(project_form, current_user)
-    end
-
-    respond_with project_form
+    respond_with resource_project
   end
 
   # Delete a project
@@ -60,8 +37,7 @@ class UffizziCore::Api::Cli::V1::ProjectsController < UffizziCore::Api::Cli::V1:
   # @response 401 Not authorized
 
   def destroy
-    project = current_user.organizational_account.active_projects.find_by!(slug: params[:slug])
-    project.disable!
+    resource_project.disable!
 
     head :no_content
   end
@@ -71,4 +47,14 @@ class UffizziCore::Api::Cli::V1::ProjectsController < UffizziCore::Api::Cli::V1:
   def project_params
     params.require(:project)
   end
+
+  def resource_project
+    @resource_project ||= current_user.projects.find_by(slug: params[:slug])
+  end
+
+  def policy_context
+    account = resource_project&.account || current_user.organizational_account
+
+    UffizziCore::AccountContext.new(current_user, user_access_module, account, params)
+  end
 end

data/app/controllers/uffizzi_core/application_controller.rb

@@ -19,10 +19,16 @@ class UffizziCore::ApplicationController < ActionController::Base
     render_not_found(exception)
   end
 
+  rescue_from Pundit::NotAuthorizedError, with: :render_not_authorized
+
   before_action :authenticate_request!
   skip_before_action :verify_authenticity_token
   respond_to :json
 
+  def render_not_authorized
+    render json: { errors: { title: [I18n.t('session.unauthorized')] } }, status: :forbidden
+  end
+
   def policy_context
     UffizziCore::BaseContext.new(current_user, user_access_module, params)
   end

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

@@ -17,10 +17,10 @@ class UffizziCore::Api::Cli::V1::Deployment::CreateForm < UffizziCore::Deploymen
            :command,
            :receive_incoming_requests,
            :continuously_deploy,
-           { healthcheck: {} },
            { variables: [:name, :value],
              secret_variables: [:name, :value],
              volumes: [:source, :target, :type, :read_only],
+             healthcheck: [:test, :interval, :timeout, :retries, :start_period, :disable, { test: [] }],
              repo_attributes: [
                :namespace,
                :name,
@@ -51,6 +51,7 @@ class UffizziCore::Api::Cli::V1::Deployment::CreateForm < UffizziCore::Deploymen
   validate :check_exists_ingress_container
   validate :check_max_memory_limit
   validate :check_max_memory_request
+  validate :check_secrets_exist_in_database
 
   def assign_dependences!(project, user)
     self.project = project
@@ -91,4 +92,17 @@ class UffizziCore::Api::Cli::V1::Deployment::CreateForm < UffizziCore::Deploymen
 
     errors.add(:containers, :max_memory_request_error, max: project.account.container_memory_limit)
   end
+
+  def check_secrets_exist_in_database
+    return if compose_file.nil?
+
+    existing_secrets = project.secrets.pluck('name')
+    compose_file.template.payload['containers_attributes']
+      .map { |container| container['secret_variables'].map { |secret| secret['name'] } }.flatten.uniq
+      .select { |secret| existing_secrets.exclude?(secret) }
+      .each do |secret|
+      error_message = I18n.t('compose.project_secret_not_found', secret: secret)
+      errors.add(:secret_variables, error_message)
+    end
+  end
 end

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

@@ -19,6 +19,7 @@ class UffizziCore::Api::Cli::V1::Deployment::UpdateForm < UffizziCore::Deploymen
            { variables: [:name, :value],
              secret_variables: [:name, :value],
              volumes: [:source, :target, :type, :read_only],
+             healthcheck: [:test, :interval, :timeout, :retries, :start_period, :disable, { test: [] }],
              repo_attributes: [
                :namespace,
                :name,

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

@@ -18,10 +18,10 @@ class UffizziCore::Api::Cli::V1::Template::CreateForm < UffizziCore::Template
              :continuously_deploy,
              :service_name,
              :name,
-             :healthcheck,
              { variables: [:name, :value],
                secret_variables: [:name, :value],
                volumes: [:source, :target, :type, :read_only],
+               healthcheck: [:test, :interval, :timeout, :retries, :start_period, :disable, { test: [] }],
                repo_attributes: [
                  :namespace,
                  :name,

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

@@ -24,7 +24,6 @@ module UffizziCore::Concerns::Models::Account
     has_many :projects, dependent: :destroy
     has_many :deployments, through: :projects
     has_many :payments, dependent: :destroy
-    has_many :invitations, as: :entityable
 
     aasm(:state) do
       state :active, initial: true

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

@@ -16,7 +16,6 @@ module UffizziCore::Concerns::Models::Project
     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

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

@@ -8,7 +8,7 @@ module UffizziCore::Concerns::Models::UserProject
 
     self.table_name = UffizziCore.table_names[:user_projects]
 
-    enumerize :role, in: UffizziCore.user_project_roles, predicates: true
+    enumerize :role, in: UffizziCore.user_project_roles, predicates: true, scope: true
     validates :role, presence: true
 
     belongs_to :user

data/app/models/uffizzi_core/project.rb

@@ -8,6 +8,7 @@
 # @property secrets [string]
 # @property default_compose [object<source: string>]
 # @property deployments [object<id: integer, domain: string>]
+# @property account [object<id: integer, kind: string, state: string>]
 
 class UffizziCore::Project < UffizziCore::ApplicationRecord
   include UffizziCore::Concerns::Models::Project

data/app/policies/uffizzi_core/api/cli/v1/{account → accounts}/credentials_policy.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-class UffizziCore::Api::Cli::V1::Account::CredentialsPolicy < UffizziCore::ApplicationPolicy
+class UffizziCore::Api::Cli::V1::Accounts::CredentialsPolicy < UffizziCore::ApplicationPolicy
   def index?
     context.user_access_module.admin_access_to_account?(context.user, context.account)
   end

data/app/policies/uffizzi_core/api/cli/v1/accounts/projects_policy.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class UffizziCore::Api::Cli::V1::Accounts::ProjectsPolicy < UffizziCore::ApplicationPolicy
+  def create?
+    context.user_access_module.admin_or_developer_access_to_account?(context.user, context.account)
+  end
+end

data/app/policies/uffizzi_core/api/cli/v1/projects_policy.rb

@@ -9,10 +9,6 @@ class UffizziCore::Api::Cli::V1::ProjectsPolicy < UffizziCore::ApplicationPolicy
     context.user_access_module.any_access_to_account?(context.user, context.account)
   end
 
-  def create?
-    context.user_access_module.admin_or_developer_access_to_account?(context.user, context.account)
-  end
-
   def destroy?
     context.user_access_module.admin_or_developer_access_to_account?(context.user, context.account)
   end

data/app/serializers/uffizzi_core/api/cli/v1/{account → accounts}/credential_serializer.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-class UffizziCore::Api::Cli::V1::Account::CredentialSerializer < UffizziCore::BaseSerializer
+class UffizziCore::Api::Cli::V1::Accounts::CredentialSerializer < UffizziCore::BaseSerializer
   attributes :id, :username, :password, :type, :state
 
   def password

data/app/serializers/uffizzi_core/api/cli/v1/accounts/project_serializer.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+class UffizziCore::Api::Cli::V1::Accounts::ProjectSerializer < UffizziCore::BaseSerializer
+  type :project
+
+  attributes :name,
+             :slug,
+             :account_id,
+             :description,
+             :created_at
+end

data/app/serializers/uffizzi_core/api/cli/v1/project_serializer/account_serializer.rb

@@ -0,0 +1,5 @@
+# frozen_string_literal: true
+
+class UffizziCore::Api::Cli::V1::ProjectSerializer::AccountSerializer < UffizziCore::BaseSerializer
+  attributes :id, :kind, :state, :name
+end

data/app/serializers/uffizzi_core/api/cli/v1/project_serializer.rb

@@ -5,6 +5,7 @@ class UffizziCore::Api::Cli::V1::ProjectSerializer < UffizziCore::BaseSerializer
   has_many :deployments
   has_many :secrets
   has_one :default_compose
+  belongs_to :account
 
   attributes :name,
              :slug,

data/app/serializers/uffizzi_core/api/cli/v1/short_project_serializer.rb

@@ -3,5 +3,5 @@
 class UffizziCore::Api::Cli::V1::ShortProjectSerializer < UffizziCore::BaseSerializer
   type :project
 
-  attributes :name, :slug
+  attributes :name, :slug, :account_id
 end

data/app/serializers/uffizzi_core/api/cli/v1/user_serializer/account_serializer.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 class UffizziCore::Api::Cli::V1::UserSerializer::AccountSerializer < UffizziCore::BaseSerializer
-  attributes :id, :state
+  attributes :id, :kind, :state, :name
 end

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

@@ -41,12 +41,7 @@ class UffizziCore::Controller::DeployContainers::ContainerSerializer < UffizziCo
   end
 
   def tag
-    case object.repo.type
-    when UffizziCore::Repo::Github.name
-      UffizziCore::RepoService.tag(object.repo)
-    else
-      object.tag
-    end
+    object.tag
   end
 
   def entrypoint
@@ -58,7 +53,7 @@ class UffizziCore::Controller::DeployContainers::ContainerSerializer < UffizziCo
   end
 
   def healthcheck
-    return {} if object.healthcheck.nil?
+    return {} if object.healthcheck.blank?
 
     command = object.healthcheck['test']
     new_command = if command.is_a?(Array)
@@ -68,6 +63,6 @@ class UffizziCore::Controller::DeployContainers::ContainerSerializer < UffizziCo
       command.split
     end
 
-    object.healthcheck.merge(test: new_command)
+    object.healthcheck.merge('test' => new_command)
   end
 end

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

@@ -11,10 +11,10 @@ class UffizziCore::ComposeFile::Parsers::Services::HealthcheckParserService
 
       {
         test: command,
-        interval: parse_time(healthcheck_data['interval']),
-        timeout: parse_time(healthcheck_data['timeout']),
+        interval: parse_time(:interval, healthcheck_data['interval']),
+        timeout: parse_time(:timeout, healthcheck_data['timeout']),
         retries: parse_retries(healthcheck_data['retries']),
-        start_period: parse_time(healthcheck_data['start_period']),
+        start_period: parse_time(:start_period, healthcheck_data['start_period']),
         disable: parse_disable_option(healthcheck_data['disable'], command),
       }
     end
@@ -28,7 +28,11 @@ class UffizziCore::ComposeFile::Parsers::Services::HealthcheckParserService
       case command
       when Array
         start_command = command.first
-        raise UffizziCore::ComposeFile::ParseError unless REQUIRED_START_COMMANDS.include?(start_command)
+
+        unless REQUIRED_START_COMMANDS.include?(start_command)
+          raise UffizziCore::ComposeFile::ParseError,
+                I18n.t('compose.required_start_commands', available_commands: REQUIRED_START_COMMANDS.join(', '))
+        end
 
         command
       when String
@@ -39,10 +43,22 @@ class UffizziCore::ComposeFile::Parsers::Services::HealthcheckParserService
     end
 
     def parse_retries(value)
-      raise UffizziCore::ComposeFile::ParseError, I18n.t('compose.invalid_integer', option: :retries) unless value.is_a?(Integer)
+      return if value.nil?
+
+      unless value.is_a?(Integer)
+        raise UffizziCore::ComposeFile::ParseError,
+              I18n.t('compose.invalid_retries', value: value)
+      end
+
+      value
     end
 
-    def parse_time(value)
+    def parse_time(key, value)
+      return if value.nil?
+
+      error_message = I18n.t('compose.invalid_time_interval', key: key, value: value)
+      raise UffizziCore::ComposeFile::ParseError, error_message if value.is_a?(Integer)
+
       tokens = {
         's' => 1,
         'm' => 60,
@@ -58,7 +74,7 @@ class UffizziCore::ComposeFile::Parsers::Services::HealthcheckParserService
 
         acc
       rescue StandardError
-        raise UffizziCore::ComposeFile::ParseError, I18n.t('compose.invalid_time_interval')
+        raise UffizziCore::ComposeFile::ParseError, error_message
       end
     end
 

data/app/services/uffizzi_core/deployment_service.rb

@@ -20,11 +20,7 @@ class UffizziCore::DeploymentService
       deployment_form.creation_source = UffizziCore::Deployment.creation_source.compose_file_manual
       deployment_form.metadata = metadata || {}
 
-      if deployment_form.save
-        update_subdomain!(deployment_form)
-
-        UffizziCore::Deployment::CreateJob.perform_async(deployment_form.id)
-      end
+      run_deployment_creation_tasks(deployment_form) if deployment_form.save
 
       deployment_form
     end
@@ -91,27 +87,28 @@ class UffizziCore::DeploymentService
     end
 
     def build_subdomain(deployment)
-      if deployment.continuous_preview_payload.present?
-        continuous_preview_payload = deployment.continuous_preview_payload
+      return build_docker_continuous_preview_subdomain(deployment) if deployment&.continuous_preview_payload&.fetch('docker', nil).present?
 
-        return build_pull_request_subdomain(deployment) if continuous_preview_payload['pull_request'].present?
-        return build_docker_continuous_preview_subdomain(deployment) if continuous_preview_payload['docker'].present?
-      end
+      github_metadata = deployment.metadata.dig('labels', 'github')
+      return build_pull_request_subdomain(deployment) if
+        github_metadata&.dig('pull_request', 'number').present? && github_metadata&.dig('repository').present?
 
       build_default_subdomain(deployment)
     end
 
     def build_pull_request_subdomain(deployment)
-      project = deployment.project
-      continuous_preview_payload = deployment.continuous_preview_payload
-      pull_request_payload = continuous_preview_payload['pull_request']
-      repo_name = pull_request_payload['repository_full_name'].split('/').last
-      deployment_name = name(deployment)
-      subdomain = "pr#{pull_request_payload['id']}-#{deployment_name}-#{repo_name}-#{project.slug}"
-
+      github_payload = deployment.metadata.dig('labels', 'github')
+      repo_name = github_payload['repository'].split('/').last
+      pull_request_number = github_payload['pull_request']['number']
+      subdomain = "pr-#{pull_request_number}-#{name(deployment)}-#{repo_name}-#{deployment.project.slug}"
       format_subdomain(subdomain)
     end
 
+    def update_subdomain!(deployment)
+      deployment.subdomain = build_subdomain(deployment)
+      deployment.save!
+    end
+
     def build_docker_continuous_preview_subdomain(deployment)
       project = deployment.project
       continuous_preview_payload = deployment.continuous_preview_payload
@@ -204,12 +201,6 @@ class UffizziCore::DeploymentService
       "deployment-#{deployment.id}"
     end
 
-    def update_subdomain!(deployment)
-      deployment.subdomain = build_subdomain(deployment)
-
-      deployment.save!
-    end
-
     def pull_request_payload_present?(deployment)
       deployment.continuous_preview_payload.present? && deployment.continuous_preview_payload['pull_request'].present?
     end
@@ -222,6 +213,12 @@ class UffizziCore::DeploymentService
 
     private
 
+    def run_deployment_creation_tasks(deployment)
+      update_subdomain!(deployment)
+
+      UffizziCore::Deployment::CreateJob.perform_async(deployment.id)
+    end
+
     def deployment_process_status(deployment)
       containers = deployment.active_containers
       activity_items = containers.map { |container| container.activity_items.order_by_id.last }.compact

data/config/locales/en.yml

@@ -56,8 +56,8 @@ en:
     project_secret_not_found: Project secret '%{secret}' not found
     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.
+    invalid_time_interval: "Invalid time interval: '%{key}:%{value}'. The time interval should be in the following format '{hours}h{minutes}m{seconds}s'. At least one value must be present."
+    invalid_retries: "Invalid retries value: 'retries:%{value}'. The value should be an integer."
     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}'"
@@ -67,6 +67,12 @@ en:
     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}'"
   secrets:
     duplicates_exists: Secret with key %{secrets} already exist.
     invalid_key_length: A secret key must be no longer than 256 characters.
+  deployment:
+    invalid_state: Deployment %{state}
+  session:
+    unsupported_login_type: This type of login is not supported
+    unauthorized: Unauthorized

data/config/routes.rb

@@ -7,7 +7,7 @@ UffizziCore::Engine.routes.draw do
   namespace :api, defaults: { format: :json } do
     namespace :cli do
       namespace :v1 do
-        resources :projects, only: ['index', 'show', 'create', 'destroy'], param: :slug do
+        resources :projects, only: ['index', 'show', 'destroy'], param: :slug do
           scope module: :projects do
             resource :compose_file, only: ['show', 'create', 'destroy']
             resources :deployments, only: ['index', 'show', 'create', 'destroy', 'update'] do
@@ -36,8 +36,13 @@ UffizziCore::Engine.routes.draw do
         end
         resource :session, only: ['create', 'destroy']
 
-        resource :account, only: [] do
-          scope module: :account do
+        namespace :ci do
+          resource :session, only: ['create']
+        end
+
+        resources :accounts, only: [] do
+          scope module: :accounts do
+            resources :projects, only: ['create']
             resources :credentials, only: ['index', 'create', 'update', 'destroy'], param: :type do
               member do
                 get :check_credential

data/lib/uffizzi_core/version.rb

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

data/lib/uffizzi_core.rb

@@ -60,4 +60,5 @@ module UffizziCore
   }
   mattr_accessor :user_creation_sources, default: [:system, :online_registration, :google, :sso]
   mattr_accessor :user_project_roles, default: [:admin, :developer, :viewer]
+  mattr_accessor :account_sources, default: [:manual]
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: uffizzi_core
 version: !ruby/object:Gem::Version
-  version: 0.7.1
+  version: 1.0.1
 platform: ruby
 authors:
 - Josh Thurman
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-08-23 00:00:00.000000000 Z
+date: 2022-09-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aasm
@@ -701,15 +701,19 @@ files:
 - app/clients/uffizzi_core/github_container_registry_client/request_result.rb
 - app/clients/uffizzi_core/google_registry_client.rb
 - app/clients/uffizzi_core/google_registry_client/request_result.rb
+- app/contexts/uffizzi_core/account_context.rb
 - app/contexts/uffizzi_core/base_context.rb
 - app/contexts/uffizzi_core/project_context.rb
 - app/contexts/uffizzi_core/webhooks_context.rb
 - app/controllers/concerns/uffizzi_core/auth_management.rb
 - app/controllers/concerns/uffizzi_core/authorization_concern.rb
 - app/controllers/concerns/uffizzi_core/dependency_injection_concern.rb
-- app/controllers/uffizzi_core/api/cli/v1/account/application_controller.rb
-- app/controllers/uffizzi_core/api/cli/v1/account/credentials_controller.rb
+- app/controllers/uffizzi_core/api/cli/v1/accounts/application_controller.rb
+- app/controllers/uffizzi_core/api/cli/v1/accounts/credentials_controller.rb
+- app/controllers/uffizzi_core/api/cli/v1/accounts/projects_controller.rb
 - app/controllers/uffizzi_core/api/cli/v1/application_controller.rb
+- app/controllers/uffizzi_core/api/cli/v1/ci/application_controller.rb
+- app/controllers/uffizzi_core/api/cli/v1/ci/sessions_controller.rb
 - app/controllers/uffizzi_core/api/cli/v1/projects/application_controller.rb
 - app/controllers/uffizzi_core/api/cli/v1/projects/compose_files_controller.rb
 - app/controllers/uffizzi_core/api/cli/v1/projects/deployments/activity_items_controller.rb
@@ -774,7 +778,6 @@ files:
 - 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
@@ -817,7 +820,6 @@ files:
 - app/models/uffizzi_core/database_offering.rb
 - app/models/uffizzi_core/deployment.rb
 - app/models/uffizzi_core/event.rb
-- app/models/uffizzi_core/invitation.rb
 - app/models/uffizzi_core/membership.rb
 - app/models/uffizzi_core/payment.rb
 - app/models/uffizzi_core/price.rb
@@ -829,7 +831,6 @@ files:
 - app/models/uffizzi_core/repo/azure.rb
 - app/models/uffizzi_core/repo/docker_hub.rb
 - app/models/uffizzi_core/repo/docker_registry.rb
-- app/models/uffizzi_core/repo/github.rb
 - app/models/uffizzi_core/repo/github_container_registry.rb
 - app/models/uffizzi_core/repo/google.rb
 - app/models/uffizzi_core/role.rb
@@ -837,7 +838,8 @@ files:
 - app/models/uffizzi_core/template.rb
 - app/models/uffizzi_core/user.rb
 - app/models/uffizzi_core/user_project.rb
-- app/policies/uffizzi_core/api/cli/v1/account/credentials_policy.rb
+- app/policies/uffizzi_core/api/cli/v1/accounts/credentials_policy.rb
+- app/policies/uffizzi_core/api/cli/v1/accounts/projects_policy.rb
 - app/policies/uffizzi_core/api/cli/v1/projects/compose_files_policy.rb
 - app/policies/uffizzi_core/api/cli/v1/projects/deployments/activity_items_policy.rb
 - app/policies/uffizzi_core/api/cli/v1/projects/deployments/containers_policy.rb
@@ -865,8 +867,10 @@ files:
 - app/repositories/uffizzi_core/usage_repo.rb
 - app/repositories/uffizzi_core/user_repo.rb
 - app/responders/uffizzi_core/json_responder.rb
-- app/serializers/uffizzi_core/api/cli/v1/account/credential_serializer.rb
+- app/serializers/uffizzi_core/api/cli/v1/accounts/credential_serializer.rb
+- app/serializers/uffizzi_core/api/cli/v1/accounts/project_serializer.rb
 - app/serializers/uffizzi_core/api/cli/v1/project_serializer.rb
+- app/serializers/uffizzi_core/api/cli/v1/project_serializer/account_serializer.rb
 - app/serializers/uffizzi_core/api/cli/v1/project_serializer/compose_file_serializer.rb
 - app/serializers/uffizzi_core/api/cli/v1/project_serializer/deployment_serializer.rb
 - app/serializers/uffizzi_core/api/cli/v1/projects/compose_file_serializer.rb

data/app/controllers/uffizzi_core/api/cli/v1/account/application_controller.rb

@@ -1,7 +0,0 @@
-# frozen_string_literal: true
-
-class UffizziCore::Api::Cli::V1::Account::ApplicationController < UffizziCore::Api::Cli::V1::ApplicationController
-  def resource_account
-    @resource_account ||= current_user.organizational_account
-  end
-end

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

@@ -1,31 +0,0 @@
-# frozen_string_literal: true
-
-module UffizziCore::Concerns::Models::Invitation
-  extend ActiveSupport::Concern
-
-  included do
-    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
-  end
-end

data/app/models/uffizzi_core/invitation.rb

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

data/app/models/uffizzi_core/repo/github.rb

@@ -1,4 +0,0 @@
-# frozen_string_literal: true
-
-class UffizziCore::Repo::Github < UffizziCore::Repo
-end