lint

Author: seebees

modules/kms-keyring-browser/src/kms_keyring_browser.ts

@@ -30,7 +30,9 @@ const getKmsClient = getClient(KMS, {
 })
 const cacheKmsClients = cacheClients(getKmsClient)
 
-export type KmsKeyringWebCryptoInput = Partial<KmsKeyringInput<AwsEsdkKMSInterface>>
+export type KmsKeyringWebCryptoInput = Partial<
+  KmsKeyringInput<AwsEsdkKMSInterface>
+>
 export type KMSWebCryptoConstructible = KMSConstructible<
   KMS,
   KMS.ClientConfiguration

modules/kms-keyring-browser/src/kms_mrk_discovery_multi_keyring_browser.ts

@@ -1,7 +1,10 @@
 // Copyright Amazon.com Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
 
-import { getAwsKmsMrkAwareDiscoveryMultiKeyringBuilder, AwsEsdkKMSInterface } from '@aws-crypto/kms-keyring'
+import {
+  getAwsKmsMrkAwareDiscoveryMultiKeyringBuilder,
+  AwsEsdkKMSInterface,
+} from '@aws-crypto/kms-keyring'
 import {
   MultiKeyringWebCrypto,
   WebCryptoAlgorithmSuite,
@@ -10,7 +13,10 @@ import { getKmsClient } from '.'
 import { AwsKmsMrkAwareSymmetricDiscoveryKeyringBrowser } from './kms_mrk_discovery_keyring_browser'
 
 export const buildAwsKmsMrkAwareDiscoveryMultiKeyringBrowser =
-  getAwsKmsMrkAwareDiscoveryMultiKeyringBuilder<WebCryptoAlgorithmSuite, AwsEsdkKMSInterface>(
+  getAwsKmsMrkAwareDiscoveryMultiKeyringBuilder<
+    WebCryptoAlgorithmSuite,
+    AwsEsdkKMSInterface
+  >(
     AwsKmsMrkAwareSymmetricDiscoveryKeyringBrowser,
     MultiKeyringWebCrypto,
     getKmsClient

modules/kms-keyring-browser/src/kms_mrk_strict_multi_keyring_browser.ts

@@ -1,7 +1,10 @@
 // Copyright Amazon.com Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
 
-import { getAwsKmsMrkAwareStrictMultiKeyringBuilder, AwsEsdkKMSInterface } from '@aws-crypto/kms-keyring'
+import {
+  getAwsKmsMrkAwareStrictMultiKeyringBuilder,
+  AwsEsdkKMSInterface,
+} from '@aws-crypto/kms-keyring'
 import {
   MultiKeyringWebCrypto,
   WebCryptoAlgorithmSuite,
@@ -10,8 +13,7 @@ import { getKmsClient } from '.'
 import { AwsKmsMrkAwareSymmetricKeyringBrowser } from './kms_mrk_keyring_browser'
 
 export const buildAwsKmsMrkAwareStrictMultiKeyringBrowser =
-  getAwsKmsMrkAwareStrictMultiKeyringBuilder<WebCryptoAlgorithmSuite, AwsEsdkKMSInterface>(
-    AwsKmsMrkAwareSymmetricKeyringBrowser,
-    MultiKeyringWebCrypto,
-    getKmsClient
-  )
+  getAwsKmsMrkAwareStrictMultiKeyringBuilder<
+    WebCryptoAlgorithmSuite,
+    AwsEsdkKMSInterface
+  >(AwsKmsMrkAwareSymmetricKeyringBrowser, MultiKeyringWebCrypto, getKmsClient)

modules/kms-keyring-browser/test/kms_keyring_browser.test.ts

@@ -91,7 +91,6 @@ describe('KmsKeyringBrowser can encrypt/decrypt with AWS SDK v2 client', () => {
   })
 })
 
-
 describe('KmsKeyringBrowser can encrypt/decrypt with AWS SDK v3 client', () => {
   const generatorKeyId =
     'arn:aws:kms:us-west-2:658956600833:alias/EncryptDecrypt'
@@ -130,4 +129,4 @@ describe('KmsKeyringBrowser can encrypt/decrypt with AWS SDK v3 client', () => {
     // The UnencryptedDataKey should be zeroed, because the cryptoKey has been set
     expect(() => test.getUnencryptedDataKey()).to.throw()
   })
-})
+})

