Changes for v3.0.12 (#280)

JimTharioAmazon · web-flow · commit 019e463ce888 · 2025-06-11T13:45:46.000-07:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,7 +5,13 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-## [3.0.11] - 2025-04-11
+## [3.0.12] - 2025-06-11
+
+### Fixed
+
+- Corrected some normalization bugs for street address
+
+## [3.0.11] - 2025-04-10
 
 ### Security
 
diff --git a/NOTICE.txt b/NOTICE.txt
diff --git a/solution-manifest.yaml b/solution-manifest.yaml
@@ -1,7 +1,7 @@
 ---
 id: SO0222 # Solution Id
 name: amazon-marketing-cloud-uploader-from-aws # trademarked name
-version: v3.0.11 # current version of the solution. Used to verify template headers
+version: v3.0.12 # current version of the solution. Used to verify template headers
 cloudformation_templates: # This list should match with AWS CloudFormation templates section of IG
   - template: amazon-marketing-cloud-uploader-from-aws.template
     main_template: true
diff --git a/source/amc_uploader/requirements.txt b/source/amc_uploader/requirements.txt
@@ -1,2 +1,2 @@
-requests>=2.32.2
-chalice==1.31.0
+requests>=2.32.4
+chalice==1.31.0
diff --git a/source/anonymous_data_logger/requirements.txt b/source/anonymous_data_logger/requirements.txt
@@ -1,2 +1,2 @@
-requests>=2.32.2
+requests>=2.32.4
 urllib3==2.2.2
diff --git a/source/glue/library/address_map_helper.json b/source/glue/library/address_map_helper.json
@@ -20,6 +20,12 @@
     }
   ],
   "DirectionalWords": [
+    {
+      "WEST": "W"
+    },
+    {
+      "W": "W"
+    },
     {
       "EAST": "E"
     },
diff --git a/source/glue/library/address_normalizer.py b/source/glue/library/address_normalizer.py
@@ -76,6 +76,7 @@ def load_address_map_helper():
     "OPEN_BRACKET": "[\\[\\{\\(]",
     "CLOSE_BRACKET": "[\\]\\}\\)]",
     "SPACE": "\\s+",
+    "DOT": "\\.",
 }
 
 
diff --git a/source/share/tasks.py b/source/share/tasks.py
@@ -268,7 +268,7 @@ def process_request(self, **kwargs):
             "Authorization": f'Bearer {kwargs["access_token"]}',
             "Content-Type": "application/json",
             "x-amzn-service-name": "amazon-marketing-cloud-uploader-from-aws",
-            "x-amzn-service-version": "v3.0.11"
+            "x-amzn-service-version": "v3.0.12"
         }
 
         if kwargs.get("advertiser_id"):
diff --git a/source/tests/unit_test/amc_transformation/sample_data/test_ca/ca_check.json b/source/tests/unit_test/amc_transformation/sample_data/test_ca/ca_check.json
@@ -4734,7 +4734,7 @@
     "first_name": "d909de647d2aec430ca98491c83afe88e8802880ec5f5bf506719ef40803ec07",
     "last_name": "a9598ce65e549e4d90fc28b8b1ad1034616dd4f1272d1d542d4a838a2fc14169",
     "email": "fd967b6af7d6dfc07865bf29a19a7d52b36d47225b24ec35c01c75c47287fc52",
-    "address": "1b56f6d7575b7a1aea4862297017438df932022408f3810cef087450fa54b334",
+    "address": "503b61d08b73d555291e13cf9ce5f62acec1af79e51ec9036674870b6cae3e13",
     "state": "a082f17cf976fb34724b2d88f5a779341f1db75157bde2da48cd392c0b74ecb7",
     "city": "388b64429579ffc9767067bdcecd9a5b6fe7c958d8b90f407a642cb6b5aabdf1",
     "phone": "9121a3178d18b14d6794f4b66e2421251a98e28f230b98db0ed97a3a82d35d18",
@@ -8056,7 +8056,7 @@
     "first_name": "c7b9bdd40758eaa827b7abc1fc31408901ac99cef4f3891c1fb3598f531bb9e6",
     "last_name": "61fbd0ff685384afff546ead4074403010e973331181787158aef9aa5ecbf6e1",
     "email": "6ef3424866956a2f196acbb7642d06de3a3ae0e05c3d596ff28af1ba8d19bbd5",
