Merge branch 'remove-ci_jwt_include_environment-feature-flag' into 'master'

Remove ci_jwt_include_environment feature flag [RUN ALL RSPEC] [RUN AS-IF-FOSS]

See merge request gitlab-org/gitlab!54168

changelogs/unreleased/remove-ci_jwt_include_environment-feature-flag.yml

+---
+title: Add environment to custom CI_JOB_JWT claims
+merge_request: 54168
+author:
+type: added

config/feature_flags/development/ci_jwt_include_environment.yml

----
-name: ci_jwt_include_environment
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/53431
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/321206
-milestone: '13.9'
-type: development
-group: group::configure
-default_enabled: false

lib/gitlab/ci/jwt.rb

@@ -60,7 +60,7 @@ module Gitlab
           ref_protected: build.protected.to_s
         }
 
-        if include_environment_claims?
+        if environment.present?
           fields.merge!(
             environment: environment.name,
             environment_protected: environment_protected?.to_s
@@ -119,10 +119,6 @@ module Gitlab
       def environment_protected?
         false # Overridden in EE
       end
-
-      def include_environment_claims?
-        Feature.enabled?(:ci_jwt_include_environment) && environment.present?
-      end
     end
   end
 end

spec/lib/gitlab/ci/jwt_spec.rb

@@ -114,17 +114,6 @@ RSpec.describe Gitlab::Ci::Jwt do
         expect(payload[:environment]).to eq('production')
         expect(payload[:environment_protected]).to eq('false')
       end
-
-      context ':ci_jwt_include_environment feature flag is disabled' do
-        before do
-          stub_feature_flags(ci_jwt_include_environment: false)
-        end
-
-        it 'does not include environment attributes' do
-          expect(payload).not_to have_key(:environment)
-          expect(payload).not_to have_key(:environment_protected)
-        end
-      end
     end
   end