Merge branch 'fix-missing-trigger-short-token-delegate-on-ci-bridge' into 'master'

Fix missing trigger_short_token delegate on Ci::Bridge

See merge request https://gitlab.com/gitlab-org/gitlab/-/merge_requests/150354



Merged-by: drew stachon <730684-drew@users.noreply.gitlab.com>
Approved-by: drew stachon <730684-drew@users.noreply.gitlab.com>
Co-authored-by: Hordur Freyr Yngvason <hfyngvason@gitlab.com>

app/models/ci/bridge.rb

@@ -25,6 +25,8 @@ class Bridge < Ci::Processable
 
     validates :ref, presence: true
 
+    delegate :trigger_short_token, to: :trigger_request, allow_nil: true
+
     # rubocop:disable Cop/ActiveRecordSerialize
     serialize :options
     serialize :yaml_variables, ::Gitlab::Serializer::Ci::Variables

spec/models/ci/bridge_spec.rb

@@ -759,6 +759,24 @@
       expect(bridge.variables.to_hash)
         .to eq(bridge.scoped_variables.concat(bridge.pipeline.persisted_variables).to_hash)
     end
+
+    context 'when bridge is for a trigger request' do
+      let(:trigger) { create(:ci_trigger, project: project) }
+      let(:trigger_request) { create(:ci_trigger_request, pipeline: pipeline, trigger: trigger) }
+
+      let(:predefined_trigger_variables) do
+        [{ key: 'CI_PIPELINE_TRIGGERED', value: 'true', public: true, masked: false },
+        { key: 'CI_TRIGGER_SHORT_TOKEN', value: trigger.short_token, public: true, masked: false }]
+      end
+
+      before do
+        bridge.trigger_request = trigger_request
+      end
+
+      it 'includes the trigger variables' do
+        expect(bridge.variables).to include(*predefined_trigger_variables)
+      end
+    end
   end
 
   describe '#pipeline_variables' do