uffizzi_core 0.1.12 → 0.1.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 43f66c059196fdf90a87f740f396bf781294f4dab94c221f38abc58caef7f141
-  data.tar.gz: 3f8aec775f29147cdc79b115401a28414ac19ee9146b9226ea62f5deb0de9083
+  metadata.gz: 7d892c859a5a90f309d59a2fd110e3e99719d62f566cda4f7cb1f0815c700f4e
+  data.tar.gz: df8bed87726cc99d3401b129245a8bc0467d087550d3258f66f08c482f897f7e
 SHA512:
-  metadata.gz: 4d90a4d0a13b2d7e899573c8484d6355d751a81bd9648443211b4fa4155f439ae40993a4f3dd18c2ec5079bb183093f0f78b7800d24f96d693a98b3ef9c81a48
-  data.tar.gz: a7dcc2e613d8d5293c070d66f4c1366534c0077c8d5d588906be93b389a51bb88c2951c9db2b68c5236e90933da51af775ae00516afbc34cd6f8c7148ce5bb51
+  metadata.gz: dc59d9a62a34892c5c50eb0b622e7a5e46ecd0e0cdbd826ea72fd0b27c88dc35ddd7c686b3b46b1aa16c2544374f5f96ca4588d41afb39433b8759fabba8484e
+  data.tar.gz: 070f387c4d12a5d662c392dfa715dd536d8100aa06978c072dbaee04bec52dd9aa126b396903610dbfc187dbac5542d7c7332d1b5a7df784210b21c1a31cea20

data/README.md

@@ -44,9 +44,3 @@ Or install it yourself as:
 ```bash
 $ gem install uffizzi_core
 ```
-
-## Migrations
-After adding a new migration, ru the following command:
-```
-rake uffizzi_core:install
-```

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

@@ -15,6 +15,7 @@ class UffizziCore::Api::Cli::V1::Account::CredentialsController < UffizziCore::A
     render json: { credentials: credentials }, status: :ok
   end
 
+  # rubocop:disable Layout/LineLength
   # Create account credential
   #
   # @path [POST] /api/cli/v1/account/credentials
@@ -24,9 +25,8 @@ class UffizziCore::Api::Cli::V1::Account::CredentialsController < UffizziCore::A
   # @response [object<errors>] 422 Unprocessable entity
   #
   # @example
-  #    type can be one of UffizziCore::Credential::Amazon, UffizziCore::Credential::Azure,
-  #    UffizziCore::Credential::DockerHub, UffizziCore::Credential::Google, UffizziCore::Credential::GithubContainerRegistry
-
+  #    type can be one of UffizziCore::Credential::Amazon, UffizziCore::Credential::Azure, UffizziCore::Credential::DockerHub, UffizziCore::Credential::Google, UffizziCore::Credential::GithubContainerRegistry
+  # rubocop:enable Layout/LineLength
   def create
     credential_form = UffizziCore::Api::Cli::V1::Account::Credential::CreateForm.new
     credential_form.assign_attributes(credential_params)

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

@@ -9,77 +9,11 @@ class UffizziCore::Api::Cli::V1::ProjectsController < UffizziCore::Api::Cli::V1:
   #
   # @path [GET] /api/cli/v1/projects
   #
-  # @response [object<projects: Array<object<slug: string, name: string>> >] 200 OK
+  # @response [object<projects: Array<object<slug: string>> >] 200 OK
   # @response 401 Not authorized
   def index
     projects = current_user.projects.active.order(updated_at: :desc)
 
-    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
-      current_membership = current_user.memberships.find_by(account: current_user.organizational_account)
-      user_projects = []
-
-      if current_membership.developer?
-        user_projects << { project: project_form, user: current_user, role: UffizziCore::UserProject.role.developer }
-      end
-
-      current_user.organizational_account.memberships.where(role: UffizziCore::Membership.role.admin).map do |membership|
-        user_projects << { project: project_form, user: membership.user, role: UffizziCore::UserProject.role.admin }
-      end
-
-      UffizziCore::UserProject.create!(user_projects)
-    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)
+    respond_with projects
   end
 end

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

