@certik/skynet 0.9.0 → 0.9.1

package/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 0.9.1
+
+- Support using `--schedule` argument to override default schedule when deploying
+
 ## 0.9.0
 
 - Added `web3` library with call support

package/deploy.js

@@ -9,10 +9,15 @@ const { getEnvOrThrow } = require("./env");
 const { getBinaryName, detectSkynetDirectory } = require("./cli");
 
 const INTERVAL_ALIASES = {
+  secondly: "*/1 * * * * * *",
   "@secondly": "*/1 * * * * * *",
+  minutely: "0 * * * * * *",
   "@minutely": "0 * * * * * *",
+  hourly: "0 0 * * * * *",
   "@hourly": "0 0 * * * * *",
+  daily: "0 0 0 * * * *",
   "@daily": "0 0 0 * * * *",
+  weekly: "0 0 0 * * 0 *",
   "@weekly": "0 0 0 * * 0 *",
 };
 
@@ -295,7 +300,17 @@ function createModeDeploy({
   validateCpu,
   validateMem,
 }) {
-  async function deployMode({ mode, from, to, stop, production, dryRun, verbose, ...selectorFlags }) {
+  async function deployMode({
+    mode,
+    from,
+    to,
+    stop,
+    production,
+    dryRun,
+    verbose,
+    schedule: cmdSchedule,
+    ...selectorFlags
+  }) {
     if (mode === "delta") {
       // delta mode will ignore from/to flags
       from = 0;
@@ -336,9 +351,17 @@ function createModeDeploy({
     // by default use delta cpu/mem settings
     const { cpu, mem } = modeResouces[mode] || modeResouces.delta;
 
-    const deltaCron = typeof deltaSchedule === "function" ? deltaSchedule(jobName) : deltaSchedule;
+    let deltaCron = typeof deltaSchedule === "function" ? deltaSchedule(jobName) : deltaSchedule;
 
-    const validateCron = typeof validateSchedule === "function" ? validateSchedule(jobName) : validateSchedule;
+    if (deltaSchedule && cmdSchedule) {
+      deltaCron = cmdSchedule;
+    }
+
+    let validateCron = typeof validateSchedule === "function" ? validateSchedule(jobName) : validateSchedule;
+
+    if (validateSchedule && cmdSchedule) {
+      validateCron = cmdSchedule;
+    }
 
     const modeIntervals = {
       delta: INTERVAL_ALIASES[deltaCron] || deltaCron,
@@ -404,7 +427,8 @@ ${getSelectorDesc(selector)}
           --from          min id to build
           --to            max id to build
           --stop          stop job instead of running the job
-          --production    deploy to production environment
+          --production    deploy to production, default is development
+          --schedule      override default schedule, support aliases: secondly, minutely, hourly, daily, weekly
           --verbose       Output debug messages
           --dry-run       print nomad job file but do not really execute it
 
@@ -432,6 +456,9 @@ ${getSelectorDesc(selector)}
             type: "number",
             default: 0,
           },
+          schedule: {
+            type: "string",
+          },
           verbose: {
             type: "boolean",
             default: false,
@@ -476,7 +503,7 @@ function createDeploy({
   cpu,
   mem,
 }) {
-  async function deployModeless({ production, stop, dryRun, verbose, ...selectorFlags }) {
+  async function deployModeless({ production, stop, dryRun, verbose, schedule: cmdSchedule, ...selectorFlags }) {
     const jobName = getJobName(name, selectorFlags, null);
 
     const selectorCmdPart = Object.keys(selectorFlags)
@@ -489,7 +516,12 @@ function createDeploy({
       args += ` --verbose`;
     }
 
-    const cron = typeof schedule === "function" ? schedule(jobName) : schedule;
+    let cron = typeof schedule === "function" ? schedule(jobName) : schedule;
+
+    if (schedule && cmdSchedule) {
+      // cmd schedule has higher priority
+      cron = cmdSchedule;
+    }
 
     const nomadJobDefinition = genConfig({
       jobName,
@@ -549,6 +581,7 @@ function createDeploy({
 ${getSelectorDesc(selector)}
           --stop          stop job instead of running the job
           --production    deploy to production, default is development
+          --schedule      override default schedule, support aliases: secondly, minutely, hourly, daily, weekly
           --verbose       Output debug messages
           --dry-run       print nomad job file but do not really execute it
       `,
@@ -557,6 +590,9 @@ ${getSelectorDesc(selector)}
         version: false,
         flags: {
           ...getSelectorFlags(selector),
+          schedule: {
+            type: "string",
+          },
           verbose: {
             type: "boolean",
             default: false,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@certik/skynet",
-  "version": "0.9.0",
+  "version": "0.9.1",
   "description": "Skynet Shared JS library",
   "main": "index.js",
   "author": "CertiK Engineering",