Merge pull request Backblaze#1115 from reef-technologies/fix-unhide-b2id-uri-support

Fix b2id:// uri support in file unhide command

Author: olzhasar-reef

b2/_internal/console_tool.py

@@ -2274,8 +2274,16 @@ def _setup_parser(cls, parser):
 
     def _run(self, args):
         b2_uri = self.get_b2_uri_from_arg(args)
-        bucket = self.api.get_bucket_by_name(b2_uri.bucket_name)
-        file_id_and_name = bucket.unhide_file(b2_uri.path, args.bypass_governance)
+
+        if isinstance(b2_uri, B2FileIdURI):
+            file_version = self.api.get_file_info_by_uri(b2_uri)
+            bucket = self.api.get_bucket_by_id(file_version.bucket_id)
+            file_name = file_version.file_name
+        else:
+            bucket = self.api.get_bucket_by_name(b2_uri.bucket_name)
+            file_name = b2_uri.path
+
+        file_id_and_name = bucket.unhide_file(file_name, args.bypass_governance)
         self._print_json(file_id_and_name)
         return 0
 

changelog.d/1114.fixed.md

@@ -0,0 +1 @@
+Fix `b2id://` uri support in `file unhide` command.

test/unit/test_console_tool.py

@@ -2161,6 +2161,39 @@ def test_get_bucket_with_hidden(self):
             expected_json_in_stdout=expected_json,
         )
 
+    @pytest.mark.apiver(from_ver=4)
+    def test_unhide_b2id(self):
+        self._authorize_account()
+        self._create_my_bucket()
+
+        bucket = self.b2_api.get_bucket_by_name('my-bucket')
+        stdout, stderr = self._get_stdouterr()
+        console_tool = self.console_tool_class(stdout, stderr)
+
+        file_version = bucket.upload(UploadSourceBytes(b'test'), 'test.txt')
+        bucket.hide_file('test.txt')
+
+        console_tool.run_command(['b2', 'file', 'unhide', f'b2id://{file_version.id_}'])
+
+        expected_json = {
+            'accountId': self.account_id,
+            'bucketId': 'bucket_0',
+            'bucketInfo': {},
+            'bucketName': 'my-bucket',
+            'bucketType': 'allPublic',
+            'corsRules': [],
+            'defaultServerSideEncryption': {'mode': 'none'},
+            'fileCount': 1,
+            'lifecycleRules': [],
+            'options': [],
+            'revision': 1,
+            'totalSize': 4,
+        }
+        self._run_command(
+            ['bucket', 'get', '--show-size', 'my-bucket'],
+            expected_json_in_stdout=expected_json,
+        )
+
     def test_get_bucket_complex(self):
         self._authorize_account()
         self._create_my_bucket()