uffizzi_core 0.1.13 → 0.1.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7d892c859a5a90f309d59a2fd110e3e99719d62f566cda4f7cb1f0815c700f4e
-  data.tar.gz: df8bed87726cc99d3401b129245a8bc0467d087550d3258f66f08c482f897f7e
+  metadata.gz: cfa4de16cbd2efbc1c9b12748807a9c283e206a490eaa4cf544eaee9e5a11733
+  data.tar.gz: 8d3d6a27ed932c3760669f2397deef476b57c44ec09b783de51eca3143bb7aad
 SHA512:
-  metadata.gz: dc59d9a62a34892c5c50eb0b622e7a5e46ecd0e0cdbd826ea72fd0b27c88dc35ddd7c686b3b46b1aa16c2544374f5f96ca4588d41afb39433b8759fabba8484e
-  data.tar.gz: 070f387c4d12a5d662c392dfa715dd536d8100aa06978c072dbaee04bec52dd9aa126b396903610dbfc187dbac5542d7c7332d1b5a7df784210b21c1a31cea20
+  metadata.gz: 0db9e7b5f79bf19ac9576b516e72792b3a58ff98edccea36ef1f9a4385e214d7498d5c5dc047fb989cd1c958a8ec8be32ad39d0257ab57c8b264a6fef7b85d96
+  data.tar.gz: a1f4c8f5a39e04357a1e9185454230b7671dffdac46f180a23310ae07f0b906912cf10fcd252fdfd1d31c7553a3074d139d504d94a916f4b2219e174771be945

data/app/clients/uffizzi_core/docker_hub_client/not_authorized_error.rb

@@ -0,0 +1,6 @@
+# frozen_string_literal: true
+
+class UffizziCore::DockerHubClient
+  class NotAuthorizedError < StandardError
+  end
+end

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

@@ -7,6 +7,12 @@ module UffizziCore::DependencyInjectionConcern
     UffizziCore::UserAccessService.new(module_class(:rbac))
   end
 
+  def build_parser_module
+    return unless module_exists?(:github)
+
+    module_class(:github).new
+  end
+
   private
 
   def module_exists?(module_name)

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

@@ -9,11 +9,66 @@ class UffizziCore::Api::Cli::V1::ProjectsController < UffizziCore::Api::Cli::V1:
   #
   # @path [GET] /api/cli/v1/projects
   #
-  # @response [object<projects: Array<object<slug: string>> >] 200 OK
+  # @response [object<projects: Array<object<slug: string, name: string>> >] 200 OK
   # @response 401 Not authorized
   def index
     projects = current_user.projects.active.order(updated_at: :desc)
 
-    respond_with projects
+    respond_with projects, each_serializer: UffizziCore::Api::Cli::V1::ShortProjectSerializer
+  end
+
+  # Get a project by slug
+  #
+  # @path [GET] /api/cli/v1/projects/{slug}
+  #
+  # @response <object< project: Project>> 200 OK
+  # @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
+  end
+
+  # Delete a project
+  #
+  # @path [DELETE] /api/cli/v1/projects/{slug}
+  #
+  # @response 204 No content
+  # @response 404 Not Found
+  # @response 401 Not authorized
+
+  def destroy
+    project = current_user.organizational_account.active_projects.find_by!(slug: params[:slug])
+    project.disable!
+
+    head :no_content
+  end
+
+  private
+
+  def project_params
+    params.require(:project)
   end
 end

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