@@ -16,7 +16,6 @@ class UffizziCore::Api::Cli::V1::Deployment::CreateForm < UffizziCore::Deploymen
            :command,
            :receive_incoming_requests,
            :continuously_deploy,
-           { healthcheck: {} },
            { variables: [:name, :value],
              secret_variables: [:name, :value],
              repo_attributes: [

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

@@ -6,34 +6,10 @@ module UffizziCore::Rbac::UserAccessService
       true
     end
 
-    def developer_access_to_account?(_user, _account)
-      true
-    end
-
-    def viewer_access_to_account?(_user, _account)
-      true
-    end
-
-    def admin_or_developer_access_to_account?(_user, _account)
-      true
-    end
-
     def any_access_to_account?(_user, _account)
       true
     end
 
-    def admin_access_to_project?(_user, _project)
-      true
-    end
-
-    def developer_access_to_project?(_user, _project)
-      true
-    end
-
-    def viewer_access_to_project?(_user, _project)
-      true
-    end
-
     def admin_or_developer_access_to_project?(_user, _project)
       true
     end

data/app/models/uffizzi_core/project.rb

@@ -1,13 +1,7 @@
 # frozen_string_literal: true
 
-# @model Project
+# @model
 # @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
@@ -29,8 +23,7 @@ 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, message: 'Name already exists' }
-  validates :slug, presence: true, uniqueness: { message: 'Project slug already taken' }
+  validates :name, presence: true, uniqueness: { scope: :account }
 
   aasm(:state) do
     state :active, initial: true

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

@@ -4,16 +4,4 @@ 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.rb

@@ -2,29 +2,6 @@
 
 class UffizziCore::Api::Cli::V1::ProjectSerializer < UffizziCore::BaseSerializer
   type :project
-  has_many :deployments
-  has_many :secrets
-  has_one :default_compose
 
-  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 = UffizziCore::DeploymentService.failed?(deployment) ? 'failed' : 'active'
-      deployment
-    end
-  end
-
-  def secrets
-    return [] unless object.secrets
-
-    object.secrets.map(&:name)
-  end
+  attributes :slug
 end

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

@@ -19,8 +19,7 @@ class UffizziCore::Api::Cli::V1::Projects::DeploymentSerializer::ContainerSerial
              :public,
              :repo_id,
              :continuously_deploy,
-             :receive_incoming_requests,
-             :healthcheck
+             :receive_incoming_requests
 
   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, :healthcheck
+  attributes :id, :name, :memory_limit, :memory_request, :continuously_deploy, :variables, :secret_variables
 
   has_many :container_config_files
 

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

@@ -15,8 +15,7 @@ class UffizziCore::Controller::DeployContainers::ContainerSerializer < UffizziCo
              :target_port,
              :public,
              :controller_name,
-             :receive_incoming_requests,
-             :healthcheck
+             :receive_incoming_requests
 
   has_many :container_config_files
 
@@ -53,18 +52,4 @@ 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,14 +17,18 @@ class UffizziCore::ComposeFile::Builders::ContainerBuilderService
     configs_data = container_data[:configs] || []
     secrets = container_data[:secrets] || []
     container_name = container_data[:container_name]
-    healthcheck_data = container_data[:healthcheck] || {}
+    continuous_preview_container_data = container_data[:'x-uffizzi-continuous-preview'] || container_data[:'x-uffizzi-continuous-previews']
 
     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 = repo_attributes(container_data, continuous_preview_global_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)
 
     {
       tag: tag(image_data, repo_attributes),
@@ -47,13 +51,6 @@ class UffizziCore::ComposeFile::Builders::ContainerBuilderService
 
   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,
@@ -151,9 +148,8 @@ class UffizziCore::ComposeFile::Builders::ContainerBuilderService
     memory_value
   end
 
-  def build_repo_attributes(container_data)
+  def build_repo_attributes(container_data, image_data, _build_data, credentials)
     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/services_options_service.rb

@@ -42,8 +42,6 @@ class UffizziCore::ComposeFile::ServicesOptionsService
                                       UffizziCore::ComposeFile::ServicesOptions::EntrypointService.parse(value)
                                     when :command
                                       UffizziCore::ComposeFile::ServicesOptions::CommandService.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)
         end

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

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

data/app/services/uffizzi_core/deployment_service.rb

@@ -8,12 +8,12 @@ module UffizziCore::DeploymentService
     building: :building,
     deploying: :deploying,
     failed: :failed,
-    queued: :queued,
   }.freeze
 
   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
