Merge pull request Backblaze#1093 from reef-technologies/master

Migrate to b2sdk.v3

Author: olzhasar-reef

b2/_internal/_cli/arg_parser_types.py

@@ -13,7 +13,7 @@
 import re
 
 import arrow
-from b2sdk.v2 import RetentionPeriod
+from b2sdk.v3 import RetentionPeriod
 
 _arrow_version = tuple(int(p) for p in arrow.__version__.split('.'))
 

b2/_internal/_cli/argcompleters.py

@@ -16,7 +16,7 @@
 
 
 def bucket_name_completer(prefix, parsed_args, **kwargs):
-    from b2sdk.v2 import unprintable_to_hex
+    from b2sdk.v3 import unprintable_to_hex
 
     from b2._internal._cli.b2api import _get_b2api_for_profile
 
@@ -36,7 +36,7 @@ def file_name_completer(prefix, parsed_args, **kwargs):
 
     To limit delay & cost only lists files returned from by single call to b2_list_file_names
     """
-    from b2sdk.v2 import LIST_FILE_NAMES_MAX_LIMIT, unprintable_to_hex
+    from b2sdk.v3 import LIST_FILE_NAMES_MAX_LIMIT, unprintable_to_hex
 
     from b2._internal._cli.b2api import _get_b2api_for_profile
 
@@ -47,7 +47,6 @@ def file_name_completer(prefix, parsed_args, **kwargs):
         latest_only=True,
         recursive=False,
         fetch_count=LIST_FILE_NAMES_MAX_LIMIT,
-        folder_to_list_can_be_a_file=True,
     )
     return [
         unprintable_to_hex(folder_name or file_version.file_name)
@@ -59,7 +58,7 @@ def b2uri_file_completer(prefix: str, parsed_args, **kwargs):
     """
     Complete B2 URI pointing to a file-like object in a bucket.
     """
-    from b2sdk.v2 import LIST_FILE_NAMES_MAX_LIMIT, unprintable_to_hex
+    from b2sdk.v3 import LIST_FILE_NAMES_MAX_LIMIT, unprintable_to_hex
 
     from b2._internal._cli.b2api import _get_b2api_for_profile
     from b2._internal._utils.python_compat import removeprefix

b2/_internal/_cli/b2api.py

@@ -11,15 +11,15 @@
 import os
 from typing import Optional
 
-from b2sdk.v2 import (
+from b2sdk.v3 import (
     AuthInfoCache,
     B2Api,
     B2HttpApiConfig,
     InMemoryAccountInfo,
     InMemoryCache,
     SqliteAccountInfo,
 )
-from b2sdk.v2.exception import MissingAccountData
+from b2sdk.v3.exception import MissingAccountData
 
 from b2._internal._cli.const import B2_USER_AGENT_APPEND_ENV_VAR
 

b2/_internal/_cli/obj_dumps.py

@@ -9,7 +9,7 @@
 ######################################################################
 import io
 
-from b2sdk.v2 import (
+from b2sdk.v3 import (
     unprintable_to_hex,
 )
 

b2/_internal/_cli/obj_loads.py

@@ -17,7 +17,7 @@
 import sys
 from typing import TypeVar
 
-from b2sdk.v2 import get_b2sdk_doc_urls
+from b2sdk.v3 import get_b2sdk_doc_urls
 
 try:
     import pydantic

b2/_internal/_utils/uri.py

@@ -16,13 +16,13 @@
 from pathlib import Path
 from typing import Sequence
 
-from b2sdk.v2 import (
+from b2sdk.v3 import (
     B2Api,
     DownloadVersion,
     FileVersion,
     Filter,
 )
-from b2sdk.v2.exception import B2Error
+from b2sdk.v3.exception import B2Error
 
 from b2._internal._utils.python_compat import removeprefix
 

b2/_internal/console_tool.py

@@ -54,7 +54,7 @@
 import b2sdk
 import requests
 import rst2ansi
-from b2sdk.v2 import (
+from b2sdk.v3 import (
     ALL_CAPABILITIES,
     B2_ACCOUNT_INFO_DEFAULT_FILE,
     B2_ACCOUNT_INFO_ENV_VAR,
@@ -103,12 +103,12 @@
     get_included_sources,
     make_progress_listener,
     notification_rule_response_to_request,
-    parse_sync_folder,
+    parse_folder,
     points_to_fifo,
     substitute_control_chars,
     unprintable_to_hex,
 )
-from b2sdk.v2.exception import (
+from b2sdk.v3.exception import (
     B2Error,
     BadFileInfo,
     EmptyDirectory,
@@ -1364,7 +1364,7 @@ def authorize(self, application_key_id, application_key, realm: str | None):
         if verbose_realm:
             self._print_stderr(f'Using {url}')
         try:
-            self.api.authorize_account(realm, application_key_id, application_key)
+            self.api.authorize_account(application_key_id, application_key, realm=realm)
 
             allowed = self.api.account_info.get_allowed()
             if 'listBuckets' not in allowed['capabilities']:
@@ -1376,15 +1376,26 @@ def authorize(self, application_key_id, application_key, realm: str | None):
                 )
                 self.api.account_info.clear()
                 return 1
-            if allowed['bucketId'] is not None and allowed['bucketName'] is None:
-                logger.error('ConsoleTool has bucket-restricted key and the bucket does not exist')
-                self._print_stderr(
-                    "ERROR: application key is restricted to bucket id '{}', which no longer exists".format(
-                        allowed['bucketId']
+            buckets = allowed['buckets']
+            if buckets:
+                existing_bucket_present = False
+
+                for item in buckets:
+                    if item['name'] is not None:
+                        existing_bucket_present = True
+                        break
+
+                if not existing_bucket_present:
+                    logger.error(
+                        'ConsoleTool has bucket-restricted key and the bucket does not exist'
                     )
-                )
-                self.api.account_info.clear()
-                return 1
+                    self._print_stderr(
+                        "ERROR: application key is restricted to bucket id '{}', which no longer exists".format(
+                            allowed['bucketId']
+                        )
+                    )
+                    self.api.account_info.clear()
+                    return 1
             return 0
         except B2Error as e:
             logger.exception('ConsoleTool account authorization error')
@@ -1736,11 +1747,13 @@ def _run(self, args):
                 set(ALL_CAPABILITIES) - preview_feature_caps | current_key_caps
             )
 
+        buckets_ids = [bucket_id_or_none] if bucket_id_or_none else None
+
         application_key = self.api.create_key(
             capabilities=args.capabilities,
             key_name=args.keyName,
             valid_duration_seconds=args.duration,
-            bucket_id=bucket_id_or_none,
+            bucket_ids=buckets_ids,
             name_prefix=args.name_prefix,
         )
 
@@ -2344,10 +2357,13 @@ def print_key(self, key: ApplicationKey, is_long_format: bool):
             format_str = '{keyId}   {keyName:20s}'
         timestamp_or_none = apply_or_none(int, key.expiration_timestamp_millis)
         (date_str, time_str) = self.timestamp_display(timestamp_or_none)
+
+        bucket_id = key.bucket_ids[0] if key.bucket_ids else None
+
         key_str = format_str.format(
             keyId=key.id_,
             keyName=key.key_name,
-            bucketName=self.bucket_display_name(key.bucket_id),
+            bucketName=self.bucket_display_name(bucket_id),
             namePrefix=(key.name_prefix or ''),
             capabilities=','.join(key.capabilities),
             dateStr=date_str,
@@ -2478,7 +2494,6 @@ def _get_ls_generator(self, args, b2_uri: B2URI | None = None):
                 recursive=args.recursive,
                 with_wildcard=args.with_wildcard,
                 filters=args.filters,
-                folder_to_list_can_be_a_file=True,
             )
         except Exception as err:
             raise CommandError(unprintable_to_hex(str(err))) from err
@@ -3170,8 +3185,8 @@ def _run(self, args):
         self.api.services.upload_manager.set_thread_pool_size(upload_threads)
         self.api.services.download_manager.set_thread_pool_size(download_threads)
 
-        source = parse_sync_folder(args.source, self.console_tool.api)
-        destination = parse_sync_folder(args.destination, self.console_tool.api)
+        source = parse_folder(args.source, self.console_tool.api)
+        destination = parse_folder(args.destination, self.console_tool.api)
         allow_empty_source = args.allow_empty_source or VERSION_0_COMPATIBILITY
 
         synchronizer = self.get_synchronizer_from_args(

b2/_internal/json_encoder.py

@@ -11,7 +11,7 @@
 import json
 from enum import Enum
 
-from b2sdk.v2 import Bucket, DownloadVersion, FileIdAndName, FileVersion
+from b2sdk.v3 import Bucket, DownloadVersion, FileIdAndName, FileVersion
 
 
 class B2CliJsonEncoder(json.JSONEncoder):

changelog.d/+b2sdk_v3.changed.md

@@ -0,0 +1 @@
+Migrate to b2sdk.v3.

changelog.d/+console_tool_tests_v1_to_v3.infrastructure.md

@@ -0,0 +1 @@
+Redesign console tools tests using b2sdk.v1 to use b2sdk.v3.