Merge branch 'include-actual-limit-in-pipeline-errors' into 'master'

Include actual limit in pipeline errors

See merge request gitlab-org/gitlab!48710

changelogs/unreleased/include-actual-limit-in-pipeline-errors.yml

+---
+title: Include actual limit in pipeline limit errors
+merge_request: 48710
+author:
+type: changed

ee/lib/ee/gitlab/ci/pipeline/quota/activity.rb

@@ -21,25 +21,24 @@ module EE
             def exceeded?
               return false unless enabled?
 
-              excessive_pipelines_count > 0
+              alive_pipelines_count > ci_active_pipelines_limit
             end
 
             def message
               return unless exceeded?
 
-              'Active pipelines limit exceeded by ' \
-                "#{pluralize(excessive_pipelines_count, 'pipeline')}!"
+              'Project has too many active pipelines! ' \
+                "There are #{pluralize(alive_pipelines_count, 'active pipeline')}, "\
+                "but the limit is #{ci_active_pipelines_limit}."
             end
 
             private
 
-            def excessive_pipelines_count
-              @excessive ||= alive_pipelines_count - ci_active_pipelines_limit
-            end
-
             def alive_pipelines_count
+              strong_memoize(:alive_pipelines_limit) do
                 @project.ci_pipelines.alive.count
               end
+            end
 
             def ci_active_pipelines_limit
               strong_memoize(:ci_active_pipelines_limit) do

ee/lib/ee/gitlab/ci/pipeline/quota/job_activity.rb

@@ -21,14 +21,15 @@ module EE
             def exceeded?
               return false unless enabled?
 
-              excessive_jobs_count > 0
+              jobs_in_alive_pipelines_count > ci_active_jobs_limit
             end
 
             def message
               return unless exceeded?
 
-              'Active jobs limit exceeded by ' \
-                "#{pluralize(excessive_jobs_count, 'job')} in the past 24 hours!"
+              'Project has too many active jobs created in the last 24 hours! ' \
+                "There are #{pluralize(jobs_in_alive_pipelines_count, 'active job')}, " \
+                "but the limit is #{ci_active_jobs_limit}."
             end
 
             private
@@ -39,8 +40,10 @@ module EE
 
             # rubocop: disable CodeReuse/ActiveRecord
             def jobs_in_alive_pipelines_count
+              strong_memoize(:jobs_in_alive_pipelines_count) do
                 @project.all_pipelines.created_after(24.hours.ago).alive.joins(:builds).count
               end
+            end
             # rubocop: enable CodeReuse/ActiveRecord
 
             def ci_active_jobs_limit

ee/lib/ee/gitlab/ci/pipeline/quota/size.rb

@@ -22,22 +22,17 @@ module EE
             def exceeded?
               return false unless enabled?
 
-              excessive_seeds_count > 0
+              seeds_size > ci_pipeline_size_limit
             end
 
             def message
               return unless exceeded?
 
-              'Pipeline size limit exceeded by ' \
-                "#{pluralize(excessive_seeds_count, 'job')}!"
+              "Pipeline has too many jobs! Requested #{seeds_size}, but the limit is #{ci_pipeline_size_limit}."
             end
 
             private
 
-            def excessive_seeds_count
-              @excessive ||= seeds_size - ci_pipeline_size_limit
-            end
-
             def ci_pipeline_size_limit
               strong_memoize(:ci_pipeline_size_limit) do
                 @namespace.actual_limits.ci_pipeline_size

ee/spec/lib/ee/gitlab/ci/pipeline/quota/activity_spec.rb

@@ -83,7 +83,7 @@ RSpec.describe EE::Gitlab::Ci::Pipeline::Quota::Activity do
 
       it 'returns info about pipeline activity limit exceeded' do
         expect(subject.message)
-          .to eq "Active pipelines limit exceeded by 2 pipelines!"
+          .to eq "Project has too many active pipelines! There are 3 active pipelines, but the limit is 1."
       end
     end
   end

ee/spec/lib/ee/gitlab/ci/pipeline/quota/job_activity_spec.rb

@@ -119,7 +119,7 @@ RSpec.describe EE::Gitlab::Ci::Pipeline::Quota::JobActivity do
 
       it 'returns info about pipeline activity limit exceeded' do
         expect(subject.message)
-          .to eq "Active jobs limit exceeded by 2 jobs in the past 24 hours!"
+          .to eq "Project has too many active jobs created in the last 24 hours! There are 3 active jobs, but the limit is 1."
       end
     end
   end

ee/spec/lib/ee/gitlab/ci/pipeline/quota/size_spec.rb

@@ -86,7 +86,7 @@ RSpec.describe EE::Gitlab::Ci::Pipeline::Quota::Size do
 
       it 'returns infor about pipeline size limit exceeded' do
         expect(subject.message)
-          .to eq "Pipeline size limit exceeded by 1 job!"
+          .to eq "Pipeline has too many jobs! Requested 2, but the limit is 1."
       end
     end
   end

ee/spec/lib/gitlab/ci/pipeline/chain/limit/size_spec.rb

@@ -64,7 +64,7 @@ RSpec.describe ::Gitlab::Ci::Pipeline::Chain::Limit::Size do
         subject
 
         expect(pipeline.errors.to_a)
-          .to include 'Pipeline size limit exceeded by 1 job!'
+          .to include 'Pipeline has too many jobs! Requested 2, but the limit is 1.'
       end
 
       it 'logs the error' do