From 845dd67b3d0b5ee297171bba437797a18e8711ee Mon Sep 17 00:00:00 2001 From: Marcus Watts Date: Mon, 7 Dec 2020 17:28:59 -0500 Subject: [PATCH] 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 --- src/common/options.cc | 1 - 1 file changed, 1 deletion(-) diff --git a/src/common/options.cc b/src/common/options.cc index 12fd4d747b6d4..efa592471903d 100644 --- a/src/common/options.cc +++ b/src/common/options.cc @@ -7047,7 +7047,6 @@ std::vector