Merge branch 'russell/improve-amazon-settings-text' into 'master'

Improve UI text of admin settings page - General -> Amazon EKS

See merge request gitlab-org/gitlab!81114

app/views/admin/application_settings/_eks.html.haml

@@ -22,15 +22,15 @@
           = f.label :eks_account_id, _('Account ID'), class: 'label-bold'
           = f.text_field :eks_account_id, class: 'form-control gl-form-input'
         .form-group
-          = f.label :eks_access_key_id, _('Access key ID'), class: 'label-bold'
+          = f.label :eks_access_key_id, _('AWS access key ID (Optional)'), class: 'label-bold'
           = f.text_field :eks_access_key_id, class: 'form-control gl-form-input'
           .form-text.text-muted
-            = _('AWS Access Key. Only required if not using role instance credentials')
+            = _('Only required if not using role instance credentials.')
 
         .form-group
-          = f.label :eks_secret_access_key, _('Secret access key'), class: 'label-bold'
+          = f.label :eks_secret_access_key, _('AWS secret access key (Optional)'), class: 'label-bold'
           = f.password_field :eks_secret_access_key, autocomplete: 'off', class: 'form-control gl-form-input'
           .form-text.text-muted
-            = _('AWS Secret Access Key. Only required if not using role instance credentials')
+            = _('Only required if not using role instance credentials.')
 
       = f.submit _('Save changes'), class: "gl-button btn btn-confirm"

locale/gitlab.pot

@@ -1773,13 +1773,13 @@ msgstr ""
 msgid "AWS Access Key"
 msgstr ""
 
-msgid "AWS Access Key. Only required if not using role instance credentials"
+msgid "AWS Secret Access Key"
 msgstr ""
 
-msgid "AWS Secret Access Key"
+msgid "AWS access key ID (Optional)"
 msgstr ""
 
-msgid "AWS Secret Access Key. Only required if not using role instance credentials"
+msgid "AWS secret access key (Optional)"
 msgstr ""
 
 msgid "AWS service error: %{error}"
@@ -1839,9 +1839,6 @@ msgstr ""
 msgid "Access granted"
 msgstr ""
 
-msgid "Access key ID"
-msgstr ""
-
 msgid "Access requests"
 msgstr ""
 
@@ -25611,6 +25608,9 @@ msgstr ""
 msgid "Only reCAPTCHA v2 is supported:"
 msgstr ""
 
+msgid "Only required if not using role instance credentials."
+msgstr ""
+
 msgid "Only use lowercase letters, numbers, and underscores."
 msgstr ""
 
@@ -32290,9 +32290,6 @@ msgstr ""
 msgid "Secret Detection"
 msgstr ""
 
-msgid "Secret access key"
-msgstr ""
-
 msgid "Secret token"
 msgstr ""
 

spec/views/admin/application_settings/_eks.html.haml_spec.rb

@@ -16,8 +16,8 @@ RSpec.describe 'admin/application_settings/_eks' do
   shared_examples 'EKS secret access key input' do
     it 'renders an empty password field' do
       render
-      expect(rendered).to have_field('Secret access key', type: 'password')
-      expect(page.find_field('Secret access key').value).to be_blank
+      expect(rendered).to have_field('AWS secret access key (Optional)', type: 'password')
+      expect(page.find_field('AWS secret access key (Optional)').value).to be_blank
     end
   end