@mikarinneoracle/oci-cdk-code-only-preview 0.0.9 → 0.0.11

package/README.md

@@ -133,7 +133,9 @@ 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.
 
-The archive is built from `OCI_CODE_ONLY_SOURCE_DIR` (or the current directory) with the required `function/` directory at its ZIP root. It includes source files and excludes `node_modules`, `.git`, `.tools`, `.terraform`, and `cdktf.out`. The current preview path is function-only: it does not create an API Gateway because the CLI-managed function OCID is not in Terraform state.
+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`, `.git`, `.tools`, `.terraform`, and `cdktf.out`. A successful code-only destroy removes this ZIP after Terraform has destroyed the Function App and infrastructure. The current preview path is function-only: it does not create an API Gateway because the CLI-managed function OCID is not in Terraform state.
+
+After a successful code-only deploy, OCDK writes the log IDs for `npx ocdk tail:execution-log` automatically.
 
 Use the same flag or environment variable for deletion. OCDK deletes the CLI-managed function first, then lets Terraform destroy the Function App and its infrastructure:
 

package/bin/deploy-code-only.js

@@ -67,12 +67,18 @@ function readFunctionMetadata() {
   return { functionName, appName, handler, runtimeName, memory, timeout };
 }
 
-function createArchive() {
+function codeOnlyArchiveFileName(functionName) {
+  const safeName = functionName.replace(/[^A-Za-z0-9._-]/g, '-');
+  return `${safeName || 'function'}.zip`;
+}
+
+function createArchive(functionName) {
   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 archivePath = path.join(tempDir, 'function-source.zip');
+  const archiveFileName = codeOnlyArchiveFileName(functionName);
+  const archivePath = path.join(projectDir, archiveFileName);
   const archiveRoot = path.join(tempDir, 'function');
   const excludedTopLevel = new Set(['node_modules', '.git', '.tools', '.terraform', 'cdktf.out']);
   fs.cpSync(projectDir, archiveRoot, {
@@ -80,12 +86,15 @@ function createArchive() {
     filter: (sourcePath) => {
       const relativePath = path.relative(projectDir, sourcePath);
       if (!relativePath) return true;
+      if (relativePath === archiveFileName) return false;
       return !excludedTopLevel.has(relativePath.split(path.sep)[0]);
     },
   });
+  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) {
     fs.rmSync(tempDir, { recursive: true, force: true });
+    fs.rmSync(archivePath, { force: true });
     fail(`could not create source archive with zip: ${zip.stderr?.trim() || zip.error?.message || 'unknown error'}`);
   }
   return { tempDir, archivePath };
@@ -133,7 +142,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();
+  const archive = createArchive(metadata.functionName);
   try {
     const functionId = findFunctionId(applicationId, metadata.functionName);
     const commonArgs = [

package/bin/ocdk.js

@@ -57,6 +57,22 @@ function resolveCodeOnlyFunctionAppId(env) {
   }
 }
 
+function resolveCodeOnlyArchivePath(projectDir, env) {
+  let functionName = env.OCI_FUNCTION_NAME?.trim();
+  if (!functionName) {
+    try {
+      const funcYaml = fs.readFileSync(path.join(projectDir, 'func.yaml'), 'utf8');
+      const match = funcYaml.match(/^\s*name\s*:\s*(?:["']([^"']*)["']|([^#\r\n]*))/m);
+      functionName = (match?.[1] || match?.[2] || '').trim();
+    } catch {
+      return undefined;
+    }
+  }
+  if (!functionName) return undefined;
+  const safeName = functionName.replace(/[^A-Za-z0-9._-]/g, '-');
+  return path.join(projectDir, `${safeName || 'function'}.zip`);
+}
+
 const npmRunCommands = ['deploy', 'diff', 'synth', 'destroy', 'list', 'get'];
 
 if (!command || command.startsWith('-')) {
@@ -164,7 +180,17 @@ if (command === 'deploy' && codeOnlyEnabled) {
     shell: false,
     env: { ...env, OCI_FUNCTION_APP_ID: functionAppId },
   });
-  process.exit(result.status ?? 1);
+  if (result.status !== 0) process.exit(result.status ?? 1);
+  const logConfig = spawnSync('node', [path.join(root, 'bin', 'write-log-config.js')], {
+    stdio: 'inherit',
+    cwd: projectDir,
+    shell: false,
+    env,
+  });
+  if (logConfig.status !== 0) {
+    console.warn('Code-only function deployed, but log-tail configuration could not be written. Run: npx ocdk write-log-config');
+  }
+  process.exit(0);
 }
 
 // Destroy the CLI-managed archive function before Terraform destroys its
@@ -203,6 +229,13 @@ if (command === 'destroy' && codeOnlyEnabled) {
     shell: false,
     env,
   });
+  if (infrastructure.status === 0) {
+    const archivePath = resolveCodeOnlyArchivePath(projectDir, env);
+    if (archivePath && fs.existsSync(archivePath)) {
+      fs.rmSync(archivePath, { force: true });
+      console.log(`Removed code-only source archive: ${archivePath}`);
+    }
+  }
   process.exit(infrastructure.status ?? 1);
 }
 

package/bin/write-log-config.js

@@ -10,7 +10,7 @@ const fs = require('fs');
 const packageRoot = path.join(__dirname, '..');
 const projectRoot = process.cwd();
 const stackName = process.env.OCI_STACK_NAME || 'oci-stack';
-const stackDir = path.join(projectRoot, 'node_modules', '@mikarinneoracle', 'oci-cdk', 'cdktf.out', 'stacks', stackName);
+const stackDir = path.join(packageRoot, 'cdktf.out', 'stacks', stackName);
 
 if (!fs.existsSync(stackDir)) {
   console.error('Stack directory not found:', stackDir);

package/package.json

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