@@ -5,7 +5,7 @@ class UffizziCore::Api::Cli::V1::Deployment::UpdateForm < UffizziCore::Deploymen
 
   permit containers_attributes: [
     :image,
-    :name,
+    :service_name,
     :tag,
     :port,
     :public,

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

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class UffizziCore::Api::Cli::V1::Project::CreateForm < UffizziCore::Project
+  include UffizziCore::ApplicationForm
+
+  permit :name, :slug, :description
+end

data/app/lib/uffizzi_core/rbac/user_access_service.rb

@@ -10,6 +10,10 @@ module UffizziCore::Rbac::UserAccessService
       true
     end
 
+    def admin_or_developer_access_to_account?(_user, _account)
+      true
+    end
+
     def admin_or_developer_access_to_project?(_user, _project)
       true
     end

data/app/models/uffizzi_core/project.rb

@@ -1,7 +1,13 @@
 # frozen_string_literal: true
 
-# @model
+# @model Project
 # @property slug [string]
+# @property name [string]
+# @property description [string]
+# @property created_at [date-time]
+# @property secrets [string]
+# @property default_compose [object<source: string>]
+# @property deployments [object<id: integer, domain: string>]
 
 class UffizziCore::Project < UffizziCore::ApplicationRecord
   include AASM
@@ -23,7 +29,8 @@ class UffizziCore::Project < UffizziCore::ApplicationRecord
   has_many :compose_files, dependent: :destroy
   has_many :secrets, dependent: :destroy, as: :resource
 
-  validates :name, presence: true, uniqueness: { scope: :account }
+  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

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

@@ -4,4 +4,16 @@ class UffizziCore::Api::Cli::V1::ProjectsPolicy < UffizziCore::ApplicationPolicy
   def index?
     context.user_access_module.any_access_to_account?(context.user, context.account)
   end
+
+  def show?
+    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
 end

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

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class UffizziCore::Api::Cli::V1::ProjectSerializer::ComposeFileSerializer < UffizziCore::BaseSerializer
+  type :compose_file
+
+  attributes :source
+end

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

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+class UffizziCore::Api::Cli::V1::ProjectSerializer::DeploymentSerializer < UffizziCore::BaseSerializer
+  type :deployment
+
+  attributes :id,
+             :preview_url,
+             :state
+
+  def preview_url
+    UffizziCore::DeploymentService.build_preview_url(object)
+  end
+end

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

@@ -2,6 +2,33 @@
 
 class UffizziCore::Api::Cli::V1::ProjectSerializer < UffizziCore::BaseSerializer
   type :project
+  has_many :deployments
+  has_many :secrets
+  has_one :default_compose
 
-  attributes :slug
+  attributes :name,
+             :slug,
+             :description,
+             :created_at
+
+  def default_compose
+    object.compose_files.main.first
+  end
+
+  def deployments
+    object.deployments.active.map do |deployment|
+      deployment.state = if UffizziCore::DeploymentService.failed?(deployment)
+        UffizziCore::Deployment::STATE_FAILED
+      else
+        UffizziCore::Deployment::STATE_ACTIVE
+      end
+      deployment
+    end
+  end
+
+  def secrets
+    return [] unless object.secrets
+
+    object.secrets.map(&:name)
+  end
 end

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

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class UffizziCore::Api::Cli::V1::ShortProjectSerializer < UffizziCore::BaseSerializer
+  type :project
+
+  attributes :name, :slug
+end

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/services/uffizzi_core/compose_file/services_options_service.rb

@@ -2,6 +2,8 @@
 
 class UffizziCore::ComposeFile::ServicesOptionsService
   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,7 +20,7 @@ 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
@@ -27,7 +29,7 @@ class UffizziCore::ComposeFile::ServicesOptionsService
                                     when :image
                                       UffizziCore::ComposeFile::ServicesOptions::ImageService.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)
                                     when :environment
@@ -51,5 +53,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/deployment_service.rb

@@ -8,6 +8,7 @@ module UffizziCore::DeploymentService
     building: :building,
     deploying: :deploying,
     failed: :failed,
+    queued: :queued,
   }.freeze
 
   class << self
@@ -103,9 +104,8 @@ module UffizziCore::DeploymentService
       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}"
 
-      format_subdomain(subdomain)
+      "pr#{pull_request_payload['id']}-#{deployment_name}.#{repo_name}.#{project.slug}"
     end
 
     def build_docker_continuous_preview_subdomain(deployment)
@@ -115,17 +115,14 @@ module UffizziCore::DeploymentService
       repo_name = docker_payload['image'].split('/').last.gsub('_', '-')
       image_tag = docker_payload['tag'].gsub('_', '-')
       deployment_name = name(deployment)
-      subdomain = "#{image_tag}-#{deployment_name}-#{repo_name}-#{project.slug}"
 
-      format_subdomain(subdomain)
+      "#{image_tag}-#{deployment_name}.#{repo_name}.#{project.slug}"
     end
 
     def build_default_subdomain(deployment)
       deployment_name = name(deployment)
       slug = deployment.project.slug.to_s