@@ -242,11 +242,10 @@ module UffizziCore::DeploymentService
 
     def deployment_process_status(deployment)
       containers = deployment.active_containers
-      activity_items = containers.map { |container| container.activity_items.order_by_id.last }.compact
+      activity_items = containers.map { |container| container.activity_items.order_by_id.last }
       events = activity_items.map { |activity_item| activity_item.events.order_by_id.last&.state }
       events = events.flatten.uniq
 
-      return DEPLOYMENT_PROCESS_STATUSES[:queued] if containers.present? && 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)
 

data/app/services/uffizzi_core/manage_activity_items_service.rb

@@ -118,7 +118,7 @@ class UffizziCore::ManageActivityItemsService
 
     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])
+    ap pod_container[:state]
 
     case pod_container_status.to_sym
     when :running

data/app/services/uffizzi_core/project_service.rb

@@ -34,15 +34,5 @@ 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,12 +6,6 @@ class UffizziCore::UserGeneratorService
   DEFAULT_ACCOUNT_NAME = 'default'
 
   class << self
-    def safe_generate(email, password, project_name)
-      generate(email, password, project_name)
-    rescue StandardError => 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)
@@ -37,17 +31,19 @@ class UffizziCore::UserGeneratorService
 
       if email.present?
         user_attributes[:email] = email
-      elsif IO::console.present?
+      else
         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
-      elsif IO::console.present?
+      else
         IO::console.getpass('Enter Password: ')
       end
 
+      abort('password can\'t be blank') if user_attributes[:password].blank?
+
       user_attributes
     end
 
@@ -57,11 +53,9 @@ class UffizziCore::UserGeneratorService
       }
       if project_name.present?
         project_attributes[:name] = project_name
-      elsif IO::console.present?
+      else
         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,7 +57,6 @@ 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/config/routes.rb

@@ -15,23 +15,13 @@ UffizziCore::Engine.routes.draw do
           post :google
         end
 
-        resources :projects, only: ['index', 'show', 'create', 'destroy'], param: :slug do
+        resources :projects, only: ['index'], param: :slug do
           scope module: :projects do
             resource :compose_file, only: ['show', 'create', 'destroy']
             resources :deployments, only: ['index', 'show', 'create', 'destroy', 'update'] do
               post :deploy_containers, on: :member
               scope module: :deployments do
                 resources :activity_items, only: ['index']
-                resources :containers, only: ['index'], param: :name do
-                  scope module: :containers do
-                    resources :logs, only: ['index']
-                    resources :builds, only: [] do
-                      collection do
-                        get :logs
-                      end
-                    end
-                  end
-                end
                 resources :events, only: ['index']
                 resources :containers, only: ['index'], param: :name do
                   scope module: :containers 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.safe_generate(ENV['UFFIZZI_USER_EMAIL'], ENV['UFFIZZI_USER_PASSWORD'], ENV['UFFIZZI_PROJECT_NAME'])
+    UffizziCore::UserGeneratorService.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.12'
+  VERSION = '0.1.13'
 end

data/swagger/v1/swagger.json

