From a289545fcd3d2fee141e549dc155d880fef6e0fa Mon Sep 17 00:00:00 2001 From: zeshanziya Date: Mon, 12 Aug 2024 01:50:47 +0000 Subject: [PATCH] handle deleting dirty environments --- __tests__/clean-pr-env.test.ts | 4 ++-- src/clean-pr-env.ts | 6 +++++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/__tests__/clean-pr-env.test.ts b/__tests__/clean-pr-env.test.ts index a678222..6615264 100644 --- 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 index 8d197ba..1af43fb 100644 --- a/src/clean-pr-env.ts +++ b/src/clean-pr-env.ts @@ -46,7 +46,11 @@ export async function cleanPrEnv(): Promise { } // 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