@mikarinneoracle/oci-cdk-code-only-preview 0.0.36 → 0.0.38

package/README.md

@@ -127,16 +127,16 @@ export OCI_CLI_PATH="/Users/MRINNE/projects/ocdk/.tools/oci-preview-bin/oci"
 # Required: OCI target
 export OCI_COMPARTMENT_ID='ocid1.compartment.oc1...'
 
-# Required: handler. OCDK resolves the latest available Python runtime.
+# Optional explicit code-only handler. OCDK converts the standard Python
+# func.yaml entrypoint to func.handler automatically.
 # Optionally pin one: export OCI_CODE_ONLY_RUNTIME_NAME='python312.ol9'
-export OCI_FUNCTION_HANDLER='func.handler'
 
 # Required in func.yaml: name: my-function
 # Terraform creates the Function App; OCI CLI preview uploads the ZIP function
 npx ocdk deploy --auto-approve --code-only
 ```
 
-For a Node.js function, use the JavaScript file as the handler (not `fdk.handle` or `node func.js`):
+For a Node.js function, use the JavaScript file as the handler (not `fdk.handle` or `node func.js`). OCDK resolves the runtime from `build_image` or `run_image` when present:
 
 ```bash
 export OCI_CODE_ONLY_RUNTIME_NAME='node24.ol9'
@@ -154,7 +154,7 @@ 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:
+For Java, the code-only archive must contain exactly one fat/uber JAR at the ZIP root. OCDK resolves the runtime from a `jdk`/`jre` version in `build_image` or `run_image` when present. Build it first and point OCDK to it when necessary:
 
 ```bash
 export OCI_CODE_ONLY_RUNTIME_NAME='java21.ol9'
@@ -173,7 +173,7 @@ OCDK also runs this build automatically when no artifact exists yet, and searche
 
 #### 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. For Python, OCDK queries this list automatically and selects the newest matching runtime when `func.yaml` contains `runtime: python` (or a versioned value such as `python3.12`). Set `OCI_CODE_ONLY_RUNTIME_NAME` to pin or override that choice. Query the Preview CLI to inspect available runtimes or when deploying another language:
+The exact `OCI_CODE_ONLY_RUNTIME_NAME` values are enabled per tenancy and region during this Limited Availability preview. For Python, Node.js, and Java, OCDK queries this list automatically. With a plain runtime name, it selects the version in `build_image` or `run_image` (for example `fnproject/python:3.12` selects `python312...`, and `jdk17` selects `java17...`); without a versioned image, it selects the newest matching runtime. Set `OCI_CODE_ONLY_RUNTIME_NAME` to pin or override that choice. Query the Preview CLI to inspect available runtimes or when deploying another language:
 
 ```bash
 # List every runtime available to the active OCI profile

package/bin/deploy-code-only.js

@@ -60,17 +60,37 @@ function listItems(result) {
   return [];
 }
 
