@mikarinneoracle/oci-cdk-code-only-preview 0.0.25 → 0.0.27

package/README.md

@@ -142,6 +142,16 @@ entrypoint: node func.js
 
 Keep `@fnproject/fdk` in `package.json` dependencies. The function source file uses `fdk.handle(...)`; it is not the OCI handler value.
 
+For Java, the code-only archive must contain exactly one fat/uber JAR at the ZIP root. Build it first and point OCDK to it when necessary:
+
+```bash
+export OCI_CODE_ONLY_RUNTIME_NAME='java21.ol9'
+export OCI_FUNCTION_HANDLER='com.example.fn.HelloFunction::handleRequest'
+export OCI_FUNCTION_JAR_PATH='target/my-function.jar'
+```
+
+If exactly one non-source JAR exists in the project root or `target/`, `OCI_FUNCTION_JAR_PATH` is optional. Java archives do not contain the project source tree or a `function/` directory.
+
 #### Find the available code-only runtimes
 
 The exact `OCI_CODE_ONLY_RUNTIME_NAME` values are enabled per tenancy and region during this Limited Availability preview. Query the Preview CLI instead of copying a runtime name from another environment:
@@ -167,7 +177,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 `tail-function-logs.js`. For Node.js functions, `package.json` remains in the archive so OCI can install the FDK and other dependencies, but OCDK removes its own package dependency (`@mikarinneoracle/oci-cdk-code-only-preview`, and the legacy package name) from the copied manifest. 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, includes source files, and excludes `node_modules`, `package-lock.json`, `.git`, `.tools`, `.terraform`, `cdktf.out`, and the generated `tail-function-logs.js`. 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

@@ -94,15 +94,53 @@ function preparePackageManifest(archiveRoot) {
   }
 }
 
-function createArchive(functionName) {
+function resolveJavaJar() {
+  const configuredPath = (process.env.OCI_CODE_ONLY_JAR_PATH || process.env.OCI_FUNCTION_JAR_PATH || '').trim();
+  if (configuredPath) {
+    const jarPath = path.resolve(projectDir, configuredPath);
+    if (!fs.existsSync(jarPath) || !fs.statSync(jarPath).isFile() || !jarPath.endsWith('.jar')) {
+      fail(`OCI_FUNCTION_JAR_PATH must point to an existing .jar file: ${jarPath}`);
+    }
+    return jarPath;
+  }
+  const candidates = [projectDir, path.join(projectDir, 'target')]
+    .flatMap((directory) => {
+      if (!fs.existsSync(directory)) return [];
+      return fs.readdirSync(directory)
+        .filter((name) => name.endsWith('.jar') && !name.endsWith('-sources.jar') && !name.endsWith('-javadoc.jar') && !name.startsWith('original-'))
+        .map((name) => path.join(directory, name));
+    });
+  const uniqueCandidates = [...new Set(candidates)];
+  if (uniqueCandidates.length === 1) return uniqueCandidates[0];
+  const found = uniqueCandidates.length ? ` Found: ${uniqueCandidates.join(', ')}` : '';
+  fail(`Java code-only deploy requires exactly one fat/uber JAR. Build the function first, or set OCI_FUNCTION_JAR_PATH to the JAR file.${found}`);
+}
+
+function createArchive(functionName, runtimeName) {
   if (!fs.existsSync(projectDir) || !fs.statSync(projectDir).isDirectory()) {
     fail(`source directory does not exist: ${projectDir}`);
   }
   const tempDir = fs.mkdtempSync(path.join(os.tmpdir(), 'ocdk-code-only-'));
   const archiveFileName = codeOnlyArchiveFileName(functionName);
   const archivePath = path.join(projectDir, archiveFileName);
+  const isJavaRuntime = runtimeName.toLowerCase().startsWith('java');
+  const isNodeRuntime = runtimeName.toLowerCase().startsWith('node');
+  if (isJavaRuntime) {
+    const jarPath = resolveJavaJar();
+    const jarName = path.basename(jarPath);
+    fs.copyFileSync(jarPath, path.join(tempDir, jarName));
+    fs.rmSync(archivePath, { force: true });
+    const zip = spawnSync('zip', ['-q', '-r', archivePath, jarName], { cwd: tempDir, encoding: 'utf8', shell: false });
+    if (zip.error || zip.status !== 0) {
+      fs.rmSync(tempDir, { recursive: true, force: true });
+      fs.rmSync(archivePath, { force: true });
+      fail(`could not create Java archive with zip: ${zip.stderr?.trim() || zip.error?.message || 'unknown error'}`);
+    }
+    return { tempDir, archivePath };
+  }
   const archiveRoot = path.join(tempDir, 'function');
   const excludedTopLevel = new Set(['node_modules', '.git', '.tools', '.terraform', 'cdktf.out', 'tail-function-logs.js', 'package-lock.json']);
+  if (!isNodeRuntime) excludedTopLevel.add('package.json');
   fs.cpSync(projectDir, archiveRoot, {
     recursive: true,
     filter: (sourcePath) => {
@@ -112,7 +150,7 @@ function createArchive(functionName) {
       return !excludedTopLevel.has(relativePath.split(path.sep)[0]);
     },
   });
-  preparePackageManifest(archiveRoot);
+  if (isNodeRuntime) preparePackageManifest(archiveRoot);
   fs.rmSync(archivePath, { force: true });
   const zip = spawnSync('zip', ['-q', '-r', archivePath, 'function'], { cwd: tempDir, encoding: 'utf8', shell: false });
   if (zip.error || zip.status !== 0) {
@@ -165,7 +203,7 @@ function main() {
   const metadata = readFunctionMetadata();
   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(metadata.functionName);
+  const archive = createArchive(metadata.functionName, metadata.runtimeName);
   try {
     const functionId = findFunctionId(applicationId, metadata.functionName);
     const commonArgs = [

package/package.json

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