update conftest

layercake/layercake/dynamodb.py

@@ -11,10 +11,10 @@ from botocore.exceptions import ClientError
 from .dateutils import now, timestamp
 
 TZ = os.getenv('TZ', 'UTC')
-DELIMITER = os.getenv('DELIMITER', '#')
-LIMIT = int(os.getenv('LIMIT', 25))
-PARTITION_KEY = os.getenv('PARTITION_KEY', 'pk')
-SORT_KEY = os.getenv('SORT_KEY', 'sk')
+PK = os.getenv('DYNAMODB_PARTITION_KEY', 'pk')
+SK = os.getenv('DYNAMODB_SORT_KEY', 'sk')
+LIMIT = int(os.getenv('DYNAMODB_LIMIT', 25))
+DELIMITER = os.getenv('DYNAMODB_DELIMITER', '#')
 
 
 logger = Logger(__name__)
@@ -85,20 +85,20 @@ class PartitionKey(PrimaryKey):
     """Represents a partition key for DynamoDB queries"""
 
     def __init__(self, pk: str) -> None:
-        super().__init__(**{PARTITION_KEY: pk})
+        super().__init__(**{PK: pk})
 
     def expr_attr_name(self) -> dict:
-        return {'#pk': PARTITION_KEY}
+        return {'#pk': PK}
 
     def expr_attr_values(self) -> dict:
-        return {':pk': self[PARTITION_KEY]}
+        return {':pk': self[PK]}
 
 
 class KeyPair(PrimaryKey):
     """Represents a composite key (partition key and sort key) for DynamoDB queries"""
 
     def __init__(self, pk: str, sk: str) -> None:
-        super().__init__(**{PARTITION_KEY: pk, SORT_KEY: sk})
+        super().__init__(**{PK: pk, SK: sk})
 
     def __repr__(self) -> str:
         pk, sk = self.values()
@@ -106,14 +106,14 @@ class KeyPair(PrimaryKey):
 
     def expr_attr_name(self) -> dict:
         return {
-            '#pk': PARTITION_KEY,
-            '#sk': SORT_KEY,
+            '#pk': PK,
+            '#sk': SK,
         }
 
     def expr_attr_values(self) -> dict:
         return {
-            ':pk': self[PARTITION_KEY],
-            ':sk': self[SORT_KEY],
+            ':pk': self[PK],
+            ':sk': self[SK],
         }
 
 

layercake/pytest.ini

@@ -1,3 +1,5 @@
 [pytest]
 env =
-    PARTITION_KEY=id
+    DYNAMODB_ENDPOINT_URL=http://127.0.0.1:8000
+    DYNAMODB_PARTITION_KEY=id
+    DYNAMODB_SORT_KEY=sk

layercake/tests/conftest.py

@@ -1,25 +1,29 @@
+import os
+
 import boto3
 import pytest
 
 import layercake.jsonl as jsonl
 from layercake.dynamodb import DynamoDBPersistenceLayer
 
-table_name = 'pytest'
-dynamodb_endpoint_url = 'http://127.0.0.1:8000'
+PYTEST_TABLE_NAME = os.getenv('PYTEST_TABLE_NAME', 'pytest')
+DYNAMODB_ENDPOINT_URL = os.getenv('DYNAMODB_ENDPOINT_URL')
+PK = os.getenv('DYNAMODB_PARTITION_KEY', 'pk')
+SK = os.getenv('DYNAMODB_SORT_KEY', 'sk')
 
 
 @pytest.fixture
 def dynamodb_client():
-    client = boto3.client('dynamodb', endpoint_url=dynamodb_endpoint_url)
+    client = boto3.client('dynamodb', endpoint_url=DYNAMODB_ENDPOINT_URL)
     client.create_table(
         AttributeDefinitions=[
-            {'AttributeName': 'id', 'AttributeType': 'S'},
-            {'AttributeName': 'sk', 'AttributeType': 'S'},
+            {'AttributeName': PK, 'AttributeType': 'S'},
+            {'AttributeName': SK, 'AttributeType': 'S'},
         ],
-        TableName=table_name,
+        TableName=PYTEST_TABLE_NAME,
         KeySchema=[
-            {'AttributeName': 'id', 'KeyType': 'HASH'},
-            {'AttributeName': 'sk', 'KeyType': 'RANGE'},
+            {'AttributeName': PK, 'KeyType': 'HASH'},
+            {'AttributeName': SK, 'KeyType': 'RANGE'},
         ],
         ProvisionedThroughput={
             'ReadCapacityUnits': 123,
@@ -29,16 +33,16 @@ def dynamodb_client():
 
     yield client
 
-    client.delete_table(TableName=table_name)
+    client.delete_table(TableName=PYTEST_TABLE_NAME)
 
 
 @pytest.fixture()
 def dynamodb_persistence_layer(dynamodb_client) -> DynamoDBPersistenceLayer:
-    return DynamoDBPersistenceLayer(table_name, dynamodb_client)
+    return DynamoDBPersistenceLayer(PYTEST_TABLE_NAME, dynamodb_client)
 
 
 @pytest.fixture()
 def dynamodb_seeds(dynamodb_client):
     with jsonl.readlines('tests/seeds.jsonl') as lines:
         for line in lines:
-            dynamodb_client.put_item(TableName=table_name, Item=line)
+            dynamodb_client.put_item(TableName=PYTEST_TABLE_NAME, Item=line)