@mikarinneoracle/oci-cdk-code-only-preview 0.0.5 → 0.0.7

package/bin/deploy-code-only.js

@@ -89,9 +89,13 @@ function createArchive() {
 }
 
 function jsonOci(args) {
-  const output = runOci([...args, '--output', 'json']);
+  const output = runOci([...args, '--output', 'json']).trim();
+  const objectStart = output.indexOf('{');
+  const arrayStart = output.indexOf('[');
+  const start = objectStart !== -1 ? objectStart : arrayStart;
+  const end = Math.max(output.lastIndexOf('}'), output.lastIndexOf(']'));
   try {
-    return JSON.parse(output);
+    return JSON.parse(start === -1 || end < start ? output : output.slice(start, end + 1));
   } catch {
     fail(`OCI CLI returned invalid JSON for: ${args.join(' ')}`);
   }
@@ -101,16 +105,6 @@ function resourceDisplayName(resource) {
   return resource.displayName || resource['display-name'] || '';
 }
 
-function findApplicationId(compartmentId, appName) {
-  const result = jsonOci(['fn', 'application', 'list', '--compartment-id', compartmentId, '--all']);
-  const matches = (result.data || []).filter((app) => resourceDisplayName(app) === appName);
-  if (matches.length === 0) {
-    fail(`Functions Application "${appName}" was not found. Code-only deploy requires an existing application.`);
-  }
-  if (matches.length > 1) fail(`multiple Functions Applications are named "${appName}"; use a unique application name.`);
-  return matches[0].id;
-}
-
 function findFunctionId(applicationId, functionName) {
   const result = jsonOci(['fn', 'function', 'list', '--application-id', applicationId, '--all']);
   const matches = (result.data || []).filter((fn) => resourceDisplayName(fn) === functionName);
@@ -130,12 +124,10 @@ function verifyPreviewCli() {
 function main() {
   const unexpectedArgs = process.argv.slice(2).filter((arg) => arg !== '--auto-approve');
   if (unexpectedArgs.length) fail(`unsupported code-only deploy option(s): ${unexpectedArgs.join(', ')}`);
-  const compartmentId = (process.env.OCI_COMPARTMENT_ID || process.env.OCI_COMPARTMENT_OCID || '').trim();
-  if (!compartmentId) fail('set OCI_COMPARTMENT_ID (or OCI_COMPARTMENT_OCID).');
-
   verifyPreviewCli();
   const metadata = readFunctionMetadata();
-  const applicationId = findApplicationId(compartmentId, metadata.appName);
+  const applicationId = (process.env.OCI_FUNCTION_APP_ID || '').trim();
+  if (!applicationId) fail('Terraform output OCI_FUNCTION_APP_ID is missing. Run through "ocdk deploy --code-only".');
   const archive = createArchive();
   try {
     const functionId = findFunctionId(applicationId, metadata.functionName);

package/bin/destroy-code-only.js

@@ -24,8 +24,13 @@ function runOci(args) {
 }
 
 function jsonOci(args) {
+  const output = runOci([...args, '--output', 'json']).trim();
+  const objectStart = output.indexOf('{');
+  const arrayStart = output.indexOf('[');
+  const start = objectStart !== -1 ? objectStart : arrayStart;
+  const end = Math.max(output.lastIndexOf('}'), output.lastIndexOf(']'));
   try {
-    return JSON.parse(runOci([...args, '--output', 'json']));
+    return JSON.parse(start === -1 || end < start ? output : output.slice(start, end + 1));
   } catch (error) {
     fail(`OCI CLI returned invalid JSON for: ${args.join(' ')} (${error.message})`);
   }
@@ -41,23 +46,17 @@ function resourceDisplayName(resource) {
 }
 
 function main() {
-  const compartmentId = (process.env.OCI_COMPARTMENT_ID || process.env.OCI_COMPARTMENT_OCID || '').trim();
-  if (!compartmentId) fail('set OCI_COMPARTMENT_ID (or OCI_COMPARTMENT_OCID).');
   const funcYamlPath = path.join(projectDir, 'func.yaml');
   const yaml = fs.existsSync(funcYamlPath) ? fs.readFileSync(funcYamlPath, 'utf8') : '';
   const functionName = (process.env.OCI_FUNCTION_NAME || yamlValue(yaml, 'name')).trim();
   const appName = (process.env.OCI_FUNCTION_APP_NAME || functionName).trim();
   if (!functionName) fail('set OCI_FUNCTION_NAME or add name: to func.yaml.');
   if (!appName) fail('set OCI_FUNCTION_APP_NAME.');
+  const applicationId = (process.env.OCI_FUNCTION_APP_ID || '').trim();
+  if (!applicationId) fail('Terraform output OCI_FUNCTION_APP_ID is missing. Run through "ocdk destroy --code-only".');
 
   const version = runOci(['--version']).trim();
-  const apps = jsonOci(['fn', 'application', 'list', '--compartment-id', compartmentId, '--all']).data || [];
-  const app = apps.find((item) => resourceDisplayName(item) === appName);
-  if (!app) {
-    console.log(`Functions Application ${appName} is absent; no code-only function needs deletion.`);
-    return;
-  }
-  const functions = jsonOci(['fn', 'function', 'list', '--application-id', app.id, '--all']).data || [];
+  const functions = jsonOci(['fn', 'function', 'list', '--application-id', applicationId, '--all']).data || [];
   const matches = functions.filter((item) => resourceDisplayName(item) === functionName);
   if (matches.length === 0) {
     console.log(`Code-only function ${functionName} is absent; continuing with Terraform destroy.`);

package/bin/ocdk.js

@@ -6,6 +6,7 @@
 
 const { spawnSync } = require('child_process');
 const path = require('path');
+const os = require('os');
 
 const fs = require('fs');
 const root = path.join(__dirname, '..');
@@ -18,6 +19,44 @@ const codeOnlyEnabled =
   args.includes('-code-only') ||
   args.includes('--code-only');
 
+function findFunctionAppId(value) {
+  if (!value || typeof value !== 'object') return undefined;
+  if (Object.prototype.hasOwnProperty.call(value, 'function_app_id')) {
+    const output = value.function_app_id;
+    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 = findFunctionAppId(child);
+    if (found) return found;
+  }
+  return undefined;
+}
+
+function resolveCodeOnlyFunctionAppId(env) {
+  if (env.OCI_FUNCTION_APP_ID?.trim()) return env.OCI_FUNCTION_APP_ID.trim();
+  const tempDir = fs.mkdtempSync(path.join(os.tmpdir(), 'ocdk-function-app-output-'));
+  const outputFile = path.join(tempDir, 'outputs.json');
+  const stackName = env.OCI_STACK_NAME || 'oci-stack';
+  try {
+    const result = spawnSync('npm', ['run', '--silent', 'cdktf', '--', 'output', stackName, '--outputs-file', outputFile], {
+      cwd: root,
+      env,
+      encoding: 'utf8',
+      shell: false,
+    });
+    if (result.status !== 0 || !fs.existsSync(outputFile)) {
+      const detail = (result.stderr || result.stdout || '').trim();
+      throw new Error(detail || 'cdktf output did not produce an output file.');
+    }
+    const appId = findFunctionAppId(JSON.parse(fs.readFileSync(outputFile, 'utf8')));
+    if (!appId) throw new Error('Terraform output "function_app_id" is missing.');
+    return appId;
+  } finally {
+    fs.rmSync(tempDir, { recursive: true, force: true });
+  }
+}
+
 const npmRunCommands = ['deploy', 'diff', 'synth', 'destroy', 'list', 'get'];
 
 if (!command || command.startsWith('-')) {
@@ -112,11 +151,18 @@ if (command === 'deploy' && codeOnlyEnabled) {
     env,
   });
   if (infrastructure.status !== 0) process.exit(infrastructure.status ?? 1);
+  let functionAppId;
+  try {
+    functionAppId = resolveCodeOnlyFunctionAppId(env);
+  } catch (error) {
+    console.error(`Code-only deploy failed: could not read Terraform Function App output: ${error.message}`);
+    process.exit(1);
+  }
   const result = spawnSync('node', [script], {
     stdio: 'inherit',
     cwd: projectDir,
     shell: false,
-    env,
+    env: { ...env, OCI_FUNCTION_APP_ID: functionAppId },
   });
   process.exit(result.status ?? 1);
 }
@@ -137,11 +183,18 @@ if (command === 'destroy' && codeOnlyEnabled) {
     OCI_STACK_ACTION: 'function-only',
     OCI_PROJECT_DIR: projectDir,
   };
+  let functionAppId;
+  try {
+    functionAppId = resolveCodeOnlyFunctionAppId(env);
+  } catch (error) {
+    console.error(`Code-only destroy failed: could not read Terraform Function App output: ${error.message}`);
+    process.exit(1);
+  }
   const functionDestroy = spawnSync('node', [script], {
     stdio: 'inherit',
     cwd: projectDir,
     shell: false,
-    env,
+    env: { ...env, OCI_FUNCTION_APP_ID: functionAppId },
   });
   if (functionDestroy.status !== 0) process.exit(functionDestroy.status ?? 1);
   const infrastructure = spawnSync('npm', ['run', '--silent', 'destroy', '--', ...passthroughArgs], {

package/package.json

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