Merge branch 'fix-nil-deployable-exception-on-job-controller-show' into 'master'

Fix users cannot access job detail page when deployable does not exist

Closes #65216

See merge request gitlab-org/gitlab-ce!32247

4 files changed, 23 insertions, 1 deletions

diff --git a/app/serializers/deployment_entity.rb b/app/serializers/deployment_entity.rb
index 8b967459173..94a827658f0 100644
--- a/app/serializers/deployment_entity.rb
+++ b/app/serializers/deployment_entity.rb
@@ -23,7 +23,7 @@ class DeploymentEntity < Grape::Entity
   expose :last?
   expose :deployed_by, as: :user, using: UserEntity
 
-  expose :deployable do |deployment, opts|
+  expose :deployable, if: -> (deployment) { deployment.deployable.present? } do |deployment, opts|
     deployment.deployable.yield_self do |deployable|
       if include_details?
         JobEntity.represent(deployable, opts)
diff --git a/changelogs/unreleased/fix-nil-deployable-exception-on-job-controller-show.yml b/changelogs/unreleased/fix-nil-deployable-exception-on-job-controller-show.yml
new file mode 100644
index 00000000000..b79317e3ab7
--- /dev/null
+++ b/changelogs/unreleased/fix-nil-deployable-exception-on-job-controller-show.yml
@@ -0,0 +1,5 @@
+---
+title: Fix users cannot access job detail page when deployable does not exist
+merge_request: 32247
+author:
+type: fixed
diff --git a/spec/features/projects/jobs_spec.rb b/spec/features/projects/jobs_spec.rb
index 8ed420300af..eb52df2ff79 100644
--- a/spec/features/projects/jobs_spec.rb
+++ b/spec/features/projects/jobs_spec.rb
@@ -609,6 +609,14 @@ describe 'Jobs', :clean_gitlab_redis_shared_state do
           expect(find('.js-environment-link')['href']).to match("environments/#{environment.id}")
           expect(find('.js-job-deployment-link')['href']).to include(second_deployment.deployable.project.path, second_deployment.deployable_id.to_s)
         end
+
+        context 'when deployment does not have a deployable' do
+          let!(:second_deployment) { create(:deployment, :success, environment: environment, deployable: nil) }
+
+          it 'has an empty href' do
+            expect(find('.js-job-deployment-link')['href']).to be_empty
+          end
+        end
       end
 
       context 'job failed to deploy' do
diff --git a/spec/serializers/deployment_entity_spec.rb b/spec/serializers/deployment_entity_spec.rb
index 1b19eac9a97..79f89dc1a9c 100644
--- a/spec/serializers/deployment_entity_spec.rb
+++ b/spec/serializers/deployment_entity_spec.rb
@@ -36,6 +36,15 @@ describe DeploymentEntity do
     expect(subject).to include(:deployed_at)
   end
 
+  context 'when deployable is nil' do
+    let(:entity) { described_class.new(deployment, request: request, deployment_details: false) }
+    let(:deployment) { create(:deployment, deployable: nil, project: project) }
+
+    it 'does not expose deployable entry' do
+      expect(subject).not_to include(:deployable)
+    end
+  end
+
   context 'when the pipeline has another manual action' do
     let(:other_build) { create(:ci_build, :manual, name: 'another deploy', pipeline: pipeline) }
     let!(:other_deployment) { create(:deployment, deployable: other_build) }