uffizzi_core 0.1.14 → 0.1.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d4aa056e4e94f8dbd93efddc149a68b583fe31090307048c1167df16b8842032
-  data.tar.gz: f7c91d5144ebe0f7cf95cbe7f3241e85bae67ff79eac46465a5cb329b23dfac6
+  metadata.gz: 398869abc38d2bc2416b1589de95feb828d73abdc34a388f74339fae083332d0
+  data.tar.gz: a58d996964d92dd95a0bd5e4ebffab62dd84eaafcc7580bf3462cc6a58ccee46
 SHA512:
-  metadata.gz: c21e0edc0adf7905754850aabe30d4aec880029de985d90434c70f5bd2804dd7a44d87664f5e668b5bbac049cf6fda304c297c5ab44cc68a778d00d4fdf95b56
-  data.tar.gz: 6aa9ac0ab849cf07720a3642222d51a258252be4ad658f2f878a6a0b54ee725fe7b8f7a3f29bd42037a62be22dc268bf339baf7dc043ad3c66b7de497692f4da
+  metadata.gz: a70937d88e1d4733d113184b702f99226f5bee51dbed31cf8d8a9bbf2b2e93f8b702a68a72bf6fcb992f8493be910d0d1d18f0c2af90328bdda755a54405617e
+  data.tar.gz: cc53ee6c8d52ad74d732ea97996e84999e2f660e47b18d251695fa81f60010060955d6e9ef5e27fe7312d56faa329bf54243eb99138efa7a1e4a92907e6a8c98

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

@@ -8,6 +8,7 @@ module UffizziCore::DeploymentService
     building: :building,
     deploying: :deploying,
     failed: :failed,
+    queued: :queued,
   }.freeze
 
   class << self
@@ -242,10 +243,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)
 

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/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/uffizzi_core/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module UffizziCore
-  VERSION = '0.1.14'
+  VERSION = '0.1.15'
 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.14
+  version: 0.1.15
 platform: ruby
 authors:
 - Josh Thurman
@@ -736,6 +736,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
@@ -838,6 +839,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 +850,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