fix(nx-fly-deployment-action): deprecated apps filter returned too much

closed COD-228

Author: hakalb

packages/nx-fly-deployment-action/src/lib/fly-deployment.spec.ts

@@ -6,7 +6,7 @@ import * as coreAction from '@codeware/core/actions';
 import { type DeployAppOptions, Fly } from '@codeware/fly-node';
 import * as devkit from '@nx/devkit';
 import { ProjectConfiguration } from '@nx/devkit';
-import { PullRequestEvent } from '@octokit/webhooks-types';
+import type { PullRequestEvent } from '@octokit/webhooks-types';
 import { vol } from 'memfs';
 
 import { flyDeployment } from './fly-deployment';
@@ -63,6 +63,7 @@ describe('flyDeployment', () => {
   const mockCoreInfo = vi.mocked(core.info);
   const mockCoreStartGroup = vi.mocked(core.startGroup);
   const mockCoreWarning = vi.mocked(core.warning);
+  const mockCoreActionGetPullRequest = vi.mocked(coreAction.getPullRequest);
   const mockExecGetExecOutput = vi.mocked(exec.getExecOutput);
   const mockGithubContext = vi.mocked(github.context);
   const mockFly = vi.mocked(Fly);
@@ -646,7 +647,7 @@ describe('flyDeployment', () => {
       );
     });
 
-    it('should destroy preview apps', async () => {
+    it('should destroy preview apps when pull request is closed', async () => {
       setContext('pr-closed');
       setupMocks({
         flyApps: [
@@ -655,6 +656,9 @@ describe('flyDeployment', () => {
         ] as Awaited<ReturnType<typeof Fly.prototype.apps.list>>
       });
       const config = setupTest();
+      mockCoreActionGetPullRequest.mockResolvedValue({
+        state: 'closed'
+      } as any);
       const result = await flyDeployment(config, true);
 
       expect(getMockFly().apps.destroy).toHaveBeenCalledWith('app-one-pr-1');
@@ -674,6 +678,54 @@ describe('flyDeployment', () => {
         ]
       } satisfies ActionOutputs);
     });
+
+    it('should destroy preview apps with pull request number', async () => {
+      setContext('pr-closed');
+      setupMocks({
+        flyApps: [{ name: 'app-one-1' }, { name: 'app-two-pr-1' }] as Awaited<
+          ReturnType<typeof Fly.prototype.apps.list>
+        >
+      });
+      const config = setupTest();
+      mockCoreActionGetPullRequest.mockResolvedValue({
+        state: 'closed'
+      } as any);
+      const result = await flyDeployment(config, true);
+
+      expect(getMockFly().apps.destroy).toHaveBeenCalledWith('app-two-pr-1');
+
+      expect(result).toEqual({
+        environment: 'preview',
+        projects: [
+          {
+            action: 'destroy',
+            app: 'app-two-pr-1'
+          }
+        ]
+      } satisfies ActionOutputs);
+    });
+
+    it('should not destroy preview apps when pull request is open', async () => {
+      setContext('pr-closed');
+      setupMocks({
+        flyApps: [
+          { name: 'app-one-pr-1' },
+          { name: 'app-two-pr-1' }
+        ] as Awaited<ReturnType<typeof Fly.prototype.apps.list>>
+      });
+      const config = setupTest();
+      mockCoreActionGetPullRequest.mockResolvedValue({
+        state: 'open'
+      } as any);
+      const result = await flyDeployment(config, true);
+
+      expect(getMockFly().apps.destroy).not.toHaveBeenCalled();
+
+      expect(result).toEqual({
+        environment: 'preview',
+        projects: []
+      } satisfies ActionOutputs);
+    });
   });
 
   describe('deploy to production', () => {

packages/nx-fly-deployment-action/src/lib/utils/run-destroy-apps.ts

@@ -25,24 +25,25 @@ export const runDestroyApps = async (
   const apps = await fly.apps.list();
 
   // Filter deprecated apps to destroy
-  const appsToDestroy = await Promise.all(
-    apps.filter(async (app) => {
-      // Extract pull request number from app name
-      const prNumber = app.name.match(/-pr-(\d+)/)?.[1];
-      if (!prNumber) {
-        return false;
-      }
+  const appPromises = apps.map(async (app) => {
+    // Extract pull request number from app name
+    const prNumber = app.name.match(/-pr-(\d+)/)?.[1];
+    if (!prNumber) {
+      return null;
+    }
+
+    const pullRequest = await getPullRequest(config.token, Number(prNumber));
+    if (!pullRequest) {
+      core.warning(`Pull request #${prNumber} not found, skip destroy`);
+      return null;
+    }
 
-      const pullRequest = await getPullRequest(config.token, Number(prNumber));
-      if (!pullRequest) {
-        core.warning(`Pull request #${prNumber} not found, skip destroy`);
-        return false;
-      }
+    // App should be destroyed when PR is closed
+    return pullRequest.state === 'closed' ? app : null;
+  });
 
-      // App should be destroyed when PR is closed
-      return pullRequest.state === 'closed';
-    })
-  );
+  const result = await Promise.all(appPromises);
+  const appsToDestroy = result.filter((app) => app !== null);
 
   core.info(`Found ${appsToDestroy.length} apps to destroy`);