fix(server): make sure local unfurl.yaml exists when patching deploym…

…ents
onecommons · Jul 31, 2023 · c151e0a · c151e0a
1 parent 2a4094a
commit c151e0a
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 10 deletions.
diff --git a/unfurl/localenv.py b/unfurl/localenv.py
@@ -75,6 +75,8 @@ def __init__(
         readonly: Optional[bool] = False,
     ):
         assert isinstance(path, str), path
+        if os.path.isdir(path):
+            path = os.path.join(path, DefaultNames.LocalConfig)
         self.projectRoot = os.path.abspath(os.path.dirname(path))
         self.overrides = overrides or {}
         if os.path.exists(path):

diff --git a/unfurl/server.py b/unfurl/server.py
@@ -838,19 +838,23 @@ def _stage(project_id: str, branch: str, args: dict, pull: bool) -> Optional[Git
     else:
         # repo doesn't exists, clone it
         repo = _clone_repo(project_id, branch, args)
-        path = Path(repo.working_dir)
-        if (path / DefaultNames.LocalConfigTemplate).is_file() and not (
+        working_dir = repo.working_dir
+        ensure_local_config(working_dir)
+        logger.info("clone success: %s to %s", repo.safe_url, repo.working_dir)
+    return repo
+
+def ensure_local_config(working_dir):
+    path = Path(working_dir)
+    if (path / DefaultNames.LocalConfigTemplate).is_file() and not (
             path / "local" / DefaultNames.LocalConfig
         ).is_file():
-            # create local/unfurl.yaml in the new project
-            new_project = Project(repo.working_dir)
-            created_local = init._create_local_config(new_project, logger, {})
-            if not created_local:
-                logger.error(
+        # create local/unfurl.yaml in the new project
+        new_project = Project( str(path / DefaultNames.LocalConfig) )
+        created_local = init._create_local_config(new_project, logger, {})
+        if not created_local:
+            logger.error(
                     f"creating local/unfurl.yaml in {new_project.projectRoot} failed"
                 )
-        logger.info("clone success: %s to %s", repo.safe_url, repo.working_dir)
-    return repo
 
 
 def _get_filepath(format, deployment_path):
@@ -1712,11 +1716,12 @@ def _patch_ensemble(
         UNFURL_CLOUD_VARS_URL=cloud_vars_url,
         apply_url_credentials=True,
     )
-    # don't validate in case we are still an incomplete draft
+    ensure_local_config(parent_localenv.project.projectRoot)
     local_env = LocalEnv(clone_location, overrides=overrides)
     local_env.make_resolver = ServerCacheResolver.make_factory(
         None, dict(username=username, password=password)
     )
+    # don't validate in case we are still an incomplete draft
     manifest = local_env.get_manifest(skip_validation=True, safe_mode=True)
     # logger.info("vault secrets %s", manifest.manifest.vault.secrets)
     _apply_ensemble_patch(patch, manifest)