From 9384fabfade9f6d662fcbfbb14b93c34e1420f99 Mon Sep 17 00:00:00 2001 From: Levon Tikoyan Date: Mon, 16 Nov 2026 13:55:02 -0500 Subject: [PATCH] fix(native-helm): use refreshed chart repository relation --- src/server/services/__tests__/deploy.test.ts | 47 ++++++++++++++++++++ src/server/services/deploy.ts | 8 ++-- 2 files changed, 52 insertions(+), 3 deletions(-) diff --git a/src/server/services/__tests__/deploy.test.ts b/src/server/services/__tests__/deploy.test.ts index 4d33f2c0..062f569a 100644 --- a/src/server/services/__tests__/deploy.test.ts +++ b/src/server/services/__tests__/deploy.test.ts @@ -713,6 +713,53 @@ describe('DeployService - shouldTriggerGithubDeployment', () => { ); }); + test('uses the repository on the refreshed deployable when graph loading replaces the relation', async () => { + const deploy = createChartDeploy({ skipImageBuild: true }); + const repository = deploy.deployable.repository; + (deploy.deployable as any).repository = undefined; + const unloadedDeployable = deploy.deployable; + deploy.$fetchGraph.mockImplementation(async (expression) => { + if (expression === 'deployable.repository') { + deploy.deployable = { ...unloadedDeployable, repository }; + } + }); + const patch = jest.spyOn(deployService, 'patchAndUpdateActivityFeed').mockResolvedValue(undefined); + + await expect( + deployService.buildImage(deploy as any, 0, 'run-1', 'app-push-sha', 42, 'app-feature') + ).resolves.toBe(true); + + expect(github.getSHAForBranch).toHaveBeenCalledWith('chart-main', 'example-org', 'chart-repo'); + expect(patch).toHaveBeenCalledWith( + deploy, + expect.objectContaining({ status: DeployStatus.BUILT, sha: 'chart-sha' }), + 'run-1' + ); + expect(mockCodefreshBuildImage).not.toHaveBeenCalled(); + expect(mockBuildWithNative).not.toHaveBeenCalled(); + }); + + test('fails closed when the refreshed deployable no longer has a chart repository', async () => { + const deploy = createChartDeploy({ skipImageBuild: true }); + const originalDeployable = deploy.deployable; + deploy.$fetchGraph.mockImplementation(async (expression) => { + if (expression === 'deployable.repository') { + deploy.deployable = { ...originalDeployable, repository: null }; + } + }); + const patch = jest.spyOn(deployService, 'patchAndUpdateActivityFeed').mockResolvedValue(undefined); + + await expect(deployService.buildImage(deploy as any, 0, 'run-1')).resolves.toBe(false); + + expect(github.getSHAForBranch).not.toHaveBeenCalled(); + expect(patch).toHaveBeenCalledWith( + deploy, + expect.objectContaining({ status: DeployStatus.BUILD_FAILED }), + 'run-1' + ); + expect(patch.mock.calls.some(([, update]) => update.status === DeployStatus.BUILT)).toBe(false); + }); + test('keeps the accepted chart SHA when replaying a deployment', async () => { const deploy = createChartDeploy({ skipImageBuild: true }); const patch = jest.spyOn(deployService, 'patchAndUpdateActivityFeed').mockResolvedValue(undefined); diff --git a/src/server/services/deploy.ts b/src/server/services/deploy.ts index b3a0e2b1..3d2aaef8 100644 --- a/src/server/services/deploy.ts +++ b/src/server/services/deploy.ts @@ -580,14 +580,16 @@ export default class DeployService extends BaseService { const requiresChartSource = skipImageBuild && chartType === ChartType.LOCAL; await deploy.$fetchGraph('deployable.repository'); - if (requiresChartSource && !deployable.repository) { + // Graph loading replaces the related deployable instance. + const repository = deploy.deployable?.repository; + if (requiresChartSource && !repository) { throw this.sourceResolutionFailure(null, deploy.branchName); } - if (deploy.deployable?.repository) { + if (repository) { try { fullSha = await this.resolveSourceSha( deploy, - deploy.deployable.repository.fullName, + repository.fullName, deploy.branchName, sourceRef, sourceGithubRepositoryId,