mrjk-foss/python-shctl-iam
mrjk-foss/python-shctl-iam
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ci: run ci and add a helper script

Browse Source
This commit is contained in:
mrjk 2023-10-09 03:58:37 -04:00
parent eda4c8ffd9
commit cbe88fba59
9 changed files with 118 additions and 120 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
iam/app.py
View File

@ -12,7 +12,7 @@ from . import exceptions as error
from .catalog import Catalog from .catalog import Catalog
from .framework import DictItem, scoped_ident from .framework import DictItem, scoped_ident
from .idents import Idents from .idents import Idents
from .lib.utils import import_module, open_yaml, get_root_pkg_dir from .lib.utils import get_root_pkg_dir, import_module, open_yaml
from .meta import NAME, VERSION from .meta import NAME, VERSION
from .providers import Providers from .providers import Providers
@ -169,7 +169,6 @@ class App:
"Disable shell" "Disable shell"
return self.catalog.shell_disable(**kwargs) return self.catalog.shell_disable(**kwargs)
def shell_install(self, shell="bash", completion=True): def shell_install(self, shell="bash", completion=True):
"Show your install script for shell" "Show your install script for shell"
@ -193,4 +192,4 @@ class App:
out.append(f" source {completion_file}") out.append(f" source {completion_file}")
out.append(f"fi") out.append(f"fi")
out.append(f"### IAM ###") out.append(f"### IAM ###")
return '\n'.join(out) return "\n".join(out)

73
iam/catalog.py
View File

