Merge branch 'morpheus' into 'master'

* morpheus:
  MB-67316 Rename setting-encryption --all-bucket-usage value
  MB-67315 Update key names

Change-Id: I701a0a1dde714f0f2ded41be2de04707740bb2ee

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
@@ -3691,7 +3691,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]
 
@@ -3702,7 +3702,7 @@ def _add_edit_parse_opts(self, opts):
         data = {}
         typ = ""
         if opts.key_type == "aws":
-            typ = "awskms-aes-key-256"
+            typ = "awskms-symmetric-key"
 
             if not opts.cloud_key_arn or not opts.cloud_region:
                 _exit_if_errors(["--cloud-key-arn and --cloud-region must be specified"])
@@ -3761,7 +3761,7 @@ def _add_edit_parse_opts(self, opts):
                     data["caSelection"] = "skipServerCertVerification"
 
         elif opts.key_type == "auto-generated":
-            typ = "auto-generated-aes-key-256"
+            typ = "cb-server-managed-aes-key-256"
 
             if not opts.encrypt_with_master and opts.encrypt_with_key is None:
                 _exit_if_errors(["one of --encrypt-with-master-password, --encrypt-with-key must be specified"])

test/test_cli.py

@@ -1546,7 +1546,7 @@ def test_add_edit_key_cloud(self):
             expected = json.dumps({
                 'usage': ['KEK-encryption'],
                 'name': 'key01',
-                'type': 'awskms-aes-key-256',
+                'type': 'awskms-symmetric-key',
                 'data': {'keyARN': 'arn', 'region': 'us-east-1', 'useIMDS': False}
             }, sort_keys=True)
             self.rest_parameter_match([expected], length_match=False)
@@ -1731,7 +1731,7 @@ def test_add_key_auto(self):
             expected = json.dumps({
                 'usage': ['KEK-encryption'],
                 'name': 'key01',
-                'type': 'auto-generated-aes-key-256',
+                'type': 'cb-server-managed-aes-key-256',
                 'data': {
                     'encryptWith': 'nodeSecretManager',
                     'autoRotation': True,