Merge pull request #128 from moj-analytical-services/update-regex-rule

Update regex rule
moj-analytical-services · Apr 8, 2024 · 143869c · 143869c
2 parents 526c2eb + f67eb50
commit 143869c
Show file tree

Hide file tree

Showing 6 changed files with 902 additions and 776 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,10 @@ 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).
 
+## v5.5.16 - 2024-04-08
+
+- Updated aws role rule
+
 ## v5.5.15 - 2023-12-01
 
 - Updated aws role rules

diff --git a/poetry.lock b/poetry.lock
diff --git a/pydbtools/__init__.py b/pydbtools/__init__.py
@@ -31,4 +31,4 @@
 )
 from .utils import s3_path_join  # noqa: F401
 
-__version__ = "5.5.15"
+__version__ = "5.5.16"
diff --git a/pydbtools/utils.py b/pydbtools/utils.py
@@ -27,8 +27,8 @@
         None,
     ),
     (
-        r"^[a-z0-9]{8}-airflow_",  # airflow
-        r"[a-z0-9]{8}-",
+        r"^[a-z0-9]{7,8}-airflow_",  # airflow
+        r"[a-z0-9]{7,8}-",
     ),
     (
         r"^[0-9]+$",  # numeric

diff --git a/pyproject.toml b/pyproject.toml
@@ -1,7 +1,7 @@
 [tool]
 [tool.poetry]
 name = "pydbtools"
-version = "5.5.15"
+version = "5.5.16"
 description = "A python package to query data via amazon athena and bring it into a pandas df using aws-wrangler."
 license = "MIT"
 authors = ["Karik Isichei <[email protected]>"]

diff --git a/tests/test_utils.py b/tests/test_utils.py
@@ -39,6 +39,7 @@ def test_pyproject_toml_matches_version():
         ("abcde:[email protected]", "my_name"),
         ("abcde:[email protected]", "my_name"),
         ("3f7f9e93-airflow_prod_role_name", "airflow_prod_role_name"),
+        ("3f7f9e9-airflow_prod_role_name", "airflow_prod_role_name"),
     ],
 )
 def test_clean_user_id(test_input, expected):