@ -1,18 +1,18 @@
import os
import logging import logging
import os
from collections import namedtuple from collections import namedtuple
from pprint import pprint from pprint import pprint
from types import SimpleNamespace from types import SimpleNamespace
import sh
# TO BE REMOVED !!!! # TO BE REMOVED !!!!
import click import click
import sh
from . import exceptions as error from . import exceptions as error
from .framework import DictCtrl, DictItem, KeyValue, KeyValueExtra from .framework import DictCtrl, DictItem, KeyValue, KeyValueExtra
from .idents import Ident from .idents import Ident
from .lib.utils import format_render, jinja_render, uniq, jinja_template_vars, empty from .lib.utils import (empty, format_render, jinja_render,
jinja_template_vars, uniq)
logger = logging.getLogger(__name__) logger = logging.getLogger(__name__)
cli_logger = logging.getLogger("iam.cli") cli_logger = logging.getLogger("iam.cli")
@ -54,19 +54,14 @@ class ServiceCommand(DictItem):
default_attrs = { default_attrs = {
"desc": "Service without description", "desc": "Service without description",
"cmd": "", # Direct commands to launch "cmd": "", # Direct commands to launch
"shell": "", # Will be run in a shell (or specific shell below)
"shell": "", # Will be run in a shell (or specific shell below)
# "shell_sh": "", # "shell_sh": "",
# "shell_bash": "", # "shell_bash": "",
# "shell_zsh": "", # "shell_zsh": "",
# "shell_fish": "", # "shell_fish": "",
# "shell_bash": "", # "shell_bash": "",
# "source_output": False, # True for shell commands by default ! # "source_output": False, # True for shell commands by default !
} }
# Overrides # Overrides
@ -76,7 +71,6 @@ class ServiceCommand(DictItem):
"Transform short form into long form" "Transform short form into long form"
self.service = self.parent self.service = self.parent
# def payload_transform(self, name, kwargs=None): # def payload_transform(self, name, kwargs=None):
# "Transform short form into long form" # "Transform short form into long form"
# self.service = self.parent # self.service = self.parent
@ -111,7 +105,6 @@ class Service(DictItem):
self.catalog = self.parent.catalog self.catalog = self.parent.catalog
def init(self): def init(self):
ret = {} ret = {}
for cmd_name, cmd in self.commands.items(): for cmd_name, cmd in self.commands.items():
ret[cmd_name] = ServiceCommand(cmd_name, cmd, parent=self) ret[cmd_name] = ServiceCommand(cmd_name, cmd, parent=self)
@ -229,7 +222,7 @@ class Service(DictItem):
out = cmd.format(**env_var) out = cmd.format(**env_var)
except KeyError as err: except KeyError as err:
msg = f"Missing variable: {err} for service: {res.key}" msg = f"Missing variable: {err} for service: {res.key}"
logger.warning (msg) logger.warning(msg)
out = msg out = msg
# raise IamException(msg) # raise IamException(msg)
@ -245,9 +238,9 @@ class Service(DictItem):
def get_cmds(self): def get_cmds(self):
"Get all services commands objects" "Get all services commands objects"
return [cmd for name, cmd in self.commands.items() if not name.startswith("shell")] return [
cmd for name, cmd in self.commands.items() if not name.startswith("shell")
]
def list_cmds(self): def list_cmds(self):
"List all services commands" "List all services commands"
@ -268,7 +261,6 @@ class Service(DictItem):
# cmd_name = cmd_name[len(shell_prefix):] # cmd_name = cmd_name[len(shell_prefix):]
name = f"{cmd_name}_{prefix}" name = f"{cmd_name}_{prefix}"
else: else:
name = cmd_name.replace("_", " ") name = cmd_name.replace("_", " ")
target[name] = conf.desc target[name] = conf.desc
@ -293,13 +285,11 @@ class Services(DictCtrl):
items_class = Service items_class = Service
RESERVED_CMD_PREFIX=["kind", "res", "svc", "shell", "run"] RESERVED_CMD_PREFIX = ["kind", "res", "svc", "shell", "run"]
def prepare(self): def prepare(self):
self.catalog = self.parent self.catalog = self.parent
def get_svc_command(self, cmd): def get_svc_command(self, cmd):
"Return the command to be run" "Return the command to be run"
@ -311,13 +301,12 @@ class Services(DictCtrl):
# Retrieve command list # Retrieve command list
cmds = self.list_cmds() cmds = self.list_cmds()
cmd_names = [cmd.name for cmd in cmds ] cmd_names = [cmd.name for cmd in cmds]
# Find best matching command # Find best matching command
cmd_split_idx = None cmd_split_idx = None
cmd = None cmd = None
curr=None curr = None
for index, part in enumerate(cmd_parts): for index, part in enumerate(cmd_parts):
curr = f"{curr} {part}" if curr is not None else part curr = f"{curr} {part}" if curr is not None else part
if curr in cmd_names: if curr in cmd_names:
@ -328,7 +317,7 @@ class Services(DictCtrl):
# Validate result # Validate result
if not cmd: if not cmd:
_choices = ','.join(cmd_names) _choices = ",".join(cmd_names)
_msg = f"No such services command named: {cmd_req}, please choose one of: {_choices}" _msg = f"No such services command named: {cmd_req}, please choose one of: {_choices}"
raise error.UnknownServiceCommand(_msg) raise error.UnknownServiceCommand(_msg)
@ -336,8 +325,6 @@ class Services(DictCtrl):
return cmd, args return cmd, args
def list_cmds(self): def list_cmds(self):
"List all services commands" "List all services commands"
@ -351,18 +338,17 @@ class Services(DictCtrl):
for cmd in ret: for cmd in ret:
prefix = cmd.name.split(" ")[0] prefix = cmd.name.split(" ")[0]
if prefix in self.RESERVED_CMD_PREFIX: if prefix in self.RESERVED_CMD_PREFIX:
_msg = f'Forbidden prefix! {cmd}' _msg = f"Forbidden prefix! {cmd}"
raise Exception (_msg) raise Exception(_msg)
conf.append(cmd.name ) conf.append(cmd.name)
dump = uniq(conf) dump = uniq(conf)
if conf != dump: if conf != dump:
_msg = f'Duplicates values! {conf}' _msg = f"Duplicates values! {conf}"
raise Exception (_msg) raise Exception(_msg)
return ret return ret
def get_linked_resources(self): def get_linked_resources(self):
""" """
Like get method, but only grab enabled services Like get method, but only grab enabled services
@ -791,7 +777,6 @@ class Context(DictItem):
self._vars = { self._vars = {
"ident": self.ident.name, "ident": self.ident.name,
"user": self.ident.name, "user": self.ident.name,
"config_dir": root_dir, "config_dir": root_dir,
"scripts_dir": os.path.join(root_dir, "scripts"), "scripts_dir": os.path.join(root_dir, "scripts"),
"bin_dir": os.path.join(root_dir, "bin"), "bin_dir": os.path.join(root_dir, "bin"),
@ -912,14 +897,12 @@ class Catalog:
# return self.services.get_loading_order(reverse=reverse) # return self.services.get_loading_order(reverse=reverse)
# Shell helpers # Shell helpers
# ================ # ================
def shell_enable(self, run_start=True): def shell_enable(self, run_start=True):
"Enable shell" "Enable shell"
actions = ["shell_enable"] actions = ["shell_enable"]
if run_start: if run_start:
actions.insert(0, "shell_start") actions.insert(0, "shell_start")
@ -928,7 +911,6 @@ class Catalog:
return self._shell_action(actions) return self._shell_action(actions)
def shell_disable(self, run_stop=False): def shell_disable(self, run_stop=False):
"Disable shell" "Disable shell"
@ -940,7 +922,6 @@ class Catalog:
return self._shell_action(actions) return self._shell_action(actions)
def _shell_action(self, action_names, reverse=False): def _shell_action(self, action_names, reverse=False):
"Run command order" "Run command order"
@ -993,22 +974,20 @@ class Catalog:
# pprint (ctx_vars) # pprint (ctx_vars)
cmd = jinja_render(cmd_shell, ctx_vars) cmd = jinja_render(cmd_shell, ctx_vars)
output_code.append(f"# Loading: {action_name} {res.name} ({service.name})") output_code.append(
f"# Loading: {action_name} {res.name} ({service.name})"
)
output_code.append(f"# =====================") output_code.append(f"# =====================")
output_code.append(cmd) output_code.append(cmd)
output_code.append("\n") output_code.append("\n")
return "\n".join(output_code) return "\n".join(output_code)
def run_svc_cmd(self, cmd): def run_svc_cmd(self, cmd):
"Run a command against the services" "Run a command against the services"
cmd, args = self.services.get_svc_command(cmd) cmd, args = self.services.get_svc_command(cmd)
# pprint (cmd.cmd) # pprint (cmd.cmd)
# pprint (args) # pprint (args)
@ -1049,14 +1028,12 @@ class Catalog:
out = None out = None
if cmd.shell: if cmd.shell:
mode = "shell" mode = "shell"
payload = cmd.shell payload = cmd.shell
# Scan for missing vars !!! # Scan for missing vars !!!
tmp = jinja_template_vars(payload) tmp = jinja_template_vars(payload)
prompt_vars = [] prompt_vars = []
for var_name in tmp: for var_name in tmp:
if var_name not in ctx_vars: if var_name not in ctx_vars:
@ -1074,7 +1051,7 @@ class Catalog:
answered_items = {} answered_items = {}
for missed in prompt_vars: for missed in prompt_vars:
default = ctx_vars.get(missed, None) default = ctx_vars.get(missed, None)
result = click.prompt(f'Select value for {missed}', default=default) result = click.prompt(f"Select value for {missed}", default=default)
answered_items[missed] = result answered_items[missed] = result
ctx_vars.update(answered_items) ctx_vars.update(answered_items)
@ -1105,15 +1082,13 @@ class Catalog:
if sh_args: if sh_args:
out = cmd(sh_args, _fg=True, _env=new_env) out = cmd(sh_args, _fg=True, _env=new_env)
else: else:
out = cmd( _fg=True, _env=new_env) out = cmd(_fg=True, _env=new_env)
# print (out) # print (out)
else: else:
raise Exception("MIssing cmd or shell in config !") raise Exception("MIssing cmd or shell in config !")
return out return out
# print ("RUN CMD", mode, "\n\n\n====\n", real_cmd) # print ("RUN CMD", mode, "\n\n\n====\n", real_cmd)

92
iam/cli_click.py
View File

@ -45,7 +45,7 @@ else:
import rich_click as click import rich_click as click
from rich_click import RichGroup from rich_click import RichGroup
from rich import box #, print from rich import box # , print
from rich.console import Console from rich.console import Console
# Overrides defaults # Overrides defaults
from rich.pretty import pprint from rich.pretty import pprint
@ -99,7 +99,7 @@ DEFAULT_LOG_LEVEL = 30 # warning
DEBUG = os.environ.get("IAM_DEBUG", "False") DEBUG = os.environ.get("IAM_DEBUG", "False")
DEFAULT_IDENT = os.environ.get("IAM_IDENT", os.environ.get("SHELL_IDENT", "")) DEFAULT_IDENT = os.environ.get("IAM_IDENT", os.environ.get("SHELL_IDENT", ""))
DEFAULT_FORMAT = os.environ.get("IAM_FORMAT", "table") DEFAULT_FORMAT = os.environ.get("IAM_FORMAT", "table")
DEFAULT_HELP_OPTIONS=["-h", "--help"] DEFAULT_HELP_OPTIONS = ["-h", "--help"]
DEFAULT_SHELL = os.environ.get("SHELL", "bash") DEFAULT_SHELL = os.environ.get("SHELL", "bash")
# list_view.formats_enum # list_view.formats_enum
@ -222,8 +222,7 @@ def get_var(name, default=None):
# @click.group(cls=NestedHelpGroup, context_settings=CONTEXT_SETTINGS) # @click.group(cls=NestedHelpGroup, context_settings=CONTEXT_SETTINGS)
@click.group(cls=NestedHelpGroup @click.group(cls=NestedHelpGroup)
)
@global_options @global_options
@format_options @format_options
@click.version_option() @click.version_option()
@ -686,7 +685,11 @@ def cli__shell():
@format_options @format_options
@click.pass_context @click.pass_context
def shell_idents( def shell_idents(
ctx, fmt_name=None, fmt_fields=None, fmt_sort=None, verbose=None, ctx,
fmt_name=None,
fmt_fields=None,
fmt_sort=None,
verbose=None,
): ):
"Shell identities" "Shell identities"
columns = ["name"] columns = ["name"]
@ -736,11 +739,15 @@ def shell_order(
) )
@cli__shell.command("enable") @cli__shell.command("enable")
@click.option( @click.option(
"skip_start", "--no-start", "-b", is_flag=True, show_default=False, default=False, help="Disable background process start" "skip_start",
"--no-start",
"-b",
is_flag=True,
show_default=False,
default=False,
help="Disable background process start",
) )
@click.pass_context @click.pass_context
def shell_enable(ctx, skip_start=True, verbose=None): def shell_enable(ctx, skip_start=True, verbose=None):
@ -750,10 +757,15 @@ def shell_enable(ctx, skip_start=True, verbose=None):
print(app.shell_enable(run_start=not skip_start)) print(app.shell_enable(run_start=not skip_start))
@cli__shell.command("disable") @cli__shell.command("disable")
@click.option( @click.option(
"run_stop", "--kill", "-k", is_flag=True, show_default=False, default=False, help="Kill background process on leave" "run_stop",
"--kill",
"-k",
is_flag=True,
show_default=False,
default=False,
help="Kill background process on leave",
) )
@click.pass_context @click.pass_context
def shell_disable(ctx, run_stop=False, verbose=None): def shell_disable(ctx, run_stop=False, verbose=None):
@ -765,7 +777,13 @@ def shell_disable(ctx, run_stop=False, verbose=None):
@cli__shell.command("kill") @cli__shell.command("kill")
@click.option( @click.option(
"all_idents", "--all", "-a", is_flag=True, show_default=False, default=False, help="Kill on all users" "all_idents",
"--all",
"-a",
is_flag=True,
show_default=False,
default=False,
help="Kill on all users",
) )
@click.pass_context @click.pass_context
def shell_kill(ctx, all_idents=False, verbose=None): def shell_kill(ctx, all_idents=False, verbose=None):
@ -785,20 +803,30 @@ def shell_kill(ctx, all_idents=False, verbose=None):
ret.append(app.shell_enable(run_start=False)) ret.append(app.shell_enable(run_start=False))
ret.append(app.shell_disable(run_stop=True)) ret.append(app.shell_disable(run_stop=True))
print('\n'.join(ret)) print("\n".join(ret))
@cli__shell.command("switch") @cli__shell.command("switch")
@click.argument("ident", required=False) @click.argument("ident", required=False)
# @format_options # @format_options
@click.option( @click.option(
"skip_start", "--no-start", "-b", is_flag=True, show_default=False, default=False, help="Disable background process start" "skip_start",
"--no-start",
"-b",
is_flag=True,
show_default=False,
default=False,
help="Disable background process start",
) )
@click.option( @click.option(
"run_stop", "--kill", "-k", is_flag=True, show_default=False, default=False, help="Kill background process on leave" "run_stop",
"--kill",
"-k",
is_flag=True,
show_default=False,
default=False,
help="Kill background process on leave",
) )
@click.pass_context @click.pass_context
def shell_switch(ctx, ident="", run_stop=False, skip_start=True, verbose=None): def shell_switch(ctx, ident="", run_stop=False, skip_start=True, verbose=None):
"Enable identity in shell" "Enable identity in shell"
@ -808,9 +836,8 @@ def shell_switch(ctx, ident="", run_stop=False, skip_start=True, verbose=None):
src_ident = app.catalog.ident.name src_ident = app.catalog.ident.name
dst_ident = ident dst_ident = ident
if src_ident == dst_ident: if src_ident == dst_ident:
print (">&2 echo 'No need to change'") print(">&2 echo 'No need to change'")
else: else:
ret = [] ret = []
@ -824,32 +851,25 @@ def shell_switch(ctx, ident="", run_stop=False, skip_start=True, verbose=None):
ret.append(app.shell_enable(run_start=not skip_start)) ret.append(app.shell_enable(run_start=not skip_start))
# Output # Output
print('\n'.join(ret)) print("\n".join(ret))
class TmpGroup(click.Group): class TmpGroup(click.Group):
def format_help(self, ctx, formatter): def format_help(self, ctx, formatter):
val = "List of available commands!" val = "List of available commands!"
formatter.write(val) formatter.write(val)
@cli_app.command(
@cli_app.command("run", "run",
# cls=TmpGroup, # cls=TmpGroup,
context_settings=dict( context_settings=dict(
ignore_unknown_options=True, ignore_unknown_options=True, allow_extra_args=True, help_option_names=[]
allow_extra_args=True, ),
help_option_names=[]
)
) )
@click.argument('cmd_params', nargs=-1, type=click.UNPROCESSED) @click.argument("cmd_params", nargs=-1, type=click.UNPROCESSED)
@click.pass_context @click.pass_context
def cli_app_run(ctx, cmd_params): def cli_app_run(ctx, cmd_params):
# print("Will run cmd:", cmd_params) # print("Will run cmd:", cmd_params)
# Check first help parameter only # Check first help parameter only
@ -867,7 +887,6 @@ def cli_app_run(ctx, cmd_params):
click.echo(ctx.get_help()) click.echo(ctx.get_help())
return return
# Get instanciated app # Get instanciated app
app = ctx.obj.app app = ctx.obj.app
@ -875,7 +894,6 @@ def cli_app_run(ctx, cmd_params):
ret = app.catalog.services.list_cmds() ret = app.catalog.services.list_cmds()
data = [[x.name, x.desc] for x in ret] data = [[x.name, x.desc] for x in ret]
# Render data # Render data
ctx.obj.render_list( ctx.obj.render_list(
data, data,
@ -892,11 +910,10 @@ def cli_app_run(ctx, cmd_params):
# Run the output # Run the output
ret = app.catalog.run_svc_cmd(cmd=cmd_params) ret = app.catalog.run_svc_cmd(cmd=cmd_params)
print (ret) print(ret)
# pprint (ret, expand_all=True) # pprint (ret, expand_all=True)
# @cli_app.command("run2", # @cli_app.command("run2",
# context_settings=dict( # context_settings=dict(
# ignore_unknown_options=True, # ignore_unknown_options=True,
@ -912,9 +929,7 @@ def cli_app_run(ctx, cmd_params):
@cli__shell.command("install") @cli__shell.command("install")
@click.argument("shell", @click.argument("shell", required=False, default=DEFAULT_SHELL)
required=False,
default=DEFAULT_SHELL)
@click.pass_context @click.pass_context
def shell_install(ctx, shell=None, verbose=None): def shell_install(ctx, shell=None, verbose=None):
"Install iam in your shell" "Install iam in your shell"
@ -926,7 +941,6 @@ def shell_install(ctx, shell=None, verbose=None):
# print("-- %< --" * 8) # print("-- %< --" * 8)
# Exception handler # Exception handler
# =============================== # ===============================
def clean_terminate(err): def clean_terminate(err):

3
iam/framework.py
View File

@ -90,15 +90,12 @@ def get_app_logger(loggers=None, level="WARNING", colors=False, format="default"
}, },
# Where logs come from # Where logs come from
"loggers": { "loggers": {
# Used to catch ALL logs # Used to catch ALL logs
"": { # root logger "": { # root logger
"handlers": ["default"], "handlers": ["default"],
"level": "WARNING", "level": "WARNING",
"propagate": False, "propagate": False,
}, },
# # Used to catch all logs of myapp and sublibs # # Used to catch all logs of myapp and sublibs
# 'myapp': { # 'myapp': {
# 'handlers': ['default'], # 'handlers': ['default'],

2
iam/lib/cli_views.py
View File

@ -21,7 +21,6 @@ except ModuleNotFoundError:
# duckdb support => https://stackoverflow.com/a/70538527 # duckdb support => https://stackoverflow.com/a/70538527
# MISSING_PKGS = [] # MISSING_PKGS = []
# try: # try:
# from rich.console import Console # from rich.console import Console
@ -343,7 +342,6 @@ class _RootView:
# logger.warning(_msg) # logger.warning(_msg)
# # raise Exception(_msg) # # raise Exception(_msg)
# Fetch renderer method # Fetch renderer method
# --------------------------- # ---------------------------
fmt_name = fmt_.name fmt_name = fmt_.name

31
iam/lib/click_utils.py
View File

@ -1,4 +1,5 @@
import logging import logging
import click import click
logger = logging.getLogger(__name__) logger = logging.getLogger(__name__)
@ -49,7 +50,6 @@ class NestedHelpGroup(click.Group):
""" """
# For partial name resolution # For partial name resolution
def resolve_command(self, ctx, args): def resolve_command(self, ctx, args):
"Return the full command name if changed" "Return the full command name if changed"
@ -59,7 +59,6 @@ class NestedHelpGroup(click.Group):
logger.debug(f"Rewrite command '{_}' to '{cmd.name}'") logger.debug(f"Rewrite command '{_}' to '{cmd.name}'")
return cmd.name, cmd, args return cmd.name, cmd, args
def get_command(self, ctx, cmd_name: str): def get_command(self, ctx, cmd_name: str):
"""Given a context and a command name, this returns a :class:`Command` """Given a context and a command name, this returns a :class:`Command`
object if it exists or returns ``None``. object if it exists or returns ``None``.
@ -67,7 +66,7 @@ class NestedHelpGroup(click.Group):
# Resolve name part by part # Resolve name part by part
parts = cmd_name.split(" ") parts = cmd_name.split(" ")
len_parts = len(parts) -1 len_parts = len(parts) - 1
curr = self curr = self
for idx, part in enumerate(parts): for idx, part in enumerate(parts):
match = curr.commands.get(part) match = curr.commands.get(part)
@ -75,8 +74,13 @@ class NestedHelpGroup(click.Group):
# Look for shortcut if last part # Look for shortcut if last part
if match is None: if match is None:
# Look for direct children only # Look for direct children only
matches = [x for x in self._resolve_children(self, ctx=ctx, ignore_groups=False, deep=0) matches = [
if x.startswith(cmd_name)] x
for x in self._resolve_children(
self, ctx=ctx, ignore_groups=False, deep=0
)
if x.startswith(cmd_name)
]
# Look for possible matches # Look for possible matches
if not matches: if not matches:
@ -84,7 +88,9 @@ class NestedHelpGroup(click.Group):
elif len(matches) == 1: elif len(matches) == 1:
match = click.Group.get_command(self, ctx, matches[0]) match = click.Group.get_command(self, ctx, matches[0])
else: else:
ctx.fail(f"Too many matches for {cmd_name}: {', '.join(sorted(matches))}") ctx.fail(
f"Too many matches for {cmd_name}: {', '.join(sorted(matches))}"
)
# Iterate over next child! # Iterate over next child!
curr = match curr = match
@ -97,7 +103,9 @@ class NestedHelpGroup(click.Group):
return sorted(self._resolve_children(self, ctx=ctx, ignore_groups=True)) return sorted(self._resolve_children(self, ctx=ctx, ignore_groups=True))
@classmethod @classmethod
def _resolve_children(cls, obj, ctx=None, ignore_groups=False, _parent=None, deep=-1): def _resolve_children(
cls, obj, ctx=None, ignore_groups=False, _parent=None, deep=-1
):
"Resolve recursively all children" "Resolve recursively all children"
# Source: Adapted from https://stackoverflow.com/a/56159096 # Source: Adapted from https://stackoverflow.com/a/56159096
@ -119,14 +127,17 @@ class NestedHelpGroup(click.Group):
# Recursive loop # Recursive loop
if deep != 0: if deep != 0:
deep = deep -1 deep = deep - 1
ret.extend( ret.extend(
cls._resolve_children( cls._resolve_children(
child, ctx=ctx, ignore_groups=ignore_groups, _parent=full_name, deep=deep child,
ctx=ctx,
ignore_groups=ignore_groups,
_parent=full_name,
deep=deep,
) )
) )
return ret return ret
return [] return []

9
iam/lib/utils.py
View File

@ -1,8 +1,8 @@
import sys
import importlib import importlib
import json import json
import logging import logging
import os import os
import sys
import tomllib import tomllib
from pprint import pprint from pprint import pprint
@ -83,6 +83,7 @@ def prune(items):
raise Exception(f"Function prune requires a list or a dict, got: {items}") raise Exception(f"Function prune requires a list or a dict, got: {items}")
return ret return ret
# from jinja2 import Environment, FileSystemLoader, meta # from jinja2 import Environment, FileSystemLoader, meta
# env = Environment(loader=FileSystemLoader('templates')) # env = Environment(loader=FileSystemLoader('templates'))
@ -91,9 +92,9 @@ def prune(items):
from jinja2 import Environment, PackageLoader, meta from jinja2 import Environment, PackageLoader, meta
def jinja_template_vars(payload):
env = Environment() #loader=PackageLoader('templates')) def jinja_template_vars(payload):
env = Environment() # loader=PackageLoader('templates'))
parsed_content = env.parse(payload) parsed_content = env.parse(payload)
return meta.find_undeclared_variables(parsed_content) return meta.find_undeclared_variables(parsed_content)
@ -250,6 +251,7 @@ def iterate_any(payload):
# raise Exception(f"Could not iterate over: {payload}") # raise Exception(f"Could not iterate over: {payload}")
def get_root_pkg_dir(name): def get_root_pkg_dir(name):
"""Return the dir where the actual paasify source code lives""" """Return the dir where the actual paasify source code lives"""
@ -264,7 +266,6 @@ def get_root_pkg_dir(name):
return None return None
def get_pkg_dir(name): def get_pkg_dir(name):
"""Return the dir where the actual paasify source code lives, it loads the module !!!""" """Return the dir where the actual paasify source code lives, it loads the module !!!"""

2
iam/plugins/local.py
View File

@ -7,6 +7,4 @@ yml_dir = get_pkg_dir(__name__)
plugin_conf = open_yaml(os.path.join(yml_dir, "local.yml"))[0] plugin_conf = open_yaml(os.path.join(yml_dir, "local.yml"))[0]
all = plugin_conf.get("providers", {}) all = plugin_conf.get("providers", {})

5
run_ci.sh Executable file
View File

@ -0,0 +1,5 @@
#!/bin/bash
black iam/
isort iam/