reset

Author: lucasmcdonald3

examples/src/keyrings/raw_rsa_keyring_example.py

@@ -39,16 +39,14 @@
 from aws_cryptographic_materialproviders.mpl.config import MaterialProvidersConfig
 from aws_cryptographic_materialproviders.mpl.models import CreateRawRsaKeyringInput, PaddingScheme
 from aws_cryptographic_materialproviders.mpl.references import IKeyring
-from aws_cryptographic_materialproviders.smithygenerated.aws_cryptography_materialproviders.errors import (
-    CollectionOfErrors,
-)
 from cryptography.hazmat.backends import default_backend as crypto_default_backend
 from cryptography.hazmat.primitives import serialization as crypto_serialization
 from cryptography.hazmat.primitives.asymmetric import rsa
 from typing import Dict
 
 import aws_encryption_sdk
 from aws_encryption_sdk import CommitmentPolicy
+from aws_encryption_sdk.exceptions import AWSEncryptionSDKClientError
 
 # TODO-MPL: Remove this as part of removing PYTHONPATH hacks.
 MODULE_ROOT_DIR = '/'.join(__file__.split("/")[:-1])
@@ -244,6 +242,6 @@ def encrypt_and_decrypt_with_keyring(public_key_file_name=None, private_key_file
             keyring=raw_rsa_keyring_bob
         )
 
-        raise AssertionError("client.decrypt should throw an error of type CollectionOfErrors!")
-    except CollectionOfErrors:
+        raise AssertionError("client.decrypt should throw an error of type AWSEncryptionSDKClientError!")
+    except AWSEncryptionSDKClientError:
         pass

src/aws_encryption_sdk/materials_managers/mpl/cmm.py

@@ -7,7 +7,10 @@
 # pylint should pass even if the MPL isn't installed
 # Also thinks these imports aren't used if it can't import them
 # noqa pylint: disable=import-error,unused-import
-from aws_cryptographic_materialproviders.mpl.errors import AwsCryptographicMaterialProvidersException
+from aws_cryptographic_materialproviders.mpl.errors import (
+    AwsCryptographicMaterialProvidersException,
+    CollectionOfErrors,
+)
 from aws_cryptographic_materialproviders.mpl.models import (
     AlgorithmSuiteIdESDK as MPL_AlgorithmSuiteIdESDK,
     CommitmentPolicyESDK as MPL_CommitmentPolicyESDK,
@@ -114,7 +117,7 @@ def decrypt_materials(
                 CryptoMaterialsManagerFromMPL._create_mpl_decrypt_materials_input_from_request(request)
             mpl_output: 'MPL_DecryptMaterialsOutput' = self.mpl_cmm.decrypt_materials(mpl_input)
             return DecryptionMaterialsFromMPL(mpl_output.decryption_materials)
-        except AwsCryptographicMaterialProvidersException as mpl_exception:
+        except (AwsCryptographicMaterialProvidersException, CollectionOfErrors) as mpl_exception:
             # Wrap MPL error into the ESDK error type
             # so customers only have to catch ESDK error types.
             raise AWSEncryptionSDKClientError(mpl_exception)