@mikarinneoracle/oci-cdk-code-only-preview 0.0.4 → 0.0.6

package/bin/deploy-code-only.js

@@ -89,17 +89,25 @@ 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(' ')}`);
   }
 }
 
+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) => app.displayName === appName);
+  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.`);
   }
@@ -109,7 +117,7 @@ function findApplicationId(compartmentId, appName) {
 
 function findFunctionId(applicationId, functionName) {
   const result = jsonOci(['fn', 'function', 'list', '--application-id', applicationId, '--all']);
-  const matches = (result.data || []).filter((fn) => fn.displayName === functionName);
+  const matches = (result.data || []).filter((fn) => resourceDisplayName(fn) === functionName);
   if (matches.length > 1) fail(`multiple functions are named "${functionName}" in the selected application.`);
   return matches[0]?.id;
 }

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})`);
   }
@@ -36,6 +41,10 @@ function yamlValue(contents, key) {
   return (match?.[1] || match?.[2] || '').trim();
 }
 
+function resourceDisplayName(resource) {
+  return resource.displayName || resource['display-name'] || '';
+}
+
 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).');
@@ -48,13 +57,13 @@ function main() {
 
   const version = runOci(['--version']).trim();
   const apps = jsonOci(['fn', 'application', 'list', '--compartment-id', compartmentId, '--all']).data || [];
-  const app = apps.find((item) => item.displayName === appName);
+  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 matches = functions.filter((item) => item.displayName === functionName);
+  const matches = functions.filter((item) => resourceDisplayName(item) === functionName);
   if (matches.length === 0) {
     console.log(`Code-only function ${functionName} is absent; continuing with Terraform destroy.`);
     return;

package/package.json

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