@@ -80,7 +80,7 @@
           "default": {
             "description": "Create account credential",
             "examples": {
-              "application/json": "type can be one of UffizziCore::Credential::Amazon, UffizziCore::Credential::Azure,\nUffizziCore::Credential::DockerHub, UffizziCore::Credential::Google, UffizziCore::Credential::GithubContainerRegistry"
+              "application/json": "type can be one of UffizziCore::Credential::Amazon, UffizziCore::Credential::Azure, UffizziCore::Credential::DockerHub, UffizziCore::Credential::Google, UffizziCore::Credential::GithubContainerRegistry"
             }
           },
           "201": {
@@ -1134,9 +1134,6 @@
                     "properties": {
                       "slug": {
                         "type": "string"
-                      },
-                      "name": {
-                        "type": "string"
                       }
                     }
                   }
@@ -1152,143 +1149,6 @@
         "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": {
-          "200": {
-            "description": "OK",
-            "schema": {
-              "type": "object",
-              "properties": {
-                "project": {
-                  "$ref": "#/definitions/Project"
-                }
-              }
-            }
-          },
-          "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": {
-          "204": {
-            "description": "No content"
-          },
-          "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": {
@@ -1615,43 +1475,11 @@
         }
       }
     },
-    "Project": {
+    "UffizziCore_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.12
+  version: 0.1.13
 platform: ruby
 authors:
 - Josh Thurman
@@ -736,7 +736,6 @@ 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
@@ -839,8 +838,6 @@ 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
@@ -850,7 +847,6 @@ 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
@@ -880,7 +876,6 @@ files:
 - 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/parsers/services/healthcheck_parser_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
@@ -907,7 +902,6 @@ files:
 - app/services/uffizzi_core/project_service.rb
 - app/services/uffizzi_core/repo_service.rb
 - app/services/uffizzi_core/response_service.rb
-- app/services/uffizzi_core/starter_template_service.rb
 - app/services/uffizzi_core/template_service.rb
 - app/services/uffizzi_core/token_service.rb
 - app/services/uffizzi_core/user_access_service.rb
@@ -929,7 +923,6 @@ 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

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

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

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

@@ -1,7 +0,0 @@
-# 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

@@ -1,13 +0,0 @@
-# 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/short_project_serializer.rb

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

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

@@ -1,73 +0,0 @@
-# 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/starter_template_service.rb

@@ -1,200 +0,0 @@
-# frozen_string_literal: true
-
-class UffizziCore::StarterTemplateService
-  class << self
-    def create(project, user)
-      voting_app_config_file = create_config_file(project, user)
-      create_containers(project, user, voting_app_config_file)
-    end
-
-    private
-
-    def create_config_file(project, user)
-      starter_template_config_file = config_file_attributes
-
-      starter_template_config_file_params = ActionController::Parameters.new(starter_template_config_file)
-
-      starter_template_config_file_form = UffizziCore::Api::Cli::V1::ConfigFile::CreateForm.new(starter_template_config_file_params)
-      starter_template_config_file_form.project = project
-      starter_template_config_file_form.added_by = user
-      starter_template_config_file_form.creation_source = UffizziCore::ConfigFile.creation_source.system
-      starter_template_config_file_form.save
-
-      starter_template_config_file_form
-    end
-
-    def create_containers(project, user, voting_app_config_file)
-      starter_template_containers = {
-        name: 'Voting App (from base images)',
-        payload: {
-          containers_attributes: containers_attributes(voting_app_config_file),
-        },
-      }
-
-      starter_template = ActionController::Parameters.new(starter_template_containers)
-
-      starter_template_form = UffizziCore::Api::Cli::V1::Template::CreateForm.new(starter_template)
-      starter_template_form.creation_source = UffizziCore::Template.creation_source.system
-      starter_template_form.added_by = user
-      starter_template_form.project = project
-      starter_template_form.save
-    end
-
-    def containers_attributes(voting_app_config_file)
-      [
-        postgres_container_attributes,
-        nginx_container_attributes(voting_app_config_file),
-        redis_container_attributes,
-        example_worker_container_attributes,
-        example_result_container_attributes,
-        example_vote_container_attributes,
-      ]
-    end
-
-    def postgres_container_attributes
-      {
-        image: 'library/postgres',
-        tag: '9.6',
-        port: nil,
-        public: false,
-        memory_limit: 250,
-        memory_request: 250,
-        receive_incoming_requests: false,
-        continuously_deploy: 'disabled',
-        secret_variables: nil,
-        variables: [
-          {
-            name: 'POSTGRES_USER',
-            value: 'postgres',
-          },
-          {
-            name: 'POSTGRES_PASSWORD',
-            value: 'postgres',
-          },
-        ],
-        repo_attributes: repo_attributes('library/postgres'),
-        container_config_files_attributes: [],
-      }
-    end
-
-    def nginx_container_attributes(voting_app_config_file)
-      {
-        image: 'library/nginx',
-        tag: 'latest',
-        port: 8080,
-        public: true,
-        memory_limit: 125,
-        memory_request: 125,
-        receive_incoming_requests: true,
-        continuously_deploy: 'disabled',
-        secret_variables: nil,
-        variables: nil,
-        repo_attributes: repo_attributes('library/nginx'),
-        container_config_files_attributes: [{
-          config_file_id: voting_app_config_file.id,
-          mount_path: '/etc/nginx/conf.d/',
-        }],
-      }
-    end
-
-    def redis_container_attributes
-      {
-        image: 'library/redis',
-        tag: 'latest',
-        port: nil,
-        public: false,
-        memory_limit: 125,
-        memory_request: 125,
-        receive_incoming_requests: false,
-        continuously_deploy: 'disabled',
-        secret_variables: nil,
-        variables: nil,
-        repo_attributes: repo_attributes('library/redis'),
-        container_config_files_attributes: [],
-      }
-    end
-
-    def example_worker_container_attributes
-      {
-        image: 'uffizzicloud/example-worker',
-        tag: 'latest',
-        port: nil,
-        public: false,
-        memory_limit: 250,
-        memory_request: 250,
-        receive_incoming_requests: false,
-        continuously_deploy: 'disabled',
-        secret_variables: nil,
-        variables: nil,
-        repo_attributes: repo_attributes('uffizzicloud/example-worker'),
-        container_config_files_attributes: [],
-      }
-    end
-
-    def example_result_container_attributes
-      {
-        image: 'uffizzicloud/example-result',
-        tag: 'latest',
-        port: nil,
-        public: false,
-        memory_limit: 125,
-        memory_request: 125,
-        receive_incoming_requests: false,
-        continuously_deploy: 'disabled',
-        secret_variables: nil,
-        variables: nil,
-        repo_attributes: repo_attributes('uffizzicloud/example-result'),
-        container_config_files_attributes: [],
-      }
-    end
-
-    def example_vote_container_attributes
-      {
-        image: 'uffizzicloud/example-vote',
-        tag: 'latest',
-        port: nil,
-        public: false,
-        memory_limit: 250,
-        memory_request: 250,
-        receive_incoming_requests: false,
-        continuously_deploy: 'disabled',
-        secret_variables: nil,
-        variables: nil,
-        repo_attributes: repo_attributes('uffizzicloud/example-vote'),
-        container_config_files_attributes: [],
-      }
-    end
-
-    def config_file_attributes
-      {
-        filename: 'vote.conf',
-        kind: 'config_map',
-        payload: "server {
-               listen       8080;
-               server_name  example.com;
-               location / {
-                 proxy_pass      http://127.0.0.1:80/;
-               }
-               location /vote/ {
-                 proxy_pass      http://127.0.0.1:8888/;
-               }
-            }",
-      }
-    end
-
-    def repo_attributes(image)
-      namespace, name = image.split('/')
-      {
-        namespace: namespace,
-        name: name,
-        slug: name,
-        type: 'UffizziCore::Repo::DockerHub',
-        description: '',
-        is_private: false,
-        repository_id: nil,
-        branch: '',
-        kind: nil,
-      }
-    end
-  end
-end

data/db/migrate/20220419074956_add_health_check_to_containers.rb

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