uffizzi_core 2.1.0 → 2.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c131ada77fc0357b6617553f51247c1b9194635a3b741b6f17b6ac901921c3ff
-  data.tar.gz: 30a013a396f81d5cbfb13932222dbd020fd3b88e94511119266970114ae9d0d8
+  metadata.gz: 50974b21b408b32cfa4a51906d55860f0aa15e9b449a08a90ec408b3ea11a471
+  data.tar.gz: 899cef8ae2a7935c479ad73aade6d044588ad604c632b29be6c9a8a6185805d4
 SHA512:
-  metadata.gz: 0060c147865cb0bf5f530159e5022dee28b5994d6a20a3b67d235482e1a398fa93228029a44ae22e31fea0c241f723c48f9a51c0597dd4c1b5db62f22083088d
-  data.tar.gz: 91fb0c6c8dc3e3fc8fd1e85ea0de05e0a43597f5c89090f8789bb1c57fb93efcad2bdbb959c4c005179d7d4db959f9da45822a73eb65f1379773492fa885f785
+  metadata.gz: 41408ab5b2dee546872ff3d6a1d8f4c341edb62fc5b1822951ee3237158293e4cd4283b4d326e33878566c521f609409a34a8b3ed376f2e9604f908e8bd71248
+  data.tar.gz: 7d52b81047dfbf542f914d15bfd896d45e2c95f763cff9fd40f7f7e70356f30df77dc064b2705e778981858e856992cd16b4dcb261119a7e85cca948ccb4f802

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/lib/uffizzi_core/concerns/models/template.rb

@@ -18,7 +18,6 @@ module UffizziCore::Concerns::Models::Template
     enumerize :creation_source, in: [:manual, :compose_file, :system], predicates: true, scope: true
 
     validates :name, presence: true
-    validates :name, uniqueness: { scope: :project }, if: -> { compose_file.blank? || compose_file.kind.main? }
 
     def valid_containers_memory_limit?
       containers_attributes = payload['containers_attributes']

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/services/uffizzi_core/deployment_service.rb

@@ -99,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)
@@ -276,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)
@@ -304,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.1.0'
+  VERSION = '2.1.2'
 end

metadata

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