Merge pull request #129 from moj-analytical-services/add-regex-rule

Added additional regex rule

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.17 - 2024-04-17
+
+- Added aws role rule
+
 ## v5.5.16 - 2024-04-08
 
 - Updated aws role rule

pydbtools/__init__.py

@@ -31,4 +31,4 @@
 )
 from .utils import s3_path_join  # noqa: F401
 
-__version__ = "5.5.16"
+__version__ = "5.5.17"

pydbtools/utils.py

@@ -26,6 +26,10 @@
         r"alpha_user_",  # alpha user
         None,
     ),
+    (
+        r"alpha_app_",  # alpha app
+        None,
+    ),
     (
         r"^[a-z0-9]{7,8}-airflow_",  # airflow
         r"[a-z0-9]{7,8}-",

pyproject.toml

@@ -1,7 +1,7 @@
 [tool]
 [tool.poetry]
 name = "pydbtools"
-version = "5.5.16"
+version = "5.5.17"
 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]>"]

tests/test_utils.py

@@ -36,6 +36,8 @@ def test_pyproject_toml_matches_version():
         ("abcde:my-name", None),
         ("d347875:alpha_user_some_user", "alpha_user_some_user"),
         ("d347875:alpha_user_some-user", "alpha_user_some_user"),
+        ("d347875:alpha_app_some_user", "alpha_app_some_user"),
+        ("d347875:alpha_app_some-user", "alpha_app_some_user"),
         ("abcde:[email protected]", "my_name"),
         ("abcde:[email protected]", "my_name"),
         ("3f7f9e93-airflow_prod_role_name", "airflow_prod_role_name"),