Updated user logic

cli/generate-applications-defaults.py

@@ -13,20 +13,31 @@ def load_yaml_file(path):
     with path.open("r", encoding="utf-8") as f:
         return yaml.safe_load(f) or {}
 
+
 def main():
-    parser = argparse.ArgumentParser(description="Generate defaults_applications YAML from docker roles.")
-    parser.add_argument("--roles-dir", default="roles", help="Path to the roles directory (default: roles)")
-    parser.add_argument("--output-file", default="group_vars/all/03_applications.yml", help="Path to output YAML file")
+    parser = argparse.ArgumentParser(
+        description="Generate defaults_applications YAML from docker roles and include users meta data for each role."
+    )
+    parser.add_argument(
+        "--roles-dir",
+        help="Path to the roles directory (default: roles)"
+    )
+    parser.add_argument(
+        "--output-file",
+        help="Path to output YAML file"
+    )
 
     args = parser.parse_args()
     cwd = Path.cwd()
     roles_dir = (cwd / args.roles_dir).resolve()
     output_file = (cwd / args.output_file).resolve()
-
+    # Ensure output directory exists
     output_file.parent.mkdir(parents=True, exist_ok=True)
 
+    # Initialize result structure
     result = {"defaults_applications": {}}
 
+    # Process each role for application configs
     for role_dir in sorted(roles_dir.iterdir()):
         role_name = role_dir.name
         vars_main = role_dir / "vars" / "main.yml"
@@ -40,9 +51,10 @@ def main():
         try:
             application_id = vars_data.get("application_id")
         except Exception as e:
-            # print the exception message
-            print(f"Warning: failed to read application_id from {vars_data} in {vars_main}.\nException: {e}", file=sys.stderr)
-            # exit with status 0
+            print(
+                f"Warning: failed to read application_id from {vars_main}\nException: {e}",
+                file=sys.stderr
+            )
             sys.exit(1)
 
         if not application_id:
@@ -56,7 +68,19 @@ def main():
         config_data = load_yaml_file(config_file)
         if config_data:
             result["defaults_applications"][application_id] = config_data
+            users_meta_file = role_dir / "meta" / "users.yml"
+            transformed_users = {}
+            if users_meta_file.exists():
+                users_meta = load_yaml_file(users_meta_file)
+                users_data = users_meta.get("users", {})
+                for user, role_user_attrs in users_data.items():
+                    transformed_users[user] = f"{{{{ users[\"{user}\"] }}}}"
 
+            # Attach transformed users under each application
+            if transformed_users:
+                result["defaults_applications"][application_id]["users"] = transformed_users
+
+    # Write out result YAML
     with output_file.open("w", encoding="utf-8") as f:
         yaml.dump(result, f, sort_keys=False)
 
@@ -65,5 +89,6 @@ def main():
     except ValueError:
         print(f"✅ Generated: {output_file}")
 
+
 if __name__ == "__main__":
     main()

cli/generate_users.py

@@ -93,7 +93,7 @@ def build_users(defs, primary_domain, start_id, become_pwd):
 
 def load_user_defs(roles_dir):
     """
-    Scan all roles/*/vars/configuration.yml files and extract 'users:' sections.
+    Scan all roles/*/meta/users.yml files and extract 'users:' sections.
 
     Raises an exception if conflicting definitions are found.
 
@@ -106,7 +106,7 @@ def load_user_defs(roles_dir):
     Raises:
         ValueError: On invalid format or conflicting field values.
     """
-    pattern = os.path.join(roles_dir, '*/vars/configuration.yml')
+    pattern = os.path.join(roles_dir, '*/meta/users.yml')
     files = sorted(glob.glob(pattern))
     merged = OrderedDict()
 
@@ -151,11 +151,11 @@ def dictify(data):
 
 def parse_args():
     parser = argparse.ArgumentParser(
-        description='Generate a users.yml by merging all roles/*/vars/configuration.yml users sections.'
+        description='Generate a users.yml by merging all roles/*/meta/users.yml users sections.'
     )
     parser.add_argument(
         '--roles-dir', '-r', required=True,
-        help='Directory containing roles (e.g., roles/*/vars/configuration.yml).'
+        help='Directory containing roles (e.g., roles/*/meta/users.yml).'
     )
     parser.add_argument(
         '--output', '-o', required=True,