-      subdomain = "#{deployment_name}-#{slug}"
-
-      format_subdomain(subdomain)
+      "#{deployment_name}.#{slug}"
     end
 
     def build_preview_url(deployment)
@@ -242,10 +239,11 @@ module UffizziCore::DeploymentService
 
     def deployment_process_status(deployment)
       containers = deployment.active_containers
-      activity_items = containers.map { |container| container.activity_items.order_by_id.last }
+      activity_items = containers.map { |container| container.activity_items.order_by_id.last }.compact
       events = activity_items.map { |activity_item| activity_item.events.order_by_id.last&.state }
       events = events.flatten.uniq
 
+      return DEPLOYMENT_PROCESS_STATUSES[:queued] if events.empty?
       return DEPLOYMENT_PROCESS_STATUSES[:failed] if events.include?(UffizziCore::Event.state.failed)
       return DEPLOYMENT_PROCESS_STATUSES[:building] if events.include?(UffizziCore::Event.state.building)
 
@@ -295,12 +293,5 @@ module UffizziCore::DeploymentService
         container.variables.push(*envs)
       end
     end
-
-    def format_subdomain(full_subdomain_name)
-      subdomain_length_limit = Settings.deployment.subdomain.length_limit
-      return full_subdomain_name if full_subdomain_name.length <= subdomain_length_limit
-
-      full_subdomain_name.slice(0, subdomain_length_limit)
-    end
   end
 end

data/app/services/uffizzi_core/manage_activity_items_service.rb

@@ -116,26 +116,18 @@ class UffizziCore::ManageActivityItemsService
     state = pod_container[:state][pod_container_status]
     reason = state&.reason
 
-    Rails.logger.info("manage_activity_items get_status dep_id=#{container.deployment.id} pod_container_status: #{pod_container_status}")
-    Rails.logger.info("manage_activity_items get_status dep_id=#{container.deployment.id} state: #{state}")
-    ap pod_container[:state]
-
     case pod_container_status.to_sym
     when :running
-      Rails.logger.info("manage_activity_items get_status dep_id=#{container.deployment.id} running")
       UffizziCore::Event.state.deployed
     when :terminated
-      Rails.logger.info("manage_activity_items get_status dep_id=#{container.deployment.id} terminated")
       UffizziCore::Event.state.failed
     when :waiting
-      Rails.logger.info("manage_activity_items get_status dep_id=#{container.deployment.id} waiting")
       return UffizziCore::Event.state.failed if ['CrashLoopBackOff'].include?(reason)
 
       raise UffizziCore::Deployment::ImagePullError, @deployment.id if ['ErrImagePull', 'ImagePullBackOff'].include?(reason)
 
       UffizziCore::Event.state.deploying
     else
-      Rails.logger.info("manage_activity_items get_status dep_id=#{container.deployment.id} else")
       UffizziCore::Event.state.deploying
     end
   end

data/app/services/uffizzi_core/project_service.rb

@@ -34,5 +34,15 @@ module UffizziCore::ProjectService
 
       UffizziCore::ComposeFile::ErrorsService.update_compose_errors!(compose_file, new_errors, compose_file.content)
     end
+
+    def add_users_to_project!(project, current_user)
+      user_projects = []
+
+      current_user.organizational_account.memberships.where(role: UffizziCore::Membership.role.admin).map do |membership|
+        user_projects << { project: project, user: membership.user, role: UffizziCore::UserProject.role.admin }
+      end
+
+      UffizziCore::UserProject.create!(user_projects)
+    end
   end
 end

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/routes.rb

@@ -15,7 +15,7 @@ UffizziCore::Engine.routes.draw do
           post :google
         end
 
-        resources :projects, only: ['index'], param: :slug do
+        resources :projects, only: ['index', 'show', 'create', 'destroy'], param: :slug do
           scope module: :projects do
             resource :compose_file, only: ['show', 'create', 'destroy']
             resources :deployments, only: ['index', 'show', 'create', 'destroy', 'update'] do

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.13'
+  VERSION = '0.1.16'
 end

data/swagger/v1/swagger.json

@@ -1134,6 +1134,9 @@
                     "properties": {
                       "slug": {
                         "type": "string"
+                      },
+                      "name": {
+                        "type": "string"
                       }
                     }
                   }
