Skip to content

fix: show 'Computing diff changes...' step during deploy diff phase #952

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
aidandaly24 wants to merge 1 commit into
base: main
Choose a base branch
from
+13 −2
Open

fix: show 'Computing diff changes...' step during deploy diff phase #952

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 13 additions & 2 deletions src/cli/tui/screens/deploy/useDeployFlow.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,6 +122,10 @@
const identityKmsKeyArn = preSynthesized?.identityKmsKeyArn ?? preflight.identityKmsKeyArn;
const allCredentials = preSynthesized?.allCredentials ?? preflight.allCredentials;

const [preDeployDiffStep, setPreDeployDiffStep] = useState<Step>({
label: 'Computing diff changes...',
status: 'pending',
});
const [publishAssetsStep, setPublishAssetsStep] = useState<Step>({ label: 'Publish assets', status: 'pending' });
const [deployStep, setDeployStep] = useState<Step>({ label: 'Deploy to AWS', status: 'pending' });
const [diffStep, setDiffStep] = useState<Step>({ label: 'Run CDK diff', status: 'pending' });
Expand All @@ -144,6 +148,7 @@
const streamOutputsRef = useRef<Record<string, string> | null>(null);

const startDeploy = useCallback(() => {
setPreDeployDiffStep({ label: 'Computing diff changes...', status: 'pending' });
setPublishAssetsStep({ label: 'Publish assets', status: 'pending' });
setDeployStep({ label: 'Deploy to AWS', status: 'pending' });
setDeployOutput(null);
Expand Down Expand Up @@ -327,6 +332,8 @@
if (!isDiffRunningRef.current) {
isDiffRunningRef.current = true;
setIsDiffLoading(true);
setPreDeployDiffStep(prev => ({ ...prev, status: 'running' }));
logger.startStep('Computing diff changes...');
switchableIoHost?.setOnRawMessage((code, _level, message, data) => {
logger.logDiff(code, message);
if (code === 'CDK_TOOLKIT_I4002') {
Expand All @@ -345,6 +352,8 @@
switchableIoHost?.setOnRawMessage(null);
isDiffRunningRef.current = false;
setIsDiffLoading(false);
logger.endStep('success');
setPreDeployDiffStep(prev => ({ ...prev, status: 'success' }));
}
}

Expand Down Expand Up @@ -478,7 +487,7 @@
};

void run();
}, [

Check warning on line 490 in src/cli/tui/screens/deploy/useDeployFlow.ts

View workflow job for this annotation

GitHub Actions / lint 

React Hook useEffect has a missing dependency: 'context?.projectSpec.agentCoreGateways?.length'. Either include it or remove the dependency array
preflight.phase,
cdkToolkitWrapper,
stackNames,
Expand Down Expand Up @@ -569,8 +578,10 @@
if (diffMode) {
return skipPreflight ? [diffStep] : [...preflight.steps, diffStep];
}
return skipPreflight ? [publishAssetsStep, deployStep] : [...preflight.steps, publishAssetsStep, deployStep];
}, [preflight.steps, publishAssetsStep, deployStep, diffStep, skipPreflight, diffMode]);
return skipPreflight
? [preDeployDiffStep, publishAssetsStep, deployStep]
: [...preflight.steps, preDeployDiffStep, publishAssetsStep, deployStep];
}, [preflight.steps, preDeployDiffStep, publishAssetsStep, deployStep, diffStep, skipPreflight, diffMode]);

const phase: DeployPhase = useMemo(() => {
const activeStep = diffMode ? diffStep : deployStep;
Expand Down
Loading