wip

Author: Lucas McDonald

DynamoDbEncryption/Makefile

@@ -123,6 +123,11 @@ PYTHON_DEPENDENCY_MODULE_NAMES := \
 	--dependency-library-name=aws.cryptography.dbEncryptionSdk.dynamoDb.itemEncryptor=aws_database_encryption_sdk \
 	--dependency-library-name=aws.cryptography.dbEncryptionSdk.dynamoDb.transforms=aws_database_encryption_sdk \
 
+# Override default test_python to run tox environment for Dafny tests
+test_python:
+	rm -rf runtimes/python/.tox
+	python3 -m tox -c runtimes/python -e dafnytests --verbose
+
 # Constants for languages that drop extern names (Python, Go)
 
 DYNAMODB_TYPES_FILE_PATH=dafny/DynamoDbEncryption/Model/AwsCryptographyDbEncryptionSdkDynamoDbTypes.dfy

DynamoDbEncryption/dafny/DynamoDbEncryption/test/DynamoToStruct.dfy

@@ -376,14 +376,14 @@ module DynamoToStructTest {
   //= type=test
   //# Entries in a String Set MUST be ordered in ascending [UTF-16 binary order](./string-ordering.md#utf-16-binary-order).
   method {:test} TestSortSSAttr() {
-    var stringSetValue := AttributeValue.SS(["&","｡","𐀂"]);
+    var stringSetValue := AttributeValue.SS(["&","｡","\ud800\udc02"]);
     // Note that string values are UTF-8 encoded, but sorted by UTF-16 encoding.
     var encodedStringSetData := StructuredDataTerminal(value := [
                                                          0,0,0,3, // 3 entries in set
                                                          0,0,0,1, // 1st entry is 1 byte
                                                          0x26, // "&" in UTF-8 encoding
                                                          0,0,0,4, // 2nd entry is 4 bytes
-                                                         0xF0,0x90,0x80,0x82, // "𐀂" in UTF-8 encoding
+                                                         0xF0,0x90,0x80,0x82, // "\ud800\udc02" in UTF-8 encoding
                                                          0,0,0,3, // 3rd entry is 3 bytes
                                                          0xEF,0xBD,0xA1 // "｡" in UTF-8 encoding
                                                        ],
@@ -395,7 +395,7 @@ module DynamoToStructTest {
 
     var newStringSetValue := StructuredToAttr(encodedStringSetData);
     expect newStringSetValue.Success?;
-    expect newStringSetValue.value == AttributeValue.SS(["&","𐀂","｡"]);
+    expect newStringSetValue.value == AttributeValue.SS(["&","\ud800\udc02","｡"]);
   }
 
   //= specification/dynamodb-encryption-client/ddb-attribute-serialization.md#set-entries
@@ -415,11 +415,11 @@ module DynamoToStructTest {
 
   method {:test} TestSetsInListAreSorted() {
     var nSetValue := AttributeValue.NS(["2","1","10"]);
-    var sSetValue := AttributeValue.SS(["&","｡","𐀂"]);
+    var sSetValue := AttributeValue.SS(["&","｡","\ud800\udc02"]);
     var bSetValue := AttributeValue.BS([[1,0],[1],[2]]);
 
     var sortedNSetValue := AttributeValue.NS(["1","10","2"]);
-    var sortedSSetValue := AttributeValue.SS(["&","𐀂","｡"]);
+    var sortedSSetValue := AttributeValue.SS(["&","\ud800\udc02","｡"]);
     var sortedBSetValue := AttributeValue.BS([[1],[1,0],[2]]);
 
     var listValue := AttributeValue.L([nSetValue, sSetValue, bSetValue]);
@@ -444,11 +444,11 @@ module DynamoToStructTest {
 
   method {:test} TestSetsInMapAreSorted() {
     var nSetValue := AttributeValue.NS(["2","1","10"]);
-    var sSetValue := AttributeValue.SS(["&","｡","𐀂"]);
+    var sSetValue := AttributeValue.SS(["&","｡","\ud800\udc02"]);
     var bSetValue := AttributeValue.BS([[1,0],[1],[2]]);
 
     var sortedNSetValue := AttributeValue.NS(["1","10","2"]);
-    var sortedSSetValue := AttributeValue.SS(["&","𐀂","｡"]);
+    var sortedSSetValue := AttributeValue.SS(["&","\ud800\udc02","｡"]);
     var sortedBSetValue := AttributeValue.BS([[1],[1,0],[2]]);
 
     var mapValue := AttributeValue.M(map["keyA" := sSetValue, "keyB" := nSetValue, "keyC" := bSetValue]);
@@ -490,7 +490,7 @@ module DynamoToStructTest {
   method {:test} TestSortMapKeys() {
     var nullValue := AttributeValue.NULL(true);
 
-    var mapValue := AttributeValue.M(map["&" := nullValue, "｡" := nullValue, "𐀂" := nullValue]);
+    var mapValue := AttributeValue.M(map["&" := nullValue, "｡" := nullValue, "\ud800\udc02" := nullValue]);
 
     // Note that the string values are encoded as UTF-8, but are sorted according to UTF-16 encoding.
     var encodedMapData := StructuredDataTerminal(
@@ -500,7 +500,7 @@ module DynamoToStructTest {
         0x26, // "&" UTF-8 encoded
         0,0, 0,0,0,0, // null value
         0,1, 0,0,0,4, // 2nd key is a string 4 bytes long
-        0xF0, 0x90, 0x80, 0x82, // "𐀂" UTF-8 encoded
+        0xF0, 0x90, 0x80, 0x82, // "\ud800\udc02" UTF-8 encoded
         0,0, 0,0,0,0, // null value
         0,1, 0,0,0,3, // 3rd key is a string 3 bytes long
         0xEF, 0xBD, 0xA1, // "｡"

DynamoDbEncryption/runtimes/python/pyproject.toml

@@ -14,8 +14,35 @@ include = ["**/internaldafny/generated/*.py"]
 python = "^3.11.0"
 aws-cryptographic-material-providers = { path = "../../../submodules/MaterialProviders/AwsCryptographicMaterialProviders/runtimes/python", develop = false}
 
+# Package testing
+
+[tool.poetry.group.test]
+optional = true
+
 [tool.poetry.group.test.dependencies]
 pytest = "^7.4.0"
+pytest-cov = "^6"
+
+# Package release
+
+[tool.poetry.group.release]
+optional = true
+
+[tool.poetry.group.release.dependencies]
+poetry = "1.8.3"
+twine = "5.1.1"
+wheel = "0.38.4"
+
+# Package documentation
+
+[tool.poetry.group.docs]
+optional = true
+
+[tool.poetry.group.docs.dependencies]
+toml = "^0.10.2"
+myst-parser = "^4"
+sphinx = "^7"
+sphinx_rtd_theme = "^2"
 
 [build-system]
 requires = ["poetry-core<2.0.0"]