@mikarinneoracle/oci-cdk-code-only-preview 0.0.15 → 0.0.17

package/bin/ocdk.js

@@ -122,6 +122,18 @@ if (command === 'tail:execution-log') {
   const projectDir = process.cwd();
   const projectScript = path.join(projectDir, 'tail-function-logs.js');
   if (fs.existsSync(projectScript)) {
+    // A stack synth creates a placeholder script. Refresh it from Terraform
+    // outputs before executing so it never masks the working fallback tailer.
+    const projectScriptContent = fs.readFileSync(projectScript, 'utf8');
+    if (projectScriptContent.includes('__EXECUTION_LOG_ID__') || projectScriptContent.includes('__LOG_GROUP_ID__')) {
+      const configureLogs = spawnSync('node', [path.join(root, 'bin', 'write-log-config.js')], {
+        stdio: 'inherit',
+        cwd: projectDir,
+        shell: false,
+        env: process.env,
+      });
+      if (configureLogs.status !== 0) process.exit(configureLogs.status ?? 1);
+    }
     const result = spawnSync('node', [projectScript, ...args.slice(1)], {
       stdio: 'inherit',
       cwd: projectDir,

package/bin/write-log-config.js

@@ -3,29 +3,49 @@
  * Write tail-function-logs.js to the project root with log IDs from terraform output.
  * Run from project root after deploy. Usage: npx ocdk write-log-config
  */
-const { execSync } = require('child_process');
+const { spawnSync } = require('child_process');
 const path = require('path');
 const fs = require('fs');
 
 const packageRoot = path.join(__dirname, '..');
 const projectRoot = process.cwd();
 const stackName = process.env.OCI_STACK_NAME || 'oci-stack';
-const stackDir = path.join(packageRoot, 'cdktf.out', 'stacks', stackName);
-
-if (!fs.existsSync(stackDir)) {
-  console.error('Stack directory not found:', stackDir);
-  console.error('Run from your project root after "npx ocdk deploy". Ensure the stack is deployed.');
-  process.exit(1);
+function outputValue(value, key) {
+  if (!value || typeof value !== 'object') return undefined;
+  if (Object.prototype.hasOwnProperty.call(value, key)) {
+    const output = value[key];
+    if (typeof output === 'string') return output;
+    if (output && typeof output === 'object' && typeof output.value === 'string') return output.value;
+  }
+  for (const child of Object.values(value)) {
+    const found = outputValue(child, key);
+    if (found) return found;
+  }
+  return undefined;
 }
 
+const tempDir = fs.mkdtempSync(path.join(require('os').tmpdir(), 'ocdk-log-output-'));
+const outputFile = path.join(tempDir, 'outputs.json');
 let logGroupId;
 let executionLogId;
 try {
-  logGroupId = execSync(`terraform output -raw log_group_id`, { encoding: 'utf8', cwd: stackDir }).trim();
-  executionLogId = execSync(`terraform output -raw execution_log_id`, { encoding: 'utf8', cwd: stackDir }).trim();
-} catch (e) {
-  console.error('Could not read terraform outputs. Ensure the stack is deployed and terraform is on PATH.');
+  const result = spawnSync('npm', ['run', '--silent', 'cdktf', '--', 'output', stackName, '--outputs-file', outputFile], {
+    cwd: packageRoot,
+    encoding: 'utf8',
+    shell: false,
+  });
+  if (result.status !== 0 || !fs.existsSync(outputFile)) {
+    throw new Error((result.stderr || result.stdout || '').trim() || 'cdktf output did not produce an output file.');
+  }
+  const outputs = JSON.parse(fs.readFileSync(outputFile, 'utf8'));
+  logGroupId = outputValue(outputs, 'log_group_id');
+  executionLogId = outputValue(outputs, 'execution_log_id');
+} catch (error) {
+  fs.rmSync(tempDir, { recursive: true, force: true });
+  console.error(`Could not read Terraform outputs: ${error.message}`);
   process.exit(1);
+} finally {
+  fs.rmSync(tempDir, { recursive: true, force: true });
 }
 
 if (!logGroupId || !executionLogId) {
@@ -44,4 +64,4 @@ if (fs.existsSync(srcScript)) {
   console.warn('Source script not found:', srcScript);
 }
 
-console.log('Done. Run: node tail-function-logs.js  or  npx ocdk tail:execution-log');
+console.log('Done. Run: npx ocdk tail:execution-log');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mikarinneoracle/oci-cdk-code-only-preview",
-  "version": "0.0.15",
+  "version": "0.0.17",
   "description": "OCI CDK stack for OCI Functions, API Gateway, and related infrastructure",
   "main": "lib/index.js",
   "bin": {