Revert "feat(cli): cannot pass objects and numbers as context arguments (#20068)"

iliapolo · web-flow · commit fa4e860d7ebe · 2022-07-29T15:02:55.000-07:00
This reverts commit ec2d68a.
diff --git a/packages/aws-cdk/lib/settings.ts b/packages/aws-cdk/lib/settings.ts
@@ -300,35 +300,6 @@ export class Settings {
     return ret;
   }
 
-  /**
-   * Context can be passed as CLI arguments in the format
-   * --context foo=bar
-   *
-   * The context value can be of any type, but when it is parsed
-   * it is always a string. Here we attempt to determine the actual
-   * type of the value.
-   */
-  private static parseContextValue(contextValue: string): any {
-    // If the value is a JSON object, then we try and parse it and return
-    // the object.
-    try {
-      return JSON.parse(contextValue);
-    } catch {}
-    const num = parseFloat(contextValue);
-    // parseFloat tries to convert any string to a number, but
-    // if the string begins with a number it will convert that and
-    // ignore the rest so only return a number if the number and the
-    // string are the same
-    if (!isNaN(num) && num.toString() === contextValue) {
-      return num;
-    }
-    // The string value 'false' is truthy so explicitely check for 'false'
-    if (contextValue === 'false') {
-      return false;
-    }
-    return contextValue;
-  }
-
   private static parseStringContextListToObject(argv: Arguments): any {
     const context: any = {};
 
@@ -339,15 +310,14 @@ export class Settings {
         if (parts[0].match(/^aws:.+/)) {
           throw new Error(`User-provided context cannot use keys prefixed with 'aws:', but ${parts[0]} was provided.`);
         }
-        context[parts[0]] = this.parseContextValue(parts[1]);
+        context[parts[0]] = parts[1];
       } else {
         warning('Context argument is not an assignment (key=value): %s', assignment);
       }
     }
     return context;
   }
 
-
   /**
    * Parse tags out of arguments
    *
diff --git a/packages/aws-cdk/test/settings.test.ts b/packages/aws-cdk/test/settings.test.ts
@@ -80,26 +80,6 @@ test('can parse string context from command line arguments with equals sign in v
   expect(settings2.get(['context']).foo).toEqual( 'bar=');
 });
 
-test('can parse context from command line arguments and convert value to correct type', () => {
-  // GIVEN
-  const settings1 = Settings.fromCommandLineArguments({ context: ['foo=false'], _: [Command.DEPLOY] });
-  const settings2 = Settings.fromCommandLineArguments({ context: ['foo=0'], _: [Command.DEPLOY] });
-  const settings3 = Settings.fromCommandLineArguments({ context: ['foo=true'], _: [Command.DEPLOY] });
-  const settings4 = Settings.fromCommandLineArguments({ context: ['foo={"a": "b", "c": true, "d": ["a", "b"]}'], _: [Command.DEPLOY] });
-  const settings5 = Settings.fromCommandLineArguments({ context: ['foo=34'], _: [Command.DEPLOY] });
-  const settings6 = Settings.fromCommandLineArguments({ context: ['foo=34 35'], _: [Command.DEPLOY] });
-  const settings7 = Settings.fromCommandLineArguments({ context: ['foo=0x22'], _: [Command.DEPLOY] });
-
-  // THEN
-  expect(settings1.get(['context']).foo).toEqual(false);
-  expect(settings2.get(['context']).foo).toEqual(0);
-  expect(settings3.get(['context']).foo).toEqual(true);
-  expect(settings4.get(['context']).foo).toEqual({ a: 'b', c: true, d: ['a', 'b'] });
-  expect(settings5.get(['context']).foo).toEqual(34);
-  expect(settings6.get(['context']).foo).toEqual('34 35');
-  expect(settings7.get(['context']).foo).toEqual('0x22');
-});
-
 test('bundling stacks defaults to an empty list', () => {
   // GIVEN
   const settings = Settings.fromCommandLineArguments({
@@ -174,4 +154,4 @@ test('providing a build arg', () => {
 
   // THEN
   expect(settings.get(['build'])).toEqual('mvn package');
-});
+});
