Merge pull request ceph#59249 from pritha-srivastava/wip-rgw-sts-err-message

cbodley · web-flow · commit 15cbae0a2745 · 2024-08-28T11:27:55.000-04:00
rgw/sts: correcting the error message returned for an sts key

Reviewed-by: Casey Bodley &lt;cbodley@redhat.com&gt;
diff --git a/src/rgw/rgw_sts.cc b/src/rgw/rgw_sts.cc
@@ -80,7 +80,7 @@ int Credentials::generateCredentials(const DoutPrefixProvider *dpp,
   buffer::ptr secret(secret_s.c_str(), secret_s.length());
   int ret = 0;
   if (ret = cryptohandler->validate_secret(secret); ret < 0) {
-    ldpp_dout(dpp, 0) << "ERROR: Invalid rgw sts key, please ensure its length is 16" << dendl;
+    ldpp_dout(dpp, 0) << "ERROR: Invalid rgw sts key, please ensure it is an alphanumeric key of length 16" << dendl;
     return ret;
   }
   string error;

Original file line number	Diff line number	Diff line change
`@@ -80,7 +80,7 @@ int Credentials::generateCredentials(const DoutPrefixProvider *dpp,`
`80`	`80`	`buffer::ptr secret(secret_s.c_str(), secret_s.length());`
`81`	`81`	`int ret = 0;`
`82`	`82`	`if (ret = cryptohandler->validate_secret(secret); ret < 0) {`
`83`		`- ldpp_dout(dpp, 0) << "ERROR: Invalid rgw sts key, please ensure its length is 16" << dendl;`
	`83`	`+ ldpp_dout(dpp, 0) << "ERROR: Invalid rgw sts key, please ensure it is an alphanumeric key of length 16" << dendl;`
`84`	`84`	`return ret;`
`85`	`85`	`}`
`86`	`86`	`string error;`