Skip squid log cleanup when squid never started

src/artifact-preservation.ts

@@ -13,10 +13,10 @@
 export function preserveIptablesAudit(workDir: string, auditDir?: string): void {
   const iptablesAuditSrc = path.join(workDir, 'init-signal', 'iptables-audit.txt');
   const targetAuditDir = auditDir || path.join(workDir, 'audit');
   if (fs.existsSync(iptablesAuditSrc) && fs.existsSync(targetAuditDir)) {
     try {
       fs.copyFileSync(iptablesAuditSrc, path.join(targetAuditDir, 'iptables-audit.txt'));
       fs.chmodSync(path.join(targetAuditDir, 'iptables-audit.txt'), 0o644);
       logger.debug('Copied iptables audit state to audit directory');
     } catch (error) {
       logger.debug('Could not copy iptables audit file:', error);
@@ -36,7 +36,6 @@
   permissionErrorMessage: string;
   preserveErrorMessage: string;
   chmodPreservedDir?: boolean;
-  runtimeDirMustExist?: boolean;
 };
 
 function preserveDirectory({
@@ -51,11 +50,10 @@
   permissionErrorMessage,
   preserveErrorMessage,
   chmodPreservedDir = false,
-  runtimeDirMustExist = true,
 }: PreserveDirectoryOptions): void {
   if (runtimeDir) {
     const targetDir = runtimeSubdir ? path.join(runtimeDir, runtimeSubdir) : runtimeDir;
-    if (!runtimeDirMustExist || fs.existsSync(targetDir)) {
+    if (fs.existsSync(targetDir)) {
       try {
         execa.sync('chmod', ['-R', 'a+rX', targetDir]);
         logger.info(`${availableLabel} available at: ${targetDir}`);
@@ -68,9 +66,9 @@
 
   const sourceDir = path.join(workDir, workSubdir);
   const destinationDir = path.join(os.tmpdir(), `${destinationBaseName}-${timestamp}`);
   if (fs.existsSync(sourceDir) && fs.readdirSync(sourceDir).length > 0) {
     try {
       fs.renameSync(sourceDir, destinationDir);
       if (chmodPreservedDir) {
         execa.sync('chmod', ['-R', 'a+rX', destinationDir]);
       }
@@ -156,7 +154,6 @@
     permissionErrorMessage: 'Could not fix squid log permissions:',
     preserveErrorMessage: 'Could not preserve squid logs:',
     chmodPreservedDir: true,
-    runtimeDirMustExist: false,
   });
 
   if (auditDir) {

src/docker-manager-cleanup.test.ts

@@ -134,6 +134,14 @@ describe('docker-manager cleanup', () => {
       }
     });
 
+    it('should skip squid log chmod when proxyLogsDir does not exist', async () => {
+      const proxyLogsDir = path.join(os.tmpdir(), `awf-missing-proxy-logs-${Date.now()}`);
+
+      await cleanup(getDir(), false, proxyLogsDir);
+
+      expect(mockExecaSync).not.toHaveBeenCalledWith('chmod', ['-R', 'a+rX', proxyLogsDir]);
+    });
+
     it('should chmod api-proxy-logs subdirectory when proxyLogsDir is specified', async () => {
       // proxyLogsDir must be OUTSIDE workDir since cleanup deletes workDir
       const externalDir = fs.mkdtempSync(path.join(os.tmpdir(), 'awf-proxy-logs-test-'));