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

package/README.md

@@ -105,6 +105,15 @@ The repository-local preview installation is required only for preview-only feat
 
 Code-only deployment first uses Terraform to create or manage the Function Application and its networking/logging resources. It then uploads a ZIP archive directly to OCI Functions with OCI CLI preview. OCI builds and manages the execution image: no Docker build, OCIR repository, or image push occurs.
 
+After the Function App exists, use the direct OCI CLI upload command to update only the code-only function and skip Terraform entirely:
+
+```bash
+export OCI_FUNCTION_APP_ID='ocid1.fnapp.oc1...'
+npx ocdk deploy-code-only
+```
+
+`deploy-code-only` requires `OCI_FUNCTION_APP_ID`; it does not create, look up, or change the Function App, API Gateway, networking, logging, or Terraform state.
+
 Activate the path with either `-code-only`, `--code-only`, or `OCI_CODE_ONLY=1`. The compatibility environment key `code-only=1` is also recognized when a process launcher can set a hyphenated environment name.
 
 ```bash
@@ -184,7 +193,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. 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.
+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 and excludes `node_modules`, `package-lock.json`, `.git`, `.tools`, `.terraform`, `cdktf.out`, and the generated `.ocdk/` directory. For Python, OCDK automatically changes Fn's normal `/function/func.py` handler path to `/function/function/func.py`, matching the required archive layout. 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

@@ -98,9 +98,15 @@ function readFunctionMetadata() {
   const configuredHandler = (process.env.OCI_FUNCTION_HANDLER || yamlValue(yaml, 'cmd') || yamlValue(yaml, 'entrypoint')).trim();
   // The managed Node runtime already invokes `node`; its handler is the script
   // path, whereas a conventional func.yaml entrypoint is `node func.js`.
+  const isPythonRuntime = runtimeName.toLowerCase().startsWith('python');
   const handler = runtimeName.toLowerCase().startsWith('node')
     ? configuredHandler.replace(/^node\s+/, '')
-    : configuredHandler;
+    // Code-only archives must have a function/ directory at their ZIP root.
+    // OCI retains that directory beneath /function, so adapt Fn's standard
+    // Python entrypoint path to the archive layout.
+    : isPythonRuntime
+      ? configuredHandler.replace(/\/function\/(?!function\/)/g, '/function/function/')
+      : configuredHandler;
   const memory = integerValue(process.env.OCI_FUNCTION_MEMORY_MB || yamlValue(yaml, 'memory'), 'OCI_FUNCTION_MEMORY_MB', 256);
   const timeout = integerValue(process.env.OCI_FUNCTION_TIMEOUT_SECONDS || yamlValue(yaml, 'timeout'), 'OCI_FUNCTION_TIMEOUT_SECONDS', 30);
 
@@ -208,11 +214,9 @@ function createArchive(functionName, runtimeName) {
     }
     return { tempDir, archivePath };
   }
-  // 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;
+  // OCI code-only source archives must contain a function/ directory at the
+  // ZIP root. Python handler paths are adapted in readFunctionMetadata().
+  const archiveRoot = path.join(tempDir, 'function');
   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, {
@@ -226,7 +230,7 @@ function createArchive(functionName, runtimeName) {
   });
   if (isNodeRuntime) preparePackageManifest(archiveRoot);
   fs.rmSync(archivePath, { force: true });
-  const zip = spawnSync('zip', ['-q', '-r', archivePath, '.'], { cwd: tempDir, encoding: 'utf8', shell: false });
+  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 });
     fs.rmSync(archivePath, { force: true });

package/bin/ocdk.js

@@ -83,6 +83,7 @@ Usage: ocdk <command> [options]
 
 Commands (same as CDK):
   deploy      Deploy the stack
+  deploy-code-only  Upload/update an existing code-only Function App without Terraform
   diff        Compare stack with current state
   synth       Synthesize Terraform
   destroy     Destroy the stack
@@ -155,6 +156,32 @@ if (command === 'tail:execution-log') {
 
 // Code-only Functions use CDKTF for the Function Application/infrastructure,
 // then OCI CLI preview for the archive-function itself.
+if (command === 'deploy-code-only') {
+  const projectDir = process.cwd();
+  const script = path.join(root, 'bin', 'deploy-code-only.js');
+  const applicationId = process.env.OCI_FUNCTION_APP_ID?.trim();
+  if (!script || !fs.existsSync(script)) {
+    console.error('Missing script: "deploy-code-only". Update @mikarinneoracle/oci-cdk-code-only-preview.');
+    process.exit(1);
+  }
+  if (!applicationId) {
+    console.error('Code-only deploy failed: OCI_FUNCTION_APP_ID is required for "ocdk deploy-code-only". This command does not run Terraform to create or discover the Function App.');
+    process.exit(1);
+  }
+  const result = spawnSync('node', [script, ...args.slice(1)], {
+    stdio: 'inherit',
+    cwd: projectDir,
+    shell: false,
+    env: {
+      ...process.env,
+      OCI_CODE_ONLY: '1',
+      OCI_PROJECT_DIR: projectDir,
+      OCI_FUNCTION_APP_ID: applicationId,
+    },
+  });
+  process.exit(result.status ?? 1);
+}
+
 if (command === 'deploy' && codeOnlyEnabled) {
   const projectDir = process.cwd();
   const script = path.join(root, 'bin', 'deploy-code-only.js');

package/package.json

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