Skip to content

fix: Merge appregdefs from template and instance repo #1337

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
chethana-shastry-p wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: Merge appregdefs from template and instance repo #1337

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 10 additions & 8 deletions scripts/build_env/appregdef_render.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,15 @@
from env_template.process_env_template import process_env_template
from render_config_env import EnvGenerator

def copy_app_reg_defs(render_dir, env_dir):
for dir_name in ["AppDefs", "RegDefs"]:
src = Path(render_dir) / dir_name
dst = Path(env_dir) / dir_name

if src.exists():
shutil.copytree(src, dst, dirs_exist_ok=True)


if __name__ == '__main__':
template_version = process_env_template()

Expand Down Expand Up @@ -31,13 +40,6 @@
render_context = EnvGenerator()
render_context.process_app_reg_defs(env_name, render_context_vars)

for dir_name in ["AppDefs", "RegDefs"]:
src = Path(render_dir) / dir_name
dst = Path(env_dir) / dir_name

if dst.exists():
shutil.rmtree(dst)
if src.exists():
shutil.move(src, dst)
copy_app_reg_defs(render_dir, env_dir)

update_generated_versions(env_dir, BUILD_ENV_TAG, template_version[NamespaceRole.COMMON])
22 changes: 22 additions & 0 deletions scripts/build_env/tests/app_reg_defs/test_appregdefs.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
from render_config_env import EnvGenerator
from envgenehelper.test_helpers import TestHelpers
from envgenehelper.business_helper import NamespaceRole
from scripts.build_env.appregdef_render import copy_app_reg_defs


class TestAppRegDefRendering:
Expand Down Expand Up @@ -106,3 +107,24 @@ def test_negative_appregdef_rendering(self, test_number, expected_exception):
with pytest.raises(expected_exception):
render_context.process_app_reg_defs(self.env_name, context_vars)

def test_appregdefs_merge_behavior(self, request):
self._setup_render_dir()

render_context = EnvGenerator()
context_vars = self._get_render_context("TC-001-001")

render_context.process_app_reg_defs(self.env_name, context_vars)

render_dir = Path(context_vars["current_env_dir"])
env_dir = Path(f"/tmp/environments/{self.cluster_name}/{self.env_name}")
appdefs_dir = Path(f"{env_dir}/AppDefs")
appdefs_dir.mkdir(parents=True, exist_ok=True)
(appdefs_dir / "existing.yml").write_text("keep-me")

copy_app_reg_defs(render_dir, env_dir)

assert (appdefs_dir / "application-1.yml").exists()
assert (appdefs_dir / "existing.yml").exists()

shutil.rmtree(appdefs_dir, ignore_errors=True)
shutil.rmtree(render_dir / "AppDefs", ignore_errors=True)
Loading