Merge pull request #43 from axelerant/issue-35

handle deleting dirty environments
axelerant · Aug 12, 2024 · 0d7a9da · 0d7a9da
2 parents df1b8dc + a289545
commit 0d7a9da
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/__tests__/clean-pr-env.test.ts b/__tests__/clean-pr-env.test.ts
@@ -114,7 +114,7 @@ describe('cleanPrEnv', () => {
   })
 
   it('should handle unexpected environment status', async () => {
-    const mockEnvResult = mockEnvironmentResult('dirty')
+    const mockEnvResult = mockEnvironmentResult('deleting')
     mockClient.getEnvironment.mockResolvedValue(mockEnvResult)
     github.context.payload.pull_request = { number: 123 }
 
@@ -127,7 +127,7 @@ describe('cleanPrEnv', () => {
     expect(mockEnvResult.deactivate).not.toHaveBeenCalled()
     expect(mockEnvResult.delete).not.toHaveBeenCalled()
     expect(core.warning).toHaveBeenCalledWith(
-      `Unable to delete 123/merge environment as it's already in dirty mode`
+      `Unable to delete 123/merge environment as it's already in deleting mode`
     )
     expect(core.endGroup).toHaveBeenCalled()
   })

diff --git a/src/clean-pr-env.ts b/src/clean-pr-env.ts
@@ -46,7 +46,11 @@ export async function cleanPrEnv(): Promise<void> {
   }
 
   // Check the status of the environment.
-  if (envResult.status === 'active' || envResult.status === 'paused') {
+  if (
+    envResult.status === 'active' ||
+    envResult.status === 'paused' ||
+    envResult.status === 'dirty'
+  ) {
     const activity = await envResult.deactivate()
     core.info(`Deactivating ${prRef} environment...`)
     // @todo display activity log