feat: add value length cap to partialClone

Author: Hweinstock

packages/amazonq/test/e2e/inline/inline.test.ts

@@ -122,7 +122,7 @@ describe('Amazon Q Inline', async function () {
             .query({
                 metricName: 'codewhisperer_userTriggerDecision',
             })
-            .map((e) => collectionUtil.partialClone(e, 3, ['credentialStartUrl'], '[omitted]'))
+            .map((e) => collectionUtil.partialClone(e, 3, ['credentialStartUrl'], { replacement: '[omitted]' }))
     }
 
     for (const [name, invokeCompletion] of [

packages/core/src/auth/sso/clients.ts

@@ -258,7 +258,7 @@ function addLoggingMiddleware(client: SSOOIDCClient) {
                     args.input as unknown as Record<string, unknown>,
                     3,
                     ['clientSecret', 'accessToken', 'refreshToken'],
-                    '[omitted]'
+                    { replacement: '[omitted]' }
                 )
                 getLogger().debug('API request (%s %s): %O', hostname, path, input)
             }
@@ -288,7 +288,7 @@ function addLoggingMiddleware(client: SSOOIDCClient) {
                     result.output as unknown as Record<string, unknown>,
                     3,
                     ['clientSecret', 'accessToken', 'refreshToken'],
-                    '[omitted]'
+                    { replacement: '[omitted]' }
                 )
                 getLogger().debug('API response (%s %s): %O', hostname, path, output)
             }

packages/core/src/shared/utilities/collectionUtils.ts

@@ -7,6 +7,7 @@ import { isWeb } from '../extensionGlobals'
 import { inspect as nodeInspect } from 'util'
 import { AsyncCollection, toCollection } from './asyncCollection'
 import { SharedProp, AccumulableKeys, Coalesce, isNonNullable } from './tsUtils'
+import { truncate } from './textUtilities'
 
 export function union<T>(a: Iterable<T>, b: Iterable<T>): Set<T> {
     const result = new Set<T>()
@@ -304,26 +305,36 @@ export function assign<T extends Record<any, any>, U extends Partial<T>>(data: T
  * @param depth
  * @param omitKeys Omit properties matching these names (at any depth).
  * @param replacement Replacement for object whose fields extend beyond `depth`, and properties matching `omitKeys`.
+ * @param maxLength truncates string values that exceed this threshold.
  */
-export function partialClone(obj: any, depth: number = 3, omitKeys: string[] = [], replacement?: any): any {
+export function partialClone(
+    obj: any,
+    depth: number = 3,
+    omitKeys: string[] = [],
+    options?: {
+        replacement?: any
+        maxLength?: number
+    }
+): any {
     // Base case: If input is not an object or has no children, return it.
     if (typeof obj !== 'object' || obj === null || 0 === Object.getOwnPropertyNames(obj).length) {
-        return obj
+        const maxLength = options?.maxLength
+        return typeof obj === 'string' && maxLength !== undefined ? truncate(obj, maxLength, '...') : obj
     }
 
     // Create a new object of the same type as the input object.
     const clonedObj = Array.isArray(obj) ? [] : {}
 
     if (depth === 0) {
-        return replacement ? replacement : clonedObj
+        return options?.replacement ? options.replacement : clonedObj
     }
 
     // Recursively clone properties of the input object
     for (const key in obj) {
         if (omitKeys.includes(key)) {
-            ;(clonedObj as any)[key] = replacement ? replacement : Array.isArray(obj) ? [] : {}
+            ;(clonedObj as any)[key] = options?.replacement ? options.replacement : Array.isArray(obj) ? [] : {}
         } else if (Object.prototype.hasOwnProperty.call(obj, key)) {
-            ;(clonedObj as any)[key] = partialClone(obj[key], depth - 1, omitKeys, replacement)
+            ;(clonedObj as any)[key] = partialClone(obj[key], depth - 1, omitKeys, options)
         }
     }
 

packages/core/src/shared/utilities/textUtilities.ts

@@ -10,7 +10,7 @@ import { default as stripAnsi } from 'strip-ansi'
 import { getLogger } from '../logger/logger'
 
 /**
- * Truncates string `s` if it exceeds `n` chars.
+ * Truncates string `s` if it has or exceeds `n` chars.
  *
  * If `n` is negative, truncates at start instead of end.
  *

packages/core/src/shared/vscode/commands2.ts

@@ -653,7 +653,7 @@ async function runCommand<T extends Callback>(fn: T, info: CommandInfo<T>): Prom
 
     logger.debug(
         `command: running ${label} with arguments: %O`,
-        partialClone(args, 3, ['clientSecret', 'accessToken', 'refreshToken', 'tooltip'], '[omitted]')
+        partialClone(args, 3, ['clientSecret', 'accessToken', 'refreshToken', 'tooltip'], { replacement: '[omitted]' })
     )
 
     try {

packages/core/src/test/shared/utilities/collectionUtils.test.ts

@@ -730,8 +730,8 @@ describe('CollectionUtils', async function () {
                 d: {},
                 e: {},
             })
-            assert.deepStrictEqual(partialClone(testObj, 0, [], '[replaced]'), '[replaced]')
-            assert.deepStrictEqual(partialClone(testObj, 1, [], '[replaced]'), {
+            assert.deepStrictEqual(partialClone(testObj, 0, [], { replacement: '[omitted]' }), '[replaced]')
+            assert.deepStrictEqual(partialClone(testObj, 1, [], { replacement: '[omitted]' }), {
                 ...testObj,
                 d: '[replaced]',
                 e: '[replaced]',
@@ -758,7 +758,7 @@ describe('CollectionUtils', async function () {
                 },
             }
 
-            assert.deepStrictEqual(partialClone(testObj, 2, ['c', 'e2'], '[omitted]'), {
+            assert.deepStrictEqual(partialClone(testObj, 2, ['c', 'e2'], { replacement: '[omitted]' }), {
                 ...testObj,
                 c: '[omitted]',
                 d: { d1: '[omitted]' },
@@ -767,7 +767,7 @@ describe('CollectionUtils', async function () {
                     e2: '[omitted]',
                 },
             })
-            assert.deepStrictEqual(partialClone(testObj, 3, ['c', 'e2'], '[omitted]'), {
+            assert.deepStrictEqual(partialClone(testObj, 3, ['c', 'e2'], { replacement: '[omitted]' }), {
                 ...testObj,
                 c: '[omitted]',
                 d: { d1: { d2: '[omitted]' } },
@@ -777,5 +777,30 @@ describe('CollectionUtils', async function () {
                 },
             })
         })
+
+        it('truncates properties by maxLength', function () {
+            const testObj = {
+                a: '1',
+                b: '11',
+                c: '11111',
+                d: {
+                    e: {
+                        a: '11111',
+                        b: '11',
+                    },
+                },
+            }
+            assert.deepStrictEqual(partialClone(testObj, 5, [], { maxLength: 2 }), {
+                a: '1',
+                b: '11',
+                c: '11...',
+                d: {
+                    e: {
+                        a: '11...',
+                        b: '11',
+                    },
+                },
+            })
+        })
     })
 })