@mikarinneoracle/oci-cdk-code-only-preview 0.0.31 → 0.0.32

package/README.md

@@ -184,7 +184,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.
 
-Each deploy re-builds `<function-name>.zip` in the project root and uploads that file. The ZIP has the required `function/` directory at its root, includes source files, and excludes `node_modules`, `package-lock.json`, `.git`, `.tools`, `.terraform`, `cdktf.out`, and the generated `.ocdk/` directory. For Node.js functions, a sanitized `package.json` remains so OCI can install the FDK and other dependencies; OCDK removes its own package dependency (`@mikarinneoracle/oci-cdk-code-only-preview`, and the legacy package name) from that copied manifest. For Python and Java code-only functions, `package.json` is excluded entirely. A successful code-only destroy removes this ZIP after Terraform has destroyed the Function App and infrastructure. With the default `OCI_STACK_ACTION=full-stack`, OCDK creates the API Gateway and uses a Terraform data source to resolve the CLI-managed function OCID for its route. The first code-only deploy therefore runs Terraform once to create the Function App, uploads the function, then runs Terraform again to create the Gateway deployment. Set `OCI_STACK_ACTION=function-only` to omit API Gateway.
+Each deploy re-builds `<function-name>.zip` in the project root and uploads that file. For Python and Node.js, source files are at the ZIP root because OCI extracts the archive into `/function`; this makes a standard Python entrypoint such as `/python/bin/fdk /function/func.py handler` resolve correctly. The archive excludes `node_modules`, `package-lock.json`, `.git`, `.tools`, `.terraform`, `cdktf.out`, and the generated `.ocdk/` directory. For Node.js functions, a sanitized `package.json` remains so OCI can install the FDK and other dependencies; OCDK removes its own package dependency (`@mikarinneoracle/oci-cdk-code-only-preview`, and the legacy package name) from that copied manifest. For Python and Java code-only functions, `package.json` is excluded entirely. A successful code-only destroy removes this ZIP after Terraform has destroyed the Function App and infrastructure. With the default `OCI_STACK_ACTION=full-stack`, OCDK creates the API Gateway and uses a Terraform data source to resolve the CLI-managed function OCID for its route. The first code-only deploy therefore runs Terraform once to create the Function App, uploads the function, then runs Terraform again to create the Gateway deployment. Set `OCI_STACK_ACTION=function-only` to omit API Gateway.
 
 After a successful code-only deploy, OCDK writes the log IDs for `npx ocdk tail:execution-log` automatically.
 

package/bin/deploy-code-only.js

@@ -208,7 +208,11 @@ function createArchive(functionName, runtimeName) {
     }
     return { tempDir, archivePath };
   }
-  const archiveRoot = path.join(tempDir, 'function');
+  // OCI extracts a source archive directly into /function. Do not add a
+  // "function/" wrapper directory here: a standard Fn Python entrypoint such
+  // as "/python/bin/fdk /function/func.py handler" must resolve func.py at
+  // the ZIP root after extraction.
+  const archiveRoot = tempDir;
   const excludedTopLevel = new Set(['node_modules', '.git', '.tools', '.terraform', 'cdktf.out', '.ocdk', 'tail-function-logs.js', 'package-lock.json']);
   if (!isNodeRuntime) excludedTopLevel.add('package.json');
   fs.cpSync(projectDir, archiveRoot, {
@@ -222,7 +226,7 @@ function createArchive(functionName, runtimeName) {
   });
   if (isNodeRuntime) preparePackageManifest(archiveRoot);
   fs.rmSync(archivePath, { force: true });
-  const zip = spawnSync('zip', ['-q', '-r', archivePath, 'function'], { cwd: tempDir, encoding: 'utf8', shell: false });
+  const zip = spawnSync('zip', ['-q', '-r', archivePath, '.'], { cwd: tempDir, encoding: 'utf8', shell: false });
   if (zip.error || zip.status !== 0) {
     fs.rmSync(tempDir, { recursive: true, force: true });
     fs.rmSync(archivePath, { force: true });

package/package.json

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