hammerkit 1.27.0-next.3 → 1.27.0-next.30
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/build.schema.json +188 -0
- package/dist/cache/backends/local-cache-backend.js +6 -0
- package/dist/cache/backends/registry-cache-backend.js +2 -2
- package/dist/cache/explain.js +17 -0
- package/dist/cli.js +2 -0
- package/dist/docker/item-network.js +13 -5
- package/dist/executer/deadline.js +17 -3
- package/dist/executer/deferred-restore.js +36 -0
- package/dist/executer/docker-service.js +30 -8
- package/dist/executer/docker-task.js +21 -1
- package/dist/executer/event-cache.js +20 -2
- package/dist/executer/execute-work-service.js +2 -0
- package/dist/executer/execute-work-task.js +10 -3
- package/dist/executer/execution-steps.js +25 -4
- package/dist/executer/reset-work-tree.js +4 -0
- package/dist/executer/scheduler/enqueue-next.js +57 -6
- package/dist/executer/scheduler/state-key.js +42 -5
- package/dist/executer/watch-loop.js +4 -1
- package/dist/harness/connect.js +20 -6
- package/dist/harness/mcp-command.js +22 -6
- package/dist/harness/mcp.js +63 -114
- package/dist/harness/opencode.js +158 -50
- package/dist/harness/pi.js +29 -0
- package/dist/harness/sandbox-client.js +168 -17
- package/dist/harness/service-tools.js +141 -0
- package/dist/harness/task-tools.js +221 -0
- package/dist/kubernetes/apply.js +27 -16
- package/dist/kubernetes/await-running-state.js +59 -13
- package/dist/kubernetes/claim-layout.js +71 -0
- package/dist/kubernetes/cluster-state.js +245 -0
- package/dist/kubernetes/ensure-http-route.js +1 -1
- package/dist/kubernetes/ensure-kubernetes-deployment-exists.js +35 -12
- package/dist/kubernetes/ensure-kubernetes-persistent-volume-claim-exists.js +1 -1
- package/dist/kubernetes/ensure-kubernetes-service-exists.js +6 -9
- package/dist/kubernetes/ensure-persistent-data.js +30 -20
- package/dist/kubernetes/follow-pod-logs.js +182 -0
- package/dist/kubernetes/get-service-ip.js +2 -2
- package/dist/kubernetes/job-placement.js +36 -12
- package/dist/kubernetes/job-secrets.js +33 -19
- package/dist/kubernetes/kept-claims.js +22 -10
- package/dist/kubernetes/network-policy.js +85 -27
- package/dist/kubernetes/remove-persistent-data.js +3 -1
- package/dist/kubernetes/resources.js +25 -3
- package/dist/kubernetes/restore-kubernetes-data.js +9 -3
- package/dist/kubernetes/sandbox-runner.js +628 -0
- package/dist/kubernetes/secrets.js +7 -11
- package/dist/kubernetes/volumes.js +6 -3
- package/dist/main.js +2 -0
- package/dist/network/egress-proxy.js +45 -6
- package/dist/optimizer/calculate-checksum.js +3 -2
- package/dist/optimizer/check-key.js +94 -0
- package/dist/optimizer/check-keys.js +64 -0
- package/dist/optimizer/get-work-cache-stats.js +17 -3
- package/dist/optimizer/work-task-cache-description.js +51 -1
- package/dist/planner/utils/append-work-dependencies.js +10 -5
- package/dist/planner/utils/append-work-service.js +19 -1
- package/dist/planner/utils/append-work-task.js +18 -3
- package/dist/planner/utils/get-work-runtime.js +6 -1
- package/dist/planner/utils/normalize-path.js +19 -1
- package/dist/planner/utils/parse-work-mount.js +7 -1
- package/dist/planner/utils/parse-work-port.js +4 -1
- package/dist/planner/utils/task-arguments.js +3 -0
- package/dist/planner/validate.js +22 -0
- package/dist/planner/work-network.js +3 -1
- package/dist/planner/work-runtime-aggregate.js +32 -0
- package/dist/planner/work-runtime-docker.js +2 -1
- package/dist/planner/work-runtime-kubernetes.js +124 -48
- package/dist/planner/work-runtime-local.js +2 -1
- package/dist/planner/work-task.js +6 -1
- package/dist/program.js +31 -10
- package/dist/remote/device-login.js +7 -2
- package/dist/remote/host-config.js +69 -3
- package/dist/remote/remote-commands.js +30 -7
- package/dist/remote/remote-work-commands.js +426 -45
- package/dist/remote/server-client.js +15 -2
- package/dist/remote/token-source.js +64 -26
- package/dist/run-program.js +9 -0
- package/dist/schema/build-file-base-task-schema.js +8 -1
- package/dist/schema/build-file-container-service-schema.js +12 -0
- package/dist/schema/build-file-container-task-schema.js +16 -1
- package/dist/schema/build-file-include-schema.js +18 -4
- package/dist/schema/build-file-kubernetes-service-schema.js +2 -0
- package/dist/schema/build-file-task-schema.js +5 -1
- package/dist/schema/capabilities-schema.js +56 -0
- package/dist/schema/reference-parser.js +120 -11
- package/dist/schema/schema-parser.js +92 -41
- package/dist/schema/work-scope-parser.js +33 -10
- package/dist/secrets/command-secret-provider.js +3 -1
- package/dist/secrets/github-app-token-command.js +3 -1
- package/dist/secrets/secret-catalog.js +43 -19
- package/dist/server/accounts-api.js +3 -1
- package/dist/server/approvals-api.js +1 -1
- package/dist/server/checks-api.js +83 -0
- package/dist/server/checks.js +116 -0
- package/dist/server/definitions-api.js +66 -3
- package/dist/server/endpoints.js +739 -0
- package/dist/server/executor.js +57 -5
- package/dist/server/kubernetes-backend.js +367 -65
- package/dist/server/kubernetes-sandbox-storage.js +48 -3
- package/dist/server/oauth.js +12 -1
- package/dist/server/plan.js +188 -103
- package/dist/server/policy.js +32 -2
- package/dist/server/repo-access.js +5 -0
- package/dist/server/run-plan.js +50 -19
- package/dist/server/run-request.js +58 -3
- package/dist/server/run-worker.js +245 -12
- package/dist/server/runs.js +410 -27
- package/dist/server/sandbox-pod.js +28 -0
- package/dist/server/sandbox-storage.js +23 -0
- package/dist/server/sandboxes-api.js +10 -4
- package/dist/server/sandboxes.js +8 -0
- package/dist/server/server-command.js +39 -20
- package/dist/server/server-config.js +255 -14
- package/dist/server/server.js +269 -15
- package/dist/server/service-runs.js +82 -0
- package/dist/utils/abort-on-signals.js +46 -6
- package/dist/utils/tar.js +36 -0
- package/dist/utils/terminal-prompt.js +53 -0
- package/package.json +1 -1
package/dist/program.js
CHANGED
|
@@ -84,7 +84,8 @@ function printTaskDefinition(environment, definition) {
|
|
|
84
84
|
}
|
|
85
85
|
}
|
|
86
86
|
// `ls --json`: what a caller (an agent picking a task) needs to know, with the
|
|
87
|
-
// command that arguments after `--` are appended to (null: it takes none)
|
|
87
|
+
// command that arguments after `--` are appended to (null: it takes none) and
|
|
88
|
+
// `args` as the build file says it (false: it refuses them).
|
|
88
89
|
function getListJson(tasks, services) {
|
|
89
90
|
return {
|
|
90
91
|
tasks: tasks.map(({ item }) => ({
|
|
@@ -96,6 +97,7 @@ function getListJson(tasks, services) {
|
|
|
96
97
|
needs: item.needs.map((n) => n.name),
|
|
97
98
|
labels: item.data.labels,
|
|
98
99
|
command: (0, task_arguments_1.getArgumentsTarget)(item.data)?.cmd ?? null,
|
|
100
|
+
args: item.data.args,
|
|
99
101
|
})),
|
|
100
102
|
services: services.map(({ item }) => ({
|
|
101
103
|
name: item.name,
|
|
@@ -105,9 +107,22 @@ function getListJson(tasks, services) {
|
|
|
105
107
|
ports: item.data.ports.map((p) => ({ host: p.hostPort, container: p.containerPort })),
|
|
106
108
|
labels: item.data.labels,
|
|
107
109
|
command: (0, task_arguments_1.getArgumentsTarget)(item.data)?.cmd ?? null,
|
|
110
|
+
args: item.data.type === 'container-service' ? item.data.args : null,
|
|
108
111
|
})),
|
|
109
112
|
};
|
|
110
113
|
}
|
|
114
|
+
// `up` and `down` select by name or by label, not both: a name outside the labels would
|
|
115
|
+
// silently select nothing
|
|
116
|
+
function parseWorkNameScope(names, options) {
|
|
117
|
+
const scope = parseWorkLabelScope(options);
|
|
118
|
+
if (names.length === 0) {
|
|
119
|
+
return scope;
|
|
120
|
+
}
|
|
121
|
+
if (scope.filterLabels || scope.excludeLabels) {
|
|
122
|
+
throw new Error('name tasks and services or select them with --filter/--exclude, not both');
|
|
123
|
+
}
|
|
124
|
+
return { ...scope, names };
|
|
125
|
+
}
|
|
111
126
|
function parseWorkLabelScope(options) {
|
|
112
127
|
const scope = {
|
|
113
128
|
environmentName: null,
|
|
@@ -584,9 +599,9 @@ async function getProgram(environment, argv) {
|
|
|
584
599
|
}
|
|
585
600
|
});
|
|
586
601
|
program
|
|
587
|
-
.command('up')
|
|
588
|
-
.description("start services(s), with the arguments after -- appended to the selected service's cmd")
|
|
589
|
-
.usage('[options] [-- args...]')
|
|
602
|
+
.command('up [names...]')
|
|
603
|
+
.description("start services(s), all or the named tasks and services, with the arguments after -- appended to the selected service's cmd")
|
|
604
|
+
.usage('[options] [names...] [-- args...]')
|
|
590
605
|
.addOption(new commander_1.Option('-f, --filter <labels...>', 'filter task and services with labels'))
|
|
591
606
|
.addOption(new commander_1.Option('-e, --exclude <labels...>', 'exclude task and services with labels'))
|
|
592
607
|
.addOption(new commander_1.Option('-c, --concurrency <number>', 'parallel worker count (default 4, unbounded when every task and service requests cpus and memory)').argParser(parseInt))
|
|
@@ -605,11 +620,12 @@ async function getProgram(environment, argv) {
|
|
|
605
620
|
.choices(['checksum', 'modify-date', 'none']))
|
|
606
621
|
.addOption(new commander_1.Option('--cache-read-only', `restore from cache backends but never push to them (or set ${read_only_1.CACHE_READ_ONLY_ENV}=1)`).default(false))
|
|
607
622
|
.addOption(new commander_1.Option('--timeout <duration>', 'fail tasks without their own timeout after this long (e.g. 10m)').argParser(units_1.parseDuration))
|
|
623
|
+
.addOption(new commander_1.Option('--max-timeout <duration>', 'fail any task after this long, also one with a longer timeout of its own (e.g. 2m)').argParser(units_1.parseDuration))
|
|
608
624
|
.addOption(new commander_1.Option('--network <level>', 'the most any task or service reaches besides its needs: none, open or allow:<host>,<host>').argParser(parseNetworkArgument))
|
|
609
|
-
.action(async (options, command) => {
|
|
625
|
+
.action(async (names, options, command) => {
|
|
610
626
|
try {
|
|
611
627
|
const scope = {
|
|
612
|
-
...
|
|
628
|
+
...parseWorkNameScope(names, options),
|
|
613
629
|
args: { values: passthrough, services: true, cache: keepsCache(command) },
|
|
614
630
|
};
|
|
615
631
|
const cli = await createCli(fileName, environment, scope);
|
|
@@ -623,6 +639,7 @@ async function getProgram(environment, argv) {
|
|
|
623
639
|
wait: options.wait,
|
|
624
640
|
cacheReadOnly: (0, read_only_1.isCacheReadOnly)(options.cacheReadOnly, environment.processEnvs),
|
|
625
641
|
timeout: options.timeout ?? null,
|
|
642
|
+
maxTimeout: options.maxTimeout ?? null,
|
|
626
643
|
network: options.network ?? null,
|
|
627
644
|
});
|
|
628
645
|
if (!result.success) {
|
|
@@ -641,14 +658,14 @@ async function getProgram(environment, argv) {
|
|
|
641
658
|
}
|
|
642
659
|
});
|
|
643
660
|
program
|
|
644
|
-
.command('down')
|
|
645
|
-
.description('stop services(s)')
|
|
661
|
+
.command('down [names...]')
|
|
662
|
+
.description('stop services(s), all or the named services and the services the named tasks need')
|
|
646
663
|
.addOption(new commander_1.Option('-f, --filter <labels...>', 'filter task and services with labels'))
|
|
647
664
|
.addOption(new commander_1.Option('-e, --exclude <labels...>', 'exclude task and services with labels'))
|
|
648
665
|
.addOption(new commander_1.Option('--env <name>', 'environment'))
|
|
649
|
-
.action(async (options) => {
|
|
666
|
+
.action(async (names, options) => {
|
|
650
667
|
try {
|
|
651
|
-
const scope =
|
|
668
|
+
const scope = { ...parseWorkNameScope(names, options), stop: true };
|
|
652
669
|
const cli = await createCli(fileName, environment, scope);
|
|
653
670
|
const result = await cli.runDown();
|
|
654
671
|
if (!result.success) {
|
|
@@ -685,8 +702,10 @@ async function getProgram(environment, argv) {
|
|
|
685
702
|
.addOption(new commander_1.Option('--dry-run', 'print the execution plan with predicted cache hits/misses without running').default(false))
|
|
686
703
|
.addOption(new commander_1.Option('--cache-read-only', `restore from cache backends but never push to them (or set ${read_only_1.CACHE_READ_ONLY_ENV}=1)`).default(false))
|
|
687
704
|
.addOption(new commander_1.Option('--timeout <duration>', 'fail tasks without their own timeout after this long (e.g. 10m)').argParser(units_1.parseDuration))
|
|
705
|
+
.addOption(new commander_1.Option('--max-timeout <duration>', 'fail any task after this long, also one with a longer timeout of its own (e.g. 2m)').argParser(units_1.parseDuration))
|
|
688
706
|
.addOption(new commander_1.Option('--network <level>', 'the most any task or service reaches besides its needs: none, open or allow:<host>,<host>').argParser(parseNetworkArgument))
|
|
689
707
|
.addOption(new commander_1.Option('--no-skip-deps', 'run dependencies even when nothing needing them has to run'))
|
|
708
|
+
.addOption(new commander_1.Option('--no-restore', 'only look cache hits up, download their outputs only when a task that runs needs them'))
|
|
690
709
|
.action(async (task, options, command) => {
|
|
691
710
|
try {
|
|
692
711
|
// For machine-readable JSON, suppress the human progress logger (which
|
|
@@ -719,8 +738,10 @@ async function getProgram(environment, argv) {
|
|
|
719
738
|
explain: options.explain,
|
|
720
739
|
cacheReadOnly: (0, read_only_1.isCacheReadOnly)(options.cacheReadOnly, environment.processEnvs),
|
|
721
740
|
timeout: options.timeout ?? null,
|
|
741
|
+
maxTimeout: options.maxTimeout ?? null,
|
|
722
742
|
network: options.network ?? null,
|
|
723
743
|
skipDeps: options.skipDeps !== false,
|
|
744
|
+
restore: options.restore !== false,
|
|
724
745
|
});
|
|
725
746
|
// Reporting only: the summary never changes the exit code or behavior.
|
|
726
747
|
if (!options.watch) {
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.deviceLogin = void 0;
|
|
3
|
+
exports.deviceLogin = exports.NoSignInError = void 0;
|
|
4
4
|
const server_client_1 = require("./server-client");
|
|
5
5
|
const GRANT_TYPE = 'urn:ietf:params:oauth:grant-type:device_code';
|
|
6
6
|
const DEFAULT_INTERVAL_SECONDS = 5;
|
|
@@ -8,6 +8,11 @@ const SLOW_DOWN_SECONDS = 5;
|
|
|
8
8
|
const FETCH_TIMEOUT_MS = 10000;
|
|
9
9
|
const MIN_INTERVAL_SECONDS = 1;
|
|
10
10
|
const MAX_LIFETIME_SECONDS = 30 * 60;
|
|
11
|
+
// The server takes tokens of this issuer but offers no device sign-in for it: the token has
|
|
12
|
+
// to come from elsewhere, such as a token command.
|
|
13
|
+
class NoSignInError extends server_client_1.ServerError {
|
|
14
|
+
}
|
|
15
|
+
exports.NoSignInError = NoSignInError;
|
|
11
16
|
const isLoopbackHost = (hostname) => ['localhost', '127.0.0.1', '[::1]'].includes(hostname);
|
|
12
17
|
// An endpoint must use the scheme of the issuer: loopback http is for a test
|
|
13
18
|
// identity provider on this machine only, never beside an https issuer.
|
|
@@ -89,7 +94,7 @@ async function deviceLogin(server, options) {
|
|
|
89
94
|
throw new server_client_1.ServerError(`${server.url} does not accept tokens from ${server.issuer} (it accepts ${accepted})`);
|
|
90
95
|
}
|
|
91
96
|
if (!offered.clientId) {
|
|
92
|
-
throw new
|
|
97
|
+
throw new NoSignInError(`${server.url} offers no sign-in for ${server.issuer}, it needs a token obtained elsewhere`);
|
|
93
98
|
}
|
|
94
99
|
// What was pinned (by `remote add` or an earlier login) wins; the server can
|
|
95
100
|
// only offer the same, never something else to sign in with.
|
|
@@ -1,10 +1,11 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.pinLogin = exports.setDefaultLocation = exports.removeServer = exports.addServer = exports.normalizeServerUrl = exports.validateServerName = exports.writeHostConfig = exports.readHostConfig = exports.getHostConfigPath = exports.hasServer = exports.hostConfigSchema = exports.hostServerSchema = exports.RESERVED_SERVER_NAMES = void 0;
|
|
3
|
+
exports.pinLogin = exports.setDefaultLocation = exports.removeServer = exports.addServer = exports.normalizeServerUrl = exports.validateServerName = exports.writeHostConfig = exports.readHostConfig = exports.getHostConfigPath = exports.getRegisteredServer = exports.getTokenCommand = exports.hasServer = exports.hostConfigSchema = exports.hostServerSchema = exports.RESERVED_SERVER_NAMES = void 0;
|
|
4
4
|
const path_1 = require("path");
|
|
5
5
|
const zod_1 = require("zod");
|
|
6
6
|
const yaml_1 = require("yaml");
|
|
7
7
|
const get_cache_directory_1 = require("../optimizer/get-cache-directory");
|
|
8
|
+
const build_file_secret_provider_schema_1 = require("../schema/build-file-secret-provider-schema");
|
|
8
9
|
// Names with a meaning of their own in `run.on` / `--on`
|
|
9
10
|
exports.RESERVED_SERVER_NAMES = ['local', 'auto'];
|
|
10
11
|
const serverNamePattern = /^[a-z0-9][a-z0-9._-]*$/i;
|
|
@@ -28,12 +29,25 @@ exports.hostServerSchema = zod_1.z
|
|
|
28
29
|
scope: zod_1.z.string().min(1).optional(),
|
|
29
30
|
})
|
|
30
31
|
.strict();
|
|
32
|
+
// A command that prints the token for a server instead of a login, see token-source.ts.
|
|
33
|
+
// It is bound to the url and issuer it was registered for, like a sign-in, and lives
|
|
34
|
+
// beside `servers` rather than in it: hammerkit before 1.27 refuses unknown keys of a
|
|
35
|
+
// server, but keeps unknown top-level keys. It is only ever read from the host config,
|
|
36
|
+
// a build file can't name one.
|
|
37
|
+
const tokenCommandSchema = zod_1.z
|
|
38
|
+
.object({ url: zod_1.z.string(), issuer: zod_1.z.string(), command: zod_1.z.string().trim().min(1) })
|
|
39
|
+
.passthrough();
|
|
31
40
|
// Unknown top-level keys are kept when the file is written back, so a newer
|
|
32
41
|
// hammerkit's settings survive an older one editing the file.
|
|
33
42
|
exports.hostConfigSchema = zod_1.z
|
|
34
43
|
.object({
|
|
35
44
|
servers: zod_1.z.record(exports.hostServerSchema).default({}),
|
|
45
|
+
tokenCommands: zod_1.z.record(tokenCommandSchema).optional(),
|
|
36
46
|
run: zod_1.z.object({ on: zod_1.z.string().optional() }).passthrough().default({}),
|
|
47
|
+
// how this machine reads secrets, beside what the build files declare (see
|
|
48
|
+
// collectSecretCatalog); a server reads only its own config
|
|
49
|
+
secretProviders: build_file_secret_provider_schema_1.buildFileSecretProvidersSchema.optional(),
|
|
50
|
+
secretAccounts: build_file_secret_provider_schema_1.buildFileSecretAccountsSchema.optional(),
|
|
37
51
|
})
|
|
38
52
|
.passthrough();
|
|
39
53
|
// Names like "constructor" must not find inherited members.
|
|
@@ -41,6 +55,35 @@ function hasServer(servers, name) {
|
|
|
41
55
|
return Object.prototype.hasOwnProperty.call(servers, name);
|
|
42
56
|
}
|
|
43
57
|
exports.hasServer = hasServer;
|
|
58
|
+
// The token command of a server, unless it was registered for another url or issuer (an
|
|
59
|
+
// older hammerkit that pointed the name elsewhere leaves it behind).
|
|
60
|
+
function getTokenCommand(config, name) {
|
|
61
|
+
const commands = config.tokenCommands ?? {};
|
|
62
|
+
const entry = Object.prototype.hasOwnProperty.call(commands, name) ? commands[name] : undefined;
|
|
63
|
+
const server = hasServer(config.servers, name) ? config.servers[name] : undefined;
|
|
64
|
+
return entry && server && entry.url === server.url && entry.issuer === server.issuer ? entry.command : undefined;
|
|
65
|
+
}
|
|
66
|
+
exports.getTokenCommand = getTokenCommand;
|
|
67
|
+
function getRegisteredServer(config, name) {
|
|
68
|
+
const tokenCommand = getTokenCommand(config, name);
|
|
69
|
+
return { ...config.servers[name], ...(tokenCommand ? { tokenCommand } : {}) };
|
|
70
|
+
}
|
|
71
|
+
exports.getRegisteredServer = getRegisteredServer;
|
|
72
|
+
function setTokenCommand(config, name, entry) {
|
|
73
|
+
const commands = { ...(config.tokenCommands ?? {}) };
|
|
74
|
+
if (entry) {
|
|
75
|
+
commands[name] = entry;
|
|
76
|
+
}
|
|
77
|
+
else {
|
|
78
|
+
delete commands[name];
|
|
79
|
+
}
|
|
80
|
+
if (Object.keys(commands).length > 0) {
|
|
81
|
+
config.tokenCommands = commands;
|
|
82
|
+
}
|
|
83
|
+
else {
|
|
84
|
+
delete config.tokenCommands;
|
|
85
|
+
}
|
|
86
|
+
}
|
|
44
87
|
function getHostConfigPath(environment) {
|
|
45
88
|
return environment.processEnvs.HAMMERKIT_CONFIG ?? (0, path_1.join)((0, get_cache_directory_1.getHammerkitDirectory)(), 'config.yaml');
|
|
46
89
|
}
|
|
@@ -121,16 +164,38 @@ async function addServer(environment, name, url, options) {
|
|
|
121
164
|
server[key] = options[key];
|
|
122
165
|
}
|
|
123
166
|
}
|
|
167
|
+
if (typeof options.tokenCommand === 'string' && !options.tokenCommand.trim()) {
|
|
168
|
+
throw new Error('the token command must not be empty, use --no-token-command to remove it');
|
|
169
|
+
}
|
|
124
170
|
const config = await readHostConfig(environment);
|
|
125
171
|
const existing = hasServer(config.servers, name) ? config.servers[name] : undefined;
|
|
126
|
-
const
|
|
172
|
+
const sameServer = (a, b) => a.url === b.url && a.issuer === b.issuer;
|
|
173
|
+
// Adding the same server again keeps what was pinned (by a login, too) unless it is given,
|
|
174
|
+
// so a later `remote add ... --token-command` needs no --force.
|
|
175
|
+
if (existing && sameServer(existing, server)) {
|
|
176
|
+
for (const key of PINNED) {
|
|
177
|
+
if (!server[key] && existing[key]) {
|
|
178
|
+
server[key] = existing[key];
|
|
179
|
+
}
|
|
180
|
+
}
|
|
181
|
+
}
|
|
182
|
+
const changed = (a, b) => !sameServer(a, b) || PINNED.some((key) => a[key] !== b[key]);
|
|
127
183
|
if (existing && changed(existing, server) && !options.force) {
|
|
128
184
|
throw new Error(`server "${name}" is already registered as ${existing.url} (issuer ${existing.issuer}); ` +
|
|
129
185
|
`use --force to point it somewhere else`);
|
|
130
186
|
}
|
|
187
|
+
// The command decides which identity's token goes to the server: changing it does not
|
|
188
|
+
// redirect anything, but a name pointed at another server does not keep the old one.
|
|
189
|
+
const kept = existing && sameServer(existing, server) ? getTokenCommand(config, name) : undefined;
|
|
190
|
+
const tokenCommand = typeof options.tokenCommand === 'string'
|
|
191
|
+
? options.tokenCommand.trim()
|
|
192
|
+
: options.tokenCommand === undefined
|
|
193
|
+
? kept
|
|
194
|
+
: undefined;
|
|
131
195
|
config.servers[name] = server;
|
|
196
|
+
setTokenCommand(config, name, tokenCommand ? { url: server.url, issuer: server.issuer, command: tokenCommand } : undefined);
|
|
132
197
|
await writeHostConfig(environment, config);
|
|
133
|
-
return server;
|
|
198
|
+
return { ...server, ...(tokenCommand ? { tokenCommand } : {}) };
|
|
134
199
|
}
|
|
135
200
|
exports.addServer = addServer;
|
|
136
201
|
async function removeServer(environment, name) {
|
|
@@ -139,6 +204,7 @@ async function removeServer(environment, name) {
|
|
|
139
204
|
throw new Error(`server "${name}" is not registered`);
|
|
140
205
|
}
|
|
141
206
|
delete config.servers[name];
|
|
207
|
+
setTokenCommand(config, name, undefined);
|
|
142
208
|
const resetDefault = config.run.on === name;
|
|
143
209
|
if (resetDefault) {
|
|
144
210
|
delete config.run.on;
|
|
@@ -40,6 +40,8 @@ passthrough = []) {
|
|
|
40
40
|
.addOption(new commander_1.Option('--client-id <id>', 'OAuth client to sign in with (pinned; default: what the server offers)'))
|
|
41
41
|
.addOption(new commander_1.Option('--audience <audience>', 'audience of the token (pinned; default: what the server offers)'))
|
|
42
42
|
.addOption(new commander_1.Option('--scope <scope>', 'scopes to request (pinned; default: what the server offers)'))
|
|
43
|
+
.addOption(new commander_1.Option('--token-command <command>', 'a command that prints the token for this server, instead of remote login (e.g. of a service account)'))
|
|
44
|
+
.addOption(new commander_1.Option('--no-token-command', 'remove the token command, sign in with remote login again'))
|
|
43
45
|
.addOption(new commander_1.Option('--force', 'point an already registered name at a different server').default(false))
|
|
44
46
|
.action(guarded('Remote add was not successful', async (name, url, options) => {
|
|
45
47
|
const server = await (0, host_config_1.addServer)(environment, name, url, {
|
|
@@ -47,9 +49,13 @@ passthrough = []) {
|
|
|
47
49
|
clientId: options.clientId,
|
|
48
50
|
audience: options.audience,
|
|
49
51
|
scope: options.scope,
|
|
52
|
+
tokenCommand: options.tokenCommand,
|
|
50
53
|
force: options.force,
|
|
51
54
|
});
|
|
52
55
|
environment.stdout.write(`added ${name}: ${server.url} (issuer ${server.issuer})\n`);
|
|
56
|
+
if (server.tokenCommand) {
|
|
57
|
+
environment.stdout.write(`tokens for ${name} come from: ${server.tokenCommand}\n`);
|
|
58
|
+
}
|
|
53
59
|
}));
|
|
54
60
|
remote
|
|
55
61
|
.command('list')
|
|
@@ -62,9 +68,10 @@ passthrough = []) {
|
|
|
62
68
|
return;
|
|
63
69
|
}
|
|
64
70
|
for (const name of names) {
|
|
65
|
-
const server = config
|
|
71
|
+
const server = (0, host_config_1.getRegisteredServer)(config, name);
|
|
66
72
|
const marker = config.run.on === name ? colors_1.default.green(' (default)') : '';
|
|
67
|
-
|
|
73
|
+
const token = server.tokenCommand ? ` token from: ${server.tokenCommand}` : '';
|
|
74
|
+
environment.stdout.write(`${colors_1.default.bold(name)}${marker} ${server.url} issuer ${server.issuer}${token}\n`);
|
|
68
75
|
}
|
|
69
76
|
if (config.run.on === 'auto' || config.run.on === 'local') {
|
|
70
77
|
environment.stdout.write(`default location: ${config.run.on}\n`);
|
|
@@ -95,17 +102,33 @@ passthrough = []) {
|
|
|
95
102
|
? `server ${name} is not registered, add it with: hammerkit remote add ${name} <url> --issuer <url>`
|
|
96
103
|
: 'name a server, or set one as the default with: hammerkit remote use <name>');
|
|
97
104
|
}
|
|
98
|
-
return { name: chosen, server: config
|
|
105
|
+
return { name: chosen, server: (0, host_config_1.getRegisteredServer)(config, chosen) };
|
|
99
106
|
};
|
|
100
107
|
remote
|
|
101
108
|
.command('login <name>')
|
|
102
109
|
.description('sign in to a registered server with your identity provider (device code, works headless)')
|
|
103
110
|
.action(guarded('Remote login was not successful', async (name) => {
|
|
104
111
|
const { server } = await getServer(name);
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
|
|
112
|
+
if (server.tokenCommand) {
|
|
113
|
+
// a sign-in would never be used: the command's token goes first
|
|
114
|
+
throw new Error(`${name} takes its tokens from its token command (${server.tokenCommand}), it needs no sign-in; ` +
|
|
115
|
+
`to sign in instead, remove it with: hammerkit remote add ${name} ${server.url} --issuer ${server.issuer} --no-token-command`);
|
|
116
|
+
}
|
|
117
|
+
let login;
|
|
118
|
+
try {
|
|
119
|
+
login = await (0, device_login_1.deviceLogin)(server, {
|
|
120
|
+
prompt: (message) => environment.stdout.write(`${message}\n`),
|
|
121
|
+
signal: environment.abortCtrl.signal,
|
|
122
|
+
});
|
|
123
|
+
}
|
|
124
|
+
catch (e) {
|
|
125
|
+
if (e instanceof device_login_1.NoSignInError) {
|
|
126
|
+
throw new Error(`${e.message}: register a command that prints one, such as the token of a service account, with: ` +
|
|
127
|
+
`hammerkit remote add ${name} ${server.url} --issuer ${server.issuer} --token-command '<command>'`);
|
|
128
|
+
}
|
|
129
|
+
throw e;
|
|
130
|
+
}
|
|
131
|
+
const { pinned, ...result } = login;
|
|
109
132
|
await (0, host_config_1.pinLogin)(environment, name, pinned);
|
|
110
133
|
await (0, credentials_1.saveToken)(environment, name, { url: server.url, issuer: server.issuer, ...result });
|
|
111
134
|
try {
|