Bugfix/improve invalid org uid error (#319)

* Improve error message for `code42 users list` when supplied org UID is invalid

* Improve error message for device commands in event of invalid org UID

* Remove per-command exception handling, add it to groups.py instead

* Remove unused imports

* Bump py42 version to get updated error handling, add tests for devices

* Update changelog

* rollback blank line delete

Author: Peter Briggs

CHANGELOG.md

@@ -25,6 +25,7 @@ how a consumer would use the library (e.g. adding unit tests, updating documenta
 ### Fixed
 
 - Bug where `audit-logs search` with `--use-checkpoint` option was causing output formatting problems.
+- Improve error message for `code42 users list`, `code42 devices list`, `code42 devices list-backup-sets`
 
 ## 1.9.0 - 2021-08-19
 

setup.py

@@ -40,7 +40,7 @@
         "keyrings.alt==3.2.0",
         "ipython>=7.16.1",
         "pandas>=1.1.3",
-        "py42>=1.18.0",
+        "py42>=1.18.1",
     ],
     extras_require={
         "dev": [

src/code42cli/click_ext/groups.py

@@ -14,6 +14,7 @@
 from py42.exceptions import Py42InvalidRuleOperationError
 from py42.exceptions import Py42InvalidUsernameError
 from py42.exceptions import Py42LegalHoldNotFoundOrPermissionDeniedError
+from py42.exceptions import Py42OrgNotFoundError
 from py42.exceptions import Py42UpdateClosedCaseError
 from py42.exceptions import Py42UserAlreadyAddedError
 from py42.exceptions import Py42UsernameMustBeEmailError
@@ -77,6 +78,7 @@ def invoke(self, ctx):
             Py42InvalidPasswordError,
             Py42InvalidUsernameError,
             Py42ActiveLegalHoldError,
+            Py42OrgNotFoundError,
         ) as err:
             self.logger.log_error(err)
             raise Code42CLIError(str(err))

tests/cmds/test_devices.py

@@ -10,6 +10,7 @@
 from py42.exceptions import Py42BadRequestError
 from py42.exceptions import Py42ForbiddenError
 from py42.exceptions import Py42NotFoundError
+from py42.exceptions import Py42OrgNotFoundError
 from tests.conftest import create_mock_response
 
 from code42cli.cmds.devices import _add_backup_set_settings_to_dataframe
@@ -725,6 +726,40 @@ def test_list_include_legal_hold_membership_merges_in_and_concats_legal_hold_inf
     assert "123456789,987654321" in result.output
 
 
+def test_list_invalid_org_uid_raises_error(runner, cli_state, custom_error):
+    custom_error.response.text = "Unable to find org"
+    invalid_org_uid = "invalid_org_uid"
+    cli_state.sdk.devices.get_all.side_effect = Py42OrgNotFoundError(
+        custom_error, invalid_org_uid
+    )
+    result = runner.invoke(
+        cli, ["devices", "list", "--org-uid", invalid_org_uid], obj=cli_state
+    )
+    assert result.exit_code == 1
+    assert (
+        f"Error: The organization with UID '{invalid_org_uid}' was not found."
+        in result.output
+    )
+
+
+def test_list_backup_sets_invalid_org_uid_raises_error(runner, cli_state, custom_error):
+    custom_error.response.text = "Unable to find org"
+    invalid_org_uid = "invalid_org_uid"
+    cli_state.sdk.devices.get_all.side_effect = Py42OrgNotFoundError(
+        custom_error, invalid_org_uid
+    )
+    result = runner.invoke(
+        cli,
+        ["devices", "list-backup-sets", "--org-uid", invalid_org_uid],
+        obj=cli_state,
+    )
+    assert result.exit_code == 1
+    assert (
+        f"Error: The organization with UID '{invalid_org_uid}' was not found."
+        in result.output
+    )
+
+
 def test_break_backup_usage_into_total_storage_correctly_calculates_values():
     test_backupusage_cell = json.loads(TEST_BACKUPUSAGE_RESPONSE)["data"]["backupUsage"]
     result = _break_backup_usage_into_total_storage(test_backupusage_cell)

tests/cmds/test_users.py

@@ -3,6 +3,7 @@
 from py42.exceptions import Py42InvalidEmailError
 from py42.exceptions import Py42InvalidPasswordError
 from py42.exceptions import Py42InvalidUsernameError
+from py42.exceptions import Py42OrgNotFoundError
 from tests.conftest import create_mock_http_error
 from tests.conftest import create_mock_response
 
@@ -330,6 +331,22 @@ def test_list_users_when_given_excluding_active_and_inactive_uses_active_equals_
     )
 
 
+def test_list_users_when_given_invalid_org_uid_raises_error(
+    runner, cli_state, get_available_roles_success, custom_error
+):
+    invalid_org_uid = "invalid_org_uid"
+    cli_state.sdk.users.get_all.side_effect = Py42OrgNotFoundError(
+        custom_error, invalid_org_uid
+    )
+    result = runner.invoke(
+        cli, ["users", "list", "--org-uid", invalid_org_uid], obj=cli_state
+    )
+    assert (
+        f"Error: The organization with UID '{invalid_org_uid}' was not found."
+        in result.output
+    )
+
+
 def test_list_legal_hold_flag_reports_none_for_users_not_on_legal_hold(
     runner,
     cli_state,