MINOR refactor env var lookup for consistency with other repos (#187)

Author: rayokota

schemaregistry/rules/encryption/hcvault/hcvault-client.ts

@@ -9,10 +9,6 @@ export class HcVaultClient implements KmsClient {
   private keyName: string
 
   constructor(keyUri: string, namespace?: string, token?: string) {
-    if (token == null)
-    {
-      namespace = process.env["VAULT_NAMESPACE"]
-    }
     if (!keyUri.startsWith(HcVaultDriver.PREFIX)) {
       throw new Error(`key uri must start with ${HcVaultDriver.PREFIX}`)
     }

schemaregistry/rules/encryption/hcvault/hcvault-driver.ts

@@ -20,8 +20,13 @@ export class HcVaultDriver implements KmsDriver {
 
   newKmsClient(config: Map<string, string>, keyUrl?: string): KmsClient {
     const uriPrefix = keyUrl != null ? keyUrl : HcVaultDriver.PREFIX
-    const tokenId = config.get(HcVaultDriver.TOKEN_ID)
-    const ns = config.get(HcVaultDriver.NAMESPACE)
+    let tokenId = config.get(HcVaultDriver.TOKEN_ID)
+    let ns = config.get(HcVaultDriver.NAMESPACE)
+    if (tokenId == null)
+    {
+      tokenId = process.env["VAULT_TOKEN"]
+      ns = process.env["VAULT_NAMESPACE"]
+    }
     return new HcVaultClient(uriPrefix, ns, tokenId)
   }
 }

schemaregistry/rules/encryption/localkms/local-client.ts

@@ -10,13 +10,7 @@ export class LocalKmsClient implements KmsClient {
   private secret: string
   private cryptor: Cryptor
 
-  constructor(secret?: string) {
-    if (secret == null) {
-      secret = process.env['LOCAL_SECRET']
-    }
-    if (secret == null) {
-      throw new Error('cannot load secret')
-    }
+  constructor(secret: string) {
     this.secret = secret
     this.cryptor = new Cryptor(DekFormat.AES128_GCM)
   }

schemaregistry/rules/encryption/localkms/local-driver.ts

@@ -18,7 +18,13 @@ export class LocalKmsDriver implements KmsDriver {
   }
 
   newKmsClient(config: Map<string, string>, keyUrl: string): KmsClient {
-    const secret = config.get(LocalKmsDriver.SECRET)
+    let secret = config.get(LocalKmsDriver.SECRET)
+    if (secret == null) {
+      secret = process.env['LOCAL_SECRET']
+    }
+    if (secret == null) {
+      throw new Error('cannot load secret')
+    }
     return new LocalKmsClient(secret)
   }
 }