Merge branch 'sh-allow-key-id-in-params' into 'master'

Filter any parameters ending with "key" in logs

See merge request gitlab-org/gitlab-ce!21688

changelogs/unreleased/sh-allow-key-id-in-params.yml

+---
+title: Filter any parameters ending with "key" in logs
+merge_request: 21688
+author:
+type: changed

config/application.rb

@@ -85,6 +85,7 @@ module Gitlab
     # - Any parameter ending with `token`
     # - Any parameter containing `password`
     # - Any parameter containing `secret`
+    # - Any parameter ending with `key`
     # - Two-factor tokens (:otp_attempt)
     # - Repo/Project Import URLs (:import_url)
     # - Build traces (:trace)
@@ -92,15 +93,13 @@ module Gitlab
     # - GitLab Pages SSL cert/key info (:certificate, :encrypted_key)
     # - Webhook URLs (:hook)
     # - Sentry DSN (:sentry_dsn)
-    # - Deploy keys (:key)
     # - File content from Web Editor (:content)
-    config.filter_parameters += [/token$/, /password/, /secret/]
+    config.filter_parameters += [/token$/, /password/, /secret/, /key$/]
     config.filter_parameters += %i(
       certificate
       encrypted_key
       hook
       import_url
-      key
       otp_attempt
       sentry_dsn
       trace