Remove DeploymentService edge cases

2 files changed, 4 insertions, 9 deletions

diff --git a/app/models/deployment.rb b/app/models/deployment.rb
index 92c7311014a..f5fdf285522 100644
--- a/app/models/deployment.rb
+++ b/app/models/deployment.rb
@@ -85,11 +85,7 @@ class Deployment < ApplicationRecord
   end
 
   def cluster
-    platform = project.deployment_platform(environment: environment.name)
-
-    if platform.present? && platform.respond_to?(:cluster)
-      platform.cluster
-    end
+    project.deployment_platform(environment: environment.name)&.cluster
   end
 
   def execute_hooks
diff --git a/app/services/prometheus/adapter_service.rb b/app/services/prometheus/adapter_service.rb
index 3be958e1613..2bdd47caf7c 100644
--- a/app/services/prometheus/adapter_service.rb
+++ b/app/services/prometheus/adapter_service.rb
@@ -27,12 +27,11 @@ module Prometheus
     end
 
     def cluster_prometheus_adapter
-      return unless deployment_platform.respond_to?(:cluster)
+      application = deployment_platform&.cluster&.application_prometheus
 
-      cluster = deployment_platform.cluster
-      return unless cluster.application_prometheus&.available?
+      return unless application&.available?
 
-      cluster.application_prometheus
+      application
     end
   end
 end