uffizzi_core 0.1.14 → 0.2.0

data/app/services/uffizzi_core/compose_file_service.rb

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

data/app/services/uffizzi_core/deployment_service.rb

@@ -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,10 +242,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/app/services/uffizzi_core/user_generator_service.rb

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

data/config/locales/en.yml

@@ -57,6 +57,7 @@ en:
     continuous_preview_in_service_level: The option '%{option}' is not supported for service-level. Use 'x-uffizzi-continuous-preview' instead
     file_already_exists: A compose file already exists for this project. Run 'uffizzi compose update' to update this file or 'uffizzi compose rm' to remove it. For more options, see 'uffizzi compose --help'
     invalid_healthcheck_command: "Service '%{name}' defines an invalid healthcheck: when 'test' is a list the first item must be either NONE, CMD or CMD-SHELL"
+    invalid_time_interval: The time interval should be in the following format '{hours}h{minutes}m{seconds}s'. At least one value must be present.
     string_or_array_error: "'%{option}' contains an invalid type, it should be a string, or an array"
     not_implemented: "'%{option}' option is not implemented"
     infinite_recursion: "Found infinite recursion for key '%{key}'"

data/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/db/migrate/20220419074956_add_health_check_to_containers.rb

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

data/lib/tasks/uffizzi_core_tasks.rake

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

data/lib/uffizzi_core/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module UffizziCore
-  VERSION = '0.1.14'
+  VERSION = '0.2.0'
 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.2.0
 platform: ruby
 authors:
 - Josh Thurman
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-05-31 00:00:00.000000000 Z
+date: 2022-06-07 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
@@ -869,25 +871,26 @@ files:
 - app/services/uffizzi_core/compose_file/builders/variables_builder_service.rb
 - app/services/uffizzi_core/compose_file/config_files_service.rb
 - app/services/uffizzi_core/compose_file/config_option_service.rb
-- app/services/uffizzi_core/compose_file/configs_options_service.rb
 - app/services/uffizzi_core/compose_file/container_service.rb
-- app/services/uffizzi_core/compose_file/continuous_preview_options_service.rb
 - app/services/uffizzi_core/compose_file/dependencies_service.rb
 - app/services/uffizzi_core/compose_file/errors_service.rb
 - app/services/uffizzi_core/compose_file/github_dependencies_service.rb
-- app/services/uffizzi_core/compose_file/ingress_options_service.rb
-- app/services/uffizzi_core/compose_file/secrets_options_service.rb
-- app/services/uffizzi_core/compose_file/services_options/command_service.rb
-- app/services/uffizzi_core/compose_file/services_options/configs_service.rb
-- app/services/uffizzi_core/compose_file/services_options/deploy_service.rb
-- app/services/uffizzi_core/compose_file/services_options/entrypoint_service.rb
-- app/services/uffizzi_core/compose_file/services_options/env_file_service.rb
-- app/services/uffizzi_core/compose_file/services_options/environment_service.rb
-- app/services/uffizzi_core/compose_file/services_options/image_service.rb
-- app/services/uffizzi_core/compose_file/services_options/secrets_service.rb
-- app/services/uffizzi_core/compose_file/services_options_service.rb
+- app/services/uffizzi_core/compose_file/parsers/configs_parser_service.rb
+- app/services/uffizzi_core/compose_file/parsers/continuous_preview_parser_service.rb
+- app/services/uffizzi_core/compose_file/parsers/ingress_parser_service.rb
+- app/services/uffizzi_core/compose_file/parsers/secrets_parser_service.rb
+- app/services/uffizzi_core/compose_file/parsers/services/command_parser_service.rb
+- app/services/uffizzi_core/compose_file/parsers/services/configs_parser_service.rb
+- app/services/uffizzi_core/compose_file/parsers/services/deploy_parser_service.rb
+- app/services/uffizzi_core/compose_file/parsers/services/entrypoint_parser_service.rb
+- app/services/uffizzi_core/compose_file/parsers/services/env_file_parser_service.rb
+- app/services/uffizzi_core/compose_file/parsers/services/environment_parser_service.rb
+- app/services/uffizzi_core/compose_file/parsers/services/healthcheck_parser_service.rb
+- app/services/uffizzi_core/compose_file/parsers/services/image_parser_service.rb
+- app/services/uffizzi_core/compose_file/parsers/services/secrets_parser_service.rb
+- app/services/uffizzi_core/compose_file/parsers/services_parser_service.rb
+- app/services/uffizzi_core/compose_file/parsers/variables_parser_service.rb
 - app/services/uffizzi_core/compose_file/template_service.rb
-- app/services/uffizzi_core/compose_file/variables_service.rb
 - app/services/uffizzi_core/compose_file_service.rb
 - app/services/uffizzi_core/container_service.rb
 - app/services/uffizzi_core/controller_service.rb
@@ -923,6 +926,7 @@ files:
 - db/migrate/20220329123323_rename_project_secrets_to_secrets.rb
 - db/migrate/20220329124542_add_resource_to_secrets.rb
 - db/migrate/20220329143241_remove_project_ref_from_secrets.rb
+- db/migrate/20220419074956_add_health_check_to_containers.rb
 - db/migrate/20220525113412_rename_name_to_uffizzi_containers.rb
 - db/seeds.rb
 - lib/tasks/uffizzi_core_tasks.rake

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