feat: override DATADOG_PREFIX only if undefined

getndazn · Nov 14, 2019 · f7b2bae · f7b2bae
1 parent c2a11b6
commit f7b2bae
Show file tree

Hide file tree

Showing 4 changed files with 54 additions and 2 deletions.
diff --git a/packages/lambda-powertools-pattern-basic/__tests__/index.js b/packages/lambda-powertools-pattern-basic/__tests__/index.js
@@ -52,4 +52,30 @@ describe('basic pattern', () => {
       expect(SampleLogging).toHaveBeenCalledWith({ sampleRate: 0.03 })
     })
   })
+
+  describe('override DATADOG_PREFIX if not defined', () => {
+    const funcName = 'lambda-powertools-func'
+
+    beforeAll(() => {
+      process.env.AWS_LAMBDA_FUNCTION_NAME = funcName
+      delete process.env.DATADOG_PREFIX
+      jest.resetModules()
+    })
+
+    afterAll(() => {
+      delete process.env.DATADOG_PREFIX
+      delete process.env.AWS_LAMBDA_FUNCTION_NAME
+    })
+
+    it('should override DATADOG_PREFIX not defined', () => {
+      require('../index')
+      expect(process.env.DATADOG_PREFIX).toBe(funcName + '.')
+    })
+
+    it('should NOT override DATADOG_PREFIX if defined', () => {
+      process.env.DATADOG_PREFIX = ''
+      require('../index')
+      expect(process.env.DATADOG_PREFIX).toStrictEqual('')
+    })
+  })
 })
diff --git a/packages/lambda-powertools-pattern-basic/index.js b/packages/lambda-powertools-pattern-basic/index.js
@@ -9,7 +9,7 @@ const FUNCTION_NAME = process.env.AWS_LAMBDA_FUNCTION_NAME
 const FUNCTION_VERSION = process.env.AWS_LAMBDA_FUNCTION_VERSION
 const ENV = process.env.ENVIRONMENT || process.env.STAGE
 
-if (!process.env.DATADOG_PREFIX) {
+if (process.env.DATADOG_PREFIX === undefined) {
   process.env.DATADOG_PREFIX = FUNCTION_NAME + '.'
 }
 

diff --git a/packages/lambda-powertools-pattern-obfuscate/__tests__/index.js b/packages/lambda-powertools-pattern-obfuscate/__tests__/index.js
@@ -81,4 +81,30 @@ describe('obfuscate pattern', () => {
       process.env = OLD_ENV
     })
   })
+
+  describe('override DATADOG_PREFIX if not defined', () => {
+    const funcName = 'lambda-powertools-func'
+
+    beforeAll(() => {
+      process.env.AWS_LAMBDA_FUNCTION_NAME = funcName
+      delete process.env.DATADOG_PREFIX
+      jest.resetModules()
+    })
+
+    afterAll(() => {
+      delete process.env.DATADOG_PREFIX
+      delete process.env.AWS_LAMBDA_FUNCTION_NAME
+    })
+
+    it('should override DATADOG_PREFIX not defined', () => {
+      require('../index')
+      expect(process.env.DATADOG_PREFIX).toBe(funcName + '.')
+    })
+
+    it('should NOT override DATADOG_PREFIX if defined', () => {
+      process.env.DATADOG_PREFIX = ''
+      require('../index')
+      expect(process.env.DATADOG_PREFIX).toStrictEqual('')
+    })
+  })
 })
diff --git a/packages/lambda-powertools-pattern-obfuscate/index.js b/packages/lambda-powertools-pattern-obfuscate/index.js
@@ -16,7 +16,7 @@ const ENV = process.env.ENVIRONMENT || process.env.STAGE
  */
 const FILTERING_MODE = Object.freeze({ 'BLACKLIST': 'BLACKLIST', 'WHITELIST': 'WHITELIST' })
 
-if (!process.env.DATADOG_PREFIX) {
+if (process.env.DATADOG_PREFIX === undefined) {
   process.env.DATADOG_PREFIX = FUNCTION_NAME + '.'
 }