uffizzi_core 0.1.11 → 0.1.12

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
@@ -103,8 +103,9 @@ 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}"
 
-      "pr#{pull_request_payload['id']}-#{deployment_name}.#{repo_name}.#{project.slug}"
+      format_subdomain(subdomain)
     end
 
     def build_docker_continuous_preview_subdomain(deployment)
@@ -114,14 +115,17 @@ 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}"
 
-      "#{image_tag}-#{deployment_name}.#{repo_name}.#{project.slug}"
+      format_subdomain(subdomain)
     end
 
     def build_default_subdomain(deployment)
       deployment_name = name(deployment)
       slug = deployment.project.slug.to_s
-      "#{deployment_name}.#{slug}"
+      subdomain = "#{deployment_name}-#{slug}"
+
+      format_subdomain(subdomain)
     end
 
     def build_preview_url(deployment)
@@ -238,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 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)
 
@@ -291,5 +296,12 @@ 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

@@ -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,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/starter_template_service.rb

@@ -0,0 +1,200 @@
+# 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/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 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)
@@ -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,8 +57,10 @@ 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}'"
   secrets:
     duplicates_exists: Secret with key %{secrets} already exist.
     invalid_key_length: A secret key must be no longer than 256 characters.

data/config/routes.rb

@@ -15,13 +15,23 @@ 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
               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/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.11'
+  VERSION = '0.1.12'
 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, UffizziCore::Credential::DockerHub, UffizziCore::Credential::Google, UffizziCore::Credential::GithubContainerRegistry"
+              "application/json": "type can be one of UffizziCore::Credential::Amazon, UffizziCore::Credential::Azure,\nUffizziCore::Credential::DockerHub, UffizziCore::Credential::Google, UffizziCore::Credential::GithubContainerRegistry"
             }
           },
           "201": {
@@ -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": {
+          "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": {
@@ -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"
+            }
+          }
         }
       }
     }