uffizzi_core 0.3.2 → 0.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4b8ca3af8c38a71fa5553b167c12e7e687798301b53e49763842060c9e84e5cf
-  data.tar.gz: 540f925f4a4670f28aba1cc733b8d2e5e583505fb0e41de48d08106fac683204
+  metadata.gz: b888a8d1591e641bb45316b744f8c7b71352104761401b3388590edb75a1cfee
+  data.tar.gz: efec514c14a589b68da1bb42fe28e7bbdf7569ab6bfc1b4ea22ba8b2b4f14b88
 SHA512:
-  metadata.gz: 3c8d5d89bb09311641a0a15a372a5bc27bd9dc61e5f5d13a648eb9f3285e602600ac32bc60ec0cc7bfef129fa495f2c9e5b7cbefa98397386fb642a1bba214cd
-  data.tar.gz: 8d388c411e83d1e9d9da2c92c8dde788a5212c398e2c8a44aec41392a4034c0ce2b5d8e88659f3c9bdfb94e4c1f48dd369a87c68e11defa849449823161a51cb
+  metadata.gz: 30dc824b604d9c770645a86853f96dd251826d1ddb0e4429b14697fc16a56e891854eac9ac20eeaea12f6aae76f9921ebb2e203517281585a6326eba93483b30
+  data.tar.gz: c732982588d01d53a65cbb090acfd244b5b8c6c5dcf272ad80a3bc37e02797dcf2d5d06df252ffbc2b5e982ff1a165d1b44ba527d95fc38c411103eee41d265e

data/app/controllers/uffizzi_core/api/cli/v1/projects/deployments_controller.rb

@@ -70,17 +70,22 @@ class UffizziCore::Api::Cli::V1::Projects::DeploymentsController < UffizziCore::
   # @response [object<errors: object<title: string>>] 404 Not found
   # @response 401 Not authorized
   def update
-    compose_file, errors = create_temporary_compose_file
+    compose_file, errors = UffizziCore::ComposeFileService.create_temporary_compose(
+      resource_project,
+      current_user,
+      compose_file_params,
+      dependencies_params[:dependencies],
+    )
     return render_invalid_file if compose_file.invalid_file?
     return render_errors(errors) if errors.present?
 
     errors = check_credentials(compose_file)
     return render_errors(errors) if errors.present?
 
-    deployment_id = params[:id]
-    deployment = UffizziCore::DeploymentService.update_from_compose(compose_file, resource_project, current_user, deployment_id)
+    deployment = UffizziCore::Deployment.find(params[:id])
+    updated_deployment = UffizziCore::DeploymentService.update_from_compose(compose_file, resource_project, current_user, deployment)
 
-    respond_with deployment
+    respond_with updated_deployment
   end
 
   # @path [POST] /api/cli/v1/projects/{project_slug}/deployments/{id}/deploy_containers
@@ -126,7 +131,12 @@ class UffizziCore::Api::Cli::V1::Projects::DeploymentsController < UffizziCore::
   def find_or_create_compose_file
     existing_compose_file = resource_project.compose_file
     if compose_file_params.present?
-      create_temporary_compose_file
+      UffizziCore::ComposeFileService.create_temporary_compose(
+        resource_project,
+        current_user,
+        compose_file_params,
+        dependencies_params[:dependencies],
+      )
     else
       raise ActiveRecord::RecordNotFound if existing_compose_file.blank?
 
@@ -135,18 +145,6 @@ class UffizziCore::Api::Cli::V1::Projects::DeploymentsController < UffizziCore::
     end
   end
 
-  def create_temporary_compose_file
-    create_params = {
-      project: resource_project,
-      user: current_user,
-      compose_file_params: compose_file_params,
-      dependencies: dependencies_params[:dependencies] || [],
-    }
-
-    kind = UffizziCore::ComposeFile.kind.temporary
-    UffizziCore::ComposeFileService.create(create_params, kind)
-  end
-
   def check_credentials(compose_file)
     credentials = resource_project.account.credentials
     check_credentials_form = UffizziCore::Api::Cli::V1::ComposeFile::CheckCredentialsForm.new

