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

package/README.md

@@ -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, OCDK queries this list automatically. With `runtime: python`, it selects the version in `build_image` or `run_image` (for example `fnproject/python:3.12` selects `python312...`); 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

@@ -65,12 +65,23 @@ function pythonRuntimeSortKey(runtimeName) {
   return match ? Number.parseInt(match[1], 10) : -1;
 }
 
-function resolvePythonRuntime(runtime) {
+function pythonRuntimePrefix(runtime, yaml) {
   // 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.
+  // "python312". For a plain "python", honor the version in Fn's
+  // build_image/run_image before falling back to the newest available version.
   const normalizedRuntime = runtime.toLowerCase().replace(/[^a-z0-9]/g, '');
-  const namePrefix = normalizedRuntime === 'python' ? 'python' : normalizedRuntime;
+  if (normalizedRuntime !== 'python') return normalizedRuntime;
+  for (const key of ['build_image', 'run_image']) {
+    const image = yamlValue(yaml, key);
+    const match = image.match(/(?:^|\/)python:(\d+)(?:\.(\d+))?(?:[-.]|$)/i);
+    if (match) return `python${match[1]}${match[2] || ''}`;
+  }
+  return 'python';
+}
+
+function resolvePythonRuntime(runtime, yaml) {
+  const namePrefix = pythonRuntimePrefix(runtime, yaml);
   const result = jsonOci(['fn', 'runtime', 'list', '--all', '--name-starts-with', namePrefix]);
   const candidates = listItems(result)
     .map(runtimeResourceName)
@@ -83,7 +94,7 @@ function resolvePythonRuntime(runtime) {
     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;
 }
 
@@ -94,7 +105,7 @@ 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) : '');
+    || (configuredRuntime.toLowerCase().startsWith('python') ? resolvePythonRuntime(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`.

package/package.json

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