uffizzi_core 2.1.6 → 2.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2fa718cfa69dcdae6e76cb1808c513aa11ed894fdf7afef9bc383cb23c129e00
-  data.tar.gz: 28679dfd137f683e33a71b64cfbfd7a5589588aa24f31f2a1a6f5284fa6b71d1
+  metadata.gz: 5d1187785a105e2f2d00f7b04e987a2340e7678215329613ca5795c44a3f790e
+  data.tar.gz: d77dfcbdb2a1a49bac3cc8a408d2c025a97fd5699bdc3fdfdf4812e46b708f10
 SHA512:
-  metadata.gz: 693edec5e777a1d96df5e3bff4a871091eaf89de12ae94d53d17591dff7e8ec8a61d9cbcf6d8088aafef68cdb434398b4fb3aac1c3c46f07ee10a10585712ac4
-  data.tar.gz: 9494c2246be34b70fcbe93f88315df66d08a7b13cb234c1a1552719e66b727093f44ad0f96f11d2b1b24002213fc8c5f00b906f4c7b159c5ad4949bdb4891df1
+  metadata.gz: '0229c075de1275071dccdfce43f54b9a37c556d6d704aea3f84ee1dc4351f41dd05f0f5a8c1c4b342abd4fd8ca2c4f054f9930a5702f01609eddf40f0b16cf54'
+  data.tar.gz: 2d3733720b7b39e24e96fe5f9ff993eb99c327e1fd5bcd30a8de65c733989b78f7a1d325408a95a0be0c81ed902ab9fa74c6c35a5436b169c190acb2a6b53ce3

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

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

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

@@ -73,18 +73,6 @@ module UffizziCore::Concerns::Models::Deployment
     def preview_url
       "#{subdomain}.#{Settings.app.managed_dns_zone}"
     end
-
-    def from_actions?
-      from_github_actions? || from_gitlab_actions?
-    end
-
-    def from_github_actions?
-      metadata.dig('labels', 'github', 'repository').present?
-    end
-
-    def from_gitlab_actions?
-      metadata.dig('labels', 'gitlab', 'repo').present?
-    end
   end
   # rubocop:enable Metrics/BlockLength
 end

data/app/services/uffizzi_core/deployment/domain_service.rb

@@ -0,0 +1,62 @@
+# frozen_string_literal: true
+
+class UffizziCore::Deployment::DomainService
+  class << self
+    include UffizziCore::DependencyInjectionConcern
+
+    def build_subdomain(deployment)
+      return domain_module.build_subdomain(deployment) if domain_module.present?
+      return build_docker_continuous_preview_subdomain(deployment) if deployment&.continuous_preview_payload&.fetch('docker', nil).present?
+
+      build_default_subdomain(deployment)
+    end
+
+    def update_subdomain!(deployment)
+      deployment.subdomain = build_subdomain(deployment)
+      deployment.save!
+    end
+
+    private
+
+    def build_docker_continuous_preview_subdomain(deployment)
+      project = deployment.project
+      continuous_preview_payload = deployment.continuous_preview_payload
+      docker_payload = continuous_preview_payload['docker']
+      repo_name = docker_payload['image'].split('/').last
+      image_tag = docker_payload['tag']
+      deployment_name = name(deployment)
+      subdomain = "#{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
+      subdomain = "#{deployment_name}-#{slug}"
+
+      format_subdomain(subdomain)
+    end
+
+    def name(deployment)
+      "deployment-#{deployment.id}"
+    end
+
+    def format_subdomain(full_subdomain_name)
+      # Replace _ to - because RFC 1123 subdomain must consist of lower case alphanumeric characters,
+      # '-' or '.', and must start and end with an alphanumeric character
+      rfc_subdomain = full_subdomain_name.gsub('_', '-')
+      subdomain_length_limit = Settings.deployment.subdomain.length_limit
+      return rfc_subdomain if rfc_subdomain.length <= subdomain_length_limit
+
+      sliced_subdomain = rfc_subdomain.slice(0, subdomain_length_limit)
+      return sliced_subdomain.chop if sliced_subdomain.end_with?('-')
+
+      sliced_subdomain
+    end
+
+    def format_url_safe(name)
+      name.gsub(/ /, '-').gsub(/[^\w-]+/, '-')
+    end
+  end
+end

data/app/services/uffizzi_core/deployment_service.rb

@@ -88,57 +88,6 @@ class UffizziCore::DeploymentService
       compose_file.destroy!
     end
 
-    def build_subdomain(deployment)
-      return build_docker_continuous_preview_subdomain(deployment) if deployment&.continuous_preview_payload&.fetch('docker', nil).present?
-      return build_pull_request_subdomain(deployment) if deployment.from_actions?
-
-      build_default_subdomain(deployment)
-    rescue UffizziCore::Deployment::LabelsNotFoundError
-      build_default_subdomain(deployment)
-    end
-
-    def build_pull_request_subdomain(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)
-      subdomain = "pr-#{pull_request_number}-#{name(deployment)}-#{formatted_repo_name}"
-      format_subdomain(subdomain)
-    end
-
-    def update_subdomain!(deployment)
-      deployment.subdomain = build_subdomain(deployment)
-      deployment.save!
-    end
-
-    def build_docker_continuous_preview_subdomain(deployment)
-      project = deployment.project
-      continuous_preview_payload = deployment.continuous_preview_payload
-      docker_payload = continuous_preview_payload['docker']
-      repo_name = docker_payload['image'].split('/').last
-      image_tag = docker_payload['tag']
-      deployment_name = name(deployment)
-      subdomain = "#{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
-      subdomain = "#{deployment_name}-#{slug}"
-
-      format_subdomain(subdomain)
-    end
-
-    def build_preview_url(deployment)
-      "#{deployment.subdomain}.#{Settings.app.managed_dns_zone}"
-    end
-
-    def build_deployment_url(deployment)
-      "#{Settings.app.host}/projects/#{deployment.project_id}/deployments"
-    end
-
     def all_containers_have_unique_ports?(containers)
       ports = containers.map(&:port).compact
       containers.empty? || ports.size == ports.uniq.size
