Merge pull request #137 from moj-analytical-services/unit-testing-git…

…hub-actions unit tests
moj-analytical-services · Aug 12, 2024 · 8a2329d · 8a2329d
2 parents bf8fd15 + 872512a
commit 8a2329d
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 3 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.6.2 - 2024-07-31
+
+- fix and unit test additional rule to recognise aws roles coming from github actions ([#136](https://github.com/moj-analytical-services/pydbtools/pull/136))
+
 ## v5.6.1 - 2024-07-31
 
 - fix failing mkdocs build ([#135](https://github.com/moj-analytical-services/pydbtools/pull/135))

diff --git a/pydbtools/__init__.py b/pydbtools/__init__.py
@@ -31,4 +31,4 @@
 )
 from .utils import s3_path_join  # noqa: F401
 
-__version__ = "5.6.1"
+__version__ = "5.6.2"
diff --git a/pydbtools/utils.py b/pydbtools/utils.py
@@ -60,7 +60,7 @@
         None,
     ),
     (
-        r"[A-Za-z0-9]+:GitHubActions",  # GitHub action for e2e
+        r"^githubactions$",  # GitHub action for e2e
         None,
     ),
 ]

diff --git a/pyproject.toml b/pyproject.toml
@@ -1,7 +1,7 @@
 [tool]
 [tool.poetry]
 name = "pydbtools"
-version = "5.6.1"
+version = "5.6.2"
 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
@@ -43,6 +43,7 @@ def test_pyproject_toml_matches_version():
         ("3f7f9e93-airflow_prod_role_name", "airflow_prod_role_name"),
         ("3f7f9e9-airflow_prod_role_name", "airflow_prod_role_name"),
         ("abcde:airflow_prod_role_name", "airflow_prod_role_name"),
+        ("abcde:GitHubActions", "githubactions"),
     ],
 )
 def test_clean_user_id(test_input, expected):
-Original file line number
+Diff line change
@@ Expand Up / @@ -60,7 +60,7 @@ @@
             None,
         ),
         (
-            r"[A-Za-z0-9]+:GitHubActions",  # GitHub action for e2e
+            r"^githubactions$",  # GitHub action for e2e
             None,
         ),
     ]
@@ Expand Down @@