underpost 3.2.70 → 3.2.90

package/src/cli/repository.js

@@ -21,6 +21,7 @@ import {
   getDataDeploy,
   buildReplicaId,
   writeEnv,
+  readConfInstances,
 } from '../server/conf.js';
 import { buildClient, unzipClientBuild, mergeClientBuildZip } from '../client-builder/client-build.js';
 import { DefaultConf } from '../../conf.js';
@@ -145,6 +146,14 @@ class UnderpostRepository {
     ) {
       if (!repoPath) repoPath = '.';
 
+      if (options.initRepo) {
+        Underpost.repo.initLocalRepo({
+          path: repoPath,
+          origin: typeof options.initRepo === 'string' ? options.initRepo : undefined,
+        });
+        return;
+      }
+
       if (options.hasChanges) {
         const status = shellExec(`cd ${repoPath} && git status --porcelain`, {
           stdout: true,
@@ -1697,7 +1706,7 @@ Prevent build private config repo.`,
       }
 
       // Resolve the active blue/green traffic colour so we target the correct pod
-      const traffic = Underpost.deploy.getCurrentTraffic(deployId, { namespace });
+      const traffic = Underpost.deploy.getCurrentTraffic(deployId, { namespace, env });
       if (!traffic) {
         logger.warn(`backupPodRepositories: could not resolve current traffic for ${deployId} — skipping`);
         return;
@@ -1854,8 +1863,10 @@ Prevent build private config repo.`,
         const confPath = `./engine-private/conf/${deployId}/conf.instances.json`;
         if (!fs.existsSync(confPath)) continue;
         try {
-          const instances = JSON.parse(fs.readFileSync(confPath, 'utf8'));
-          const match = instances.find((i) => i && i.runtime === runtime);
+          // readConfInstances returns the bare array of entries. The template
+          // entries carry runtime + metadata.repository, so the un-expanded list
+          // is enough here (no need to expand variants).
+          const match = readConfInstances(deployId).find((i) => i && i.runtime === runtime);
           if (match && match.metadata && match.metadata.repository) {
             logger.info(`[resolveInstanceRepo] resolved from ${confPath}`, {
               runtime,