uffizzi_core 0.3.4 → 0.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 34e197de1424923114ad82fd43fa818b4841058bd0681e3320c4ba4e2352c452
-  data.tar.gz: 4b94e04a11bcef28b4fc732fbf0c0d2f51a6512b609fbbc8cbe9b52d2123fd4f
+  metadata.gz: b888a8d1591e641bb45316b744f8c7b71352104761401b3388590edb75a1cfee
+  data.tar.gz: efec514c14a589b68da1bb42fe28e7bbdf7569ab6bfc1b4ea22ba8b2b4f14b88
 SHA512:
-  metadata.gz: 97b2382ee4af9787273b595d1d8840332c51dba8d861cc7752a773137ab1e2639129219ad361ef1f752e5cc88e3a3524b142c84fca22e4076f4da273c461e8ae
-  data.tar.gz: 195a8f935b0866004c1e6a0a7beb9b42f613042d36f66f2331f19bb86c5c8bb67df5f190d8a42ab5d97c42ddb9fb51685d9082e5370e8edc3fcf51cf872e9e11
+  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/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/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/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/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)

data/lib/uffizzi_core/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module UffizziCore
-  VERSION = '0.3.4'
+  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.4
+  version: 0.3.5
 platform: ruby
 authors:
 - Josh Thurman
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-07-21 00:00:00.000000000 Z
+date: 2022-07-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aasm