Merge branch 'id-persisted-env' into 'master'

Always use expanded env name to load persisted env

See merge request gitlab-org/gitlab!37585

app/models/ci/build.rb

@@ -73,7 +73,6 @@ module Ci
       return unless has_environment?
 
       strong_memoize(:persisted_environment) do
-        deployment&.environment ||
         Environment.find_by(name: expanded_environment_name, project: project)
       end
     end
@@ -457,8 +456,7 @@ module Ci
       strong_memoize(:expanded_environment_name) do
         # We're using a persisted expanded environment name in order to avoid
         # variable expansion per request.
-        if Feature.enabled?(:ci_persisted_expanded_environment_name, project, default_enabled: true) &&
-          metadata&.expanded_environment_name.present?
+        if metadata&.expanded_environment_name.present?
           metadata.expanded_environment_name
         else
           ExpandVariables.expand(environment, -> { simple_variables })

changelogs/unreleased/id-persisted-env.yml

+---
+title: Always use expanded env name to load persisted environment
+merge_request: 37585
+author:
+type: performance

ee/spec/policies/ci/build_policy_spec.rb

@@ -15,21 +15,5 @@ RSpec.describe Ci::BuildPolicy do
     subject { user.can?(:update_build, build) }
 
     it_behaves_like 'protected environments access'
-
-    context 'when a pipeline has manual deployment job' do
-      let!(:build) { create(:ee_ci_build, :with_deployment, :manual, :deploy_to_production, pipeline: pipeline) }
-
-      before do
-        project.add_developer(user)
-      end
-
-      it 'does not expand environment name' do
-        allow(build.project).to receive(:protected_environments_feature_available?) { true }
-        expect(build.project).to receive(:protected_environment_accessible_to?)
-        expect(build).not_to receive(:expanded_environment_name)
-
-        subject
-      end
-    end
   end
 end

spec/models/ci/build_spec.rb

@@ -1195,18 +1195,6 @@ RSpec.describe Ci::Build do
 
             is_expected.to eq('review/host')
           end
-
-          context 'when ci_persisted_expanded_environment_name feature flag is disabled' do
-            before do
-              stub_feature_flags(ci_persisted_expanded_environment_name: false)
-            end
-
-            it 'returns an expanded environment name with a list of variables' do
-              expect(build).to receive(:simple_variables).once.and_call_original
-
-              is_expected.to eq('review/host')
-            end
-          end
         end
       end
 
@@ -2009,23 +1997,13 @@ RSpec.describe Ci::Build do
       it { is_expected.to be_nil }
     end
 
-    context 'when build has a start environment' do
-      let(:build) { create(:ci_build, :with_deployment, :deploy_to_production, pipeline: pipeline) }
-
-      it 'does not expand environment name' do
-        expect(build).not_to receive(:expanded_environment_name)
-
-        subject
-      end
-    end
-
     context 'when build has a stop environment' do
-      let(:build) { create(:ci_build, :stop_review_app, pipeline: pipeline) }
+      let(:build) { create(:ci_build, :stop_review_app, pipeline: pipeline, environment: "foo-#{project.default_branch}") }
 
       it 'expands environment name' do
-        expect(build).to receive(:expanded_environment_name)
+        expect(build).to receive(:expanded_environment_name).and_call_original
 
-        subject
+        is_expected.to eq(environment)
       end
     end
   end