@@ -1149,6 +1152,143 @@
         "summary": "Get projects of current user",
         "x-controller": "uffizzi_core/api/cli/v1/projects",
         "x-action": "index"
+      },
+      "post": {
+        "tags": [
+          "Project"
+        ],
+        "operationId": "Project-create",
+        "parameters": [
+          {
+            "name": "params",
+            "description": "params",
+            "required": true,
+            "in": "body",
+            "schema": {
+              "type": "object",
+              "properties": {
+                "name": {
+                  "type": "string"
+                },
+                "slug": {
+                  "type": "string"
+                },
+                "description": {
+                  "type": "string"
+                }
+              }
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "schema": {
+              "type": "object",
+              "properties": {
+                "project": {
+                  "$ref": "#/definitions/Project"
+                }
+              }
+            }
+          },
+          "404": {
+            "description": "Not Found"
+          },
+          "401": {
+            "description": "Not authorized"
+          },
+          "422": {
+            "description": "Unprocessable entity",
+            "schema": {
+              "type": "object",
+              "properties": {
+                "errors": {
+                  "type": "object",
+                  "properties": {
+                    "password": {
+                      "type": "string"
+                    }
+                  }
+                }
+              }
+            }
+          }
+        },
+        "description": "Create a project",
+        "summary": "Create a project",
+        "x-controller": "uffizzi_core/api/cli/v1/projects",
+        "x-action": "create"
+      }
+    },
+    "/api/cli/v1/projects/{slug}": {
+      "get": {
+        "tags": [
+          "Project"
+        ],
+        "operationId": "Project-show",
+        "parameters": [
+          {
+            "name": "slug",
+            "description": "Scope response to slug",
+            "required": true,
+            "in": "path",
+            "type": "string"
+          }
+        ],
+        "responses": {
+          "204": {
+            "description": "No content"
+          },
+          "404": {
+            "description": "Not Found"
+          },
+          "401": {
+            "description": "Not authorized"
+          }
+        },
+        "description": "Get a project by slug",
+        "summary": "Get a project by slug",
+        "x-controller": "uffizzi_core/api/cli/v1/projects",
+        "x-action": "show"
+      },
+      "delete": {
+        "tags": [
+          "Project"
+        ],
+        "operationId": "Project-destroy",
+        "parameters": [
+          {
+            "name": "slug",
+            "description": "Scope response to slug",
+            "required": true,
+            "in": "path",
+            "type": "string"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "schema": {
+              "type": "object",
+              "properties": {
+                "project": {
+                  "$ref": "#/definitions/Project"
+                }
+              }
+            }
+          },
+          "404": {
+            "description": "Not Found"
+          },
+          "401": {
+            "description": "Not authorized"
+          }
+        },
+        "description": "Delete a project",
+        "summary": "Delete a project",
+        "x-controller": "uffizzi_core/api/cli/v1/projects",
+        "x-action": "destroy"
       }
     },
     "/api/cli/v1/session": {
@@ -1475,11 +1615,43 @@
         }
       }
     },
