From: Marcus Watts <mwatts@redhat.com>
Date: Mon, 7 Dec 2020 22:28:59 +0000 (-0500)
Subject: rgw/kms/vault - relax configuration parsing for rgw_crypt_vault_secret_engine
X-Git-Tag: v17.1.0~2697^2~11
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=845dd67b3d0b5ee297171bba437797a18e8711ee;p=ceph.git

rgw/kms/vault - relax configuration parsing for rgw_crypt_vault_secret_engine

To better manage forwards and backwards compatibility when using vault
transit for rgw object encryption (sse:kms); it is desirable to provide
parameters to control how this works.  It was more attractive to overload
the existing rgw_crypt_vault_secret_engine parameter for this purpose
than to invent one or more all-new parameters.

Additionally, the enum support in the configuration parser looks like
it ought to have helpful syntax checking functionality.  This is not so;
failure to provide a supported enum results in silently replacing that
with the default option, resulting in confusing and non-obvious behavior
that is not at all helpful.

This change removes the enum constraint on rgw_crypt_vault_secret_engine,
allowing for more useful messages from the rgw code, and the possibility
to also provide additional information on the same line.

Fixes: http://tracker.ceph.com/issues/48746
Signed-off-by: Marcus Watts <mwatts@redhat.com>
---

diff --git a/src/common/options.cc b/src/common/options.cc
index 12fd4d747b6..efa59247190 100644
--- a/src/common/options.cc
+++ b/src/common/options.cc
@@ -7047,7 +7047,6 @@ std::vector<Option> get_rgw_options() {
 
 
     Option("rgw_crypt_vault_secret_engine", Option::TYPE_STR, Option::LEVEL_ADVANCED)
-    .set_enum_allowed({"kv", "transit"})
     .set_default("transit")
     .set_description(
         "Vault Secret Engine to be used to retrieve encryption keys.")