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

package/bin/ocdk.js

@@ -122,18 +122,15 @@ 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);
-    }
+    // Refresh on every run. Older generated scripts can have empty defaults
+    // instead of placeholders, so inspecting their content is not reliable.
+    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/package.json

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

package/scripts/tail-function-log.js

@@ -16,13 +16,15 @@ function debug(...args) {
 }
 
 // Defaults: in-code (injected by npx ocdk write-log-config when writing tail-function-logs.js) or env vars. Placeholders become empty.
+const EXECUTION_LOG_ID_PLACEHOLDER = ['__EXECUTION', '_LOG_ID__'].join('');
+const LOG_GROUP_ID_PLACEHOLDER = ['__LOG', '_GROUP_ID__'].join('');
 let DEFAULT_EXECUTION_LOG_ID = '__EXECUTION_LOG_ID__';
 let DEFAULT_LOG_GROUP_ID = '__LOG_GROUP_ID__';
 if (DEBUG) {
-  debug('in-code defaults: execution_log=', DEFAULT_EXECUTION_LOG_ID === '__EXECUTION_LOG_ID__' ? 'placeholder' : 'set', 'log_group=', DEFAULT_LOG_GROUP_ID === '__LOG_GROUP_ID__' ? 'placeholder' : 'set');
+  debug('in-code defaults: execution_log=', DEFAULT_EXECUTION_LOG_ID === EXECUTION_LOG_ID_PLACEHOLDER ? 'placeholder' : 'set', 'log_group=', DEFAULT_LOG_GROUP_ID === LOG_GROUP_ID_PLACEHOLDER ? 'placeholder' : 'set');
 }
-if (DEFAULT_EXECUTION_LOG_ID === '__EXECUTION_LOG_ID__') DEFAULT_EXECUTION_LOG_ID = '';
-if (DEFAULT_LOG_GROUP_ID === '__LOG_GROUP_ID__') DEFAULT_LOG_GROUP_ID = '';
+if (DEFAULT_EXECUTION_LOG_ID === EXECUTION_LOG_ID_PLACEHOLDER) DEFAULT_EXECUTION_LOG_ID = '';
+if (DEFAULT_LOG_GROUP_ID === LOG_GROUP_ID_PLACEHOLDER) DEFAULT_LOG_GROUP_ID = '';
 if (DEBUG) {
   debug('final execution_log:', DEFAULT_EXECUTION_LOG_ID ? `${DEFAULT_EXECUTION_LOG_ID.slice(0, 30)}...` : '(empty)', 'log_group:', DEFAULT_LOG_GROUP_ID ? `${DEFAULT_LOG_GROUP_ID.slice(0, 30)}...` : '(empty)');
 }