modules/kms-keyring-browser/test/kms_mrk_keyring_browser.test.ts

@@ -175,4 +175,4 @@ describe('AwsKmsMrkAwareSymmetricKeyringBrowser can encrypt/decrypt with AWS SDK
     // The UnencryptedDataKey should be zeroed, because the cryptoKey has been set
     expect(() => test.getUnencryptedDataKey()).to.throw()
   })
-})
+})

modules/kms-keyring-node/src/kms_keyring_node.ts

@@ -10,7 +10,7 @@ import {
   limitRegions,
   excludeRegions,
   cacheClients,
-  AwsEsdkKMSInterface
+  AwsEsdkKMSInterface,
 } from '@aws-crypto/kms-keyring'
 import {
   immutableClass,
@@ -32,9 +32,10 @@ export type KMSNodeConstructible = KMSConstructible<
 >
 export type KmsNodeClientSupplier = KmsClientSupplier<AwsEsdkKMSInterface>
 
-export class KmsKeyringNode extends KmsKeyringClass<NodeAlgorithmSuite, AwsEsdkKMSInterface>(
-  KeyringNode as Newable<KeyringNode>
-) {
+export class KmsKeyringNode extends KmsKeyringClass<
+  NodeAlgorithmSuite,
+  AwsEsdkKMSInterface
+>(KeyringNode as Newable<KeyringNode>) {
   constructor({
     clientProvider = cacheKmsClients,
     keyIds,

modules/kms-keyring-node/src/kms_mrk_discovery_keyring_node.ts

@@ -16,6 +16,7 @@ export type AwsKmsMrkAwareSymmetricDiscoveryKeyringNodeInput =
   AwsKmsMrkAwareSymmetricDiscoveryKeyringInput<AwsEsdkKMSInterface>
 
 export const AwsKmsMrkAwareSymmetricDiscoveryKeyringNode =
-  AwsKmsMrkAwareSymmetricDiscoveryKeyringClass<NodeAlgorithmSuite, AwsEsdkKMSInterface>(
-    KeyringNode as Newable<KeyringNode>
-  )
+  AwsKmsMrkAwareSymmetricDiscoveryKeyringClass<
+    NodeAlgorithmSuite,
+    AwsEsdkKMSInterface
+  >(KeyringNode as Newable<KeyringNode>)

modules/kms-keyring-node/src/kms_mrk_discovery_multi_keyring_node.ts

@@ -24,8 +24,7 @@ export interface AwsKmsMrkAwareDiscoveryMultiKeyringNodeInput {
 }
 
 export const buildAwsKmsMrkAwareDiscoveryMultiKeyringNode =
-  getAwsKmsMrkAwareDiscoveryMultiKeyringBuilder<NodeAlgorithmSuite, AwsEsdkKMSInterface>(
-    AwsKmsMrkAwareSymmetricDiscoveryKeyringNode,
-    MultiKeyringNode,
-    getKmsClient
-  )
+  getAwsKmsMrkAwareDiscoveryMultiKeyringBuilder<
+    NodeAlgorithmSuite,
+    AwsEsdkKMSInterface
+  >(AwsKmsMrkAwareSymmetricDiscoveryKeyringNode, MultiKeyringNode, getKmsClient)

modules/kms-keyring-node/src/kms_mrk_strict_multi_keyring_node.ts

@@ -1,7 +1,10 @@
 // Copyright Amazon.com Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
 
-import { getAwsKmsMrkAwareStrictMultiKeyringBuilder, AwsEsdkKMSInterface } from '@aws-crypto/kms-keyring'
+import {
+  getAwsKmsMrkAwareStrictMultiKeyringBuilder,
+  AwsEsdkKMSInterface,
+} from '@aws-crypto/kms-keyring'
 import { KmsClientSupplier } from '@aws-crypto/kms-keyring'
 import {
   MultiKeyringNode,
@@ -18,8 +21,7 @@ export interface AwsKmsMrkAwareStrictMultiKeyringNodeInput {
 }
 
 export const buildAwsKmsMrkAwareStrictMultiKeyringNode =
-  getAwsKmsMrkAwareStrictMultiKeyringBuilder<NodeAlgorithmSuite, AwsEsdkKMSInterface>(
-    AwsKmsMrkAwareSymmetricKeyringNode,
-    MultiKeyringNode,
-    getKmsClient
-  )
+  getAwsKmsMrkAwareStrictMultiKeyringBuilder<
+    NodeAlgorithmSuite,
+    AwsEsdkKMSInterface
+  >(AwsKmsMrkAwareSymmetricKeyringNode, MultiKeyringNode, getKmsClient)

modules/kms-keyring-node/test/kms_keyring_node.test.ts

@@ -46,9 +46,9 @@ describe('KmsKeyringNode can encrypt/decrypt with AWS SDK v2 client', () => {
   const keyArn =
     'arn:aws:kms:us-west-2:658956600833:key/b3537ef1-d8dc-4780-9f5a-55776cbb2f7f'
   const keyIds = [keyArn]
-  
+
   const clientProvider = getClient(V2KMS)
-  
+
   const keyring = new KmsKeyringNode({ clientProvider, generatorKeyId, keyIds })
   let encryptedDataKey: EncryptedDataKey
   let udk: Uint8Array
@@ -115,5 +115,3 @@ describe('KmsKeyringNode can encrypt/decrypt with AWS SDK v3 client', () => {
     expect(unwrapDataKey(test.getUnencryptedDataKey())).to.deep.equal(udk)
   })
 })
-
-

modules/kms-keyring-node/test/kms_mrk_discovery_keyring_node.test.ts

@@ -126,12 +126,11 @@ describe('AwsKmsMrkAwareSymmetricDiscoveryKeyringNode can encrypt/decrypt with A
   })
 
   it('can decrypt an EncryptedDataKey', async () => {
-    const { CiphertextBlob } = await client
-      .generateDataKey({
-        KeyId: keyId,
-        NumberOfBytes: suite.keyLengthBytes,
-        EncryptionContext: encryptionContext,
-      })
+    const { CiphertextBlob } = await client.generateDataKey({
+      KeyId: keyId,
+      NumberOfBytes: suite.keyLengthBytes,
+      EncryptionContext: encryptionContext,
+    })
     console.log(CiphertextBlob)
     needs(CiphertextBlob instanceof Uint8Array, 'never')
     const edk = new EncryptedDataKey({
@@ -147,4 +146,4 @@ describe('AwsKmsMrkAwareSymmetricDiscoveryKeyringNode can encrypt/decrypt with A
     const decryptTest = await keyring.onDecrypt(material, [edk])
     expect(decryptTest.hasValidKey()).to.equal(true)
   })
-})
+})

modules/kms-keyring/src/kms_mrk_discovery_keyring.ts

@@ -140,13 +140,12 @@ export function AwsKmsMrkAwareSymmetricDiscoveryKeyringClass<
          * then the keyring would filter out all EDKs
          * because the region does not match.
          */
-        this.clientRegion = clientRegion()
-          .then((region: string) => {
-            /* Postcondition: Resolve the AWS SDK V3 region promise and update clientRegion. */
-            readOnlyProperty(this, 'clientRegion', region)
-            /* Postcondition: Resolve the promise with the value set. */
-            return region
-          })
+        this.clientRegion = clientRegion().then((region: string) => {
+          /* Postcondition: Resolve the AWS SDK V3 region promise and update clientRegion. */
+          readOnlyProperty(this, 'clientRegion', region)
+          /* Postcondition: Resolve the promise with the value set. */
+          return region
+        })
       } else {
         readOnlyProperty(this, 'clientRegion', clientRegion)
       }
@@ -189,14 +188,15 @@ export function AwsKmsMrkAwareSymmetricDiscoveryKeyringClass<
 
       // See the constructor, this is to support both AWS SDK v2 and v3.
       needs(
-        typeof this.clientRegion === 'string'
-        /* Precondition: AWS SDK V3 region promise MUST have resolved to a string.
-         * In the constructor the region promise resolves
-         * to the same value that is then set.
-         */
-        // @ts-ignore
-        || typeof (await this.clientRegion) == 'string'
-        , 'clientRegion MUST be a string.')
+        typeof this.clientRegion === 'string' ||
+          /* Precondition: AWS SDK V3 region promise MUST have resolved to a string.
+           * In the constructor the region promise resolves
+           * to the same value that is then set.
+           */
+          // @ts-ignore
+          typeof (await this.clientRegion) == 'string',
+        'clientRegion MUST be a string.'
+      )
 
       const { client, grantTokens, clientRegion } = this
 

modules/kms-keyring/test/kms_mrk_discovery_keyring.constructor.test.ts

@@ -102,13 +102,16 @@ describe('AwsKmsMrkAwareSymmetricDiscoveryKeyring: constructor', () => {
     }
   })
 
-
   it('Postcondition: Store the AWS SDK V3 region promise as the clientRegion.', async () => {
     let regionCalled = false
-    const client: any = { config: { region: async () => {
-      regionCalled = true
-      return 'us-west-2'
-    } } }
+    const client: any = {
+      config: {
+        region: async () => {
+          regionCalled = true
+          return 'us-west-2'
+        },
+      },
+    }
 
     class TestAwsKmsMrkAwareSymmetricDiscoveryKeyring extends AwsKmsMrkAwareSymmetricDiscoveryKeyringClass(
       Keyring as Newable<Keyring<NodeAlgorithmSuite>>
@@ -120,7 +123,10 @@ describe('AwsKmsMrkAwareSymmetricDiscoveryKeyring: constructor', () => {
     expect(regionCalled).to.equal(true)
     expect(test.clientRegion).to.not.equal(client.config.region)
     // @ts-ignore This is to check that the value is a promise
-    expect(typeof test.clientRegion === 'object' && typeof test.clientRegion.then === 'function').to.equal(true)
+    expect(
+      typeof test.clientRegion === 'object' &&
+        typeof test.clientRegion.then === 'function'
+    ).to.equal(true)
   })
 
   it('Postcondition: Resolve the AWS SDK V3 region promise and update clientRegion.', async () => {
@@ -136,7 +142,9 @@ describe('AwsKmsMrkAwareSymmetricDiscoveryKeyring: constructor', () => {
     })
     await test.clientRegion
     expect(test.clientRegion).to.equal(region)
-    expect(Object.getOwnPropertyDescriptor(test, 'clientRegion')?.writable).to.equal(false)
+    expect(
+      Object.getOwnPropertyDescriptor(test, 'clientRegion')?.writable
+    ).to.equal(false)
   })
 
   it('Postcondition: Resolve the promise with the value set.', async () => {
@@ -150,7 +158,7 @@ describe('AwsKmsMrkAwareSymmetricDiscoveryKeyring: constructor', () => {
     const test = new TestAwsKmsMrkAwareSymmetricDiscoveryKeyring({
       client,
     })
-    
+
     await expect(test.clientRegion).to.eventually.equal(region)
   })
 })

modules/kms-keyring/test/kms_mrk_discovery_keyring.ondecrypt.test.ts

@@ -817,11 +817,12 @@ describe('AwsKmsMrkAwareSymmetricDiscoveryKeyring: _onDecrypt', () => {
       client,
     })
 
-    await expect((async () => {
-      const material: any = { hasValidKey: () => false}
-
-      await test._onDecrypt(material, [])
+    await expect(
+      (async () => {
+        const material: any = { hasValidKey: () => false }
 
-    })()).to.eventually.rejectedWith('clientRegion MUST be a string.')
+        await test._onDecrypt(material, [])
+      })()
+    ).to.eventually.rejectedWith('clientRegion MUST be a string.')
   })
 })