Merge pull request #248 from drubin/jsonpath

k8s-ci-robot · web-flow · commit c0a5ca065495 · 2019-05-24T09:40:23.000-07:00
Switch from jsonpath to jsonpath-plus
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -56,7 +56,7 @@
     "byline": "^5.0.0",
     "isomorphic-ws": "^4.0.1",
     "js-yaml": "^3.12.0",
-    "jsonpath": "^1.0.1",
+    "jsonpath-plus": "^0.19.0",
     "request": "^2.88.0",
     "shelljs": "^0.8.2",
     "tslib": "^1.9.3",
diff --git a/src/cloud_auth.ts b/src/cloud_auth.ts
@@ -1,5 +1,4 @@
-// workaround for issue https://github.com/dchester/jsonpath/issues/96
-import jsonpath = require('jsonpath/jsonpath.min');
+import * as jsonpath from 'jsonpath-plus';
 import * as shelljs from 'shelljs';
 
 import { Authenticator } from './auth';
@@ -81,7 +80,7 @@ export class CloudAuth implements Authenticator {
         const tokenPathKey = '$' + tokenPathKeyInConfig.slice(1, -1);
         const expiryPathKey = '$' + expiryPathKeyInConfig.slice(1, -1);
 
-        config['access-token'] = jsonpath.query(resultObj, tokenPathKey);
-        config.expiry = jsonpath.query(resultObj, expiryPathKey);
+        config['access-token'] = jsonpath.JSONPath(tokenPathKey, resultObj);
+        config.expiry = jsonpath.JSONPath(expiryPathKey, resultObj);
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`		`-// workaround for issue https://github.com/dchester/jsonpath/issues/96`
`2`		`-import jsonpath = require('jsonpath/jsonpath.min');`
	`1`	`+import * as jsonpath from 'jsonpath-plus';`
`3`	`2`	`import * as shelljs from 'shelljs';`
`4`	`3`
`5`	`4`	`import { Authenticator } from './auth';`
`@@ -81,7 +80,7 @@ export class CloudAuth implements Authenticator {`
`81`	`80`	`const tokenPathKey = '$' + tokenPathKeyInConfig.slice(1, -1);`
`82`	`81`	`const expiryPathKey = '$' + expiryPathKeyInConfig.slice(1, -1);`
`83`	`82`
`84`		`- config['access-token'] = jsonpath.query(resultObj, tokenPathKey);`
`85`		`- config.expiry = jsonpath.query(resultObj, expiryPathKey);`
	`83`	`+ config['access-token'] = jsonpath.JSONPath(tokenPathKey, resultObj);`
	`84`	`+ config.expiry = jsonpath.JSONPath(expiryPathKey, resultObj);`
`86`	`85`	`}`
`87`	`86`	`}`