MB-67316 Rename setting-encryption --all-bucket-usage value

Change the --all-bucket-usage value from 'bucket-encryption-*' to
'bucket-encryption' to match the change made in ns_server
(https://review.couchbase.org/c/ns_server/+/219214).

Change-Id: I015ec65e507eeca6d1e4d2bffcd55457e95823bc
Reviewed-on: https://review.couchbase.org/c/couchbase-cli/+/229757
Tested-by: Build Bot <build@couchbase.com>
Reviewed-by: Safian Ali <safian.ali@couchbase.com>

Author: lubomarinski

.githooks/pre-commit

@@ -15,7 +15,7 @@ if [[ ! -x .githooks/commit-msg ]]; then
 fi
 
 # ensure the custom aspell dictionary is sorted correctly
-(head -n 1 jenkins/.aspell.en.pws && tail -n +2 jenkins/.aspell.en.pws | LC_COLLATE="C" sort -f) | sponge jenkins/.aspell.en.pws
+(head -n 1 jenkins/.aspell.en.pws && tail -n +2 jenkins/.aspell.en.pws | LC_COLLATE="C" sort -fs) | sponge jenkins/.aspell.en.pws
 
 # we are safe to re-add the modified dictionary
 git add jenkins/.aspell.en.pws

cbmgr.py

@@ -1,5 +1,6 @@
 """A Couchbase  CLI subcommand"""
 
+import dataclasses
 import getpass
 import inspect
 import ipaddress
@@ -15,7 +16,6 @@
 import tempfile
 import time
 import traceback
-import dataclasses
 import urllib.parse
 from argparse import SUPPRESS, Action, ArgumentError, ArgumentParser, HelpFormatter
 from operator import itemgetter
@@ -3690,7 +3690,7 @@ def _add_edit_parse_opts(self, opts):
         if opts.kek_usage:
             usages.append("KEK-encryption")
         if opts.all_bucket_usage:
-            usages.append("bucket-encryption-*")
+            usages.append("bucket-encryption")
         if opts.bucket_usage:
             usages += [f"bucket-encryption-{b}" for b in opts.bucket_usage]