@pager/minion-army 1.3.0 → 2.1.0

package/.github/workflows/release.yml

@@ -9,13 +9,15 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v1
+        uses: actions/checkout@v2
+        with:
+          persist-credentials: false
       - name: Setup Node.js
-        uses: actions/setup-node@v1
+        uses: actions/setup-node@v2
         with:
-          node-version: 12
+          node-version: 18
       - name: Cache
-        uses: actions/cache@v1
+        uses: actions/cache@v2
         with:
           path: ~/.npm
           key: ${{ runner.os }}-npm-${{ hashFiles('**/package.json') }}

package/CHANGELOG.md

@@ -1,3 +1,22 @@
+# [2.1.0](https://github.com/pagerinc/minion-army/compare/v2.0.0...v2.1.0) (2023-05-08)
+
+
+### Features
+
+* add requeue to the schema ([#453](https://github.com/pagerinc/minion-army/issues/453)) ([74a5c41](https://github.com/pagerinc/minion-army/commit/74a5c4127aee8513500edfe04760bf03ffee057f))
+
+# [2.0.0](https://github.com/pagerinc/minion-army/compare/v1.3.0...v2.0.0) (2020-08-19)
+
+
+### Bug Fixes
+
+* update deps, move from @hapi/joi to joi ([#234](https://github.com/pagerinc/minion-army/issues/234)) ([fad00f6](https://github.com/pagerinc/minion-army/commit/fad00f6bbb888b824ab52ded956492639c22b496))
+
+
+### BREAKING CHANGES
+
+* using joi instead of @hapi/joi
+
 # [1.3.0](https://github.com/pagerinc/minion-army/compare/v1.2.0...v1.3.0) (2020-07-17)
 
 

package/README.md

@@ -5,7 +5,7 @@ Microservice Framework for RabbitMQ Workers
 
 ```javascript
 const Army = require('@pager/minion-army');
-const Joi = require('@hapi/joi');
+const Joi = require('joi');
 
 // Refer to lib/schema.js to see valid options
 const manifest = {
@@ -39,4 +39,4 @@ const manifest = {
 const army = Army(manifest);
 
 army.start(); // if you provide defaults.autoStart = true this is not needed
-```
+```

package/cloudbuild.yaml

@@ -0,0 +1,39 @@
+steps:
+  - id: npm-install
+    name: node:18
+    secretEnv: ['NPM_TOKEN']
+    entrypoint: npm
+    args: ['i', '--quiet', '--package-lock-only']
+
+  - id: npm-ci
+    name: node:18
+    secretEnv: ['NPM_TOKEN']
+    entrypoint: npm
+    args: ['ci', '--quiet']
+
+  - id: test-unit
+    name: node:18
+    secretEnv: ['NPM_TOKEN']
+    entrypoint: npm
+    args: ['test']
+
+  - id: npm-publish
+    name: 'gcr.io/$PROJECT_ID/cloudbuilders/npm:6.13.4'
+    secretEnv: ['NPM_TOKEN']
+    env:
+      - 'TAG_NAME=$TAG_NAME'
+      - '_PR_NUMBER=$_PR_NUMBER'
+
+timeout: 10m
+
+logsBucket: 'gs://$PROJECT_ID-primary-cloudbuild-logs'
+
+tags:
+  - 'backend'
+  - 'npm'
+  - 'nodejs'
+
+secrets:
+  - kmsKeyName: projects/production-197117/locations/global/keyRings/gcb/cryptoKeys/main
+    secretEnv:
+      NPM_TOKEN: 'CiUA/4lqmXwRPPaGHe+X7TS7mwqARNCw5QFq7yfq7ESHaJrf+tzeElEADvOwrLQvnxCLG2wy+H2vD+DWHMosEgIfzpKNBJAVHX1u4FSwIF5utaN6tMIrLuZB18HnK2SKpsXTPvB/+0Eoz1acnj6WO+slz+GUGUnxefU='

package/lib/index.js

@@ -3,7 +3,7 @@
 const Minion = require('@pager/minion');
 const { EventEmitter } = require('events');
 const Jackrabbit = require('@pager/jackrabbit');
-const Joi = require('@hapi/joi');
+const Joi = require('joi');
 const Schema = require('./schema');
 
 const validatorFactory = (handler, schema) => (payload, metadata) => { // eslint-disable-line

package/lib/schema.js

@@ -1,6 +1,6 @@
 'use strict';
 
-const Joi = require('@hapi/joi');
+const Joi = require('joi');
 
 const rabbit = Joi.object(); // TODO: validate that rabbit object complies with jackrabbit interface
 const exchange = Joi.object(); // TODO: validate that exchange object complies with jackrabbit interface
@@ -19,7 +19,8 @@ const config = Joi.object({
     rabbit,
     rabbitUrl: Joi.string(),
     prefetch: Joi.number(),
-    queueMode: Joi.string()
+    queueMode: Joi.string(),
+    requeue: Joi.boolean()
 });
 
 const worker = {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pager/minion-army",
-  "version": "1.3.0",
+  "version": "2.1.0",
   "description": "Microservice Framework for RabbitMQ Workers",
   "main": "lib/index.js",
   "scripts": {
@@ -13,7 +13,7 @@
     "rabbitmq",
     "framework"
   ],
-  "author": "gmauricio.munoz@gmail.com",
+  "author": "engineering@pager.com",
   "license": "MIT",
   "repository": {
     "type": "git",
@@ -24,18 +24,21 @@
   },
   "homepage": "https://github.com/pagerinc/minion#readme",
   "dependencies": {
-    "@hapi/joi": "17.x",
     "@pager/jackrabbit": "5.x",
     "@pager/minion": "3.x"
   },
   "devDependencies": {
     "@hapi/eslint-config-hapi": "13.x",
     "@hapi/eslint-plugin-hapi": "4.x",
-    "@pager/semantic-release-config": "1.x",
+    "@pager/semantic-release-config": "2.x",
     "ava": "3.x",
     "eslint": "7.x",
+    "joi": "^17.2.1",
     "nyc": "15.x",
-    "semantic-release": "17.x"
+    "semantic-release": "21.x"
+  },
+  "peerDependencies": {
+    "joi": "^17.2.0"
   },
   "renovate": {
     "extends": [

package/test/index.js

@@ -2,7 +2,7 @@
 
 const { EventEmitter } = require('events');
 const Test = require('ava');
-const Joi = require('@hapi/joi');
+const Joi = require('joi');
 
 const Army = require('../lib/index');
 

package/.circleci/config.yml

@@ -1,61 +0,0 @@
-version: 2
-
-defaults: &defaults
-  working_directory: ~/repo
-  docker:
-    - image: circleci/node:12.18@sha256:3d012ab87cc4e31fe371f4587d9b698cfa21c42784373cc3cb6689d5af6c3a97
-
-jobs:
-  test:
-    <<: *defaults
-    steps:
-      - checkout
-
-      - restore_cache:
-          keys:
-            - dependency-cache-{{ checksum "package.json" }}
-            - dependency-cache-
-
-      - run: npm install
-
-      - save_cache:
-          key: dependency-cache-{{ checksum "package.json" }}
-          paths:
-            - ./node_modules
-
-      - run:
-          name: Run tests
-          command: npm test
-
-      - persist_to_workspace:
-          root: ~/repo
-          paths: .
-
-  deploy:
-    <<: *defaults
-    steps:
-      - attach_workspace:
-          at: ~/repo
-      - run:
-          name: Authenticate with registry
-          command: echo "//registry.npmjs.org/:_authToken=$NPM_TOKEN" > ~/repo/.npmrc
-      - run:
-          name: Publish package
-          command: npm publish
-
-workflows:
-  version: 2
-  test-deploy:
-    jobs:
-      - test:
-          filters:
-            tags:
-              only: /^v.*/
-      - deploy:
-          requires:
-            - test
-          filters:
-            tags:
-              only: /^v.*/
-            branches:
-              ignore: /.*/