fix: aligns dynamic kms import w/ typings

Figedi · Jun 8, 2023 · 8233a59 · 8233a59
1 parent 427d89b
commit 8233a59
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/src/kms-addon/kmsKeyDecryptor.spec.ts b/src/kms-addon/kmsKeyDecryptor.spec.ts
@@ -1,5 +1,5 @@
 import { expect } from "chai";
-import type { v1 } from "@google-cloud/kms";
+import type { KeyManagementServiceClient } from "@google-cloud/kms";
 
 import { setupStubbedKms } from "./shared.specFiles/kmsStubs";
 import { encryptJson } from "../shared.specFiles/sopsUtils";
@@ -56,7 +56,7 @@ describe("SopsClient with KmsKeyDecryptor", () => {
     describe("decryptSopsJson", () => {
         let key: Buffer;
         let iv: Buffer;
-        let kms: v1.KeyManagementServiceClient;
+        let kms: KeyManagementServiceClient;
         let keyDecryptor: IKeyDecryptor;
         let sopsClient: SopsClient;
 

diff --git a/src/kms-addon/kmsKeyDecryptor.ts b/src/kms-addon/kmsKeyDecryptor.ts
@@ -1,9 +1,9 @@
 import { statSync } from "fs";
-import type { v1 } from "@google-cloud/kms";
+import type { KeyManagementServiceClient } from "@google-cloud/kms";
 import { IKeyDecryptor, ISopsEncryptedJSON } from "../types";
 
 export class KmsKeyDecryptor implements IKeyDecryptor {
-    private constructor(private client: v1.KeyManagementServiceClient) {}
+    private constructor(private client: KeyManagementServiceClient) {}
 
     public static async create(projectId?: string, serviceAccountPath?: string) {
         // eslint-disable-next-line import/no-extraneous-dependencies
@@ -26,7 +26,7 @@ export class KmsKeyDecryptor implements IKeyDecryptor {
         return new KmsKeyDecryptor(new mod.KeyManagementServiceClient({ projectId }));
     }
 
-    public static createWithKmsClient(client: v1.KeyManagementServiceClient): IKeyDecryptor {
+    public static createWithKmsClient(client: KeyManagementServiceClient): IKeyDecryptor {
         return new KmsKeyDecryptor(client);
     }
 

diff --git a/src/kms-addon/shared.specFiles/kmsStubs.ts b/src/kms-addon/shared.specFiles/kmsStubs.ts
@@ -1,14 +1,14 @@
-import type { v1 } from "@google-cloud/kms";
+import type { KeyManagementServiceClient } from "@google-cloud/kms";
 import { scryptSync } from "crypto";
 
-export const createStubbedKeyManagementClient = (key: Buffer): v1.KeyManagementServiceClient => {
+export const createStubbedKeyManagementClient = (key: Buffer): KeyManagementServiceClient => {
     return {
         decrypt: async () => [
             {
                 plaintext: key,
             },
         ],
-    } as unknown as v1.KeyManagementServiceClient;
+    } as unknown as KeyManagementServiceClient;
 };
 
 export const setupStubbedKms = (password: string): any => {