-    "address": "c1776caa443d2be21691ea20788097d131f9a530a9f5848faa3da7d687df662e",
+    "address": "dad22e4161982e162ea24f395af9d0a640afd29e15bea75ed543e1363444b85a",
     "state": "a082f17cf976fb34724b2d88f5a779341f1db75157bde2da48cd392c0b74ecb7",
     "city": "dc2c60a9c39124a8e38d9d8b2a113632f8c9e5b8f03e479956474c9035707642",
     "phone": "593afebdbd83d5262aa9cb37d735a11fd1198f9715563e650524c5ea85c1bba6",
diff --git a/source/tests/unit_test/amc_transformation/sample_data/test_es/es_check.json b/source/tests/unit_test/amc_transformation/sample_data/test_es/es_check.json
@@ -4096,7 +4096,7 @@
     "first_name": "47229efc8721837e0f1b8b6f211b8ccb425d4ed9903c373e86418e1575c96810",
     "last_name": "d7ce1c3c7a236929e635ea068c1d94667b379134894ae830a0b3f04529c76beb",
     "email": "538470d376c7ab59ba5c715df03ed8295cac235e6d135dae176d90dd0137c223",
-    "address": "ba73ec2be80c554f5d0dce5c5aa6946cb319970f1ea67806bbc826fa4ae54507",
+    "address": "8b002c41674d4c9c3a7fe332d9f24222d2e1b30dd4a9424e58225d6be76b185d",
     "state": "6959097001d10501ac7d54c0bdb8db61420f658f2922cc26e46d536119a31126",
     "city": "24cfb44d899764efd72b7f4ca9822f9f96d5c82d7811f4abd1a838b792ac4dbf",
     "phone": "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855",
@@ -6351,7 +6351,7 @@
     "first_name": "a04c8216558b98326f9d96303b55dd1a84174c5dbb3c9d2b3e0698f3ce7ef4f2",
     "last_name": "b10d49b92d6d4bcf56bb09b35f33695e47423719769a7e9e6e29e2568467b63d",
     "email": "2c8347ab37080b36c6babc382ed1a79c7f72e92021c89c6ae2d83efcdb4ebe9e",
-    "address": "67b4d4b757360669c0ff3336d4b37980859994fdc8a88cd1845b1f487864c189",
+    "address": "18ecbb274d0440fb7ec00f1367fb584837bff6581092cd5ceac6d1fa075263c6",
     "state": "6959097001d10501ac7d54c0bdb8db61420f658f2922cc26e46d536119a31126",
     "city": "b30b8594f67988b17fa2941ff596a1057b4bf63f2d26ccd02f5d84b78f92d27d",
     "phone": "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855",
diff --git a/source/tests/unit_test/amc_transformation/sample_data/test_fr/fr_check.json b/source/tests/unit_test/amc_transformation/sample_data/test_fr/fr_check.json
@@ -3975,7 +3975,7 @@
     "first_name": "87a1423c903ce1b279abd9510ec5cef099611562c71830d9c8d3b24a1a8bf147",
     "last_name": "cc23140694a5b838b756980cfee1af0864a88c07e654a68c3ea0ef37cfbeeba1",
     "email": "1b8fc523e74cf9f347d299d29faf35da8f6cede1b44f51c18f2476dfd97c9a1b",
-    "address": "9182734121c9c8ca42576bc45c20bb8e337221df19da753f54cf75d8e5880dd4",
+    "address": "8ef96b559be90c1668696d0519f87e101ba1d627df86d2ac4103851cad5c4c38",
     "state": "3485639faf1591f3c16f295198e9389db5b33c949587ec48663597d4e00299d5",
     "city": "653c348eb60d9474654e9e463b521d6094d747713e8f6bd69e9799f152d3814f",
     "phone": "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855",
@@ -6736,7 +6736,7 @@
     "first_name": "6e1f3da6cf8847b5c2ced23d0fa63272e6cd630dabe13b73f1d2666b0cb1444d",
     "last_name": "1fcb3f3eb4a9eb0de1a496543f2b146262382d793eedaa674acbad6a066ea5d4",
     "email": "4746652a8e959c825887d5df80497acaa5ba73e9ed6b23a573085c101e08ac10",
