ExternalVendorCode/balena-supervisor
1
0
Fork 0
mirror of https://github.com/balena-os/balena-supervisor.git synced 2025-05-31 23:00:48 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Type parameters for validation functions better

Browse Source 
They can now be string | null | undefined.

Change-type: patch
Signed-off-by: Cameron Diver <cameron@resin.io>
This commit is contained in:
Cameron Diver 2018-04-30 08:38:53 +01:00
parent 06a5e0986c
commit 67b9ec6ca7
No known key found for this signature in database
GPG Key ID: 69264F9C923F55C1
1 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/lib/validation.ts
View File

@ -16,13 +16,15 @@ export interface LabelObject {
const ENV_VAR_KEY_REGEX = /^[a-zA-Z_][a-zA-Z0-9_]*$/;
const LABEL_NAME_REGEX = /^[a-zA-Z][a-zA-Z0-9\.\-]*$/;
type NullableString = string | undefined | null;
/**
* checkInt
*
* Check an input string as a number, optionally specifying a requirement
* to be positive
*/
export function checkInt(s: string | null, options: CheckIntOptions = {}): number | void {
export function checkInt(s: NullableString, options: CheckIntOptions = {}): number | void {
if (s == null) {
return;
}
@ -45,7 +47,7 @@ export function checkInt(s: string | null, options: CheckIntOptions = {}): numbe
*
* Check that a string exists, and is not an empty string, 'null', or 'undefined'
*/
export function checkString(s: string): string | void {
export function checkString(s: NullableString): string | void {
if (s == null || !_.isString(s) || _.includes([ 'null', 'undefined', '' ], s)) {
return;
}
@ -104,13 +106,13 @@ export function isValidEnv(obj: EnvVarObject): boolean {
return _.every(obj, (val, key) => {
if (!isValidShortText(key)) {
console.log('debug: Non-valid short text env var key passed to validation.isValidEnv');
console.log(`\tKey: ${inspect(key)}`)
console.log(`\tKey: ${inspect(key)}`);
return false;
}
if (!ENV_VAR_KEY_REGEX.test(key)) {
console.log('debug: Invalid env var key passed to validation.isValidEnv');
console.log(`\tKey: ${inspect(key)}`)
console.log(`\tKey: ${inspect(key)}`);
return false;
}
@ -230,7 +232,7 @@ export function isValidDependentAppsObject(apps: any): boolean {
return false;
}
return true;
}
},
});
});
}
@ -282,7 +284,7 @@ function isValidService(service: any, serviceId: string): boolean {
return false;
}
return true;
}
},
});
}
@ -340,7 +342,7 @@ export function isValidAppsObject(obj: any): boolean {
}
return true;
});
}
},
});
});
}
@ -405,10 +407,10 @@ export function isValidDependentDevicesObject(devices: any): boolean {
return false;
}
return true;
}
},
});
});
}
},
});
});
}