@andrian.yablonskyy/thub-agent 1.0.24 → 1.0.26

package/README.md

@@ -55,6 +55,7 @@ Key options for `thub run`:
 | `--docker-image <name>` | SW only: a Docker image the Client runs as the DUT instead of its own `sw.image` (the Client must allow it: `sw.allowJobImages`). |
 | `--git-repo <url> [<branch>\|<tag>\|<commit>]` | A git repository the Client clones (default ref: the default branch); the command runs in the checkout. |
 | `--depth <n>` | With `--git-repo`: commits to fetch, default `1`; `0` = full history. |
+| `--git-options <string>` | With `--git-repo`: extra git options placed between `git` and its subcommand on the Client, e.g. `'-c core.sshCommand="ssh -i ~/.ssh/lab_key -p 2222"'`. Shell-quoted (no shell run). Stored with the job, so reference key files rather than inlining secrets. |
 | `--suite <name>` | Passed to the command as `THUB_SUITE`. |
 | `--arg <value>` | Extra argument for the command, as `"$@"` (repeatable). |
 | `--timeout <dur>` | e.g. `30m`, default `30m`. |

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@andrian.yablonskyy/thub-agent",
-  "version": "1.0.24",
+  "version": "1.0.26",
   "description": "TestHub Agent CLI — the single entry point CI/CD and developers use to submit and follow test jobs",
   "bin": {
     "thub": "./src/cli.js"
@@ -12,7 +12,7 @@
     "lint:fix": "eslint . --fix"
   },
   "dependencies": {
-    "@andrian.yablonskyy/thub-common": "*",
+    "@andrian.yablonskyy/thub-common": "^1.0.26",
     "commander": "^13.1.0"
   },
   "devDependencies": {

package/src/cli.js

@@ -17,7 +17,8 @@
 
 const { Command } = require('commander'),
   {
-    ApiClient, EXIT_CODES, ACTIVE_JOB_STATES, exitCodeForJobState, PACKAGES, fetchLatestVersion, isNewer, isValidVersion, formatDateTime
+    ApiClient, EXIT_CODES, ACTIVE_JOB_STATES, exitCodeForJobState, PACKAGES, fetchLatestVersion, isNewer, isValidVersion, formatDateTime,
+    splitArgs
   } = require('@andrian.yablonskyy/thub-common'),
   { resolveConnection, resolveGroup, resolveUser, writeConfigFile, readConfigFile } = require('./config'),
   { parseDurationSec } = require('./duration'),
@@ -76,6 +77,17 @@ function taskFromOptions(opts){
   if (opts.depth !== undefined && !opts.gitRepo){
     throw usageError('--depth only applies to --git-repo');
   }
+  if (opts.gitOptions !== undefined && !opts.gitRepo){
+    throw usageError('--git-options only applies to --git-repo');
+  }
+  if (opts.gitOptions){
+    try {
+      splitArgs(opts.gitOptions);
+    }
+    catch (err){
+      throw usageError(`--git-options: ${err.message}`);
+    }
+  }
   if (opts.gitRepo){
     const [url, ref, ...extra] = opts.gitRepo;
     if (extra.length){
@@ -85,7 +97,7 @@ function taskFromOptions(opts){
     if (!Number.isInteger(depth) || depth < 0){
       throw usageError(`--depth ${opts.depth}: must be a whole number (0 = full history)`);
     }
-    task.git = { url, ...(ref ? { ref } : {}), depth };
+    task.git = { url, ...(ref ? { ref } : {}), depth, ...(opts.gitOptions ? { options: opts.gitOptions } : {}) };
   }
   return task;
 }
@@ -96,6 +108,17 @@ function usageError(message){
 
 function fail(err){
   console.error(`Error: ${err.message}`);
+  // The Coordinator validates the spec with its own thub-common: an unknown
+  // field means it's older than this Agent.
+  if (/Invalid job spec.*must NOT have additional properties/.test(err.message)){
+    let url = 'the configured URL';
+    try {
+      ({ url } = resolveConnection(program.opts()));
+    }
+    catch { /* keep the generic wording */ }
+    console.error(`Hint: the Coordinator at ${url} doesn't know an option ` +
+      `this Agent (v${version}) sent — update the Coordinator (dashboard → Update app, or npm i -g @andrian.yablonskyy/thub-coordinator@latest).`);
+  }
   process.exit(err.status && Number.isInteger(err.status) && err.status < 100 ? err.status : EXIT_CODES.USAGE);
 }
 
@@ -143,6 +166,11 @@ program
       '(https://, ssh://, git:// or user@host:path; default ref: the default branch)'
   )
   .option('--depth <n>', 'With --git-repo: how many commits to fetch (default 1; 0 = full history)')
+  .option(
+    '--git-options <string>',
+    'With --git-repo: extra git options, placed between `git` and its subcommand on the Client (shell-quoted, no shell run), ' +
+      'e.g. \'-c core.sshCommand="ssh -i ~/.ssh/lab_key -p 2222"\'. Stored with the job — reference key files, don\'t inline secrets'
+  )
   .option('--suite <name>', 'Test suite name, passed to --command as THUB_SUITE', 'default')
   .option('--arg <value>', 'Extra argument for --command, as "$@" (repeatable)', collectRepeatable, [])
   .option('--timeout <duration>', 'e.g. 30m, 1h', '30m')