miel.truyen/nx
1
0
Fork 0
Code Issues Pull Requests Actions 5 Packages Projects Releases Wiki Activity

fix(core): hasher should handle non existent env vars

Browse Source
This commit is contained in:
Victor Savkin 2022-06-28 10:46:23 -04:00
parent 1afad766e6
commit 40716f1f8a
No known key found for this signature in database
GPG Key ID: 39178FEB7698B817
2 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
packages/nx/src/hasher/hasher.spec.ts
View File

@ -73,6 +73,7 @@ describe('Hasher', () => {
}); });
it('should create task hash', async () => { it('should create task hash', async () => {
process.env.TESTENV = 'env123';
const hasher = new Hasher( const hasher = new Hasher(
{ {
nodes: { nodes: {
@ -82,7 +83,15 @@ describe('Hasher', () => {
data: { data: {
root: 'libs/parent', root: 'libs/parent',
targets: { targets: {
build: {}, build: {
inputs: [
'default',
'^default',
{ runtime: 'echo runtime123' },
{ env: 'TESTENV' },
{ env: 'NONEXISTENTENV' },
],
},
}, },
files: [{ file: '/file', ext: '.ts', hash: 'file.hash' }], files: [{ file: '/file', ext: '.ts', hash: 'file.hash' }],
}, },
@ -94,7 +103,7 @@ describe('Hasher', () => {
}, },
{} as any, {} as any,
{ {
runtimeCacheInputs: ['echo runtime123', 'echo runtime456'], runtimeCacheInputs: ['echo runtime456'],
}, },
createHashing() createHashing()
); );
@ -110,13 +119,14 @@ describe('Hasher', () => {
expect(hash.value).toContain('prop-value'); //overrides expect(hash.value).toContain('prop-value'); //overrides
expect(hash.value).toContain('parent'); //project expect(hash.value).toContain('parent'); //project
expect(hash.value).toContain('build'); //target expect(hash.value).toContain('build'); //target
expect(hash.value).toContain('runtime123'); //target expect(hash.value).toContain('runtime123');
expect(hash.value).toContain('runtime456'); //target expect(hash.value).toContain('runtime456');
expect(hash.value).toContain('env123');
expect(hash.details.command).toEqual('parent|build||{"prop":"prop-value"}'); expect(hash.details.command).toEqual('parent|build||{"prop":"prop-value"}');
expect(hash.details.nodes).toEqual({ expect(hash.details.nodes).toEqual({
'parent:$filesets': 'parent:$filesets':
'/file|file.hash|{"root":"libs/parent","targets":{"build":{}}}|{"compilerOptions":{"paths":{"@nrwl/parent":["libs/parent/src/index.ts"],"@nrwl/child":["libs/child/src/index.ts"]}}}', '/file|file.hash|{"root":"libs/parent","targets":{"build":{"inputs":["default","^default",{"runtime":"echo runtime123"},{"env":"TESTENV"},{"env":"NONEXISTENTENV"}]}}}|{"compilerOptions":{"paths":{"@nrwl/parent":["libs/parent/src/index.ts"],"@nrwl/child":["libs/child/src/index.ts"]}}}',
'{workspaceRoot}/yarn.lock': 'yarn.lock.hash', '{workspaceRoot}/yarn.lock': 'yarn.lock.hash',
'{workspaceRoot}/package-lock.json': 'package-lock.json.hash', '{workspaceRoot}/package-lock.json': 'package-lock.json.hash',
'{workspaceRoot}/pnpm-lock.yaml': 'pnpm-lock.yaml.hash', '{workspaceRoot}/pnpm-lock.yaml': 'pnpm-lock.yaml.hash',
@ -125,6 +135,8 @@ describe('Hasher', () => {
'{workspaceRoot}/.nxignore': '', '{workspaceRoot}/.nxignore': '',
'runtime:echo runtime123': 'runtime123', 'runtime:echo runtime123': 'runtime123',
'runtime:echo runtime456': 'runtime456', 'runtime:echo runtime456': 'runtime456',
'env:TESTENV': 'env123',
'env:NONEXISTENTENV': '',
}); });
}); });

4
packages/nx/src/hasher/hasher.ts
View File

@ -443,9 +443,9 @@ class TaskHasher {
} }
private async hashEnv(envVarName: string): Promise<PartialHash> { private async hashEnv(envVarName: string): Promise<PartialHash> {
const value = this.hashing.hashArray([process.env[envVarName]]); const value = this.hashing.hashArray([process.env[envVarName] ?? '']);
return { return {
details: { [`runtime:${envVarName}`]: value }, details: { [`env:${envVarName}`]: value },
value, value,
}; };
} }