refactor(logger): update to support pino@7 (external-secrets#445)

sbose78 · Jul 22, 2020 · d582991 · d582991
1 parent b578198
commit d582991
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 10 deletions.
diff --git a/charts/kubernetes-external-secrets/values.yaml b/charts/kubernetes-external-secrets/values.yaml
@@ -16,6 +16,7 @@ env:
  AWS_DEFAULT_REGION: us-west-2
  POLLER_INTERVAL_MILLISECONDS: 10000 # Caution, setting this frequency may incur additional charges on some platforms
  LOG_LEVEL: info
+ LOG_MESSAGE_KEY: 'msg'
  # Print logs level as string ("info") rather than integer (30)
  # USE_HUMAN_READABLE_LOG_LEVELS: true
  METRICS_PORT: 3001

diff --git a/config/environment.js b/config/environment.js
@@ -25,6 +25,7 @@ const pollerIntervalMilliseconds = process.env.POLLER_INTERVAL_MILLISECONDS
 
 const logLevel = process.env.LOG_LEVEL || 'info'
 const useHumanReadableLogLevels = 'USE_HUMAN_READABLE_LOG_LEVELS' in process.env
+const logMessageKey = 'LOG_MESSAGE_KEY' in process.env
 
 const pollingDisabled = 'DISABLE_POLLING' in process.env
 
@@ -46,5 +47,6 @@ module.exports = {
  pollingDisabled,
  logLevel,
  customResourceManagerDisabled,
- useHumanReadableLogLevels
+ useHumanReadableLogLevels,
+ logMessageKey
 }
diff --git a/config/index.js b/config/index.js
@@ -33,10 +33,15 @@ const kubeClient = new kube.Client({ backend: kubeBackend })
 
 const logger = pino({
  serializers: {
- err: pino.stdSerializers.err
+ err: pino.stdSerializers.err,
+ messageKey: envConfig.logMessageKey || 'msg'
  },
  level: envConfig.logLevel,
- useLevelLabels: envConfig.useHumanReadableLogLevels
+ formatters: {
+ level (label, number) {
+ return { level: envConfig.useHumanReadableLogLevels ? label : number }
+ }
+ }
 })
 
 const customResourceManager = new CustomResourceManager({

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -44,7 +44,7 @@
  "lodash.merge": "^4.6.2",
  "make-promises-safe": "^5.1.0",
  "node-vault": "^0.9.18",
- "pino": "^6.0.0",
+ "pino": "^6.4.1",
  "prom-client": "^12.0.0"
  },
  "devDependencies": {