-    "address": "ea10a790c5632226be4fa4f1ff8e9e74d93f61d47614e246eebb73cf860db865",
+    "address": "d8bbd7a6107ea7b8651473252f0c410c0826f95a278822f774f9186f02784e4c",
     "state": "8693873cd8f8a2d9c7c596477180f851e525f4eaf55a4f637b445cb442a5e340",
     "city": "816bacfea48829de5a1b857067131213a2809167fdeb1de26eacadd7db269a8a",
     "phone": "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855",
diff --git a/source/tests/unit_test/amc_transformation/sample_data/test_gb/gb_check.json b/source/tests/unit_test/amc_transformation/sample_data/test_gb/gb_check.json
@@ -9508,7 +9508,7 @@
     "first_name": "c8b33f6c594c44e991b404f369a8d4c15748e2de5e635ec1a65f8e35d13a324c",
     "last_name": "aa0f4976985cf9a91aaf8342c7d5ca49d80f6d9db12060effe7c143b65b9d8bb",
     "email": "fe5db3f060ea4ee07ba1ad44a05633257ad084be2a6ec5af0e6581dbcb9d8fae",
-    "address": "1a8f531fc9c02a2bbb82a1e48c79b0d7a5539fb490c1ef062f0b56b4ce73252d",
+    "address": "f1fb700e36b29c85b14bb290a626e9e1611ccd6ee6699a5dbbb4eae4effc75cb",
     "phone": "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855",
     "city": "279c790e3237c16c34fbb8805ccac21d189f9a94d6a52fdf5d3e03778116455f",
     "zip": "571de1df7856ba2adf21f06badf38e510bf34869fd988c61d1d312ef49d47577",
diff --git a/source/tests/unit_test/amc_transformation/sample_data/test_in/in_check.json b/source/tests/unit_test/amc_transformation/sample_data/test_in/in_check.json
@@ -2842,7 +2842,7 @@
     "first_name": "c9bb526fb4dde6859db10d72f50bb235ec76b65e966fe696fbc76371dbb0db40",
     "last_name": "64187e4b0c5f159c29fc0cbeaa8fa092c0b5c8d36c72e9e00ab35d07ff58a92b",
     "email": "02f984a383ff43b99b82c398af4e87c395d15c3f7e490071606a09b5ade4a9ed",
-    "address": "1a3690f04fe3cd85d7eb65f9738cfd47c8ce5c7fc808c3e30d7f38b5ef858f72",
+    "address": "9b73899c99735c64adbac1c44e982ff5263c7888b4f7cb474720d61b55155a13",
     "state": "ea325d761f98c6b73320e442b67f2a3574d9924716d788ddc0dbbdcaca853fe7",
     "city": "d4731f8ddc2174055280f532883335a4998a03a9151da1a5d4ccf720dbcd2be5",
     "phone": "d064ecaecb5af538cac67309e42e7d8e39c6a88d11ee5c00825cb4e407f47778",
@@ -3007,7 +3007,7 @@
     "first_name": "3a8e5402453da409612f962fdb8e3df14253f3c7278c9795fe2b49c56fbc10f8",
     "last_name": "b045524fbdabe6ef8b72a2482e776f0906dc03d192eb64dc01b06b7e6356549d",
     "email": "d2dbd465fda149109676192d89b7cdd30017bf366f986c1ce91436407b38b2af",
-    "address": "652de066ab240a1ee9dffd3d5d350bb7149e26ba2739739bb61541ec6096f307",
+    "address": "7c865823836441c67671b3df767bbe769de878b09c00bf998d4d38cec54f8a42",
     "state": "6152d43caa491abea69c0001c468166366618867baf85f1f5fc9b26e00966a24",
     "city": "571b0e35550136585f653a70460974d32f85879142300ecb361eff423ac62cd4",
     "phone": "478ae5916a578dc4b66328b63d711b976f0cfcb7239bf5119d14c5805f21cd77",
@@ -7143,7 +7143,7 @@
     "first_name": "fa39223abacabf18c7732bcee269d084895286162186ed574ec169e47c5cb3b9",
     "last_name": "2de3189b4401b27fc23b9c11f1b259fcde3d6d76011a8af98afea40f4019e1b8",
     "email": "5b615aa4c41a6a0591ee40fc3b3f61893d34875bc5ced5636e5ebda286324f9e",
