Merge branch 'fix/gb/fix-hidden-bridge-jobs' into 'master'

Fix bridge jobs than can be hidden keys too

Closes gitlab-ce#58358

See merge request gitlab-org/gitlab-ee!9796

ee/changelogs/unreleased/fix-gb-fix-hidden-bridge-jobs.yml

+---
+title: Fix bridge jobs than can be hidden keys too
+merge_request: 9796
+author:
+type: fixed

ee/lib/ee/gitlab/ci/config/entry/jobs.rb

@@ -10,10 +10,12 @@ module EE
 
             override :node_type
             def node_type(name)
-              if bridge?(name)
+              if hidden?(name)
+                ::Gitlab::Ci::Config::Entry::Hidden
+              elsif bridge?(name)
                 ::EE::Gitlab::Ci::Config::Entry::Bridge
               else
-                super
+                ::Gitlab::Ci::Config::Entry::Job
               end
             end
 

ee/spec/lib/gitlab/ci/config/entry/jobs_spec.rb

@@ -5,6 +5,7 @@ describe Gitlab::Ci::Config::Entry::Jobs do
     described_class.new(
       {
         '.hidden_job'.to_sym => { script: 'something' },
+        '.hidden_bridge'.to_sym => { trigger: 'my/project' },
         regular_job: { script: 'something' },
         my_trigger: { trigger: 'my/project' }
       }
@@ -24,6 +25,11 @@ describe Gitlab::Ci::Config::Entry::Jobs do
           .to eq ::Gitlab::Ci::Config::Entry::Hidden
       end
 
+      it 'correctly identifies hidden bridge jobs' do
+        expect(subject.node_type(:'.hidden_bridge'))
+          .to eq ::Gitlab::Ci::Config::Entry::Hidden
+      end
+
       it 'correctly identifies regular jobs' do
         expect(subject.node_type(:regular_job))
           .to eq ::Gitlab::Ci::Config::Entry::Job