MB-67315 Update key names

ns_server updated the following key names in MB-61292:

* awskms-aes-key-256 -> awskms-symmetric-key
(https://review.couchbase.org/c/ns_server/+/228494)
* auto-generated-aes-key-256 -> cb-server-managed-aes-key-256
(https://review.couchbase.org/c/ns_server/+/228428)

We now use the new key names when creating/editing keys.

Change-Id: I8df1829dc627223b7ff8112fd98d8e99890b2c45
Reviewed-on: https://review.couchbase.org/c/couchbase-cli/+/229754
Tested-by: Build Bot <build@couchbase.com>
Reviewed-by: Lubo Marinski <lubo.marinski@couchbase.com>

Author: safianalicb

cbmgr.py

@@ -3701,7 +3701,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"])
@@ -3760,7 +3760,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,