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

package/README.md

@@ -133,7 +133,7 @@ export OCI_FUNCTION_APP_NAME='my-existing-function-app'
 
 These settings are optional: `OCI_CODE_ONLY_SOURCE_DIR` (defaults to the current directory), `OCI_FUNCTION_MEMORY_MB` (from `func.yaml`, otherwise `256`), and `OCI_FUNCTION_TIMEOUT_SECONDS` (from `func.yaml`, otherwise `30`). `OCI_TENANCY_ID`, `OCI_REGION`, and `OCI_NAMESPACE` are also optional when they can be resolved from the active OCI CLI profile.
 
-The archive is built from `OCI_CODE_ONLY_SOURCE_DIR` (or the current directory). It includes source files and excludes `node_modules`, `.git`, `.tools`, `.terraform`, and `cdktf.out`. The current preview path is function-only: it does not create an API Gateway because the CLI-managed function OCID is not in Terraform state.
+The archive is built from `OCI_CODE_ONLY_SOURCE_DIR` (or the current directory) with the required `function/` directory at its ZIP root. It includes source files and excludes `node_modules`, `.git`, `.tools`, `.terraform`, and `cdktf.out`. The current preview path is function-only: it does not create an API Gateway because the CLI-managed function OCID is not in Terraform state.
 
 Use the same flag or environment variable for deletion. OCDK deletes the CLI-managed function first, then lets Terraform destroy the Function App and its infrastructure:
 

package/bin/deploy-code-only.js

@@ -73,14 +73,17 @@ function createArchive() {
   }
   const tempDir = fs.mkdtempSync(path.join(os.tmpdir(), 'ocdk-code-only-'));
   const archivePath = path.join(tempDir, 'function-source.zip');
-  const zip = spawnSync('zip', [
-    '-q', '-r', archivePath, '.',
-    '-x', 'node_modules/*',
-    '-x', '.git/*',
-    '-x', '.tools/*',
-    '-x', '.terraform/*',
-    '-x', 'cdktf.out/*',
-  ], { cwd: projectDir, encoding: 'utf8', shell: false });
+  const archiveRoot = path.join(tempDir, 'function');
+  const excludedTopLevel = new Set(['node_modules', '.git', '.tools', '.terraform', 'cdktf.out']);
+  fs.cpSync(projectDir, archiveRoot, {
+    recursive: true,
+    filter: (sourcePath) => {
+      const relativePath = path.relative(projectDir, sourcePath);
+      if (!relativePath) return true;
+      return !excludedTopLevel.has(relativePath.split(path.sep)[0]);
+    },
+  });
+  const zip = spawnSync('zip', ['-q', '-r', archivePath, 'function'], { cwd: tempDir, encoding: 'utf8', shell: false });
   if (zip.error || zip.status !== 0) {
     fs.rmSync(tempDir, { recursive: true, force: true });
     fail(`could not create source archive with zip: ${zip.stderr?.trim() || zip.error?.message || 'unknown error'}`);
@@ -90,6 +93,8 @@ function createArchive() {
 
 function jsonOci(args) {
   const output = runOci([...args, '--output', 'json']).trim();
+  // Preview CLI can return an empty body for a successful list of no functions.
+  if (!output) return { data: [] };
   const objectStart = output.indexOf('{');
   const arrayStart = output.indexOf('[');
   const start = objectStart !== -1 ? objectStart : arrayStart;

package/bin/destroy-code-only.js

@@ -25,6 +25,8 @@ function runOci(args) {
 
 function jsonOci(args) {
   const output = runOci([...args, '--output', 'json']).trim();
+  // Preview CLI can return an empty body for a successful list of no functions.
+  if (!output) return { data: [] };
   const objectStart = output.indexOf('{');
   const arrayStart = output.indexOf('[');
   const start = objectStart !== -1 ? objectStart : arrayStart;

package/package.json

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