data/app/jobs/uffizzi_core/config_file/apply_job.rb

@@ -5,7 +5,7 @@ class UffizziCore::ConfigFile::ApplyJob < UffizziCore::ApplicationJob
 
   sidekiq_retry_in do |count, exception|
     case exception
-    when UffizziCore::ControllerService::DeploymentNotFoundError
+    when UffizziCore::DeploymentNotFoundError
       Rails.logger.info("DEPLOYMENT_PROCESS ApplyJob retry deployment_id=#{exception.deployment_id} count=#{count}")
       Settings.controller.resource_create_retry_time
     end
@@ -22,7 +22,7 @@ class UffizziCore::ConfigFile::ApplyJob < UffizziCore::ApplicationJob
     end
 
     unless UffizziCore::ControllerService.deployment_exists?(deployment)
-      raise UffizziCore::ControllerService::DeploymentNotFoundError,
+      raise UffizziCore::DeploymentNotFoundError,
             deployment_id
     end
 

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

@@ -14,14 +14,6 @@ module UffizziCore::Concerns::Models::ActivityItem
 
     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

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

@@ -57,6 +57,7 @@ module UffizziCore::Concerns::Models::Deployment
 
     def after_disable
       clean
+      update!(disabled_at: Time.now)
     end
 
     def after_fail
@@ -67,5 +68,9 @@ module UffizziCore::Concerns::Models::Deployment
       active_containers.each(&:disable!)
       UffizziCore::Deployment::DeleteJob.perform_async(id)
     end
+
+    def preview_url
+      "#{subdomain}.#{Settings.app.managed_dns_zone}"
+    end
   end
 end

data/app/repositories/uffizzi_core/activity_item_repo.rb

@@ -5,5 +5,9 @@ module UffizziCore::ActivityItemRepo
 
   included do
     include UffizziCore::BasicOrderRepo
+
+    scope :docker, -> {
+      where(type: UffizziCore::ActivityItem::Docker.name)
+    }
   end
 end

data/app/repositories/uffizzi_core/compose_file_repo.rb

@@ -4,8 +4,5 @@ module UffizziCore::ComposeFileRepo
   extend ActiveSupport::Concern
 
   included do
-    scope :with_auto_deploy, -> {
-      where(auto_deploy: UffizziCore::ComposeFile::STATE_ENABLED)
-    }
   end
 end

data/app/repositories/uffizzi_core/config_file_repo.rb

@@ -14,27 +14,5 @@ module UffizziCore::ConfigFileRepo
     scope :by_source, ->(source) {
       where(source: source)
     }
-
-    scope :only_used_config_files, -> {
-      select(:id)
-        .where("(id = ANY(ARRAY(select distinct(
-                 jsonb_array_elements(
-                   (
-                     jsonb_array_elements(
-                       jsonb_extract_path_text(
-                         payload::jsonb, 'containers_attributes'
-                       )::jsonb
-                     ) ->> 'container_config_files_attributes'
-                   )::jsonb
-                 ) ->> 'config_file_id'
-               ) as ids from templates)::int[]))")
-        .or(
-          UffizziCore::ConfigFile.where(
-            id: UffizziCore::ContainerConfigFile.where(
-              container_id: UffizziCore::Container.active.select(:id),
-            ).select(:config_file_id),
-          ),
-        )
-    }
   end
 end

data/app/repositories/uffizzi_core/container_repo.rb

@@ -6,7 +6,6 @@ module UffizziCore::ContainerRepo
   included do
     include UffizziCore::BasicOrderRepo
 
-    scope :with_github_repo, -> { includes(:repo).where(repo: { type: UffizziCore::Repo::Github.name }) }
     scope :with_amazon_repo, -> { includes(:repo).where(repo: { type: UffizziCore::Repo::Amazon.name }) }
     scope :with_docker_hub_repo, -> { includes(:repo).where(repo: { type: UffizziCore::Repo::DockerHub.name }) }
 
