diff --git a/CHANGELOG.md b/CHANGELOG.md index 45bddf8..b67c1b2 100644 --- 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.15 - 2023-12-01 + +- Updated aws role rules + ## v5.5.14 - 2023-12-01 - Updated get_database_name_from_userid to apply explicit rules for roles diff --git a/pydbtools/__init__.py b/pydbtools/__init__.py index 30f8c4d..8acab69 100644 --- a/pydbtools/__init__.py +++ b/pydbtools/__init__.py @@ -31,4 +31,4 @@ ) from .utils import s3_path_join # noqa: F401 -__version__ = "5.5.14" +__version__ = "5.5.15" diff --git a/pydbtools/utils.py b/pydbtools/utils.py index 07273cc..d0a3b98 100644 --- a/pydbtools/utils.py +++ b/pydbtools/utils.py @@ -22,10 +22,6 @@ r"@[a-z.-]+.gov.uk$", # gov email r"@[a-z.-]+.gov.uk", ), - ( - r"^[0-9]+", # numeric - None, - ), ( r"alpha_user_", # alpha user None, @@ -34,6 +30,10 @@ r"^[a-z0-9]{8}-airflow_", # airflow r"[a-z0-9]{8}-", ), + ( + r"^[0-9]+$", # numeric + None, + ), ] diff --git a/pyproject.toml b/pyproject.toml index e270bb1..4fecbb7 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,7 +1,7 @@ [tool] [tool.poetry] name = "pydbtools" -version = "5.5.14" +version = "5.5.15" 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 "] diff --git a/tests/test_utils.py b/tests/test_utils.py index 25f6dd7..8cba9a6 100644 --- a/tests/test_utils.py +++ b/tests/test_utils.py @@ -38,7 +38,7 @@ def test_pyproject_toml_matches_version(): ("d347875:alpha_user_some-user", "alpha_user_some_user"), ("abcde:my-name@digital.justice.gov.uk", "my_name"), ("abcde:my-name@justice.gov.uk", "my_name"), - ("f7fd6d7d-airflow_prod_role_name", "airflow_prod_role_name"), + ("3f7f9e93-airflow_prod_role_name", "airflow_prod_role_name"), ], ) def test_clean_user_id(test_input, expected):