tweak imports to support older versions of aws-encryption-sdk

Author: mattsb42-aws

test_vector_handlers/src/awses_test_vectors/internal/aws_kms.py

@@ -13,7 +13,10 @@
 """
 Helper utilities for interacting with AWS KMS.
 """
-from aws_encryption_sdk.identifiers import AlgorithmSuite
+try:
+    from aws_encryption_sdk.identifiers import AlgorithmSuite
+except ImportError:
+    from aws_encryption_sdk.identifiers import Algorithm as AlgorithmSuite
 from aws_encryption_sdk.key_providers.kms import KMSMasterKeyProvider
 
 from awses_test_vectors.internal.defaults import ENCODING

test_vector_handlers/src/awses_test_vectors/internal/util.py

@@ -19,7 +19,11 @@
 
 import six
 from attr import Attribute  # noqa pylint: disable=unused-import
-from aws_encryption_sdk.identifiers import AlgorithmSuite
+
+try:
+    from aws_encryption_sdk.identifiers import AlgorithmSuite
+except ImportError:
+    from aws_encryption_sdk.identifiers import Algorithm as AlgorithmSuite
 
 try:  # Python 3.5.0 and 3.5.1 have incompatible typing modules
     from typing import Any, Callable, Dict, Iterable, Type  # noqa pylint: disable=unused-import

test_vector_handlers/src/awses_test_vectors/manifests/full_message/encrypt.py

@@ -23,7 +23,6 @@
 import attr
 import aws_encryption_sdk
 import six
-from aws_encryption_sdk.identifiers import AlgorithmSuite
 from aws_encryption_sdk.key_providers.base import MasterKeyProvider
 
 from awses_test_vectors.internal.defaults import ENCODING
@@ -40,6 +39,12 @@
 from awses_test_vectors.manifests.keys import KeysManifest
 from awses_test_vectors.manifests.master_key import MasterKeySpec, master_key_provider_from_master_key_specs
 
+try:
+    from aws_encryption_sdk.identifiers import AlgorithmSuite
+except ImportError:
+    from aws_encryption_sdk.identifiers import Algorithm as AlgorithmSuite
+
+
 try:  # Python 3.5.0 and 3.5.1 have incompatible typing modules
     from typing import Callable, Dict, IO, Iterable, Optional  # noqa pylint: disable=unused-import
     from awses_test_vectors.internal.mypy_types import (  # noqa pylint: disable=unused-import

test_vector_handlers/src/awses_test_vectors/manifests/master_key.py

@@ -18,7 +18,6 @@
 import attr
 import six
 from aws_encryption_sdk.identifiers import EncryptionKeyType, WrappingAlgorithm
-from aws_encryption_sdk.internal.crypto.wrapping_keys import WrappingKey
 from aws_encryption_sdk.key_providers.base import MasterKeyProvider  # noqa pylint: disable=unused-import
 from aws_encryption_sdk.key_providers.kms import KMSMasterKey  # noqa pylint: disable=unused-import
 from aws_encryption_sdk.key_providers.raw import RawMasterKey
@@ -27,6 +26,12 @@
 from awses_test_vectors.internal.util import membership_validator
 from awses_test_vectors.manifests.keys import KeysManifest, KeySpec  # noqa pylint: disable=unused-import
 
+try:
+    from aws_encryption_sdk.internal.crypto.wrapping_keys import WrappingKey
+except ImportError:
+    from aws_encryption_sdk.internal.crypto import WrappingKey
+
+
 try:  # Python 3.5.0 and 3.5.1 have incompatible typing modules
     from typing import Iterable  # noqa pylint: disable=unused-import
     from awses_test_vectors.internal.mypy_types import MASTER_KEY_SPEC  # noqa pylint: disable=unused-import