Merge pull request #84 from mattsb42-aws/dev-83

fix KMSMasterKeyProvider to determine the default region before trying to create the requested master keys

CHANGELOG.rst

@@ -2,6 +2,16 @@
 Changelog
 *********
 
+1.3.7 -- 2018-09-17
+===================
+
+Bugfixes
+--------
+
+* Fix KMSMasterKeyProvider to determine the default region before trying to create the requested master keys.
+  `#83 <https://github.com/aws/aws-encryption-sdk-python/issues/83>`_
+
+
 1.3.6 -- 2018-09-04
 ===================
 

src/aws_encryption_sdk/identifiers.py

@@ -21,7 +21,7 @@
 
 from aws_encryption_sdk.exceptions import InvalidAlgorithmError
 
-__version__ = "1.3.6"
+__version__ = "1.3.7"
 USER_AGENT_SUFFIX = "AwsEncryptionSdkPython/{}".format(__version__)
 
 

src/aws_encryption_sdk/key_providers/kms.py

@@ -116,8 +116,7 @@ def __init__(self, **kwargs):  # pylint: disable=unused-argument
     def _process_config(self):
         """Traverses the config and adds master keys and regional clients as needed."""
         self._user_agent_adding_config = botocore.config.Config(user_agent_extra=USER_AGENT_SUFFIX)
-        if self.config.key_ids:
-            self.add_master_keys_from_list(self.config.key_ids)
+
         if self.config.region_names:
             self.add_regional_clients_from_list(self.config.region_names)
             self.default_region = self.config.region_names[0]
@@ -126,6 +125,9 @@ def _process_config(self):
             if self.default_region is not None:
                 self.add_regional_client(self.default_region)
 
+        if self.config.key_ids:
+            self.add_master_keys_from_list(self.config.key_ids)
+
     def add_regional_client(self, region_name):
         """Adds a regional client for the specified region if it does not already exist.
 

test/unit/test_providers_kms_master_key_provider.py

@@ -25,6 +25,13 @@
 pytestmark = [pytest.mark.unit, pytest.mark.local]
 
 
+def test_init_with_regionless_key_ids_and_region_names():
+    key_ids = ("alias/key_1",)
+    region_names = ("test-region-1",)
+    provider = KMSMasterKeyProvider(region_names=region_names, key_ids=key_ids)
+    assert provider.master_key("alias/key_1").config.client.meta.region_name == region_names[0]
+
+
 class TestKMSMasterKeyProvider(unittest.TestCase):
     def setUp(self):
         self.mock_botocore_session_patcher = patch("aws_encryption_sdk.key_providers.kms.botocore.session.Session")