move utility function to util file

Author: Hweinstock

packages/core/src/shared/awsClientBuilderV3.ts

@@ -22,6 +22,7 @@ import { telemetry } from './telemetry'
 import { getRequestId } from './errors'
 import { extensionVersion } from '.'
 import { getLogger } from './logger'
+import { omitIfPresent } from './utilities/tsUtils'
 
 export type AwsClient = IClient<any, any, any>
 interface AwsConfigOptions {
@@ -108,16 +109,6 @@ export function recordErrorTelemetry(err: Error, serviceName?: string) {
     } satisfies RequestData as any)
 }
 
-export function omitIfPresent<T extends Record<string, unknown>>(obj: T, keys: string[]): T {
-    const objCopy = { ...obj }
-    for (const key of keys) {
-        if (key in objCopy) {
-            ;(objCopy as any)[key] = '[omitted]'
-        }
-    }
-    return objCopy
-}
-
 function logAndThrow(e: any, serviceId: string, errorMessageAppend: string): never {
     if (e instanceof Error) {
         recordErrorTelemetry(e, serviceId)

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

@@ -10,6 +10,16 @@ export function stringOrProp(obj: any, prop: string): string {
     return obj[prop] ?? ''
 }
 
+export function omitIfPresent<T extends Record<string, unknown>>(obj: T, keys: string[]): T {
+    const objCopy = { ...obj }
+    for (const key of keys) {
+        if (key in objCopy) {
+            ;(objCopy as any)[key] = '[omitted]'
+        }
+    }
+    return objCopy
+}
+
 export function getMissingProps<T>(obj: T, ...props: (keyof T)[]): typeof props {
     return props.filter((prop) => obj[prop] === undefined)
 }

packages/core/src/test/shared/defaultAwsClientBuilderV3.test.ts

@@ -13,7 +13,6 @@ import {
     AWSClientBuilderV3,
     DefaultAWSClientBuilderV3,
     getServiceId,
-    omitIfPresent,
     recordErrorTelemetry,
 } from '../../shared/awsClientBuilderV3'
 import { Client } from '@aws-sdk/smithy-client'
@@ -83,17 +82,3 @@ describe('recordErrorTelemetry', function () {
         assertTelemetry('vscode_executeCommand', { requestServiceType: 'aws-service' })
     })
 })
-
-describe('omitIfPresent', function () {
-    it('returns a new object with value replace by [omitted]', function () {
-        const obj = { a: 1, b: 2 }
-        const result = omitIfPresent(obj, ['a'])
-        assert.deepStrictEqual(result, { a: '[omitted]', b: 2 })
-    })
-
-    it('returns the original object if the key is not present', function () {
-        const obj = { a: 1, b: 2 }
-        const result = omitIfPresent(obj, ['c'])
-        assert.deepStrictEqual(result, obj)
-    })
-})

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

@@ -0,0 +1,20 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import assert from 'assert'
+import { omitIfPresent } from '../../../shared/utilities/tsUtils'
+
+describe('omitIfPresent', function () {
+    it('returns a new object with value replace by [omitted]', function () {
+        const obj = { a: 1, b: 2 }
+        const result = omitIfPresent(obj, ['a'])
+        assert.deepStrictEqual(result, { a: '[omitted]', b: 2 })
+    })
+
+    it('returns the original object if the key is not present', function () {
+        const obj = { a: 1, b: 2 }
+        const result = omitIfPresent(obj, ['c'])
+        assert.deepStrictEqual(result, obj)
+    })
+})