-    "UffizziCore_Project": {
+    "Project": {
       "type": "object",
       "properties": {
         "slug": {
           "type": "string"
+        },
+        "name": {
+          "type": "string"
+        },
+        "description": {
+          "type": "string"
+        },
+        "created_at": {
+          "type": "string",
+          "format": "date-time"
+        },
+        "secrets": {
+          "type": "string"
+        },
+        "default_compose": {
+          "type": "object",
+          "properties": {
+            "source": {
+              "type": "string"
+            }
+          }
+        },
+        "deployments": {
+          "type": "object",
+          "properties": {
+            "id": {
+              "type": "integer"
+            },
+            "domain": {
+              "type": "string"
+            }
+          }
         }
       }
     }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: uffizzi_core
 version: !ruby/object:Gem::Version
-  version: 0.1.13
+  version: 0.1.16
 platform: ruby
 authors:
 - Josh Thurman
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-05-30 00:00:00.000000000 Z
+date: 2022-06-06 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
@@ -736,6 +737,7 @@ files:
 - app/forms/uffizzi_core/api/cli/v1/config_file/create_form.rb
 - app/forms/uffizzi_core/api/cli/v1/deployment/create_form.rb
 - app/forms/uffizzi_core/api/cli/v1/deployment/update_form.rb
+- app/forms/uffizzi_core/api/cli/v1/project/create_form.rb
 - app/forms/uffizzi_core/api/cli/v1/project/update_form.rb
 - app/forms/uffizzi_core/api/cli/v1/secret/bulk_assign_form.rb
 - app/forms/uffizzi_core/api/cli/v1/session_create_form.rb
@@ -757,9 +759,6 @@ 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/activity_item.rb
-- app/lib/uffizzi_core/concerns/models/credential.rb
-- app/lib/uffizzi_core/concerns/models/repo.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
@@ -838,6 +837,8 @@ files:
 - 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/project_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
 - app/serializers/uffizzi_core/api/cli/v1/projects/deployment_serializer.rb
 - app/serializers/uffizzi_core/api/cli/v1/projects/deployment_serializer/container_serializer.rb
@@ -847,6 +848,7 @@ files:
 - app/serializers/uffizzi_core/api/cli/v1/projects/deployments/container_serializer/container_config_file_serializer.rb
 - app/serializers/uffizzi_core/api/cli/v1/projects/deployments/container_serializer/container_config_file_serializer/config_file_serializer.rb
 - app/serializers/uffizzi_core/api/cli/v1/projects/secret_serializer.rb
+- app/serializers/uffizzi_core/api/cli/v1/short_project_serializer.rb
 - app/serializers/uffizzi_core/api/cli/v1/user_serializer.rb
 - app/serializers/uffizzi_core/api/cli/v1/user_serializer/account_serializer.rb
 - app/serializers/uffizzi_core/base_serializer.rb

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

@@ -1,39 +0,0 @@
-# frozen_string_literal: true
-
-module UffizziCore::Concerns::Models::ActivityItem
-  extend ActiveSupport::Concern
-
-  included do
-    include UffizziCore::ActivityItemRepo
-
-    self.table_name = UffizziCore.table_names[:activity_items]
-
-    belongs_to :deployment
-    belongs_to :container
-    belongs_to :build, optional: true
-
-    has_many :events, dependent: :destroy
-
-    scope :docker, -> {
-      where(type: UffizziCore::ActivityItem::Docker.name)
-    }
-
-    scope :github, -> {
-      where(type: UffizziCore::ActivityItem::Github.name)
-    }
-
-    def docker?
-      type == UffizziCore::ActivityItem::Docker.name
-    end
-
-    def image
-      [namespace, name].compact.join('/')
-    end
-
-    def full_image
-      return "#{image}:#{tag}" if docker?
-
-      ''
-    end
-  end
-end

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

@@ -1,65 +0,0 @@
-# frozen_string_literal: true
-
-module UffizziCore::Concerns::Models::Credential
-  extend ActiveSupport::Concern
-
-  included do
-    include AASM
-    include UffizziCore::CredentialRepo
-
-    self.table_name = UffizziCore.table_names[:credentials]
-
-    belongs_to :account
-
-    before_destroy :remove_token
-
-    validates :registry_url, presence: true
-
-    aasm :state, column: :state do
-      state :not_connected, initial: true
-      state :active
-      state :unauthorized
-
-      event :activate do
-        transitions from: [:not_connected, :unauthorized], to: :active
-      end
-
-      event :unauthorize do
-        transitions from: [:not_connected, :active], to: :unauthorized
-      end
-    end
-
-    def github_container_registry?
-      type == UffizziCore::Credential::GithubContainerRegistry.name
-    end
-
-    def docker_hub?
-      type == UffizziCore::Credential::DockerHub.name
-    end
-
-    def azure?
-      type == UffizziCore::Credential::Azure.name
-    end
-
-    def google?
-      type == UffizziCore::Credential::Google.name
-    end
-
-    def amazon?
-      type == UffizziCore::Credential::Amazon.name
-    end
-
-    private
-
-    def remove_token
-      account.projects.find_each do |project|
-        project.deployments.find_each do |deployment|
-          containers = deployment.containers
-          attributes = { continuously_deploy: UffizziCore::Container::STATE_DISABLED }
-
-          containers.with_docker_hub_repo.update_all(attributes) if docker_hub?
-        end
-      end
-    end
-  end
-end

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

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