-    "address": "a854302ec133754304a035ea2cffe9e613a4460e91bd9d02825da4c3c06bac0f",
+    "address": "6285d9cbad84c446faa54456c89f2d7d338f047fa520154f4c6d43eb343ef760",
     "state": "469cc643a19fb75901e5d331b8dc14befa8b98810b246c2fb22fff0c382dc39e",
     "city": "5d411fcd3d60b4a9033867e514a72564ced319f5d91efd5afb7f52c93df04efd",
     "phone": "9e16d49535447d75970d291811a74637c9062b65ae879b3480a451bdd830752f",
diff --git a/source/tests/unit_test/amc_transformation/sample_data/test_it/it_check.json b/source/tests/unit_test/amc_transformation/sample_data/test_it/it_check.json
@@ -4481,7 +4481,7 @@
     "first_name": "62387fe5ef5cefca114ffb579f85c08323460279d1bb3f8ffeb62ee3640cbca4",
     "last_name": "28263836ea961ac7e409f8d6311e2b91e6b97bf2cb446326ddf77cb74ef30809",
     "email": "f72e426604778b3aa99a224e901b6d1fe325c0edda30447d04f867a185d66bf3",
-    "address": "130940953ad0b53dd084c1b9b87e3722b5160e3dee40f403b170ecb56571fb10",
+    "address": "b29b2e88680ae55de4a9d94168e649beaa150476edd31fe73d6c7e9c4db449d4",
     "state": "4bd2c412ba70847f497a7adb5ccd527724bfd229fc9b24f755c32b270459464b",
     "city": "4f763f54e682a3a341167d70d7caeb99c5c1e8ed9832d33be09763bb4c1c1eef",
     "phone": "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855",
diff --git a/source/tests/unit_test/amc_transformation/sample_data/test_jp/jp_check.json b/source/tests/unit_test/amc_transformation/sample_data/test_jp/jp_check.json
@@ -81,7 +81,7 @@
     "first_name": "9f72339b512bef6ea59ebd14d6ecaa0469390b38b28bdc3d78218aea1df48744",
     "last_name": "d0273736aea173ee8583e3a5ea1506f93e7e052c7de529b0ce5311081d0d86e9",
     "email": "37e254332c1c3d646ab4cdba83b2f6c73ebaf1badc993fb9a4aabc3697a5297a",
-    "address": "85fbba73ea2d882fbf124d25bdf5c7ed3c4686ad0fb6a543b12063487174f368",
+    "address": "8bf349bb859448d5d486bf7931ba9fe87d7ba68d2616512db28bc7df628f4385",
     "phone": "5294cc6f2147714d0b29b37d3bd15d177c6d0c9d727f84ec2ac54522608e4286",
     "city": "a47ca01295c0dd1502132d40fd5da0160dfaa44af361243fbe8b08034cab7d6a",
     "zip": "60b3f4f68d9f41984804827cc3e902a95e7841ec55f93dace4d5fe736ed0e3d1",
@@ -2347,7 +2347,7 @@
     "first_name": "70e8bbbf9469df76b3d2551067a87b1d1ad21a65fcf7983210e7c541905e4f4b",
     "last_name": "6fd944faf72447e455cc79231d9ab5fb786294d1e59abcadb6c0194e1e85cab2",
     "email": "50880246d3573d2549cc1fff35a12b137da9274fe7ec053660a9ebc0d6a8f74d",
-    "address": "3cfe12dcaa14888f104fe56412653dce8ed54de7d4e31fe2de7a8e52ad0682e2",
+    "address": "113bdc593344549f790e253a2278a0187a72287fb79c472c4878e4460e40f7c1",
     "phone": "73336839a55764c067ec04a09306011b11c5c5643c7f8fd7def60ab3fd610689",
     "city": "29ffd80ae201709e2d5076db4c6c9259022380dd23336f9527d6d9798e738b3d",
     "zip": "9660f2459de3c920566c0d68e16aedeabb6c13d6bb107d0e150ee2beaee995c9",
