From 73329506a91e682c73e85aef556b1841a03e0ebd Mon Sep 17 00:00:00 2001 From: Kevin Veen-Birkenbach Date: Wed, 9 Jul 2025 12:31:37 +0200 Subject: [PATCH] Solved bug which existed due to user structure refactoring --- Makefile | 5 +++-- cli/generate_applications.py | 2 +- tests/unit/cli/test_generate_applications_defaults_users.py | 3 ++- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 3d9ca837..9e3c6dc6 100644 --- a/Makefile +++ b/Makefile @@ -7,9 +7,10 @@ INCLUDES_OUT := ./tasks/utils/server-roles.yml INCLUDES_SCRIPT := ./cli/generate_playbook.py EXTRA_USERS := $(shell \ - find $(ROLES_DIR) -maxdepth 1 -type d -name 'web-app*' -printf '%f\n' \ - | sed -E 's/^web-app[_-]?//' \ + find $(ROLES_DIR) -maxdepth 1 -type d -name '*' -printf '%f\n' \ + | sed -E 's/.*-//' \ | grep -E -x '[a-z0-9]+' \ + | sort -u \ | paste -sd, - \ ) diff --git a/cli/generate_applications.py b/cli/generate_applications.py index 0c13aaab..99ad80da 100644 --- a/cli/generate_applications.py +++ b/cli/generate_applications.py @@ -80,7 +80,7 @@ def main(): sys.exit(1) config_data["group_id"] = gid_number result["defaults_applications"][application_id] = config_data - users_meta_file = role_dir / "meta" / "users.yml" + users_meta_file = role_dir / "users" / "main.yml" transformed_users = {} if users_meta_file.exists(): users_meta = load_yaml_file(users_meta_file) diff --git a/tests/unit/cli/test_generate_applications_defaults_users.py b/tests/unit/cli/test_generate_applications_defaults_users.py index 61dad097..461c3333 100644 --- a/tests/unit/cli/test_generate_applications_defaults_users.py +++ b/tests/unit/cli/test_generate_applications_defaults_users.py @@ -18,6 +18,7 @@ class TestGenerateDefaultApplicationsUsers(unittest.TestCase): (self.role / "vars").mkdir(parents=True) (self.role / "config").mkdir(parents=True) (self.role / "meta").mkdir(parents=True) + (self.role / "users").mkdir(parents=True) # Write application_id and configuration (self.role / "vars" / "main.yml").write_text("application_id: app_with_users\n") @@ -30,7 +31,7 @@ class TestGenerateDefaultApplicationsUsers(unittest.TestCase): 'bob': {'uid': 2002, 'gid': 2002} } } - with (self.role / "meta" / "users.yml").open('w', encoding='utf-8') as f: + with (self.role / "users" / "main.yml").open('w', encoding='utf-8') as f: yaml.dump(users_meta, f) # Output file path