Update

.github/workflows/build-and-push-services.yml

@@ -68,7 +68,7 @@ jobs:
       - name: Parse Semver
         id: semver
         if: ${{ steps.ref.outputs.release }}
-        uses: booxmedialtd/ws-action-parse-semver@v1.3.1
+        uses: booxmedialtd/ws-action-parse-semver@v1.4.0
         with:
           input_string: ${{ steps.ref.outputs.version }}
           #version_extractor_regex: '\/v(.*)$'

.yarnrc.yml

@@ -6,4 +6,4 @@ plugins:
   - path: .yarn/plugins/@yarnpkg/plugin-workspace-tools.cjs
     spec: "@yarnpkg/plugin-workspace-tools"
 
-yarnPath: .yarn/releases/yarn-2.4.2.cjs
+yarnPath: .yarn/releases/yarn-3.0.0.cjs

package.json

@@ -13,32 +13,32 @@
   "author": "Alex Layton <[email protected]>",
   "license": "Apache-2.0",
   "dependencies": {
-    "@oada/client": "^2.4.2",
-    "@oada/list-lib": "^2.1.6",
+    "@oada/client": "^2.6.1",
+    "@oada/list-lib": "^2.1.9",
     "@oada/types": "^1.5.1",
-    "@tsconfig/node16": "^1.0.1",
-    "ajv": "^8.6.0",
+    "@tsconfig/node16": "^1.0.2",
+    "ajv": "^8.6.2",
     "bluebird": "^3.7.2",
-    "convict": "^6.1.0",
-    "debug": "^4.3.1",
+    "convict": "^6.2.0",
+    "debug": "^4.3.2",
     "dotenv": "^10.0.0",
     "handlebars": "^4.7.7",
     "json-pointer": "^0.6.1",
-    "luxon": "^1.27.0",
+    "luxon": "^2.0.2",
     "minimist": "^1.2.5",
-    "nconf": "^0.11.2",
+    "nconf": "^0.11.3",
     "p-queue": "^6.6.2"
   },
   "devDependencies": {
-    "@types/bluebird": "^3.5.35",
-    "@types/convict": "^6",
-    "@types/debug": "^4.1.5",
+    "@types/bluebird": "^3.5.36",
+    "@types/convict": "^6.1.1",
+    "@types/debug": "^4.1.7",
     "@types/json-pointer": "^1.0.31",
-    "@types/luxon": "^1.27.0",
-    "@types/minimist": "^1.2.1",
-    "@types/node": "^14.17.3",
-    "@yarnpkg/pnpify": "^3.0.0-rc.6",
-    "prettier": "^2.3.1",
-    "typescript": "^4.3.2"
+    "@types/luxon": "^2.0.0",
+    "@types/minimist": "^1.2.2",
+    "@types/node": "^16.6.1",
+    "@yarnpkg/sdks": "^2.4.1-rc.4",
+    "prettier": "^2.3.2",
+    "typescript": "^4.3.5"
   }
 }

src/index.ts

@@ -202,7 +202,7 @@ async function ruleHandler({
   data,
 }: RuleRunCtx & RuleItem) {
   trace('Handling rule %s', id);
-  trace('%O', rule);
+  trace(rule);
 
   const path = join(rule.list, item);
   try {
@@ -215,7 +215,7 @@ async function ruleHandler({
     await runRule({ data, validate, move, item, rule, id, conn, token });
   } catch (err) {
     // Catch error so we can still try other items
-    error(`Error running rule %s: %O`, id, err);
+    error(err, `Error running rule ${id}`);
   }
 }
 
@@ -228,7 +228,7 @@ async function runRule({
   id,
   conn,
 }: RuleRunCtx & RuleItem) {
-  trace(`Testing rule %s on %s`, id, item);
+  trace('Testing rule %s on %s', id, item);
   trace(data);
 
   try {
@@ -319,7 +319,7 @@ const helpers = Bluebird.map(files, (file) => join(dir, file))
       trace('Loaded helpers from %s: %O', file, out);
       return out;
     } catch (err) {
-      error('Error loading helper module: %O', err);
+      error(err, 'Error loading helper module');
       return {};
     }
   })