@@ -7374,7 +7374,7 @@
     "first_name": "1d14facb567f0513a14bcaf6e5a1f21f9dfc225ade20b097f4faf45dfae5450e",
     "last_name": "10bddc6ec7b5c10af18f764b0cf55fdeec746513bd716c14267206a46af2bf60",
     "email": "907f9e6313b3e3961f4d78e17412d179cf5a658ea7d7167eca62b264c980a81c",
-    "address": "51c0fe2c4b33b4d594bb019041e2e969097c716f895bf23a3ae628380f6d55b6",
+    "address": "b23311fbba0681da6ee21fe2e5b7e9045f935e089ba050a28d5d55aac5bd860b",
     "phone": "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855",
     "city": "a3d3ea8421a110d476128015f017d04249b4809c8998abdb2efbe4a2f10d4e86",
     "zip": "3b627a136183f556fefad93b2085568ca9c8173bb4d74c28f8c0139b34602a5e",
diff --git a/source/tests/unit_test/amc_transformation/sample_data/test_us/us_check.json b/source/tests/unit_test/amc_transformation/sample_data/test_us/us_check.json
@@ -9556,7 +9556,7 @@
     "first_name": "438122d9dde9b4e74513dc6a2bac879d419b769571afc38a9079205024ac9cee",
     "last_name": "dd47e0f9f10cda3202f312c79f770541c5bdb9aa658609aff33108b026a4073e",
     "email": "71db0d0e2ebe04fcbaac9e967e0f59b9ed690d61a2c34a6062449483d1ea018b",
-    "address": "d2c0e5d45c461d29f4c5969e3464292798091d7111522ad5410f4a9d11b795c7",
+    "address": "d7fbea62a0b2449b4b017e195ed446ff655c89b06dd3cb3f7e7571372fba66f3",
     "phone": "f59902c7c5693b667a9e33995e29b81f959ac21eeb6500891ab06d5ff687c687",
     "city": "1865e4f9be9639fc76d7d4da8ee25eaa7421f6837accb67516937e69469ea7e4",
     "state": "225ed6562f6887b1074b9d0908100afedb97b49e883ed40361f7470b990f43a4",
diff --git a/source/website/package-lock.json b/source/website/package-lock.json
diff --git a/source/website/package.json b/source/website/package.json
@@ -1,6 +1,6 @@
 {
   "name": "amcufa",
-  "version": "3.0.11",
+  "version": "3.0.12",
   "private": true,
   "scripts": {
     "serve": "vue-cli-service serve",

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`		`-requests>=2.32.2`
	`1`	`+requests>=2.32.4`
`2`	`2`	`urllib3==2.2.2`
Original file line number	Diff line number	Diff line change
`@@ -20,6 +20,12 @@`
`20`	`20`	`}`
`21`	`21`	`],`
`22`	`22`	`"DirectionalWords": [`
	`23`	`+ {`
	`24`	`+ "WEST": "W"`
	`25`	`+ },`
	`26`	`+ {`
	`27`	`+ "W": "W"`
	`28`	`+ },`
`23`	`29`	`{`
`24`	`30`	`"EAST": "E"`
`25`	`31`	`},`
Original file line number	Diff line number	Diff line change
`@@ -76,6 +76,7 @@ def load_address_map_helper():`
`76`	`76`	`"OPEN_BRACKET": "[\\[\\{\\(]",`
`77`	`77`	`"CLOSE_BRACKET": "[\\]\\}\\)]",`
`78`	`78`	`"SPACE": "\\s+",`
	`79`	`+ "DOT": "\\.",`
`79`	`80`	`}`
`80`	`81`
`81`	`82`
Original file line number	Diff line number	Diff line change
`@@ -268,7 +268,7 @@ def process_request(self, **kwargs):`
`268`	`268`	`"Authorization": f'Bearer {kwargs["access_token"]}',`
`269`	`269`	`"Content-Type": "application/json",`
`270`	`270`	`"x-amzn-service-name": "amazon-marketing-cloud-uploader-from-aws",`
`271`		`- "x-amzn-service-version": "v3.0.11"`
	`271`	`+ "x-amzn-service-version": "v3.0.12"`
`272`	`272`	`}`
`273`	`273`
`274`	`274`	`if kwargs.get("advertiser_id"):`