uffizzi_core 2.0.25 → 2.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: aa7005a5115382ee954986597b0deaf564a5982ce41f8fdffd3724c4d1a1a677
-  data.tar.gz: f051ca13a33f8aa04a884606b9e3c937c953dccfa5abc67ade1b9021b9667487
+  metadata.gz: 9ff3664e2d0ace5264aea60fd9a6c2b6f592632b3e5f844411a230941ee953da
+  data.tar.gz: b41024e92002bbac34eb430fd6da45740c921c595515b4c8e82b6d184a04a421
 SHA512:
-  metadata.gz: 4b39d25336b04cee50b41df36552c5b911999e1a1db796a47c39fa9b65ebc467ff8b62daf343d873f3b4db5f22c77780c35cdd16d543b8aa5b99c4bc397e1a8c
-  data.tar.gz: ad8187b28f881fb4013bccd56b6eda7cf49ecfc553028cb6c75b8bb0552bc434a83c3e0c4b0ba83f13d90d82f3affadd38a93f7cd28aa3641266dfcb639cee9f
+  metadata.gz: 2af201493e2a9fb7a6cc8793586bfd8881270cb13fe76804e35dda0d5ecfff87d9d608dbdc54276ba2db7839208c38baa8e861fa15d692d5b322f81c4bda916b
+  data.tar.gz: 9f41c789e248872b742cfda598b40c38b3a9e8298d86fa890c80e56943440de19e74e8ab904e482b3d03d1562f99bc91ce475b3b6cb11459346f0d2eefc8af98

data/app/controllers/concerns/uffizzi_core/dependency_injection_concern.rb

@@ -37,6 +37,12 @@ module UffizziCore::DependencyInjectionConcern
     module_class(:notification_module)
   end
 
+  def deployment_module
+    return unless module_exists?(:deployment_module)
+
+    module_class(:deployment_module)
+  end
+
   private
 
   def module_exists?(module_name)

data/app/controllers/uffizzi_core/api/cli/v1/projects/deployments/activity_items_controller.rb

@@ -15,7 +15,7 @@ class UffizziCore::Api::Cli::V1::Projects::Deployments::ActivityItemsController
   # @response 401 Not authorized
   # @response 404 Not found
   def index
-    deployment = resource_project.deployments.existed.find(params[:deployment_id])
+    deployment = resource_project.deployments.enabled.find(params[:deployment_id])
 
     unless deployment.active?
       return render json: { errors: { title: [I18n.t('deployment.invalid_state', id: deployment.id, state: deployment.state)] } },

data/app/controllers/uffizzi_core/api/cli/v1/projects/deployments/containers_controller.rb

@@ -23,7 +23,7 @@ class UffizziCore::Api::Cli::V1::Projects::Deployments::ContainersController <
   end
 
   def k8s_container_description
-    deployment ||= resource_project.deployments.existed.find(params[:deployment_id])
+    deployment ||= resource_project.deployments.enabled.find(params[:deployment_id])
     container = deployment.containers.active.find_by!(service_name: params[:container_name])
     last_state = UffizziCore::ContainerService.last_state(container)
 

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

@@ -168,7 +168,7 @@ class UffizziCore::Api::Cli::V1::Projects::DeploymentsController < UffizziCore::
   end
 
   def deployments
-    @deployments ||= resource_project.deployments.existed
+    @deployments ||= resource_project.deployments.enabled
   end
 
   def deployment_params

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

@@ -19,6 +19,7 @@ module UffizziCore::Concerns::Models::User
     has_many :accounts, through: :memberships
     has_many :user_projects, dependent: :destroy
     has_many :projects, through: :user_projects
+    has_many :deployments, class_name: UffizziCore::Deployment.name, foreign_key: :deployed_by_id, dependent: :nullify
 
     has_one_attached :avatar
 
@@ -32,14 +33,6 @@ module UffizziCore::Concerns::Models::User
       accounts.find_by(kind: UffizziCore::Account.kind.personal)
     end
 
-    def active_projects
-      projects.active
-    end
-
-    def deployments
-      UffizziCore::Deployment.where(project_id: active_projects)
-    end
-
     def full_name
       "#{first_name} #{last_name}"
     end

data/app/repositories/uffizzi_core/deployment_repo.rb

@@ -8,7 +8,7 @@ module UffizziCore::DeploymentRepo
       where(name: name)
     }
     scope :with_amazon_repos, -> { includes(containers: [:repo]).where(containers: { repos: { type: UffizziCore::Repo::Amazon.name } }) }
-    scope :existed, -> { where(state: [:active, :failed]) }
+    scope :enabled, -> { where(state: [:active, :failed]) }
     scope :active_for_credential_id, ->(credential_id) {
       active.joins(project: :credentials).merge(UffizziCore::Project.active).where(credentials: { id: credential_id })
     }

data/app/services/uffizzi_core/deployment_service.rb

@@ -12,6 +12,8 @@ class UffizziCore::DeploymentService
   }.freeze
 
   class << self
+    include UffizziCore::DependencyInjectionConcern
+
     def create_from_compose(compose_file, project, user, params)
       deployment_attributes = ActionController::Parameters.new(compose_file.template.payload)
       deployment_form = UffizziCore::Api::Cli::V1::Deployment::CreateForm.new(deployment_attributes)
@@ -97,7 +99,7 @@ class UffizziCore::DeploymentService
     end
 
     def build_pull_request_subdomain(deployment)
-      repo_name, pull_request_number = pull_request_data(deployment)
+      _, repo_name, pull_request_number = pull_request_data(deployment)
       raise UffizziCore::Deployment::LabelsNotFoundError if repo_name.nil? || pull_request_number.nil?
 
       formatted_repo_name = format_url_safe(repo_name.split('/').last.downcase)
@@ -274,6 +276,9 @@ class UffizziCore::DeploymentService
         envs.push('name' => 'UFFIZZI_URL', 'value' => "https://#{deployment.preview_url}")
         envs.push('name' => 'UFFIZZI_DOMAIN', 'value' => deployment.preview_url)
 
+        preview_url = "https://#{deployment_module.build_preview_url(deployment)}" if deployment_module.present?
+        envs.push('name' => 'UFFIZZI_PREDICTABLE_URL', 'value' => preview_url || '')
+
         container.variables = [] if container.variables.nil?
 
         container.variables.push(*envs)
@@ -302,13 +307,13 @@ class UffizziCore::DeploymentService
     def github_pull_request_data(deployment)
       github_data = deployment.metadata.dig('labels', 'github')
 
-      [github_data['repository'], github_data.dig('event', 'number')]
+      [:github, github_data['repository'], github_data.dig('event', 'number')]
     end
 
     def gitlab_merge_request_data(deployment)
       gitlab_data = deployment.metadata.dig('labels', 'gitlab')
 
-      [gitlab_data['repo'], gitlab_data.dig('merge_request', 'number')]
+      [:gitlab, gitlab_data['repo'], gitlab_data.dig('merge_request', 'number')]
     end
 
     def format_url_safe(name)

data/lib/uffizzi_core/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: uffizzi_core
 version: !ruby/object:Gem::Version
-  version: 2.0.25
+  version: 2.1.1
 platform: ruby
 authors:
 - Josh Thurman
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-01-26 00:00:00.000000000 Z
+date: 2023-02-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aasm