uffizzi_core 2.0.4 → 2.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 00ba39a6ed0a43804f4225204a8a8bead0bd930b6e41d0af55ed5055b0341148
-  data.tar.gz: d0f0312479a28b67acda70fa8cc9294f8296215942cceb795f065d356ee62f83
+  metadata.gz: f1065eeedad42eb66cc223f635c61871171ab68a30bcbf529601630f4cdd75ee
+  data.tar.gz: 4d3a5120d1839a4bf944af27dfcbf501b5b616c909b57af247b9e528c3d4ae62
 SHA512:
-  metadata.gz: 00ae81e5bd57a538db963bf231ef34c6e57b574238c1374208f5f412918fd47746b694fe5b5a8f511f0d3d121b26037f4e02dc1149fe65c2369de72b4ad65550
-  data.tar.gz: e8a42e3edb430950a2eb641b57633f132e49ed94c2e62d51ed4fe48e37c8e9801f69316ff833e0ecafa37848527e9810c2c397a8eeeae4b82a2f9ade1dd62e18
+  metadata.gz: 3e0d2877db2d9c6931db243b3f98e47f71235acc288d47c05dd1e5a6841366f82c9ca07ce2958d3b5052869d7ca495089ac3d1da81d636dff2586dd1a21ab842
+  data.tar.gz: eabdf9cd8a38a86640d3f25ca0ffc735adae9191b4508c50455d9a24e7d5441c762274033737dae4066060525e7f9953af656a0465cc7418d3d5a3ec324c6f52

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

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

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

@@ -3,6 +3,7 @@
 module UffizziCore::Concerns::Models::Deployment
   extend ActiveSupport::Concern
 
+  # rubocop:disable Metrics/BlockLength
   included do
     include AASM
     include UffizziCore::StateMachineConcern
@@ -72,5 +73,18 @@ 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_service.rb

@@ -89,19 +89,18 @@ class UffizziCore::DeploymentService
 
     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?
 
-      github_metadata = deployment.metadata.dig('labels', 'github')
-      return build_pull_request_subdomain(deployment) if
-        github_metadata&.dig('pull_request', 'number').present? && github_metadata&.dig('repository').present?
-
+      build_default_subdomain(deployment)
+    rescue UffizziCore::Deployment::LabelsNotFoundError
       build_default_subdomain(deployment)
     end
 
     def build_pull_request_subdomain(deployment)
-      github_payload = deployment.metadata.dig('labels', 'github')
-      repo_name = github_payload['repository'].split('/').last.downcase
-      pull_request_number = github_payload['pull_request']['number']
-      subdomain = "pr-#{pull_request_number}-#{name(deployment)}-#{repo_name}-#{deployment.project.slug}"
+      repo_name, pull_request_number = pull_request_data(deployment)
+      raise UffizziCore::Deployment::LabelsNotFoundError if repo_name.nil? || pull_request_number.nil?
+
+      subdomain = "pr-#{pull_request_number}-#{name(deployment)}-#{repo_name.downcase}"
       format_subdomain(subdomain)
     end
 
@@ -291,5 +290,23 @@ class UffizziCore::DeploymentService
 
       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_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')]
+    end
   end
 end

data/lib/uffizzi_core/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: uffizzi_core
 version: !ruby/object:Gem::Version
-  version: 2.0.4
+  version: 2.0.5
 platform: ruby
 authors:
 - Josh Thurman
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-10-18 00:00:00.000000000 Z
+date: 2022-10-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aasm
@@ -774,6 +774,7 @@ files:
 - app/errors/uffizzi_core/compose_file/parse_error.rb
 - app/errors/uffizzi_core/compose_file/secrets_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/forms/uffizzi_core/api/cli/v1/account/credential/check_credential_form.rb
 - app/forms/uffizzi_core/api/cli/v1/account/credential/create_form.rb