Merge branch '332272-reset-job-token-scope' into 'master'

Add ResetJobTokenScopeEnabledAgain migration

See merge request gitlab-org/gitlab!68079

db/post_migrate/20210812145010_reset_job_token_scope_enabled_again.rb

+# frozen_string_literal: true
+
+class ResetJobTokenScopeEnabledAgain < ActiveRecord::Migration[6.1]
+  include Gitlab::Database::MigrationHelpers
+
+  def up
+    with_lock_retries do
+      remove_column :project_ci_cd_settings, :job_token_scope_enabled
+      add_column :project_ci_cd_settings, :job_token_scope_enabled, :boolean, default: false, null: false
+    end
+  end
+
+  def down
+    # no-op
+  end
+end

db/schema_migrations/20210812145010

+24c49a12b6624c8e215e8a0c16b1bc9acc1875e68d3727fc3904b9e2eee1d319
\ No newline at end of file

spec/migrations/reset_job_token_scope_enabled_again_spec.rb

+# frozen_string_literal: true
+
+require 'spec_helper'
+
+require_migration!
+
+RSpec.describe ResetJobTokenScopeEnabledAgain do
+  let(:settings) { table(:project_ci_cd_settings) }
+  let(:projects) { table(:projects) }
+  let(:namespaces) { table(:namespaces) }
+  let(:namespace) { namespaces.create!(name: 'gitlab', path: 'gitlab-org') }
+  let(:project_1) { projects.create!(name: 'proj-1', path: 'gitlab-org', namespace_id: namespace.id)}
+  let(:project_2) { projects.create!(name: 'proj-2', path: 'gitlab-org', namespace_id: namespace.id)}
+
+  before do
+    settings.create!(id: 1, project_id: project_1.id, job_token_scope_enabled: true)
+    settings.create!(id: 2, project_id: project_2.id, job_token_scope_enabled: false)
+  end
+
+  it 'migrates job_token_scope_enabled to be always false' do
+    expect { migrate! }
+      .to change { settings.where(job_token_scope_enabled: false).count }
+      .from(1).to(2)
+  end
+end