Add new exception types

* Fix hvac#1093 by adding PreconditionFailed exception for status code 412 * Add UnsupportedOperation exception for status code 405
mweigel · Apr 4, 2024 · fc6c8e5 · fc6c8e5
1 parent 48027db
commit fc6c8e5
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 13 deletions.
diff --git a/hvac/exceptions.py b/hvac/exceptions.py
@@ -23,6 +23,8 @@ def from_status(cls, status_code: int, *args, **kwargs):
             401: Unauthorized,
             403: Forbidden,
             404: InvalidPath,
+            405: UnsupportedOperation,
+            412: PreconditionFailed,
             429: RateLimitExceeded,
             500: InternalServerError,
             501: VaultNotInitialized,
@@ -49,6 +51,14 @@ class InvalidPath(VaultError):
     pass
 
 
+class UnsupportedOperation(VaultError):
+    pass
+
+
+class PreconditionFailed(VaultError):
+    pass
+
+
 class RateLimitExceeded(VaultError):
     pass
 

diff --git a/tests/integration_tests/api/auth_methods/test_gcp.py b/tests/integration_tests/api/auth_methods/test_gcp.py
@@ -96,7 +96,7 @@ def test_read_config(self, label):
             param(
                 "no existing config",
                 write_config_first=False,
-                raises=exceptions.UnexpectedError,
+                raises=exceptions.UnsupportedOperation,
             ),
         ]
     )

diff --git a/tests/unit_tests/api/secrets_engines/test_gcp.py b/tests/unit_tests/api/secrets_engines/test_gcp.py
@@ -10,7 +10,7 @@
     ParamValidationError,
     InvalidRequest,
     InvalidPath,
-    UnexpectedError,
+    UnsupportedOperation,
     InternalServerError,
 )
 
@@ -268,7 +268,7 @@ def test_create_or_update_roleset(
         [
             param(method="POST", expected_status_code=204),
             param(method="POST", expected_status_code=400, raises=InvalidRequest),
-            param(method="POST", expected_status_code=405, raises=UnexpectedError),
+            param(method="POST", expected_status_code=405, raises=UnsupportedOperation),
         ]
     )
     def test_rotate_roleset_account(
@@ -309,7 +309,7 @@ def test_rotate_roleset_account(
         [
             param(method="POST", expected_status_code=204),
             param(method="POST", expected_status_code=400, raises=InvalidRequest),
-            param(method="POST", expected_status_code=405, raises=UnexpectedError),
+            param(method="POST", expected_status_code=405, raises=UnsupportedOperation),
         ]
     )
     def test_rotate_roleset_account_key(
@@ -382,7 +382,7 @@ def test_rotate_roleset_account_key(
                 method="GET",
                 expected_status_code=405,
                 secret_type="service_account_key",
-                raises=UnexpectedError,
+                raises=UnsupportedOperation,
             ),
         ]
     )
@@ -435,7 +435,7 @@ def test_read_roleset(
                 expected_response={"data": {"keys": ["roleset-01", "roleset-02"]}},
             ),
             param(method="LIST", expected_status_code=404, raises=InvalidPath),
-            param(method="LIST", expected_status_code=405, raises=UnexpectedError),
+            param(method="LIST", expected_status_code=405, raises=UnsupportedOperation),
         ]
     )
     def test_list_rolesets(
@@ -471,7 +471,9 @@ def test_list_rolesets(
         [
             param(method="DELETE", expected_status_code=204),
             param(method="DELETE", expected_status_code=404, raises=InvalidPath),
-            param(method="DELETE", expected_status_code=405, raises=UnexpectedError),
+            param(
+                method="DELETE", expected_status_code=405, raises=UnsupportedOperation
+            ),
         ]
     )
     def test_delete_roleset(
@@ -712,7 +714,7 @@ def test_create_or_update_static_account(
             param(
                 method="POST",
                 expected_status_code=405,
-                raises=UnexpectedError,
+                raises=UnsupportedOperation,
                 expected_response={
                     "errors": ["cannot rotate key for non-access-token static account"]
                 },
@@ -789,7 +791,7 @@ def test_rotate_static_account_key(
                 method="GET",
                 expected_status_code=405,
                 secret_type="service_account_key",
-                raises=UnexpectedError,
+                raises=UnsupportedOperation,
             ),
         ]
     )
@@ -846,7 +848,7 @@ def test_read_static_account(
                 },
             ),
             param(method="LIST", expected_status_code=404, raises=InvalidPath),
-            param(method="LIST", expected_status_code=405, raises=UnexpectedError),
+            param(method="LIST", expected_status_code=405, raises=UnsupportedOperation),
         ]
     )
     def test_list_static_accounts(
@@ -883,7 +885,9 @@ def test_list_static_accounts(
         [
             param(method="DELETE", expected_status_code=204),
             param(method="DELETE", expected_status_code=404, raises=InvalidPath),
-            param(method="DELETE", expected_status_code=405, raises=UnexpectedError),
+            param(
+                method="DELETE", expected_status_code=405, raises=UnsupportedOperation
+            ),
         ]
     )
     def test_delete_static_account(
@@ -1186,7 +1190,7 @@ def test_read_impersonated_account(
                 },
             ),
             param(method="LIST", expected_status_code=404, raises=InvalidPath),
-            param(method="LIST", expected_status_code=405, raises=UnexpectedError),
+            param(method="LIST", expected_status_code=405, raises=UnsupportedOperation),
         ]
     )
     def test_list_impersonated_accounts(
@@ -1225,7 +1229,9 @@ def test_list_impersonated_accounts(
         [
             param(method="DELETE", expected_status_code=204),
             param(method="DELETE", expected_status_code=404, raises=InvalidPath),
-            param(method="DELETE", expected_status_code=405, raises=UnexpectedError),
+            param(
+                method="DELETE", expected_status_code=405, raises=UnsupportedOperation
+            ),
         ]
     )
     def test_delete_impersonated_account(