-function pythonRuntimeSortKey(runtimeName) {
-  const match = runtimeName.toLowerCase().match(/^python(\d+)/);
+function runtimeLanguage(runtime) {
+  const normalized = runtime.toLowerCase().replace(/[^a-z0-9]/g, '');
+  return ['python', 'node', 'java'].find((language) => normalized.startsWith(language));
+}
+
+function runtimeSortKey(runtimeName, language) {
+  const match = runtimeName.toLowerCase().match(new RegExp(`^${language}(\\d+)`));
   return match ? Number.parseInt(match[1], 10) : -1;
 }
 
-function resolvePythonRuntime(runtime) {
-  // OCI's preview runtime names omit separators from the Python version:
-  // func.yaml's "python3.12" therefore maps to the runtime-list prefix
-  // "python312". A plain "python" selects the newest available version.
+function runtimePrefix(runtime, yaml) {
+  // OCI's preview runtime names omit separators from language versions, such
+  // as Python 3.12 -> python312. For a plain language name, honor the version
+  // in Fn's build_image/run_image before falling back to the newest runtime.
   const normalizedRuntime = runtime.toLowerCase().replace(/[^a-z0-9]/g, '');
-  const namePrefix = normalizedRuntime === 'python' ? 'python' : normalizedRuntime;
+  const language = runtimeLanguage(runtime);
+  if (!language || normalizedRuntime !== language) return normalizedRuntime;
+  for (const key of ['build_image', 'run_image']) {
+    const image = yamlValue(yaml, key);
+    const versionMatch = language === 'java'
+      ? image.match(/(?:jdk|jre|java)[-:]?(\d+)/i)
+      : image.match(new RegExp(`(?:^|/)${language}:(\\d+)(?:\\.(\\d+))?(?:[-.]|$)`, 'i'));
+    if (versionMatch) return `${language}${versionMatch[1]}${versionMatch[2] || ''}`;
+  }
+  return language;
+}
+
+function resolveRuntime(runtime, yaml) {
+  const language = runtimeLanguage(runtime);
+  if (!language) return '';
+  const namePrefix = runtimePrefix(runtime, yaml);
   const result = jsonOci(['fn', 'runtime', 'list', '--all', '--name-starts-with', namePrefix]);
   const candidates = listItems(result)
     .map(runtimeResourceName)
@@ -79,14 +99,21 @@ function resolvePythonRuntime(runtime) {
     fail(`no available code-only runtime matches ${runtime}. Set OCI_CODE_ONLY_RUNTIME_NAME to a runtime returned by "oci fn runtime list --all".`);
   }
   candidates.sort((left, right) => {
-    const versionDifference = pythonRuntimeSortKey(right) - pythonRuntimeSortKey(left);
+    const versionDifference = runtimeSortKey(right, language) - runtimeSortKey(left, language);
     return versionDifference || right.localeCompare(left);
   });
   const selected = candidates[0];
-  console.log(`Selected OCI code-only runtime ${selected} for func.yaml runtime ${runtime}. Set OCI_CODE_ONLY_RUNTIME_NAME to pin a different runtime.`);
+  console.log(`Selected OCI code-only runtime ${selected} for func.yaml runtime ${runtime} (runtime prefix ${namePrefix}). Set OCI_CODE_ONLY_RUNTIME_NAME to pin a different runtime.`);
   return selected;
 }
 
+function codeOnlyPythonHandler(handler) {
+  // Fn's generated container entrypoint is not a code-only handler. Convert
+  // the standard form to the handler syntax required by the managed runtime.
+  const match = handler.match(/^\/python\/bin\/fdk\s+\/function\/(.+?)\.py\s+([A-Za-z_][A-Za-z0-9_]*)$/);
+  return match ? `${match[1].replace(/[\\/]/g, '.')}.${match[2]}` : handler;
+}
+
 function readFunctionMetadata() {
   const funcYamlPath = path.join(projectDir, 'func.yaml');
   const yaml = fs.existsSync(funcYamlPath) ? fs.readFileSync(funcYamlPath, 'utf8') : '';
@@ -94,19 +121,21 @@ function readFunctionMetadata() {
   const appName = (process.env.OCI_FUNCTION_APP_NAME || functionName).trim();
   const configuredRuntime = yamlValue(yaml, 'runtime');
   const runtimeName = (process.env.OCI_CODE_ONLY_RUNTIME_NAME || '').trim()
-    || (configuredRuntime.toLowerCase().startsWith('python') ? resolvePythonRuntime(configuredRuntime) : '');
+    || resolveRuntime(configuredRuntime, yaml);
   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 handler = runtimeName.toLowerCase().startsWith('node')
     ? configuredHandler.replace(/^node\s+/, '')
+    : runtimeName.toLowerCase().startsWith('python')
+      ? codeOnlyPythonHandler(configuredHandler)
     : 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);
 
   if (!functionName) fail('set OCI_FUNCTION_NAME or add name: to func.yaml.');
   if (!appName) fail('set OCI_FUNCTION_APP_NAME.');
-  if (!runtimeName) fail('set OCI_CODE_ONLY_RUNTIME_NAME (for example python312.ol9). Automatic runtime resolution currently supports Python functions with runtime: python in func.yaml.');
+  if (!runtimeName) fail('set OCI_CODE_ONLY_RUNTIME_NAME (for example python312.ol9). Automatic runtime resolution supports Python, Node.js, and Java func.yaml runtimes.');
   if (!handler) fail('set OCI_FUNCTION_HANDLER or add cmd: to func.yaml.');
 
   return { functionName, appName, handler, runtimeName, memory, timeout };

package/package.json

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