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

Remove environment variable whitespace trimming

Browse Source 
Change-type: patch
Signed-off-by: Cameron Diver <cameron@balena.io>
This commit is contained in:
Cameron Diver 2019-02-11 14:38:48 +00:00
parent 3b43579da7
commit 6bf008cc85
No known key found for this signature in database
GPG Key ID: 49690ED87032539F
2 changed files with 13 additions and 11 deletions

2
src/lib/conversions.ts

@ -4,7 +4,7 @@ import { EnvVarObject } from './types';
export function envArrayToObject(env: string[]): EnvVarObject {
const toPair = (keyVal: string) => {
const m = keyVal.match(/^([^=]+)=\s*(.*)\s*$/);
const m = keyVal.match(/^([^=]+)=(.*)$/);
if (m == null) {
console.log(
`WARNING: Could not correctly parse env var ${keyVal}. ` +

22
test/15-conversions.spec.coffee

@ -37,13 +37,15 @@ describe 'conversions', ->
expect(conversion.envArrayToObject([])).to.deep.equal({})
expect(conversion.envArrayToObject(1)).to.deep.equal({})
it 'should ignore leading and trailing whitespace', ->
expect(conversion.envArrayToObject([
'TEST=\ntest'
'TEST2=test\n'
'TEST3=\ntest\n'
])).to.deep.equal({
TEST: 'test'
TEST2: 'test'
TEST3: 'test'
})
it 'should correctly handle whitespace', ->
expect(conversion.envArrayToObject([
'key1= test',
'key2=test\ntest',
'key3=test ',
'key4= test '
])).to.deep.equal({
key1: ' test',
key2: 'test\ntest',
key3: 'test ',
key4: ' test ',
})