moritz/alakazam
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix app selection

Browse Source
This commit is contained in:
Moritz 2023-11-27 16:52:54 +01:00
parent 28579a56b2
commit 37dedb5cef
1 changed files with 41 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

71
alakazam.py
View File

@ -430,12 +430,11 @@ def setup(apps):
def config(apps):
""" Configure the apps """
for instance, instance_config in CONFIGS.items():
if not apps:
apps = instance_config.keys()
for app in apps:
if app not in instance_config:
logging.error(f"Could not find any '{app}' configuration for instance {instance}")
exit(1)
if apps:
selected_apps = [app for app in apps if app in instance_config.keys()]
else:
selected_apps = instance_config.keys()
for app in selected_apps:
app_config = instance_config[app]
domain = app_config['app_domain']
server = app_config["server"]
@ -453,12 +452,11 @@ def secrets(apps):
""" Configure the apps """
for instance, instance_config in CONFIGS.items():
instance_apps = instance_config.keys()
if not apps:
apps = instance_apps
for app in apps:
if app not in instance_config:
logging.error(f"Could not find any '{app}' configuration for instance {instance}")
exit(1)
if apps:
selected_apps = [app for app in apps if app in instance_config.keys()]
else:
selected_apps = instance_config.keys()
for app in selected_apps:
app_config = instance_config[app]
domain = app_config['app_domain']
print(f"Create secrets for {domain}")
@ -471,9 +469,11 @@ def get_deployed_apps(apps):
deployed_apps = []
processed_server = []
for _, instance_config in CONFIGS.items():
if not apps:
apps = instance_config.keys()
for app in apps:
if apps:
selected_apps = [app for app in apps if app in instance_config.keys()]
else:
selected_apps = instance_config.keys()
for app in selected_apps:
server = instance_config[app]['server']
if server in processed_server:
continue
@ -492,9 +492,11 @@ def deploy(apps, run_cmds, force):
""" Deploy all the apps """
deployed_domains = get_deployed_apps(apps)
for _, instance_config in CONFIGS.items():
if not apps:
apps = instance_config.keys()
for app in apps:
if apps:
selected_apps = [app for app in apps if app in instance_config.keys()]
else:
selected_apps = instance_config.keys()
for app in selected_apps:
app_config = instance_config[app]
domain = app_config['app_domain']
if domain in deployed_domains and not force:
@ -526,9 +528,11 @@ def undeploy(apps):
""" Undeploy all the apps """
deployed_domains = get_deployed_apps(apps)
for _, instance_config in CONFIGS.items():
if not apps:
apps = instance_config.keys()
for app in apps:
if apps:
selected_apps = [app for app in apps if app in instance_config.keys()]
else:
selected_apps = instance_config.keys()
for app in selected_apps:
app_config = instance_config[app]
domain = app_config['app_domain']
if domain not in deployed_domains:
@ -544,9 +548,11 @@ def cmds(apps):
""" execute all post deploy cmds """
deployed_domains = get_deployed_apps(apps)
for _, instance_config in CONFIGS.items():
if not apps:
apps = instance_config.keys()
for app in apps:
if apps:
selected_apps = [app for app in apps if app in instance_config.keys()]
else:
selected_apps = instance_config.keys()
for app in selected_apps:
app_config = instance_config[app]
domain = app_config['app_domain']
if domain not in deployed_domains:
@ -588,12 +594,17 @@ def print_all_apps(apps):
def list_apps(apps):
pool_apps = {}
for instance, instance_config in CONFIGS.items():
pool_apps[instance] = []
if not apps:
apps = instance_config.keys()
for app in apps:
domain = instance_config[app]['app_domain']
pool_apps[instance].append((app, domain))
instance_app_domains = []
if apps:
selected_apps = [app for app in apps if app in instance_config.keys()]
else:
selected_apps = instance_config.keys()
for app in selected_apps:
if app in instance_config:
domain = instance_config[app]['app_domain']
instance_app_domains.append((app, domain))
if instance_app_domains:
pool_apps[instance] = instance_app_domains
return pool_apps