@mikarinneoracle/oci-cdk-code-only-preview 0.0.28 → 0.0.30

package/README.md

@@ -57,7 +57,7 @@ Only **`OCI_COMPARTMENT_ID`** (or `OCI_COMPARTMENT_OCID`) is required for deploy
 | `OCI_IMAGE_TAG` | Image tag for OCIR | func.yaml version or `latest` |
 | `OCI_CODE_ONLY` | When `1`, use the Code-only Functions ZIP deploy path | `0` |
 | `OCI_CODE_ONLY_SOURCE_DIR` | Source directory to archive for code-only deploy | current directory |
-| `OCI_CODE_ONLY_RUNTIME_NAME` | Required OCI Functions runtime name for code-only deploy (for example `python312.ol9`) | — |
+| `OCI_CODE_ONLY_RUNTIME_NAME` | Optional explicit OCI Functions runtime name for code-only deploy (for example `python312.ol9`). OCDK resolves Python automatically from `func.yaml`. | — |
 | **API Gateway** | | |
 | `OCI_APIGATEWAY_DEPLOYMENT_JSON` | Path to deployment spec JSON | `oci_apigateway_deployment.json` in project root |
 | **Stack / networking** | | |
@@ -115,8 +115,8 @@ export OCI_CLI_PATH="/Users/MRINNE/projects/ocdk/.tools/oci-preview-bin/oci"
 # Required: OCI target
 export OCI_COMPARTMENT_ID='ocid1.compartment.oc1...'
 
-# Required: code-only runtime and handler
-export OCI_CODE_ONLY_RUNTIME_NAME='python312.ol9'
+# Required: handler. OCDK resolves the latest available Python runtime.
+# Optionally pin one: export OCI_CODE_ONLY_RUNTIME_NAME='python312.ol9'
 export OCI_FUNCTION_HANDLER='func.handler'
 
 # Required in func.yaml: name: my-function
@@ -157,11 +157,11 @@ mvn -DskipTests package
 # or: gradle build -x test
 ```
 
-OCDK also runs this build automatically when no artifact exists yet, and searches the project root, Maven `target/`, and Gradle `build/libs/`. The build must produce a fat/uber JAR: Maven projects normally use `maven-shade-plugin`, and Gradle projects use the Shadow plugin. If several JARs exist, set `OCI_FUNCTION_JAR_PATH` to the fat JAR explicitly. Java archives do not contain the project source tree or a `function/` directory.
+OCDK also runs this build automatically when no artifact exists yet, and searches the project root, Maven `target/`, and Gradle `build/libs/`. The OCI service validates the JAR contents; if several non-source JARs exist, set `OCI_FUNCTION_JAR_PATH` to the one to deploy explicitly. 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:
+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:
 
 ```bash
 # List every runtime available to the active OCI profile

package/bin/deploy-code-only.js

@@ -49,12 +49,45 @@ function integerValue(value, name, fallback) {
   return String(parsed);
 }
 
+function runtimeResourceName(runtime) {
+  return runtime.name || runtime['runtime-name'] || runtime.runtimeName || runtime['runtimeName'] || '';
+}
+
+function pythonRuntimeSortKey(runtimeName) {
+  const match = runtimeName.toLowerCase().match(/^python(\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.
+  const normalizedRuntime = runtime.toLowerCase().replace(/[^a-z0-9]/g, '');
+  const namePrefix = normalizedRuntime === 'python' ? 'python' : normalizedRuntime;
+  const result = jsonOci(['fn', 'runtime', 'list', '--all', '--name-starts-with', namePrefix]);
+  const candidates = (result.data || [])
+    .map(runtimeResourceName)
+    .filter((name) => name.toLowerCase().startsWith(namePrefix));
+  if (!candidates.length) {
+    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);
+    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.`);
+  return selected;
+}
+
 function readFunctionMetadata() {
   const funcYamlPath = path.join(projectDir, 'func.yaml');
   const yaml = fs.existsSync(funcYamlPath) ? fs.readFileSync(funcYamlPath, 'utf8') : '';
   const functionName = (process.env.OCI_FUNCTION_NAME || yamlValue(yaml, 'name')).trim();
   const appName = (process.env.OCI_FUNCTION_APP_NAME || functionName).trim();
-  const runtimeName = (process.env.OCI_CODE_ONLY_RUNTIME_NAME || '').trim();
+  const configuredRuntime = yamlValue(yaml, 'runtime');
+  const runtimeName = (process.env.OCI_CODE_ONLY_RUNTIME_NAME || '').trim()
+    || (configuredRuntime.toLowerCase().startsWith('python') ? resolvePythonRuntime(configuredRuntime) : '');
   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`.
@@ -66,7 +99,7 @@ function readFunctionMetadata() {
 
   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).');
+  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 (!handler) fail('set OCI_FUNCTION_HANDLER or add cmd: to func.yaml.');
 
   return { functionName, appName, handler, runtimeName, memory, timeout };
@@ -123,12 +156,6 @@ function buildJavaProject() {
   }
 }
 
-function isFatJavaJar(jarPath) {
-  const result = spawnSync('jar', ['tf', jarPath], { encoding: 'utf8', shell: false });
-  if (result.error || result.status !== 0) return false;
-  return /(^|\n)com\/fnproject\/fn\/(api|runtime)\//.test(result.stdout || '');
-}
-
 function resolveJavaJar() {
   const configuredPath = (process.env.OCI_CODE_ONLY_JAR_PATH || process.env.OCI_FUNCTION_JAR_PATH || '').trim();
   if (configuredPath) {
@@ -136,9 +163,6 @@ function resolveJavaJar() {
     if (!fs.existsSync(jarPath) || !fs.statSync(jarPath).isFile() || !jarPath.endsWith('.jar')) {
       fail(`OCI_FUNCTION_JAR_PATH must point to an existing .jar file: ${jarPath}`);
     }
-    if (!isFatJavaJar(jarPath)) {
-      fail(`Java archive is not a fat/uber JAR: ${jarPath}. Configure your Maven Shade or Gradle Shadow build, then point OCI_FUNCTION_JAR_PATH to its output.`);
-    }
     return jarPath;
   }
   let candidates = listJavaJarCandidates();
@@ -148,14 +172,11 @@ function resolveJavaJar() {
   }
   const uniqueCandidates = [...new Set(candidates)];
   if (uniqueCandidates.length === 1) {
-    if (!isFatJavaJar(uniqueCandidates[0])) {
-      fail(`Java build produced a non-fat JAR: ${uniqueCandidates[0]}. Configure your Maven Shade or Gradle Shadow build, then set OCI_FUNCTION_JAR_PATH to its fat/uber JAR.`);
-    }
     return uniqueCandidates[0];
   }
   const found = uniqueCandidates.length ? ` Found: ${uniqueCandidates.join(', ')}` : '';
-  const guidance = ' Run `mvn -DskipTests package` (or `gradle build -x test`) to produce a fat/uber JAR using Maven Shade or Gradle Shadow, then set OCI_FUNCTION_JAR_PATH (for example target/my-function-all.jar).';
-  fail(`Java code-only deploy requires exactly one fat/uber JAR.${guidance}${found}`);
+  const guidance = ' Run `mvn -DskipTests package` (or `gradle build -x test`) to produce the function JAR, then set OCI_FUNCTION_JAR_PATH (for example target/my-function.jar).';
+  fail(`Java code-only deploy requires exactly one JAR.${guidance}${found}`);
 }
 
 function createArchive(functionName, runtimeName) {

package/package.json

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