@@ -190,7 +139,7 @@ class UffizziCore::DeploymentService
 
       deployment.reload
 
-      new_deployment_subdomain = build_subdomain(deployment)
+      new_deployment_subdomain = DomainService.build_subdomain(deployment)
 
       if new_deployment_subdomain != old_deployment_subdomain
         deployment.update(subdomain: new_deployment_subdomain)
@@ -199,10 +148,6 @@ class UffizziCore::DeploymentService
       UffizziCore::Deployment::DeployContainersJob.perform_async(deployment.id)
     end
 
-    def name(deployment)
-      "deployment-#{deployment.id}"
-    end
-
     def pull_request_payload_present?(deployment)
       deployment.continuous_preview_payload.present? && deployment.continuous_preview_payload['pull_request'].present?
     end
@@ -216,7 +161,7 @@ class UffizziCore::DeploymentService
     private
 
     def run_deployment_creation_tasks(deployment)
-      update_subdomain!(deployment)
+      UffizziCore::Deployment::DomainService.update_subdomain!(deployment)
 
       UffizziCore::Deployment::CreateJob.perform_async(deployment.id)
     end
@@ -275,7 +220,7 @@ 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?
+        preview_url = "https://#{domain_module.build_preview_url(deployment)}" if domain_module.present?
         envs.push('name' => 'UFFIZZI_PREDICTABLE_URL', 'value' => preview_url || '')
 
         container.variables = [] if container.variables.nil?
@@ -283,40 +228,5 @@ class UffizziCore::DeploymentService
         container.variables.push(*envs)
       end
     end
-
-    def format_subdomain(full_subdomain_name)
-      # Replace _ to - because RFC 1123 subdomain must consist of lower case alphanumeric characters,
-      # '-' or '.', and must start and end with an alphanumeric character
-      rfc_subdomain = full_subdomain_name.gsub('_', '-')
-      subdomain_length_limit = Settings.deployment.subdomain.length_limit
-      return rfc_subdomain if rfc_subdomain.length <= subdomain_length_limit
-
-      sliced_subdomain = rfc_subdomain.slice(0, subdomain_length_limit)
-      return sliced_subdomain.chop if sliced_subdomain.end_with?('-')
-
-      sliced_subdomain
-    end
-
-    def pull_request_data(deployment)
-      return github_pull_request_data(deployment) if deployment.from_github_actions?
-
-      gitlab_merge_request_data(deployment)
-    end
-
-    def github_pull_request_data(deployment)
-      github_data = deployment.metadata.dig('labels', 'github')
-
-      [:github, github_data['repository'], github_data.dig('event', 'number')]
-    end
-
-    def gitlab_merge_request_data(deployment)
-      gitlab_data = deployment.metadata.dig('labels', 'gitlab')
-
-      [:gitlab, gitlab_data['repo'], gitlab_data.dig('merge_request', 'number')]
-    end
-
-    def format_url_safe(name)
-      name.gsub(/ /, '-').gsub(/[^\w-]+/, '-')
-    end
   end
 end

data/lib/uffizzi_core/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: uffizzi_core
 version: !ruby/object:Gem::Version
-  version: 2.1.6
+  version: 2.1.7
 platform: ruby
 authors:
 - Josh Thurman
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-03-02 00:00:00.000000000 Z
+date: 2023-03-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aasm
@@ -779,7 +779,6 @@ files:
 - app/errors/uffizzi_core/compose_file_error.rb
 - app/errors/uffizzi_core/container_registry_error.rb
 - app/errors/uffizzi_core/deployment/image_pull_error.rb
-- app/errors/uffizzi_core/deployment/labels_not_found_error.rb
 - app/errors/uffizzi_core/deployment_not_found_error.rb
 - app/errors/uffizzi_core/registry_not_supported_error.rb
 - app/forms/uffizzi_core/api/cli/v1/account/credential/check_credential_form.rb
@@ -993,6 +992,7 @@ files:
 - app/services/uffizzi_core/container_registry_service.rb
 - app/services/uffizzi_core/container_service.rb
 - app/services/uffizzi_core/controller_service.rb
+- app/services/uffizzi_core/deployment/domain_service.rb
 - app/services/uffizzi_core/deployment_service.rb
 - app/services/uffizzi_core/logs_service.rb
 - app/services/uffizzi_core/manage_activity_items_service.rb

data/app/errors/uffizzi_core/deployment/labels_not_found_error.rb

@@ -1,4 +0,0 @@
-# frozen_string_literal: true
-
-class UffizziCore::Deployment::LabelsNotFoundError < StandardError
-end