fix create-key --all-capabilities when account doesnt have access t…

…o notification-rules cap
reef-technologies · Apr 23, 2024 · 0ca594d · 0ca594d
1 parent 6a78575
commit 0ca594d
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 3 deletions.
diff --git a/b2/_internal/console_tool.py b/b2/_internal/console_tool.py
@@ -1643,7 +1643,14 @@ def _run(self, args):
             bucket_id_or_none = self.api.get_bucket_by_name(args.bucket).id_
 
         if args.all_capabilities:
-            args.capabilities = ALL_CAPABILITIES
+            current_key_caps = set(self.api.account_info.get_allowed()['capabilities'])
+            preview_feature_caps = {
+                'readBucketNotifications',
+                'writeBucketNotifications',
+            }
+            args.capabilities = sorted(
+                set(ALL_CAPABILITIES) - preview_feature_caps | current_key_caps
+            )
 
         application_key = self.api.create_key(
             capabilities=args.capabilities,

diff --git a/changelog.d/+create_key.fixed.md b/changelog.d/+create_key.fixed.md
@@ -0,0 +1 @@
+Fix `create-key --all-capabilities` erroring out when new b2sdk is installed.
diff --git a/test/unit/test_console_tool.py b/test/unit/test_console_tool.py
@@ -744,7 +744,7 @@ def test_keys(self):
             appKeyId1   goodKeyName-Two        my-bucket-a            -            -          ''   readFiles,listBuckets,readBucketEncryption
             appKeyId3   goodKeyName-Four       -                      -            -          ''   {}
             appKeyId4   goodKeyName-Five       id=bucket_1            -            -          ''   readFiles,listBuckets
-            """.format(','.join(ALL_CAPABILITIES))
+            """.format(','.join(sorted(ALL_CAPABILITIES)))
 
         self._run_command(['list-keys'], expected_list_keys_out, '', 0)
         self._run_command(['list-keys', '--long'], expected_list_keys_out_long, '', 0)
@@ -1584,7 +1584,7 @@ def test_get_account_info(self):
                 {
                     "bucketId": None,
                     "bucketName": None,
-                    "capabilities": ALL_CAPABILITIES,
+                    "capabilities": sorted(ALL_CAPABILITIES),
                     "namePrefix": None
                 },
             "apiUrl": "http://api.example.com",
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		Fix `create-key --all-capabilities` erroring out when new b2sdk is installed.