chore: bump dependencies and logger

Author: kevin-greene-ck

package-lock.json

@@ -9,7 +9,7 @@
   ],
   "scripts": {
     "clean": "rimraf dist/",
-    "clean-all": "rimraf dist/ node_modules/ package-lock.json",
+    "clean:all": "rimraf dist/ node_modules/ package-lock.json",
     "lint": "tslint --fix './src/**/*.ts'",
     "docker": "docker-compose up --force-recreate &",
     "docker:kill": "docker-compose kill",
@@ -33,17 +33,17 @@
     "@creditkarma/dynamic-config": ">=0.7.0 <0.10.0"
   },
   "devDependencies": {
-    "@creditkarma/dynamic-config": "^0.9.0",
-    "@types/code": "^4.0.4",
-    "@types/lab": "^11.1.0",
-    "code": "^4.1.0",
-    "lab": "^14.3.1",
+    "@creditkarma/dynamic-config": "^0.9.7",
+    "@creditkarma/consul-client": "^0.8.4",
+    "@hapi/code": "^5.3.1",
+    "@hapi/lab": "^19.0.1",
+    "@types/hapi__code": "^5.3.0",
     "rimraf": "^2.6.2",
-    "tslint": "^5.11.0",
-    "typescript": "3.1.x",
-    "wait-on": "^3.1.0"
+    "tslint": "^5.17.0",
+    "typescript": "3.5.x",
+    "wait-on": "^3.2.0"
   },
   "dependencies": {
-    "ajv": "^6.5.4"
+    "ajv": "^6.10.0"
   }
 }

package.json

@@ -5,26 +5,26 @@ function isDebug(): boolean {
     )
 }
 
-export const log = (msg: string, data?: any) => {
-    if (data !== undefined && isDebug()) {
-        console.log(`[feature-flags:info]: ${msg}: `, data)
-    } else if (isDebug()) {
-        console.log(`[feature-flags:info]: ${msg}`)
-    }
-}
+export type LogFunction = (tags: Array<string>, data?: string | object) => void
 
-export const warn = (msg: string, data?: any) => {
-    if (data !== undefined && isDebug()) {
-        console.warn(`[feature-flags:warn]: ${msg}: `, data)
+export const defaultLogger: LogFunction = (tags: Array<string>, data?: string | object): void => {
+    if (tags.includes('error')) {
+        if (data !== undefined) {
+            console.error(`[${tags.join(',')}]: `, data)
+        } else {
+            console.error(`[${tags.join(',')}]`)
+        }
+    } else if (tags.includes('warn')) {
+        if (data !== undefined) {
+            console.warn(`[${tags.join(',')}]: `, data)
+        } else {
+            console.warn(`[${tags.join(',')}]`)
+        }
     } else if (isDebug()) {
-        console.warn(`[feature-flags:warn]: ${msg}`)
-    }
-}
-
-export const error = (msg: string, data?: any) => {
-    if (data !== undefined) {
-        console.error(`[feature-flags:error]: ${msg}: `, data)
-    } else {
-        console.error(`[feature-flags:error]: ${msg}`)
+        if (data !== undefined) {
+            console.log(`[${tags.join(',')}]: `, data)
+        } else {
+            console.log(`[${tags.join(',')}]`)
+        }
     }
 }

src/main/logger.ts

@@ -1,12 +1,14 @@
 import { config } from '@creditkarma/dynamic-config'
 import { DEFAULT_TOGGLES_PATH } from './constants'
-import * as logger from './logger'
+import { defaultLogger } from './logger'
 import { toggleSchema } from './schema'
+
 import {
     IToggleDescription,
     Toggle,
     ToggleMap,
 } from './types'
+
 import { memoize, objectMatchesSchema } from './utils'
 
 const rawToggles: ToggleMap = new Map()
@@ -22,7 +24,7 @@ const lazyToggles: () => Promise<ToggleMap> = memoize(() => {
                 resolve(Promise.resolve(rawToggles))
 
             } else {
-                logger.error(`Value of 'toggles' should be an array`)
+                defaultLogger(['error', 'toggleMap'], `Value of 'toggles' should be an array`)
                 reject(new Error(`Value of 'toggles' should be an array`))
             }
         })
@@ -38,7 +40,7 @@ export function toggleMap(key: string): Promise<Toggle> {
                 return (randomInt < toggleDesc.fraction)
 
             } else {
-                logger.warn(`There is no toggle for key[${key}]. Defaults to false`)
+                defaultLogger(['warn', 'toggleMap'], `There is no toggle for key[${key}]. Defaults to false`)
                 return false
             }
         }

src/main/toggles.ts

@@ -1,10 +1,11 @@
 #!/usr/bin/env node
 import { KvStore } from '@creditkarma/consul-client'
+import { CONSUL_ADDRESS } from './constants'
 
 process.chdir(__dirname)
 
 setTimeout(() => {
-    const consulClient: KvStore = new KvStore([ 'http://localhost:8510' ])
+    const consulClient: KvStore = new KvStore([ CONSUL_ADDRESS ])
 
     Promise.all([
         consulClient.set({ path: 'toggles' }, [

src/tests/integration/bootstrap.ts

@@ -0,0 +1 @@
+export const CONSUL_ADDRESS = 'http://localhost:8510'

src/tests/integration/constants.ts

@@ -1,5 +1,8 @@
-import { expect } from 'code'
-import * as Lab from 'lab'
+import { expect } from '@hapi/code'
+import * as Lab from '@hapi/lab'
+
+import { KvStore } from '@creditkarma/consul-client'
+import { CONSUL_ADDRESS } from './constants'
 
 import { toggleMap } from '../../main'
 
@@ -8,6 +11,16 @@ export const lab = Lab.script()
 const describe = lab.describe
 const it = lab.it
 
+const consulClient: KvStore = new KvStore([ CONSUL_ADDRESS ])
+
+function delay(time: number = 3000): Promise<void> {
+    return new Promise((resolve, reject) => {
+        setTimeout(() => {
+            resolve()
+        }, time)
+    })
+}
+
 describe('ToggleMap', () => {
     it('should return false for toggle set to 0.0', async () => {
         const toggle = await toggleMap('com.creditkarma.featureFlags.AlwaysDisabled')
@@ -18,4 +31,29 @@ describe('ToggleMap', () => {
         const toggle = await toggleMap('com.creditkarma.featureFlags.AlwaysEnabled')
         expect(toggle()).to.equal(true)
     })
+
+    it('should respond to dynamic updates', async () => {
+        await consulClient.set({ path: 'toggles' }, [
+            {
+                id: 'com.creditkarma.featureFlags.AlwaysEnabled',
+                description: "It's a feature toggle",
+                fraction: 0,
+            },
+            {
+                id: 'com.creditkarma.featureFlags.AlwaysDisabled',
+                description: "It's a feature toggle",
+                fraction: 1.0,
+            },
+            {
+                id: 'com.creditkarma.featureFlags.SometimesDisabled',
+                description: "It's a feature toggle",
+                fraction: 0.4,
+            },
+        ])
+
+        await delay()
+
+        const toggle = await toggleMap('com.creditkarma.featureFlags.AlwaysEnabled')
+        expect(toggle()).to.equal(false)
+    })
 })