fix names and add handling for region selection

Author: mattsb42-aws

test/functional/functional_test_utils.py

@@ -23,6 +23,7 @@
 import boto3
 import pytest
 from boto3.dynamodb.types import Binary
+from botocore.exceptions import NoRegionError
 from moto import mock_dynamodb2
 
 from dynamodb_encryption_sdk.delegated_keys.jce import JceNameLocalDelegatedKey
@@ -43,11 +44,12 @@
 RUNNING_IN_TRAVIS = "TRAVIS" in os.environ
 _DELEGATED_KEY_CACHE = defaultdict(lambda: defaultdict(dict))
 TEST_TABLE_NAME = "my_table"
+TEST_REGION_NAME = "us-west-2"
 TEST_INDEX = {
     "partition_attribute": {"type": "S", "value": "test_value"},
     "sort_attribute": {"type": "N", "value": Decimal("99.233")},
 }
-SECONARY_INDEX = {
+SECONDARY_INDEX = {
     "secondary_index_1": {"type": "B", "value": Binary(b"\x00\x01\x02")},
     "secondary_index_2": {"type": "S", "value": "another_value"},
 }
@@ -76,7 +78,7 @@
 @pytest.fixture
 def example_table():
     mock_dynamodb2().start(reset=False)
-    ddb = boto3.client("dynamodb", region_name="us-west-2")
+    ddb = boto3.client("dynamodb", region_name=TEST_REGION_NAME)
     ddb.create_table(
         TableName=TEST_TABLE_NAME,
         KeySchema=[
@@ -94,9 +96,9 @@ def example_table():
 
 
 @pytest.fixture
-def table_with_local_seconary_indexes():
+def table_with_local_secondary_indexes():
     mock_dynamodb2().start(reset=False)
-    ddb = boto3.client("dynamodb", region_name="us-west-2")
+    ddb = boto3.client("dynamodb", region_name=TEST_REGION_NAME)
     ddb.create_table(
         TableName=TEST_TABLE_NAME,
         KeySchema=[
@@ -117,7 +119,7 @@ def table_with_local_seconary_indexes():
         ],
         AttributeDefinitions=[
             {"AttributeName": name, "AttributeType": value["type"]}
-            for name, value in list(TEST_INDEX.items()) + list(SECONARY_INDEX.items())
+            for name, value in list(TEST_INDEX.items()) + list(SECONDARY_INDEX.items())
         ],
         ProvisionedThroughput={"ReadCapacityUnits": 100, "WriteCapacityUnits": 100},
     )
@@ -129,7 +131,7 @@ def table_with_local_seconary_indexes():
 @pytest.fixture
 def table_with_global_secondary_indexes():
     mock_dynamodb2().start(reset=False)
-    ddb = boto3.client("dynamodb", region_name="us-west-2")
+    ddb = boto3.client("dynamodb", region_name=TEST_REGION_NAME)
     ddb.create_table(
         TableName=TEST_TABLE_NAME,
         KeySchema=[
@@ -152,7 +154,7 @@ def table_with_global_secondary_indexes():
         ],
         AttributeDefinitions=[
             {"AttributeName": name, "AttributeType": value["type"]}
-            for name, value in list(TEST_INDEX.items()) + list(SECONARY_INDEX.items())
+            for name, value in list(TEST_INDEX.items()) + list(SECONDARY_INDEX.items())
         ],
         ProvisionedThroughput={"ReadCapacityUnits": 100, "WriteCapacityUnits": 100},
     )
@@ -649,19 +651,19 @@ def client_cycle_batch_items_check_paginators(
 
 
 def build_metastore():
-    client = boto3.client("dynamodb", region_name="us-west-2")
+    client = boto3.client("dynamodb", region_name=TEST_REGION_NAME)
     table_name = base64.urlsafe_b64encode(os.urandom(32)).decode("utf-8").replace("=", ".")
 
     MetaStore.create_table(client, table_name, 1, 1)
     waiter = client.get_waiter("table_exists")
     waiter.wait(TableName=table_name)
 
-    table = boto3.resource("dynamodb", region_name="us-west-2").Table(table_name)
+    table = boto3.resource("dynamodb", region_name=TEST_REGION_NAME).Table(table_name)
     return MetaStore(table, build_static_jce_cmp("AES", 256, "HmacSHA256", 256)), table_name
 
 
 def delete_metastore(table_name):
-    client = boto3.client("dynamodb", region_name="us-west-2")
+    client = boto3.client("dynamodb", region_name=TEST_REGION_NAME)
     client.delete_table(TableName=table_name)
     # It sometimes takes a long time to delete a table.
     # If hanging, asynchronously deleting tables becomes an issue,
@@ -698,7 +700,10 @@ def _count_gets(records, table_name):
 
 
 def check_metastore_cache_use_encrypt(metastore, table_name, log_capture):
-    table = boto3.resource("dynamodb").Table(table_name)
+    try:
+        table = boto3.resource("dynamodb").Table(table_name)
+    except NoRegionError:
+        table = boto3.resource("dynamodb", region_name=TEST_REGION_NAME).Table(table_name)
 
     most_recent_provider = MostRecentProvider(provider_store=metastore, material_name="test", version_ttl=600.0)
     e_table = EncryptedTable(table=table, materials_provider=most_recent_provider)

test/functional/test_structures.py

@@ -22,7 +22,7 @@
     TEST_TABLE_NAME,
     example_table,
     table_with_global_secondary_indexes,
-    table_with_local_seconary_indexes,
+    table_with_local_secondary_indexes,
 )
 
 pytestmark = [pytest.mark.functional, pytest.mark.local]
@@ -37,14 +37,14 @@ def test_tableinfo_refresh_indexes_no_secondary_indexes(example_table):
     table.refresh_indexed_attributes(client)
 
 
-def test_tableinfo_refresh_indexes_with_gsis(table_with_global_seconary_indexes):
+def test_tableinfo_refresh_indexes_with_gsis(table_with_global_secondary_indexes):
     client = boto3.client("dynamodb", region_name="us-west-2")
     table = TableInfo(name=TEST_TABLE_NAME)
 
     table.refresh_indexed_attributes(client)
 
 
-def test_tableinfo_refresh_indexes_with_lsis(table_with_local_seconary_indexes):
+def test_tableinfo_refresh_indexes_with_lsis(table_with_local_secondary_indexes):
     client = boto3.client("dynamodb", region_name="us-west-2")
     table = TableInfo(name=TEST_TABLE_NAME)