Merge branch '348307_deprecate_static_objects_external_storage_auth_token' into 'master'

Deprecate plaintext field static_objects_external_storage_auth_token

See merge request gitlab-org/gitlab!77579

app/models/application_setting.rb

@@ -9,6 +9,7 @@ class ApplicationSetting < ApplicationRecord
   include Sanitizable
 
   ignore_columns %i[elasticsearch_shards elasticsearch_replicas], remove_with: '14.4', remove_after: '2021-09-22'
+  ignore_columns %i[static_objects_external_storage_auth_token], remove_with: '14.9', remove_after: '2022-03-22'
 
   INSTANCE_REVIEW_MIN_USERS = 50
   GRAFANA_URL_ERROR_MESSAGE = 'Please check your Grafana URL setting in ' \
@@ -21,7 +22,7 @@ class ApplicationSetting < ApplicationRecord
 
   add_authentication_token_field :runners_registration_token, encrypted: -> { Feature.enabled?(:application_settings_tokens_optional_encryption) ? :optional : :required }
   add_authentication_token_field :health_check_access_token
-  add_authentication_token_field :static_objects_external_storage_auth_token, encrypted: :optional
+  add_authentication_token_field :static_objects_external_storage_auth_token, encrypted: :required
 
   belongs_to :self_monitoring_project, class_name: "Project", foreign_key: 'instance_administration_project_id'
   belongs_to :push_rule

spec/models/application_setting_spec.rb

@@ -1244,7 +1244,7 @@ RSpec.describe ApplicationSetting do
     end
   end
 
-  describe '#static_objects_external_storage_auth_token=' do
+  describe '#static_objects_external_storage_auth_token=', :aggregate_failures do
     subject { setting.static_objects_external_storage_auth_token = token }
 
     let(:token) { 'Test' }
@@ -1268,5 +1268,20 @@ RSpec.describe ApplicationSetting do
         expect(setting.static_objects_external_storage_auth_token).to be_nil
       end
     end
+
+    context 'with plaintext token only' do
+      let(:token) { '' }
+
+      it 'ignores the plaintext token' do
+        subject
+
+        ApplicationSetting.update_all(static_objects_external_storage_auth_token: 'Test')
+
+        setting.reload
+        expect(setting[:static_objects_external_storage_auth_token]).to be_nil
+        expect(setting[:static_objects_external_storage_auth_token_encrypted]).to be_nil
+        expect(setting.static_objects_external_storage_auth_token).to be_nil
+      end
+    end
   end
 end