ExternalVendorCode/balena-supervisor
1
0
Fork 0
mirror of https://github.com/balena-os/balena-supervisor.git synced 2025-06-22 00:57:24 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Improve naming of a util function & add unit test

Browse Source 
isOlderThan -> isValidDateAndOlderThan

See: https://github.com/balena-os/balena-supervisor/pull/2170#discussion_r1226809686
Signed-off-by: Christina Ying Wang <christina@balena.io>
This commit is contained in:
Christina Ying Wang
2023-06-14 17:24:30 -07:00
parent ab80f198d8
commit ace642ea0f
3 changed files with 49 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/compose/app.ts
View File

@ -12,7 +12,7 @@ import {
generateStep,
CompositionStepAction,
} from './composition-steps';
import { isOlderThan } from './utils';
import { isValidDateAndOlderThan } from './utils';
import * as targetStateCache from '../device-state/target-state-cache';
import { getNetworkGateway } from '../lib/docker-utils';
import * as constants from '../lib/constants';
@ -671,7 +671,7 @@ export class App {
} else if (target.config.running !== current.config.running) {
if (
this.requirementsMetForSpecialStart(current, target) &&
!isOlderThan(current.createdAt, SECONDS_TO_WAIT_FOR_START)
!isValidDateAndOlderThan(current.createdAt, SECONDS_TO_WAIT_FOR_START)
) {
return generateStep('noop', {});
}

16
src/compose/utils.ts
View File

@ -694,8 +694,20 @@ export function dockerMountToServiceMount(
return mount as LongDefinition;
}
export function isOlderThan(currentTime: Date | null, seconds: number) {
if (currentTime == null) {
function isDate(d: unknown): d is Date {
return d instanceof Date;
}
/**
* @param currentTime Date instance
* @param seconds time in seconds to check against currentTime
* @returns
*/
export function isValidDateAndOlderThan(
currentTime: unknown,
seconds: number,
): boolean {
if (!isDate(currentTime)) {
return false;
}
return new Date().getTime() - currentTime.getTime() > seconds * 1000;