Support setting a string parameter to the empty string.

Signed-off-by: Eric Promislow <[email protected]>
rancher-sandbox · Apr 14, 2022 · ecbeab9 · ecbeab9
1 parent 1f50e9f
commit ecbeab9
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/src/config/__tests__/settings.spec.ts b/src/config/__tests__/settings.spec.ts
@@ -120,7 +120,15 @@ describe('updateFromCommandLine', () => {
 
     expect(newPrefs.kubernetes.options.traefik).toBeFalsy();
     newPrefs.kubernetes.options.traefik = true;
-    expect(newPrefs).toMatchObject(origPrefs);
+    expect(newPrefs).toEqual(origPrefs);
+  });
+
+  test('nothing after an = should set target to empty string', () => {
+    const newPrefs = settings.updateFromCommandLine(prefs, ['--images-namespace=']);
+
+    expect(newPrefs.images.namespace).toBe('');
+    newPrefs.images.namespace = origPrefs.images.namespace;
+    expect(newPrefs).toEqual(origPrefs);
   });
 
   test('should change several values (and no others)', () => {

diff --git a/src/config/settings.ts b/src/config/settings.ts
@@ -183,12 +183,12 @@ export function updateFromCommandLine(cfg: Settings, args: string[]): Settings {
       throw new Error(`Can't overwrite existing setting ${ arg } in current settings at ${ join(paths.config, 'settings.json') }`);
     case 'boolean':
       // --some-boolean-setting ==> --some-boolean-setting=true
-      if (!value) {
+      if (value === undefined) {
         finalValue = 'true'; // JSON.parse to boolean `true` a few lines later.
       }
       break;
     default:
-      if (!value) {
+      if (value === undefined) {
         if (i === lim - 1) {
           throw new Error(`No value provided for option ${ arg } in command-line [${ args.join(' ') }]`);
         }