@firestartr/cli 2.6.0-snapshot-2 → 2.6.0-snapshot-3

package/build/index.js

@@ -294790,8 +294790,6 @@ function processHandler(processToHandle, ctl, onTimedOut) {
         return (this.output ?? '').trim();
     }
     writeToTerraformProject(mainTfPath) {
-        // DEBUG LOG
-        // eslint-disable-next-line no-console
         const dir = mainTfPath.split('/').slice(0, -1).join('/');
         if (!external_fs_.existsSync(dir)) {
             external_fs_.mkdirSync(dir, { recursive: true });
@@ -294800,7 +294798,6 @@ function processHandler(processToHandle, ctl, onTimedOut) {
             throw new Error('Writer output is not set. Did you forget to call render()?');
         }
         external_fs_.writeFileSync(mainTfPath, this.output, { encoding: 'utf8' });
-        // eslint-disable-next-line no-console
     }
 });
 
@@ -295583,21 +295580,25 @@ var external_stream_ = __nccwpck_require__(12781);
 
 class project_tf_TFProjectManager {
     async tearUpProject() {
+        const resolvedProjectPath = this.projectPath
+            ? external_path_.resolve(this.projectPath)
+            : '';
         // Remove the entire workspace directory
-        if (this.projectPath && this.projectPath.startsWith('/tmp/gh-debug/')) {
+        if (resolvedProjectPath &&
+            resolvedProjectPath.startsWith('/tmp/gh-debug/')) {
             // Never delete debug workspaces, per spec.
             terraform_provisioner_src_logger.info(`[terraform-provisioner]: SKIP teardown for debug workspace at ${this.projectPath}`);
             return;
         }
-        if (this.projectPath &&
-            this.projectPath.startsWith('/tmp/') &&
-            external_path_.resolve(this.projectPath) !== '/tmp') {
+        if (resolvedProjectPath &&
+            resolvedProjectPath.startsWith('/tmp/') &&
+            resolvedProjectPath !== '/tmp') {
             try {
-                external_fs_.rmSync(this.projectPath, {
+                external_fs_.rmSync(resolvedProjectPath, {
                     recursive: true,
                     force: true,
                 });
-                terraform_provisioner_src_logger.info(`[terraform-provisioner]: Workspace at ${this.projectPath} torn up successfully`);
+                terraform_provisioner_src_logger.info(`[terraform-provisioner]: Workspace at ${resolvedProjectPath} torn up successfully`);
             }
             catch (e) {
                 throw new Error(`[terraform-provisioner]: Failed to tear up local project at ${this.projectPath}: ${e}`);
@@ -295642,8 +295643,10 @@ class project_tf_TFProjectManager {
         this.stream.on('end', fnEnd);
     }
     async build() {
-        // Workspace reuse block: verify if we should preserve existing workspace
         if (this.ctx?.reuseExistingProject) {
+            if (!external_fs_.existsSync(this.projectPath)) {
+                throw new Error(`[terraform-provisioner]: Workspace reuse requested but projectPath does not exist: ${this.projectPath}. Cannot continue.`);
+            }
             const expectedFiles = await computeInlineWorkspaceFiles(this.ctx);
             const missing = validateWorkspaceStructure(this.projectPath, expectedFiles);
             if (missing.length === 0) {
@@ -295676,8 +295679,8 @@ class project_tf_TFProjectManager {
             const writerImports = new WriterImports(this.customArgs);
             await writerImports.render();
             await writerImports.writeToTerraformProject(external_path_.join(this.projectPath, 'imports.tf'));
-            // Always re-init backend after imports.tf is rebuilt (import mode)
-            this.tfOutput += await init(this.projectPath, this.secrets, this.stream, this.ctl);
+            // Note: for freshly built workspaces, __init() will run before the import command executes.
+            // Only reuse mode needs an extra init immediately after regenerating imports.tf.
         }
     }
     async __init() {
@@ -296273,21 +296276,25 @@ var lib_ajv_default = /*#__PURE__*/__nccwpck_require__.n(lib_ajv);
 
 class TFProjectManagerRemote {
     async tearUpProject() {
+        const resolvedProjectPath = this.projectPath
+            ? external_path_.resolve(this.projectPath)
+            : '';
         // Remove the entire workspace directory
-        if (this.projectPath && this.projectPath.startsWith('/tmp/gh-debug/')) {
+        if (resolvedProjectPath &&
+            resolvedProjectPath.startsWith('/tmp/gh-debug/')) {
             // Never delete debug workspaces, per spec.
             terraform_provisioner_src_logger.info(`[terraform-provisioner]: SKIP teardown for debug workspace at ${this.projectPath}`);
             return;
         }
-        if (this.projectPath &&
-            this.projectPath.startsWith('/tmp/') &&
-            external_path_.resolve(this.projectPath) !== '/tmp') {
+        if (resolvedProjectPath &&
+            resolvedProjectPath.startsWith('/tmp/') &&
+            resolvedProjectPath !== '/tmp') {
             try {
-                external_fs_.rmSync(this.projectPath, {
+                external_fs_.rmSync(resolvedProjectPath, {
                     recursive: true,
                     force: true,
                 });
-                terraform_provisioner_src_logger.info(`[terraform-provisioner]: Workspace at ${this.projectPath} torn up successfully`);
+                terraform_provisioner_src_logger.info(`[terraform-provisioner]: Workspace at ${resolvedProjectPath} torn up successfully`);
             }
             catch (e) {
                 throw new Error(`[terraform-provisioner]: Failed to tear up local project at ${this.projectPath}: ${e}`);
@@ -296337,6 +296344,9 @@ class TFProjectManagerRemote {
     async build() {
         // Workspace reuse block for remote
         if (this.ctx?.reuseExistingProject) {
+            if (!external_fs_.existsSync(this.projectPath)) {
+                throw new Error(`[terraform-provisioner]: Workspace reuse requested but projectPath does not exist: ${this.projectPath}. Cannot continue.`);
+            }
             const expectedFiles = await computeRemoteWorkspaceFiles(this.ctx);
             const missing = validateWorkspaceStructure(this.projectPath, expectedFiles);
             if (missing.length === 0) {
@@ -296372,8 +296382,8 @@ class TFProjectManagerRemote {
             const writerImports = new WriterImports(this.customArgs);
             await writerImports.render();
             await writerImports.writeToTerraformProject(external_path_.join(this.projectPath, 'imports.tf'));
-            // Always re-init backend after imports.tf is rebuilt (import mode)
-            this.tfOutput += await init(this.projectPath, this.secrets, this.stream, this.ctl);
+            // Note: for freshly built workspaces, __init() will run before the import command executes.
+            // Only reuse mode needs an extra init immediately after regenerating imports.tf.
         }
     }
     async __init() {
@@ -299977,11 +299987,51 @@ function providers_replaceInlineSecrets(inline, secrets) {
     return result;
 }
 
+;// CONCATENATED MODULE: ../gh_provisioner/src/debug.ts
+
+
+
+
+
+const DEBUG_DIR = external_path_default().join(external_os_default().tmpdir(), 'gh-debug');
+// Returns the project path to use for debug artifacts (always SessionProjectPath for consistency)
+function getDebugProjectPath(entity) {
+    // Use the sessionProjectPath, which now always includes the 4-character sessionId
+    return (entity.sessionProjectPath ||
+        external_path_default().join(DEBUG_DIR, entity.k8sId.replace(/\//, '-') + '-id_missing'));
+}
+async function initDebug(entity, deps) {
+    // Clean only this session's project debug directory, NOT all debug workspaces
+    // Only create the specific debug project path for this session; never remove in debug mode
+    await (0,promises_.mkdir)(getDebugProjectPath(entity), { recursive: true });
+    const debugArtifactsDir = external_path_default().join(getDebugProjectPath(entity), 'gh_provisioner_debug');
+    await (0,promises_.mkdir)(debugArtifactsDir, { recursive: true });
+    // Write artifact files into the required debug project subdirectory
+    await (0,promises_.writeFile)(external_path_default().join(debugArtifactsDir, 'cr.yaml'), catalog_common/* default.io.toYaml */.Z.io.toYaml(entity.cr.rawCr));
+    await (0,promises_.writeFile)(external_path_default().join(debugArtifactsDir, 'deps.yaml'), catalog_common/* default.io.toYaml */.Z.io.toYaml(deps));
+    gh_provisioner_src_logger.enableFileLogging(external_path_default().join(debugArtifactsDir, 'debug.log'));
+}
+// Deprecated: Use getDebugProjectPath in all debug logic
+function getTFProjectPath(entity) {
+    return getDebugProjectPath(entity);
+}
+async function debugTerraformOutput(entity, output) {
+    const pathToOutput = external_path_default().join(getDebugProjectPath(entity), 'terraform-output.txt');
+    await (0,promises_.writeFile)(pathToOutput, output);
+    gh_provisioner_src_logger.debug(`[gh-provisioner] debug: Terraform error written to ${pathToOutput}`);
+}
+async function endDebug(entity) {
+    await (0,promises_.writeFile)(external_path_default().join(getDebugProjectPath(entity), 'config.json'), JSON.stringify(entity.document, null, 4));
+    gh_provisioner_src_logger.disableFileLogging();
+}
+
 ;// CONCATENATED MODULE: ../gh_provisioner/src/tp_bridge.ts
 // Bridge to terraform provisioner
 
 
 
+
+
 const tp_bridge_TF_PROJECTS_PATH = '/tmp/gh-workspaces';
 async function runOnTerraform(entity, command, customArgs, opts = {}) {
     if (!entity || typeof entity !== 'object')
@@ -300030,7 +300080,9 @@ function tp_bridge_buildContext(entity, reuseExistingProjectOverride = false, im
     const result = providers_adaptProviders(entity);
     const projectPath = entity.sessionProjectPath
         ? entity.sessionProjectPath // Always use session projectPath if present
-        : `/tmp/gh-workspaces/${entity.cr.kind.toLowerCase()}-${entity.cr.name}-${entity.sessionId ?? 'unknown'}`;
+        : entity.inDebugMode
+            ? getTFProjectPath(entity)
+            : external_path_default().join(tp_bridge_TF_PROJECTS_PATH, `${entity.cr.kind.toLowerCase()}-${entity.cr.name}-${entity.sessionId ?? 'unknown'}`);
     const backend = providers_adaptBackend(entity);
     return {
         type: 'Remote',
@@ -300560,44 +300612,6 @@ async function loadCr(crPath) {
     return entityCr;
 }
 
-;// CONCATENATED MODULE: ../gh_provisioner/src/debug.ts
-
-
-
-
-
-const DEBUG_DIR = external_path_default().join(external_os_default().tmpdir(), 'gh-debug');
-// Returns the project path to use for debug artifacts (always SessionProjectPath for consistency)
-function getDebugProjectPath(entity) {
-    // Use the sessionProjectPath, which now always includes the 4-character sessionId
-    return (entity.sessionProjectPath ||
-        external_path_default().join(DEBUG_DIR, entity.k8sId.replace(/\//, '-') + '-id_missing'));
-}
-async function initDebug(entity, deps) {
-    // Clean only this session's project debug directory, NOT all debug workspaces
-    // Only create the specific debug project path for this session; never remove in debug mode
-    await (0,promises_.mkdir)(getDebugProjectPath(entity), { recursive: true });
-    const debugArtifactsDir = external_path_default().join(getDebugProjectPath(entity), 'gh_provisioner_debug');
-    await (0,promises_.mkdir)(debugArtifactsDir, { recursive: true });
-    // Write artifact files into the required debug project subdirectory
-    await (0,promises_.writeFile)(external_path_default().join(debugArtifactsDir, 'cr.yaml'), catalog_common/* default.io.toYaml */.Z.io.toYaml(entity.cr.rawCr));
-    await (0,promises_.writeFile)(external_path_default().join(debugArtifactsDir, 'deps.yaml'), catalog_common/* default.io.toYaml */.Z.io.toYaml(deps));
-    gh_provisioner_src_logger.enableFileLogging(external_path_default().join(debugArtifactsDir, 'debug.log'));
-}
-// Deprecated: Use getDebugProjectPath in all debug logic
-function getTFProjectPath(entity) {
-    return getDebugProjectPath(entity);
-}
-async function debugTerraformOutput(entity, output) {
-    const pathToOutput = external_path_default().join(getDebugProjectPath(entity), 'terraform-output.txt');
-    await (0,promises_.writeFile)(pathToOutput, output);
-    gh_provisioner_src_logger.debug(`[gh-provisioner] debug: Terraform error written to ${pathToOutput}`);
-}
-async function endDebug(entity) {
-    await (0,promises_.writeFile)(external_path_default().join(getDebugProjectPath(entity), 'config.json'), JSON.stringify(entity.document, null, 4));
-    gh_provisioner_src_logger.disableFileLogging();
-}
-
 ;// CONCATENATED MODULE: ../gh_provisioner/index.ts
 
 
@@ -302511,7 +302525,7 @@ const crs_analyzerSubcommand = {
 };
 
 ;// CONCATENATED MODULE: ./package.json
-const package_namespaceObject = JSON.parse('{"i8":"2.6.0-snapshot-2"}');
+const package_namespaceObject = JSON.parse('{"i8":"2.6.0-snapshot-3"}');
 ;// CONCATENATED MODULE: ../../package.json
 const package_namespaceObject_1 = {"i8":"2.5.0"};
 ;// CONCATENATED MODULE: ./src/subcommands/index.ts

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@firestartr/cli",
-  "version": "2.6.0-snapshot-2",
+  "version": "2.6.0-snapshot-3",
   "private": false,
   "description": "Commandline tool",
   "main": "build/main.js",