@@ -14,10 +13,6 @@ module UffizziCore::ContainerRepo
       where(public: true)
     }
 
-    scope :with_enabled_continuously_deploy, -> {
-      where(continuously_deploy: UffizziCore::Container::STATE_ENABLED)
-    }
-
     scope :by_repo_type, ->(type) {
       includes(:repo).where(repo: { type: type })
     }

data/app/repositories/uffizzi_core/credential_repo.rb

@@ -5,19 +5,11 @@ module UffizziCore::CredentialRepo
 
   included do
     scope :by_type, ->(type) { where(type: type) }
-
     scope :docker_hub, -> { by_type(UffizziCore::Credential::DockerHub.name) }
-
-    scope :github, -> { by_type(UffizziCore::Credential::Github.name) }
-
     scope :azure, -> { by_type(UffizziCore::Credential::Azure.name) }
-
     scope :google, -> { by_type(UffizziCore::Credential::Google.name) }
-
     scope :amazon, -> { by_type(UffizziCore::Credential::Amazon.name) }
-
     scope :github_container_registry, -> { by_type(UffizziCore::Credential::GithubContainerRegistry.name) }
-
     scope :deployable, -> {
       by_type([
                 UffizziCore::Credential::DockerHub.name,

data/app/repositories/uffizzi_core/deployment_repo.rb

@@ -7,18 +7,7 @@ module UffizziCore::DeploymentRepo
     scope :with_name, ->(name) {
       where(name: name)
     }
-    scope :by_config_file, ->(config_file) {
-      container_config_files = UffizziCore::ContainerConfigFile.where(config_file: config_file)
-      containers = UffizziCore::Container.where(id: container_config_files.select(:container_id))
-      where(id: containers.select(:deployment_id))
-    }
     scope :with_amazon_repos, -> { includes(containers: [:repo]).where(containers: { repos: { type: UffizziCore::Repo::Amazon.name } }) }
-    scope :by_templates, ->(templates) {
-      where(template: templates).where.not(templates: nil)
-    }
-    scope :with_containers, ->(source, image, tag) {
-      includes(containers: :repo).where(containers: { image: image, tag: tag, repos: { type: source } })
-    }
     scope :existed, -> { where(state: [:active, :failed]) }
   end
 end

data/app/repositories/uffizzi_core/membership_repo.rb

@@ -4,7 +4,6 @@ module UffizziCore::MembershipRepo
   extend ActiveSupport::Concern
 
   included do
-    scope :by_role, ->(role) { where(role: role) }
     scope :by_role_admin, -> { by_role(UffizziCore::Membership.role.admin) }
   end
 end

data/app/repositories/uffizzi_core/repo_repo.rb

@@ -5,6 +5,5 @@ module UffizziCore::RepoRepo
 
   included do
     scope :docker_hub, -> { where(type: UffizziCore::Repo::DockerHub.name) }
-    scope :github, -> { where(type: UffizziCore::Repo::Github.name) }
   end
 end

data/app/repositories/uffizzi_core/template_repo.rb

@@ -4,92 +4,5 @@ module UffizziCore::TemplateRepo
   extend ActiveSupport::Concern
 
   included do
-    scope :by_docker_containers_with_deploy_preview_when_image_tag_is_created, ->(source, image, tag) {
-      general_query = {
-        containers_attributes: [
-          {
-            image: image,
-            repo_attributes: {
-              type: source,
-              deploy_preview_when_image_tag_is_created: true,
-            },
-          },
-        ],
-      }
-
-      excluding_query = {
-        containers_attributes: [
-          {
-            image: image,
-            tag: tag,
-            repo_attributes: {
-              type: source,
-              deploy_preview_when_image_tag_is_created: true,
-            },
-          },
-        ],
-      }
-
-      where('templates.payload @> ?', general_query.to_json).where.not('templates.payload @> ?', excluding_query.to_json)
-    }
-
-    scope :by_docker_containers_with_delete_preview_when_image_tag_is_updated, ->(source, image, tag) {
-      general_query = {
-        containers_attributes: [
-          {
-            image: image,
-            tag: tag,
-            repo_attributes: {
-              type: source,
-              delete_preview_when_image_tag_is_updated: true,
-            },
-          },
-        ],
-      }
-
-      where('templates.payload @> ?', general_query.to_json)
-    }
-
-    scope :by_github_containers_with_deploy_preview_when_pull_request_is_opened, ->(repository_id, branch) {
-      query = {
-        containers_attributes: [
-          {
-            repo_attributes: {
-              type: UffizziCore::Repo::Github.name,
-              repository_id: repository_id,
-              branch: branch,
-              deploy_preview_when_pull_request_is_opened: true,
-            },
-          },
-        ],
-      }
-
-      where('templates.payload @> ?', query.to_json)
-    }
-
-    scope :by_github_containers_with_delete_preview_when_pull_request_is_closed, ->(repository_id, branch) {
-      query = {
-        containers_attributes: [
-          {
-            repo_attributes: {
-              type: UffizziCore::Repo::Github.name,
-              repository_id: repository_id,
-              branch: branch,
-              delete_preview_when_pull_request_is_closed: true,
-            },
-          },
-        ],
-      }
-
-      where('templates.payload @> ?', query.to_json)
-    }
-
-    scope :by_compose_file_kind, ->(kind) {
-      left_joins(:compose_file).where(compose_files: { kind: kind })
-    }
-
-    scope :without_compose, -> {
-      left_joins(:compose_file).where(compose_files: { id: nil })
-    }
   end
 end

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

@@ -6,8 +6,4 @@ class UffizziCore::Api::Cli::V1::ProjectSerializer::DeploymentSerializer < Uffiz
   attributes :id,
              :preview_url,
              :state
-
-  def preview_url
-    UffizziCore::DeploymentService.build_preview_url(object)
-  end
 end

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

@@ -30,10 +30,6 @@ class UffizziCore::Api::Cli::V1::Projects::DeploymentSerializer < UffizziCore::B
     object.containers.active
   end
 
-  def preview_url
-    UffizziCore::DeploymentService.build_preview_url(object)
-  end
-
   def tag
     object.ingress_container&.tag
   end

data/app/services/uffizzi_core/compose_file_service.rb

@@ -87,6 +87,17 @@ class UffizziCore::ComposeFileService
       end
     end
 
+    def create_temporary_compose(resource_project, current_user, compose_file_params, dependencies)
+      create_params = {
+        project: resource_project,
+        user: current_user,
+        compose_file_params: compose_file_params,
+        dependencies: dependencies || [],
+      }
+      kind = UffizziCore::ComposeFile.kind.temporary
+      UffizziCore::ComposeFileService.create(create_params, kind)
+    end
+
     private
 
     def process_compose_file(compose_file_form, params)

data/app/services/uffizzi_core/controller_service.rb

@@ -52,7 +52,7 @@ class UffizziCore::ControllerService
       body = {
         containers: containers,
         credentials: credentials,
-        deployment_url: UffizziCore::DeploymentService.build_preview_url(deployment),
+        deployment_url: deployment.preview_url,
       }
 
       if password_protection_module.present?

data/app/services/uffizzi_core/deployment_service.rb

@@ -29,23 +29,21 @@ class UffizziCore::DeploymentService
       deployment_form
     end
 
-    def update_from_compose(compose_file, project, user, deployment_id)
+    def update_from_compose(compose_file, project, user, deployment)
       deployment_attributes = ActionController::Parameters.new(compose_file.template.payload)
 
       deployment_form = UffizziCore::Api::Cli::V1::Deployment::UpdateForm.new(deployment_attributes)
       deployment_form.assign_dependences!(project, user)
       deployment_form.compose_file = compose_file
 
-      if deployment_form.valid?
-        deployment = UffizziCore::Deployment.find(deployment_id)
+      ActiveRecord::Base.transaction do
         deployment.containers.destroy_all
-        deployment.compose_file.destroy if deployment.compose_file.kind.temporary?
-        deployment.update!(containers: deployment_form.containers, compose_file_id: compose_file.id)
+        deployment.compose_file.destroy! if deployment.compose_file.kind.temporary?
 
-        return deployment
+        deployment.update!(containers: deployment_form.containers, compose_file_id: compose_file.id)
       end
 
-      deployment_form
+      deployment
     end
 
     def deploy_containers(deployment, repeated = false)
@@ -62,7 +60,7 @@ class UffizziCore::DeploymentService
         Rails.logger.info("DEPLOYMENT_PROCESS deployment_id=#{deployment.id} start deploying into controller")
 
         containers = deployment.active_containers
-        containers = add_default_deployment_variables!(containers)
+        containers = add_default_deployment_variables!(containers, deployment)
 
         UffizziCore::ControllerService.deploy_containers(deployment, containers)
       else
@@ -284,13 +282,15 @@ class UffizziCore::DeploymentService
       Digest::SHA256.hexdigest("#{container.id}:#{container.image}")[0, 10]
     end
 
-    def add_default_deployment_variables!(containers)
+    def add_default_deployment_variables!(containers, deployment)
       containers.each do |container|
         envs = []
         if container.port.present? && !UffizziCore::ContainerService.defines_env?(container, 'PORT')
           envs.push('name' => 'PORT', 'value' => container.target_port.to_s)
         end
 
+        envs.push('name' => 'UFFIZZI_URL', 'value' => "https://#{deployment.preview_url}")
+
         container.variables = [] if container.variables.nil?
 
         container.variables.push(*envs)

data/app/services/uffizzi_core/docker_hub_service.rb

@@ -49,13 +49,13 @@ class UffizziCore::DockerHubService
     end
 
     def user_client(credential)
-      if @client.nil?
-        @client = UffizziCore::DockerHubClient.new(credential)
+      return @client if @client&.credential&.username == credential.username
 
-        unless @client.authentificated?
-          Rails.logger.warn("broken credentials, DockerHubService credential_id=#{credential.id}")
-          credential.unauthorize! unless credential.unauthorized?
-        end
+      @client = UffizziCore::DockerHubClient.new(credential)
+
+      unless @client.authentificated?
+        Rails.logger.warn("broken credentials, DockerHubService credential_id=#{credential.id}")
+        credential.unauthorize! unless credential.unauthorized?
       end
 
       @client

data/db/migrate/20220704135629_add_disabled_at_to_deployments.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+class AddDisabledAtToDeployments < ActiveRecord::Migration[6.1]
+  def up
+    change_table :uffizzi_core_deployments do |t|
+      t.datetime :disabled_at
+    end
+    UffizziCore::Deployment.disabled.update_all('disabled_at = updated_at')
+  end
+
+  def down
+    change_table :uffizzi_core_deployments do |t|
+      t.remove :disabled_at
+    end
+  end
+end

data/lib/uffizzi_core/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module UffizziCore
-  VERSION = '0.3.2'
+  VERSION = '0.3.5'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: uffizzi_core
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.5
 platform: ruby
 authors:
 - Josh Thurman
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-07-18 00:00:00.000000000 Z
+date: 2022-07-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aasm
@@ -957,6 +957,7 @@ files:
 - db/migrate/20220419074956_add_health_check_to_containers.rb
 - db/migrate/20220422151523_add_volumes_to_uffizzi_core_containers.rb
 - db/migrate/20220525113412_rename_name_to_uffizzi_containers.rb
+- db/migrate/20220704135629_add_disabled_at_to_deployments.rb
 - db/seeds.rb
 - lib/tasks/uffizzi_core_tasks.rake
 - lib/uffizzi_core.rb