cleanup src

Author: baileympearson

src/client-side-encryption/errors.ts

@@ -23,9 +23,8 @@ export class MongoCryptError extends Error {
  * An error indicating that `ClientEncryption.createEncryptedCollection()` failed to create data keys
  */
 export class MongoCryptCreateDataKeyError extends MongoCryptError {
-  // TODO: type encrypted fields
   encryptedFields: Document;
-  constructor({ encryptedFields, cause }) {
+  constructor({encryptedFields, cause}: { encryptedFields: Document, cause: Error }) {
     super(`Unable to complete creating data keys: ${cause.message}`, { cause });
     this.encryptedFields = encryptedFields;
   }
@@ -40,9 +39,8 @@ export class MongoCryptCreateDataKeyError extends MongoCryptError {
  * An error indicating that `ClientEncryption.createEncryptedCollection()` failed to create a collection
  */
 export class MongoCryptCreateEncryptedCollectionError extends MongoCryptError {
-  // TODO: type encrypted fields
   encryptedFields: Document;
-  constructor({ encryptedFields, cause }) {
+  constructor({encryptedFields, cause}: { encryptedFields: Document, cause: Error }) {
     super(`Unable to create collection: ${cause.message}`, { cause });
     this.encryptedFields = encryptedFields;
   }

src/client-side-encryption/providers/aws.ts

@@ -16,6 +16,5 @@ export async function loadAWSCredentials(kmsProviders: KMSProviders): Promise<KM
   // The state machine is the only place calling this so it will
   // catch if there is a rejection here.
   const aws = await provider();
-  // TODO - figure out the type mismatch here
   return { ...kmsProviders, aws };
 }

src/client-side-encryption/providers/azure.ts

@@ -117,8 +117,10 @@ export function prepareRequest(options: AzureKMSRequestOptions): {
   const url =
     options.url == null
       ? new URL('http://169.254.169.254/metadata/identity/oauth2/token')
-      : // TODO - figure out why typings are messed up.
-        // @ts-expect-error the URL constructor supports a url parameter, but the types say it doesn't
+      : // The Node URL constructor technically supports "any object that converts to a valid URL string",
+        // but Node types doesn't support this.  See the Node docs for new URL().
+        // https://nodejs.org/api/url.html#new-urlinput-base
+        // @ts-ignore
         new URL(options.url);
 
   url.searchParams.append('api-version', '2018-02-01');

src/client-side-encryption/providers/gcp.ts

@@ -9,7 +9,7 @@ export async function loadGCPCredentials(kmsProviders: KMSProviders): Promise<KM
     return kmsProviders;
   }
 
-  const { access_token: accessToken } = await gcpMetadata.instance({
+  const { access_token: accessToken } = await gcpMetadata.instance<{ access_token: string }>({
     property: 'service-accounts/default/token'
   });
   return { ...kmsProviders, gcp: { accessToken } };

src/cmap/auth/mongodb_aws.ts

@@ -157,14 +157,6 @@ interface AWSTempCredentials {
   Expiration?: Date;
 }
 
-/* @internal */
-export interface AWSCredentials {
-  accessKeyId?: string;
-  secretAccessKey?: string;
-  sessionToken?: string;
-  expiration?: Date;
-}
-
 async function makeTempCredentials(credentials: MongoCredentials): Promise<MongoCredentials> {
   function makeMongoCredentialsFromAWSTemp(creds: AWSTempCredentials) {
     if (!creds.AccessKeyId || !creds.SecretAccessKey || !creds.Token) {

src/deps.ts

@@ -1,6 +1,5 @@
 /* eslint-disable @typescript-eslint/no-var-requires */
 import type { Document } from './bson';
-import type { AWSCredentials } from './cmap/auth/mongodb_aws';
 import type { ProxyOptions } from './cmap/connection';
 import { MongoMissingDependencyError } from './error';
 import type { MongoClient } from './mongo_client';
@@ -76,6 +75,18 @@ export function getZstdLibrary(): typeof ZStandard | { kModuleError: MongoMissin
   }
 }
 
+/**
+ * @internal
+ * Copy of the AwsCredentialIdentityProvider interface from [`@smithy/types`](https://socket.dev/npm/package/@smithy/types/files/1.1.1/dist-types/identity/awsCredentialIdentity.d.ts),
+ * the return type of the aws-sdk's `fromNodeProviderChain().provider()`.
+ */
+export interface AWSCredentials {
+  accessKeyId: string;
+  secretAccessKey: string;
+  sessionToken: string;
+  expiration?: Date;
+}
+
 type CredentialProvider = {
   fromNodeProviderChain(this: void): () => Promise<AWSCredentials>;
 };