@andrian.yablonskyy/thub-common 1.0.28 → 1.0.29

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@andrian.yablonskyy/thub-common",
-  "version": "1.0.28",
+  "version": "1.0.29",
   "description": "Shared job-spec schema, state enums and a thin API client used by the Agent and Client",
   "main": "src/index.js",
   "files": [

package/src/job-spec.schema.js

@@ -102,11 +102,10 @@ const DOCKER_IMAGE_PATTERN =
         }
       },
       // Environment variables (`--env NAME=value`) the Client sets for every
-      // command it runs for the job — git, docker login, the job's command.
-      // DOCKER_REGISTRY + DOCKER_USERNAME + DOCKER_PASSWORD: the Client logs in
-      // to that registry first (README §8.1). Values are secrets as far as
-      // the Coordinator is concerned: masked in the Agent API and dropped
-      // from its database once the job ends.
+      // command it runs for the job — git and the job's command. No name
+      // means anything special. Values are secrets as far as the Coordinator
+      // is concerned: masked in the Agent API and dropped from its database
+      // once the job ends.
       env: {
         type: 'object',
         maxProperties: 64,
@@ -128,9 +127,6 @@ const DOCKER_IMAGE_PATTERN =
       // see README §7.1 "Dry-run the pipeline".
       dryRun: { type: 'boolean', default: false }
     }
-  },
+  };
 
-  // The job env variables the Client logs in to a Docker registry with.
-  DOCKER_LOGIN_ENV = ['DOCKER_REGISTRY', 'DOCKER_USERNAME', 'DOCKER_PASSWORD'];
-
-module.exports = { jobSpecSchema, DOCKER_IMAGE_PATTERN, ENV_NAME_PATTERN, DOCKER_LOGIN_ENV };
+module.exports = { jobSpecSchema, DOCKER_IMAGE_PATTERN, ENV_NAME_PATTERN };

package/src/validate-job-spec.js

@@ -15,7 +15,7 @@
 
 const Ajv = require('ajv'),
   addFormats = require('ajv-formats'),
-  { jobSpecSchema, DOCKER_LOGIN_ENV } = require('./job-spec.schema'),
+  { jobSpecSchema } = require('./job-spec.schema'),
   { splitArgs } = require('./split-args');
 
 const ajv = new Ajv({ useDefaults: true, allErrors: true, strict: false });
@@ -55,8 +55,8 @@ function legacyShapeError(spec){
 const GIT_URL = /^(?:(?:https?|ssh|git):\/\/[^\s]+|[A-Za-z0-9._-]+@[A-Za-z0-9.-]+:[^\s]+)$/,
 
   // Job env names the Client sets itself for a job's commands (besides
-  // THUB_*): git's safety settings, and the job's own Docker config dir.
-  RESERVED_ENV = ['GIT_TERMINAL_PROMPT', 'GIT_ALLOW_PROTOCOL', 'DOCKER_CONFIG'];
+  // THUB_*): git's safety settings.
+  RESERVED_ENV = ['GIT_TERMINAL_PROMPT', 'GIT_ALLOW_PROTOCOL'];
 
 // Rules across fields, spelled out here rather than as schema if/then,
 // whose errors ("must match a schema in then") say little.
@@ -69,15 +69,10 @@ function crossFieldErrors(spec){
     errors.push('/git/url must be an https://, http://, ssh:// or git:// URL, or user@host:path');
   }
   const envNames = Object.keys(spec.env && typeof spec.env === 'object' ? spec.env : {}),
-    reserved = envNames.filter((n) => /^THUB_/.test(n) || RESERVED_ENV.includes(n)),
-    login = DOCKER_LOGIN_ENV.filter((n) => envNames.includes(n));
+    reserved = envNames.filter((n) => /^THUB_/.test(n) || RESERVED_ENV.includes(n));
   if (reserved.length){
     errors.push(`/env ${reserved.join(', ')}: set by the Client itself (THUB_*, ${RESERVED_ENV.join(', ')}) — use other names`);
   }
-  if (login.length && login.length < DOCKER_LOGIN_ENV.length){
-    errors.push(`/env a Docker registry login needs all of ${DOCKER_LOGIN_ENV.join(', ')} — missing ` +
-      DOCKER_LOGIN_ENV.filter((n) => !login.includes(n)).join(', '));
-  }
   if (spec.git?.options){
     try {
       splitArgs(spec.git.options);
@@ -97,4 +92,4 @@ function maskEnv(env){
 
 const MASKED = '***';
 
-module.exports = { validateJobSpec, maskEnv, DOCKER_LOGIN_ENV, JOB_ENV_MASK: MASKED };
+module.exports = { validateJobSpec, maskEnv, JOB_ENV_MASK: MASKED };