@intentic/providers 1.325.0 → 1.327.0
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/README.md +4 -1
- package/dist/auth/authentik.d.ts +1 -1
- package/dist/auth/authentik.d.ts.map +1 -1
- package/dist/auth/authentik.js +5 -6
- package/dist/auth/authentik.js.map +1 -1
- package/dist/backings/garage-bucket.d.ts +1 -1
- package/dist/backings/garage-bucket.d.ts.map +1 -1
- package/dist/backings/garage-bucket.js +1 -2
- package/dist/backings/garage-bucket.js.map +1 -1
- package/dist/backings/garage.d.ts +1 -1
- package/dist/backings/garage.d.ts.map +1 -1
- package/dist/backings/garage.js +6 -6
- package/dist/backings/garage.js.map +1 -1
- package/dist/backings/postgres-database.d.ts +1 -1
- package/dist/backings/postgres-database.d.ts.map +1 -1
- package/dist/backings/postgres-database.js +1 -2
- package/dist/backings/postgres-database.js.map +1 -1
- package/dist/backings/postgres.d.ts +1 -1
- package/dist/backings/postgres.d.ts.map +1 -1
- package/dist/backings/postgres.js +6 -6
- package/dist/backings/postgres.js.map +1 -1
- package/dist/backings/valkey-namespace.d.ts +1 -1
- package/dist/backings/valkey-namespace.d.ts.map +1 -1
- package/dist/backings/valkey-namespace.js +1 -2
- package/dist/backings/valkey-namespace.js.map +1 -1
- package/dist/backings/valkey.d.ts +1 -1
- package/dist/backings/valkey.d.ts.map +1 -1
- package/dist/backings/valkey.js +7 -7
- package/dist/backings/valkey.js.map +1 -1
- package/dist/backup/backup-restore.d.ts +1 -1
- package/dist/backup/backup-restore.d.ts.map +1 -1
- package/dist/backup/backup-restore.js +1 -2
- package/dist/backup/backup-restore.js.map +1 -1
- package/dist/backup/backup.d.ts +1 -1
- package/dist/backup/backup.d.ts.map +1 -1
- package/dist/backup/backup.js +11 -10
- package/dist/backup/backup.js.map +1 -1
- package/dist/core/backing-provider.d.ts +4 -3
- package/dist/core/backing-provider.d.ts.map +1 -1
- package/dist/core/backing-provider.js +6 -8
- package/dist/core/backing-provider.js.map +1 -1
- package/dist/core/backing-ssh.d.ts +0 -1
- package/dist/core/backing-ssh.d.ts.map +1 -1
- package/dist/core/backing-ssh.js +0 -1
- package/dist/core/backing-ssh.js.map +1 -1
- package/dist/core/host-files.d.ts.map +1 -1
- package/dist/core/host-files.js +1 -1
- package/dist/core/host-files.js.map +1 -1
- package/dist/core/inputs.d.ts.map +1 -1
- package/dist/core/inputs.js +2 -1
- package/dist/core/inputs.js.map +1 -1
- package/dist/core/instance-binding.d.ts +2 -2
- package/dist/core/instance-binding.d.ts.map +1 -1
- package/dist/core/instance-binding.js +1 -2
- package/dist/core/instance-binding.js.map +1 -1
- package/dist/core/list-stamped.d.ts +13 -3
- package/dist/core/list-stamped.d.ts.map +1 -1
- package/dist/core/list-stamped.js +46 -15
- package/dist/core/list-stamped.js.map +1 -1
- package/dist/core/ssh-probe.d.ts +1 -1
- package/dist/core/ssh-probe.d.ts.map +1 -1
- package/dist/core/ssh-probe.js +1 -2
- package/dist/core/ssh-probe.js.map +1 -1
- package/dist/core/ssh.d.ts +1 -2
- package/dist/core/ssh.d.ts.map +1 -1
- package/dist/core/ssh.js +1 -2
- package/dist/core/ssh.js.map +1 -1
- package/dist/core/stamp.d.ts +23 -0
- package/dist/core/stamp.d.ts.map +1 -0
- package/dist/core/stamp.js +34 -0
- package/dist/core/stamp.js.map +1 -0
- package/dist/forgejo/ci.d.ts +1 -1
- package/dist/forgejo/ci.d.ts.map +1 -1
- package/dist/forgejo/ci.js +1 -3
- package/dist/forgejo/ci.js.map +1 -1
- package/dist/forgejo/forgejo-notify.d.ts +1 -1
- package/dist/forgejo/forgejo-notify.d.ts.map +1 -1
- package/dist/forgejo/forgejo-notify.js +1 -3
- package/dist/forgejo/forgejo-notify.js.map +1 -1
- package/dist/forgejo/forgejo-org.d.ts +1 -1
- package/dist/forgejo/forgejo-org.d.ts.map +1 -1
- package/dist/forgejo/forgejo-org.js +1 -3
- package/dist/forgejo/forgejo-org.js.map +1 -1
- package/dist/forgejo/forgejo-runner.d.ts +1 -1
- package/dist/forgejo/forgejo-runner.d.ts.map +1 -1
- package/dist/forgejo/forgejo-runner.js +4 -4
- package/dist/forgejo/forgejo-runner.js.map +1 -1
- package/dist/forgejo/forgejo-team.d.ts +1 -1
- package/dist/forgejo/forgejo-team.d.ts.map +1 -1
- package/dist/forgejo/forgejo-team.js +1 -3
- package/dist/forgejo/forgejo-team.js.map +1 -1
- package/dist/forgejo/forgejo-user.d.ts +1 -1
- package/dist/forgejo/forgejo-user.d.ts.map +1 -1
- package/dist/forgejo/forgejo-user.js +1 -3
- package/dist/forgejo/forgejo-user.js.map +1 -1
- package/dist/forgejo/forgejo.d.ts +1 -1
- package/dist/forgejo/forgejo.d.ts.map +1 -1
- package/dist/forgejo/forgejo.js +4 -4
- package/dist/forgejo/forgejo.js.map +1 -1
- package/dist/forgejo/repo.d.ts +1 -1
- package/dist/forgejo/repo.d.ts.map +1 -1
- package/dist/forgejo/repo.js +1 -3
- package/dist/forgejo/repo.js.map +1 -1
- package/dist/host/host.d.ts +1 -1
- package/dist/host/host.d.ts.map +1 -1
- package/dist/host/host.js +1 -2
- package/dist/host/host.js.map +1 -1
- package/dist/host/workspace.d.ts +1 -1
- package/dist/host/workspace.d.ts.map +1 -1
- package/dist/host/workspace.js +5 -4
- package/dist/host/workspace.js.map +1 -1
- package/dist/index.d.ts +4 -3
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +4 -3
- package/dist/index.js.map +1 -1
- package/dist/komodo/deployment.d.ts +1 -1
- package/dist/komodo/deployment.d.ts.map +1 -1
- package/dist/komodo/deployment.js +1 -3
- package/dist/komodo/deployment.js.map +1 -1
- package/dist/komodo/komodo-notify.d.ts +1 -1
- package/dist/komodo/komodo-notify.d.ts.map +1 -1
- package/dist/komodo/komodo-notify.js +1 -3
- package/dist/komodo/komodo-notify.js.map +1 -1
- package/dist/komodo/komodo-periphery.d.ts +1 -1
- package/dist/komodo/komodo-periphery.d.ts.map +1 -1
- package/dist/komodo/komodo-periphery.js +1 -2
- package/dist/komodo/komodo-periphery.js.map +1 -1
- package/dist/komodo/komodo-server.d.ts +1 -1
- package/dist/komodo/komodo-server.d.ts.map +1 -1
- package/dist/komodo/komodo-server.js +1 -3
- package/dist/komodo/komodo-server.js.map +1 -1
- package/dist/komodo/komodo-user.d.ts +1 -1
- package/dist/komodo/komodo-user.d.ts.map +1 -1
- package/dist/komodo/komodo-user.js +1 -3
- package/dist/komodo/komodo-user.js.map +1 -1
- package/dist/komodo/komodo.d.ts +2 -2
- package/dist/komodo/komodo.d.ts.map +1 -1
- package/dist/komodo/komodo.js +42 -160
- package/dist/komodo/komodo.js.map +1 -1
- package/dist/network/cf-route.d.ts +7 -0
- package/dist/network/cf-route.d.ts.map +1 -1
- package/dist/network/cf-route.js +40 -14
- package/dist/network/cf-route.js.map +1 -1
- package/dist/network/cloudflare-api.d.ts +1 -0
- package/dist/network/cloudflare-api.d.ts.map +1 -1
- package/dist/network/cloudflare-api.js +10 -57
- package/dist/network/cloudflare-api.js.map +1 -1
- package/dist/network/tunnel.d.ts +8 -1
- package/dist/network/tunnel.d.ts.map +1 -1
- package/dist/network/tunnel.js +4 -5
- package/dist/network/tunnel.js.map +1 -1
- package/dist/observability/signoz.d.ts +2 -2
- package/dist/observability/signoz.d.ts.map +1 -1
- package/dist/observability/signoz.js +6 -6
- package/dist/observability/signoz.js.map +1 -1
- package/dist/providers.d.ts +2 -2
- package/dist/providers.d.ts.map +1 -1
- package/dist/providers.js +2 -3
- package/dist/providers.js.map +1 -1
- package/dist/services/compose-service.d.ts +11 -1
- package/dist/services/compose-service.d.ts.map +1 -1
- package/dist/services/compose-service.js +59 -23
- package/dist/services/compose-service.js.map +1 -1
- package/dist/services/infisical.d.ts +1 -1
- package/dist/services/infisical.d.ts.map +1 -1
- package/dist/services/infisical.js +5 -5
- package/dist/services/infisical.js.map +1 -1
- package/dist/services/invoiceninja.d.ts +1 -1
- package/dist/services/invoiceninja.d.ts.map +1 -1
- package/dist/services/invoiceninja.js +5 -5
- package/dist/services/invoiceninja.js.map +1 -1
- package/dist/services/openproject.d.ts +1 -1
- package/dist/services/openproject.d.ts.map +1 -1
- package/dist/services/openproject.js +5 -5
- package/dist/services/openproject.js.map +1 -1
- package/dist/services/outline.d.ts +1 -1
- package/dist/services/outline.d.ts.map +1 -1
- package/dist/services/outline.js +5 -5
- package/dist/services/outline.js.map +1 -1
- package/dist/services/paperless.d.ts +1 -1
- package/dist/services/paperless.d.ts.map +1 -1
- package/dist/services/paperless.js +5 -5
- package/dist/services/paperless.js.map +1 -1
- package/package.json +8 -8
package/dist/network/tunnel.js
CHANGED
|
@@ -1,8 +1,7 @@
|
|
|
1
1
|
import { pollUntil } from "@intentic/base/async";
|
|
2
2
|
import { z } from "zod";
|
|
3
3
|
import { hasPendingRef, parseInputs, sshSchema, sshTarget } from "../core/inputs.js";
|
|
4
|
-
import { connectWithRetry
|
|
5
|
-
import { cloudflareApi } from "./cloudflare-api.js";
|
|
4
|
+
import { connectWithRetry } from "../core/ssh.js";
|
|
6
5
|
const tunnelSchema = sshSchema.extend({
|
|
7
6
|
name: z.string(),
|
|
8
7
|
accountId: z.string(),
|
|
@@ -81,7 +80,8 @@ const runConnector = async (executor, parsed, tunnelId, token, log) => {
|
|
|
81
80
|
await session.dispose();
|
|
82
81
|
}
|
|
83
82
|
};
|
|
84
|
-
export const
|
|
83
|
+
export const findOrCreateTunnel = async (api, args) => (await api.findTunnel(args)) ?? (await api.createTunnel(args));
|
|
84
|
+
export const createTunnelProvider = (api, executor) => ({
|
|
85
85
|
read: async (inputs, ctx) => {
|
|
86
86
|
if (hasPendingRef(inputs, "accountId")) {
|
|
87
87
|
return undefined;
|
|
@@ -116,8 +116,7 @@ export const createTunnelProvider = (api = cloudflareApi, executor = sshExecutor
|
|
|
116
116
|
},
|
|
117
117
|
apply: async (inputs, observed, ctx) => {
|
|
118
118
|
const parsed = parse(inputs);
|
|
119
|
-
const
|
|
120
|
-
const tunnel = existing ?? (await api.createTunnel({ accountId: parsed.accountId, apiToken: parsed.apiToken, name: parsed.name }));
|
|
119
|
+
const tunnel = await findOrCreateTunnel(api, { accountId: parsed.accountId, apiToken: parsed.apiToken, name: parsed.name });
|
|
121
120
|
await api.putTunnelIngress({
|
|
122
121
|
accountId: parsed.accountId,
|
|
123
122
|
apiToken: parsed.apiToken,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tunnel.js","sourceRoot":"","sources":["../../src/network/tunnel.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AAEjD,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AACxB,OAAO,EAAE,aAAa,EAAE,WAAW,EAAE,SAAS,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;AAErF,OAAO,EAAE,gBAAgB,EAAE,
|
|
1
|
+
{"version":3,"file":"tunnel.js","sourceRoot":"","sources":["../../src/network/tunnel.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
1
|
import type { Provider } from "@intentic/engine";
|
|
2
|
-
import {
|
|
3
|
-
export declare const createSignozProvider: (executor
|
|
2
|
+
import type { SshExecutor } from "../core/ssh.js";
|
|
3
|
+
export declare const createSignozProvider: (executor: SshExecutor) => Provider;
|
|
4
4
|
//# sourceMappingURL=signoz.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"signoz.d.ts","sourceRoot":"","sources":["../../src/observability/signoz.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAEjD,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"signoz.d.ts","sourceRoot":"","sources":["../../src/observability/signoz.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAEjD,OAAO,KAAK,EAAE,WAAW,EAAc,MAAM,gBAAgB,CAAC;AAqT9D,eAAO,MAAM,oBAAoB,aAAc,WAAW,KAAG,QA8BxD,CAAC"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { z } from "zod";
|
|
2
|
-
import {
|
|
2
|
+
import { stampLabels } from "../core/stamp.js";
|
|
3
3
|
import { createComposeServiceProvider, SERVICE_LOGGING, serviceSchema } from "../services/compose-service.js";
|
|
4
4
|
const signozSchema = serviceSchema.extend({
|
|
5
5
|
adminUser: z.string(),
|
|
@@ -14,7 +14,7 @@ const OTLP_GRPC_PORT = 4317;
|
|
|
14
14
|
const OTLP_HTTP_PORT = 4318;
|
|
15
15
|
const HISTOGRAM_QUANTILE_VERSION = "v0.0.1";
|
|
16
16
|
const internalUrl = (parsed) => `http://${parsed.internalIp}:${UI_PORT}`;
|
|
17
|
-
const composeYaml = (parsed,
|
|
17
|
+
const composeYaml = (parsed, stamp) => [
|
|
18
18
|
"services:",
|
|
19
19
|
" init-clickhouse:",
|
|
20
20
|
` image: ${parsed.clickhouseImage}`,
|
|
@@ -79,7 +79,7 @@ const composeYaml = (parsed, id, hash) => [
|
|
|
79
79
|
" - SIGNOZ_SQLSTORE_SQLITE_PATH=/var/lib/signoz/signoz.db",
|
|
80
80
|
" env_file: ./.env",
|
|
81
81
|
" volumes: [ sqlite:/var/lib/signoz/ ]",
|
|
82
|
-
|
|
82
|
+
stampLabels("signoz", stamp),
|
|
83
83
|
" otel-collector:",
|
|
84
84
|
` image: ${parsed.otelImage}`,
|
|
85
85
|
" restart: unless-stopped",
|
|
@@ -265,13 +265,13 @@ const seedAdmin = async (session, parsed, log) => {
|
|
|
265
265
|
log(`signoz: register returned ${result.stdout.trim() || "no status"} (admin likely already seeded)`);
|
|
266
266
|
}
|
|
267
267
|
};
|
|
268
|
-
export const createSignozProvider = (executor
|
|
268
|
+
export const createSignozProvider = (executor) => createComposeServiceProvider({
|
|
269
269
|
kind: "signoz",
|
|
270
270
|
schema: signozSchema,
|
|
271
271
|
port: UI_PORT,
|
|
272
272
|
healthPath: "/api/v1/health",
|
|
273
|
-
files: (parsed,
|
|
274
|
-
"compose.yaml": composeYaml(parsed,
|
|
273
|
+
files: (parsed, stamp) => ({
|
|
274
|
+
"compose.yaml": composeYaml(parsed, stamp),
|
|
275
275
|
"init-clickhouse.sh": initScript(),
|
|
276
276
|
"cluster.xml": clusterXml(),
|
|
277
277
|
"custom-function.xml": customFunctionXml(),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"signoz.js","sourceRoot":"","sources":["../../src/observability/signoz.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;
|
|
1
|
+
{"version":3,"file":"signoz.js","sourceRoot":"","sources":["../../src/observability/signoz.ts"],"names":[],"mappings":"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"}
|
package/dist/providers.d.ts
CHANGED
|
@@ -10,7 +10,7 @@ import type { KomodoApi } from "./komodo/komodo-api.js";
|
|
|
10
10
|
import { type DnsPropagationWait } from "./network/cf-route.js";
|
|
11
11
|
import type { CloudflareApi } from "./network/cloudflare-api.js";
|
|
12
12
|
export interface ProviderDeps {
|
|
13
|
-
readonly ssh
|
|
13
|
+
readonly ssh: SshExecutor;
|
|
14
14
|
readonly cloudflare?: CloudflareApi;
|
|
15
15
|
readonly forgejo?: ForgejoApi;
|
|
16
16
|
readonly komodo?: KomodoApi;
|
|
@@ -21,5 +21,5 @@ export interface ProviderDeps {
|
|
|
21
21
|
readonly authentik?: AuthentikApi;
|
|
22
22
|
readonly dnsPropagation?: DnsPropagationWait;
|
|
23
23
|
}
|
|
24
|
-
export declare const createProviders: (deps
|
|
24
|
+
export declare const createProviders: (deps: ProviderDeps) => Providers;
|
|
25
25
|
//# sourceMappingURL=providers.d.ts.map
|
package/dist/providers.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"providers.d.ts","sourceRoot":"","sources":["../src/providers.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAElD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AAI5D,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;
|
|
1
|
+
{"version":3,"file":"providers.d.ts","sourceRoot":"","sources":["../src/providers.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAElD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AAI5D,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AASjD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,0BAA0B,CAAC;AAW3D,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAC;AAKxD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAC;AAKxD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAGhE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,8BAA8B,CAAC;AAI9D,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAC;AAMxD,OAAO,EAAyB,KAAK,kBAAkB,EAAE,MAAM,uBAAuB,CAAC;AAEvF,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,6BAA6B,CAAC;AAajE,MAAM,WAAW,YAAY;IAEzB,QAAQ,CAAC,GAAG,EAAE,WAAW,CAAC;IAC1B,QAAQ,CAAC,UAAU,CAAC,EAAE,aAAa,CAAC;IACpC,QAAQ,CAAC,OAAO,CAAC,EAAE,UAAU,CAAC;IAC9B,QAAQ,CAAC,MAAM,CAAC,EAAE,SAAS,CAAC;IAC5B,QAAQ,CAAC,MAAM,CAAC,EAAE,SAAS,CAAC;IAC5B,QAAQ,CAAC,MAAM,CAAC,EAAE,SAAS,CAAC;IAC5B,QAAQ,CAAC,OAAO,CAAC,EAAE,UAAU,CAAC;IAC9B,QAAQ,CAAC,MAAM,CAAC,EAAE,SAAS,CAAC;IAC5B,QAAQ,CAAC,SAAS,CAAC,EAAE,YAAY,CAAC;IAGlC,QAAQ,CAAC,cAAc,CAAC,EAAE,kBAAkB,CAAC;CAChD;AAID,eAAO,MAAM,eAAe,SAAU,YAAY,KAAG,SAqDpD,CAAC"}
|
package/dist/providers.js
CHANGED
|
@@ -2,7 +2,6 @@ import { createAuthentikProvider } from "./auth/authentik.js";
|
|
|
2
2
|
import { authentikApi } from "./auth/authentik-api.js";
|
|
3
3
|
import { createAuthentikClientProvider } from "./auth/authentik-client.js";
|
|
4
4
|
import { createBackupProvider } from "./backup/backup.js";
|
|
5
|
-
import { sshExecutor } from "./core/ssh.js";
|
|
6
5
|
import { createGarageProvider } from "./backings/garage.js";
|
|
7
6
|
import { createGarageBucketProvider } from "./backings/garage-bucket.js";
|
|
8
7
|
import { createPostgresProvider } from "./backings/postgres.js";
|
|
@@ -49,8 +48,8 @@ import { createInvoiceninjaProvider } from "./services/invoiceninja.js";
|
|
|
49
48
|
import { createOpenprojectProvider } from "./services/openproject.js";
|
|
50
49
|
import { createOutlineProvider } from "./services/outline.js";
|
|
51
50
|
import { createPaperlessProvider } from "./services/paperless.js";
|
|
52
|
-
export const createProviders = (deps
|
|
53
|
-
const ssh = deps.ssh
|
|
51
|
+
export const createProviders = (deps) => {
|
|
52
|
+
const ssh = deps.ssh;
|
|
54
53
|
const cloudflare = deps.cloudflare ?? cloudflareApi;
|
|
55
54
|
const forgejo = deps.forgejo ?? forgejoApi;
|
|
56
55
|
const komodo = deps.komodo ?? komodoApi;
|
package/dist/providers.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"providers.js","sourceRoot":"","sources":["../src/providers.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,uBAAuB,EAAE,MAAM,qBAAqB,CAAC;AAE9D,OAAO,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AACvD,OAAO,EAAE,6BAA6B,EAAE,MAAM,4BAA4B,CAAC;AAC3E,OAAO,EAAE,oBAAoB,EAAE,MAAM,oBAAoB,CAAC;AAE1D,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"providers.js","sourceRoot":"","sources":["../src/providers.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,uBAAuB,EAAE,MAAM,qBAAqB,CAAC;AAE9D,OAAO,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AACvD,OAAO,EAAE,6BAA6B,EAAE,MAAM,4BAA4B,CAAC;AAC3E,OAAO,EAAE,oBAAoB,EAAE,MAAM,oBAAoB,CAAC;AAE1D,OAAO,EAAE,oBAAoB,EAAE,MAAM,sBAAsB,CAAC;AAC5D,OAAO,EAAE,0BAA0B,EAAE,MAAM,6BAA6B,CAAC;AACzE,OAAO,EAAE,sBAAsB,EAAE,MAAM,wBAAwB,CAAC;AAChE,OAAO,EAAE,8BAA8B,EAAE,MAAM,iCAAiC,CAAC;AACjF,OAAO,EAAE,oBAAoB,EAAE,MAAM,sBAAsB,CAAC;AAC5D,OAAO,EAAE,6BAA6B,EAAE,MAAM,gCAAgC,CAAC;AAC/E,OAAO,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAC;AACnD,OAAO,EAAE,qBAAqB,EAAE,MAAM,sBAAsB,CAAC;AAE7D,OAAO,EAAE,UAAU,EAAE,MAAM,0BAA0B,CAAC;AACtD,OAAO,EAAE,2BAA2B,EAAE,MAAM,6BAA6B,CAAC;AAC1E,OAAO,EAAE,wBAAwB,EAAE,MAAM,0BAA0B,CAAC;AACpE,OAAO,EAAE,2BAA2B,EAAE,MAAM,6BAA6B,CAAC;AAC1E,OAAO,EAAE,yBAAyB,EAAE,MAAM,2BAA2B,CAAC;AACtE,OAAO,EAAE,yBAAyB,EAAE,MAAM,2BAA2B,CAAC;AACtE,OAAO,EAAE,kBAAkB,EAAE,MAAM,mBAAmB,CAAC;AACvD,OAAO,EAAE,kBAAkB,EAAE,MAAM,mBAAmB,CAAC;AACvD,OAAO,EAAE,oBAAoB,EAAE,MAAM,qBAAqB,CAAC;AAC3D,OAAO,EAAE,oBAAoB,EAAE,MAAM,oBAAoB,CAAC;AAE1D,OAAO,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAC;AACnD,OAAO,EAAE,kBAAkB,EAAE,MAAM,mBAAmB,CAAC;AACvD,OAAO,EAAE,oBAAoB,EAAE,MAAM,qBAAqB,CAAC;AAC3D,OAAO,EAAE,oBAAoB,EAAE,MAAM,oBAAoB,CAAC;AAE1D,OAAO,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAC;AACnD,OAAO,EAAE,kBAAkB,EAAE,MAAM,gBAAgB,CAAC;AACpD,OAAO,EAAE,uBAAuB,EAAE,MAAM,qBAAqB,CAAC;AAC9D,OAAO,EAAE,qBAAqB,EAAE,MAAM,2BAA2B,CAAC;AAElE,OAAO,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAC3D,OAAO,EAAE,oBAAoB,EAAE,MAAM,0BAA0B,CAAC;AAEhE,OAAO,EAAE,SAAS,EAAE,MAAM,8BAA8B,CAAC;AACzD,OAAO,EAAE,wBAAwB,EAAE,MAAM,wBAAwB,CAAC;AAClE,OAAO,EAAE,oBAAoB,EAAE,MAAM,oBAAoB,CAAC;AAE1D,OAAO,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAC;AACnD,OAAO,EAAE,0BAA0B,EAAE,MAAM,2BAA2B,CAAC;AACvE,OAAO,EAAE,6BAA6B,EAAE,MAAM,8BAA8B,CAAC;AAC7E,OAAO,EAAE,0BAA0B,EAAE,MAAM,2BAA2B,CAAC;AACvE,OAAO,EAAE,wBAAwB,EAAE,MAAM,yBAAyB,CAAC;AACnE,OAAO,EAAE,qBAAqB,EAA2B,MAAM,uBAAuB,CAAC;AACvF,OAAO,EAAE,wBAAwB,EAAE,MAAM,yBAAyB,CAAC;AAEnE,OAAO,EAAE,aAAa,EAAE,MAAM,6BAA6B,CAAC;AAC5D,OAAO,EAAE,oBAAoB,EAAE,MAAM,qBAAqB,CAAC;AAC3D,OAAO,EAAE,oBAAoB,EAAE,MAAM,2BAA2B,CAAC;AACjE,OAAO,EAAE,uBAAuB,EAAE,MAAM,yBAAyB,CAAC;AAClE,OAAO,EAAE,0BAA0B,EAAE,MAAM,4BAA4B,CAAC;AACxE,OAAO,EAAE,yBAAyB,EAAE,MAAM,2BAA2B,CAAC;AACtE,OAAO,EAAE,qBAAqB,EAAE,MAAM,uBAAuB,CAAC;AAC9D,OAAO,EAAE,uBAAuB,EAAE,MAAM,yBAAyB,CAAC;AAuBlE,MAAM,CAAC,MAAM,eAAe,GAAG,CAAC,IAAkB,EAAa,EAAE;IAC7D,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,CAAC;IACrB,MAAM,UAAU,GAAG,IAAI,CAAC,UAAU,IAAI,aAAa,CAAC;IACpD,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,IAAI,UAAU,CAAC;IAC3C,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,IAAI,SAAS,CAAC;IACxC,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,IAAI,SAAS,CAAC;IACxC,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,IAAI,SAAS,CAAC;IACxC,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,IAAI,UAAU,CAAC;IAC3C,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,IAAI,SAAS,CAAC;IACxC,OAAO;QACH,IAAI,EAAE,kBAAkB,CAAC,GAAG,CAAC;QAC7B,UAAU,EAAE,wBAAwB,CAAC,UAAU,CAAC;QAChD,UAAU,EAAE,qBAAqB,CAAC,UAAU,EAAE,IAAI,CAAC,cAAc,CAAC;QAClE,MAAM,EAAE,oBAAoB,CAAC,UAAU,EAAE,GAAG,CAAC;QAC7C,OAAO,EAAE,qBAAqB,CAAC,GAAG,CAAC;QACnC,cAAc,EAAE,yBAAyB,CAAC,OAAO,EAAE,GAAG,CAAC;QACvD,aAAa,EAAE,wBAAwB,CAAC,OAAO,EAAE,GAAG,CAAC;QACrD,cAAc,EAAE,yBAAyB,CAAC,OAAO,EAAE,GAAG,CAAC;QACvD,gBAAgB,EAAE,2BAA2B,CAAC,GAAG,CAAC;QAClD,MAAM,EAAE,oBAAoB,CAAC,GAAG,CAAC;QACjC,kBAAkB,EAAE,6BAA6B,CAAC,GAAG,CAAC;QACtD,eAAe,EAAE,0BAA0B,CAAC,MAAM,EAAE,GAAG,CAAC;QACxD,aAAa,EAAE,wBAAwB,CAAC,MAAM,EAAE,GAAG,CAAC;QACpD,IAAI,EAAE,kBAAkB,CAAC,OAAO,EAAE,GAAG,CAAC;QACtC,EAAE,EAAE,gBAAgB,CAAC,OAAO,EAAE,GAAG,CAAC;QAClC,UAAU,EAAE,wBAAwB,CAAC,MAAM,EAAE,GAAG,CAAC;QACjD,gBAAgB,EAAE,2BAA2B,CAAC,OAAO,EAAE,GAAG,CAAC;QAC3D,eAAe,EAAE,0BAA0B,CAAC,MAAM,EAAE,GAAG,CAAC;QACxD,MAAM,EAAE,oBAAoB,CAAC,GAAG,CAAC;QACjC,OAAO,EAAE,qBAAqB,CAAC,GAAG,CAAC;QACnC,SAAS,EAAE,uBAAuB,CAAC,GAAG,CAAC;QACvC,WAAW,EAAE,yBAAyB,CAAC,GAAG,CAAC;QAC3C,YAAY,EAAE,0BAA0B,CAAC,GAAG,CAAC;QAC7C,SAAS,EAAE,uBAAuB,CAAC,GAAG,CAAC;QACvC,MAAM,EAAE,oBAAoB,CAAC,GAAG,CAAC;QACjC,QAAQ,EAAE,sBAAsB,CAAC,GAAG,CAAC;QACrC,mBAAmB,EAAE,8BAA8B,CAAC,GAAG,CAAC;QACxD,MAAM,EAAE,oBAAoB,CAAC,GAAG,CAAC;QACjC,kBAAkB,EAAE,6BAA6B,CAAC,GAAG,CAAC;QACtD,SAAS,EAAE,uBAAuB,CAAC,GAAG,CAAC;QACvC,kBAAkB,EAAE,6BAA6B,CAAC,IAAI,CAAC,SAAS,IAAI,YAAY,CAAC;QACjF,MAAM,EAAE,oBAAoB,CAAC,GAAG,CAAC;QACjC,eAAe,EAAE,0BAA0B,CAAC,GAAG,CAAC;QAChD,MAAM,EAAE,oBAAoB,CAAC,MAAM,CAAC;QACpC,SAAS,EAAE,oBAAoB,CAAC,MAAM,CAAC;QACvC,OAAO,EAAE,kBAAkB,CAAC,MAAM,CAAC;QACnC,MAAM,EAAE,oBAAoB,CAAC,MAAM,CAAC;QACpC,SAAS,EAAE,oBAAoB,CAAC,MAAM,CAAC;QACvC,OAAO,EAAE,kBAAkB,CAAC,MAAM,CAAC;QACnC,OAAO,EAAE,qBAAqB,CAAC,OAAO,CAAC;QACvC,MAAM,EAAE,oBAAoB,CAAC,MAAM,CAAC;QACpC,SAAS,EAAE,uBAAuB,CAAC,GAAG,CAAC;KAC1C,CAAC;AACN,CAAC,CAAC"}
|
|
@@ -2,6 +2,7 @@ import type { Provider } from "@intentic/engine";
|
|
|
2
2
|
import { z } from "zod";
|
|
3
3
|
import { type EnvEntry, type HostFile } from "../core/host-files.js";
|
|
4
4
|
import type { SshSession, SshExecutor } from "../core/ssh.js";
|
|
5
|
+
import { type ContainerStamp } from "../core/stamp.js";
|
|
5
6
|
export declare const serviceSchema: z.ZodObject<{
|
|
6
7
|
address: z.ZodString;
|
|
7
8
|
user: z.ZodString;
|
|
@@ -14,17 +15,26 @@ export declare const serviceSchema: z.ZodObject<{
|
|
|
14
15
|
internalIp: z.ZodString;
|
|
15
16
|
domain: z.ZodString;
|
|
16
17
|
}, z.core.$strip>;
|
|
18
|
+
export interface ComposeServiceGuard {
|
|
19
|
+
readonly repo: string;
|
|
20
|
+
readonly resticImage: string;
|
|
21
|
+
readonly volumes: readonly string[];
|
|
22
|
+
readonly tag?: string;
|
|
23
|
+
}
|
|
17
24
|
export interface ComposeServiceSpec<S extends z.ZodType> {
|
|
18
25
|
readonly kind: string;
|
|
19
26
|
readonly schema: S;
|
|
20
27
|
readonly port: number;
|
|
21
28
|
readonly healthPath: string;
|
|
22
29
|
readonly readyTimeoutMs?: number;
|
|
23
|
-
readonly files: (parsed: z.infer<S>,
|
|
30
|
+
readonly files: (parsed: z.infer<S>, stamp: ContainerStamp, images: Record<string, string>) => Record<string, string | HostFile>;
|
|
24
31
|
readonly env?: (parsed: z.infer<S>) => readonly EnvEntry[];
|
|
25
32
|
readonly extraOutputs?: (parsed: z.infer<S>) => Record<string, unknown>;
|
|
26
33
|
readonly images: (parsed: z.infer<S>) => Record<string, string>;
|
|
27
34
|
readonly seed?: (session: SshSession, parsed: z.infer<S>, log: (message: string) => void) => Promise<void>;
|
|
35
|
+
readonly pendingRefs?: readonly string[];
|
|
36
|
+
readonly adoptsOwner?: boolean;
|
|
37
|
+
readonly guard?: (parsed: z.infer<S>) => ComposeServiceGuard | undefined;
|
|
28
38
|
}
|
|
29
39
|
export declare const SERVICE_LOGGING = " logging: { driver: json-file, options: { max-size: 10m, max-file: \"3\" } }";
|
|
30
40
|
export declare const createComposeServiceProvider: <S extends typeof serviceSchema>(spec: ComposeServiceSpec<S>, executor: SshExecutor) => Provider;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"compose-service.d.ts","sourceRoot":"","sources":["../../src/services/compose-service.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,QAAQ,EAAkB,MAAM,kBAAkB,CAAC;
|
|
1
|
+
{"version":3,"file":"compose-service.d.ts","sourceRoot":"","sources":["../../src/services/compose-service.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,QAAQ,EAAkB,MAAM,kBAAkB,CAAC;AACjE,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAIxB,OAAO,EAAE,KAAK,QAAQ,EAAE,KAAK,QAAQ,EAAgC,MAAM,uBAAuB,CAAC;AAGnG,OAAO,KAAK,EAAE,UAAU,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAC9D,OAAO,EAAE,KAAK,cAAc,EAA4C,MAAM,kBAAkB,CAAC;AAIjG,eAAO,MAAM,aAAa;;;;;;;;;;;iBAGxB,CAAC;AAKH,MAAM,WAAW,mBAAmB;IAChC,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAC;IAE7B,QAAQ,CAAC,OAAO,EAAE,SAAS,MAAM,EAAE,CAAC;IAEpC,QAAQ,CAAC,GAAG,CAAC,EAAE,MAAM,CAAC;CACzB;AAID,MAAM,WAAW,kBAAkB,CAAC,CAAC,SAAS,CAAC,CAAC,OAAO;IAEnD,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,MAAM,EAAE,CAAC,CAAC;IAEnB,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IAEtB,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC;IAC5B,QAAQ,CAAC,cAAc,CAAC,EAAE,MAAM,CAAC;IAGjC,QAAQ,CAAC,KAAK,EAAE,CAAC,MAAM,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,cAAc,EAAE,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,KAAK,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,QAAQ,CAAC,CAAC;IACjI,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,SAAS,QAAQ,EAAE,CAAC;IAE3D,QAAQ,CAAC,YAAY,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAExE,QAAQ,CAAC,MAAM,EAAE,CAAC,MAAM,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAEhE,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC,OAAO,EAAE,UAAU,EAAE,MAAM,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,GAAG,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,IAAI,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IAE3G,QAAQ,CAAC,WAAW,CAAC,EAAE,SAAS,MAAM,EAAE,CAAC;IAGzC,QAAQ,CAAC,WAAW,CAAC,EAAE,OAAO,CAAC;IAC/B,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,mBAAmB,GAAG,SAAS,CAAC;CAC5E;AAQD,eAAO,MAAM,eAAe,oFAAkF,CAAC;AAO/G,eAAO,MAAM,4BAA4B,GAAI,CAAC,SAAS,OAAO,aAAa,QAAQ,kBAAkB,CAAC,CAAC,CAAC,YAAY,WAAW,KAAG,QAyKjI,CAAC"}
|
|
@@ -1,15 +1,18 @@
|
|
|
1
1
|
import { HOST_STATE_ROOT } from "@intentic/constants";
|
|
2
2
|
import { pollUntil } from "@intentic/base/async";
|
|
3
|
-
import { HASH_KEY } from "@intentic/graph";
|
|
4
3
|
import { z } from "zod";
|
|
4
|
+
import { HASH_KEY } from "@intentic/graph";
|
|
5
5
|
import { containerLabel } from "../core/backing-ssh.js";
|
|
6
|
+
import { guardedUpdate } from "../core/guarded-update.js";
|
|
6
7
|
import { writeEnvOnce, writeHostFiles } from "../core/host-files.js";
|
|
7
8
|
import { hasPendingRef, parseInputs, sshSchema, sshTarget } from "../core/inputs.js";
|
|
8
9
|
import { listStampedContainers } from "../core/list-stamped.js";
|
|
10
|
+
import { containerStampOf, observedStamp, stampOf } from "../core/stamp.js";
|
|
9
11
|
export const serviceSchema = sshSchema.extend({
|
|
10
12
|
internalIp: z.string(),
|
|
11
13
|
domain: z.string(),
|
|
12
14
|
});
|
|
15
|
+
const isImageMap = (value) => typeof value === "object" && value !== null && Object.values(value).every((image) => typeof image === "string");
|
|
13
16
|
const READY_INTERVAL_MS = 4_000;
|
|
14
17
|
export const SERVICE_LOGGING = ` logging: { driver: json-file, options: { max-size: 10m, max-file: "3" } }`;
|
|
15
18
|
const running = async (session, id) => {
|
|
@@ -48,13 +51,20 @@ export const createComposeServiceProvider = (spec, executor) => {
|
|
|
48
51
|
throw new Error(`${spec.kind} did not become healthy within ${readyTimeoutMs}ms`);
|
|
49
52
|
}
|
|
50
53
|
};
|
|
51
|
-
const ensureFiles = async (session, parsed,
|
|
52
|
-
await writeHostFiles(session, spec.kind, stateDir, spec.files(parsed,
|
|
54
|
+
const ensureFiles = async (session, parsed, stamp, images) => {
|
|
55
|
+
await writeHostFiles(session, spec.kind, stateDir, spec.files(parsed, stamp, images));
|
|
53
56
|
await writeEnvOnce(session, spec.kind, stateDir, spec.env?.(parsed) ?? []);
|
|
54
57
|
};
|
|
58
|
+
const observedOwner = async (session, id) => {
|
|
59
|
+
if (spec.adoptsOwner === false) {
|
|
60
|
+
const stampHash = await containerLabel(session, id, HASH_KEY);
|
|
61
|
+
return stampHash === "" ? {} : { stampHash };
|
|
62
|
+
}
|
|
63
|
+
return observedStamp(await containerStampOf(session, id));
|
|
64
|
+
};
|
|
55
65
|
return {
|
|
56
66
|
read: async (inputs, ctx) => {
|
|
57
|
-
if (hasPendingRef(inputs, "internalIp")) {
|
|
67
|
+
if (hasPendingRef(inputs, ...(spec.pendingRefs ?? ["internalIp"]))) {
|
|
58
68
|
return undefined;
|
|
59
69
|
}
|
|
60
70
|
const parsed = parse(inputs);
|
|
@@ -70,8 +80,11 @@ export const createComposeServiceProvider = (spec, executor) => {
|
|
|
70
80
|
if (!(await running(session, ctx.id)) || !(await healthy(session, parsed))) {
|
|
71
81
|
return undefined;
|
|
72
82
|
}
|
|
73
|
-
|
|
74
|
-
|
|
83
|
+
return {
|
|
84
|
+
outputs: outputsFor(parsed),
|
|
85
|
+
detail: { images: await runningImages(session) },
|
|
86
|
+
...(await observedOwner(session, ctx.id)),
|
|
87
|
+
};
|
|
75
88
|
}
|
|
76
89
|
finally {
|
|
77
90
|
await session.dispose();
|
|
@@ -90,29 +103,52 @@ export const createComposeServiceProvider = (spec, executor) => {
|
|
|
90
103
|
}
|
|
91
104
|
return { action: "noop" };
|
|
92
105
|
},
|
|
93
|
-
apply: async (inputs,
|
|
106
|
+
apply: async (inputs, observed, ctx) => {
|
|
94
107
|
const parsed = parse(inputs);
|
|
95
108
|
const session = await executor.connect(sshTarget(parsed));
|
|
96
109
|
try {
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
pending
|
|
101
|
-
const
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
110
|
+
const stamp = stampOf(ctx);
|
|
111
|
+
const bringUp = async (images) => {
|
|
112
|
+
await ensureFiles(session, parsed, stamp, images);
|
|
113
|
+
let pending = "";
|
|
114
|
+
const streamLines = (chunk) => {
|
|
115
|
+
pending += chunk;
|
|
116
|
+
const lines = pending.split("\n");
|
|
117
|
+
pending = lines.pop() ?? "";
|
|
118
|
+
for (const text of lines) {
|
|
119
|
+
if (text.trim() !== "") {
|
|
120
|
+
ctx.log(`${spec.kind}: ${text}`);
|
|
121
|
+
}
|
|
106
122
|
}
|
|
123
|
+
};
|
|
124
|
+
const up = await session.exec(`docker compose -p ${spec.kind} --project-directory ${stateDir} -f ${stateDir}/compose.yaml up -d`, streamLines);
|
|
125
|
+
streamLines("\n");
|
|
126
|
+
if (up.code !== 0) {
|
|
127
|
+
throw new Error(`failed to bring up ${spec.kind} stack: exited ${up.code}: ${up.stderr.trim()}`);
|
|
107
128
|
}
|
|
129
|
+
ctx.log(`${spec.kind}: waiting for ${internalUrl(parsed)}${spec.healthPath} (up to ${readyTimeoutMs / 1000}s)`);
|
|
130
|
+
await waitHealthy(session, parsed);
|
|
108
131
|
};
|
|
109
|
-
const
|
|
110
|
-
|
|
111
|
-
if (
|
|
112
|
-
|
|
132
|
+
const guard = spec.guard?.(parsed);
|
|
133
|
+
const oldImages = observed?.detail?.["images"];
|
|
134
|
+
if (guard !== undefined && observed !== undefined && isImageMap(oldImages)) {
|
|
135
|
+
await guardedUpdate({
|
|
136
|
+
session,
|
|
137
|
+
repo: guard.repo,
|
|
138
|
+
resticImage: guard.resticImage,
|
|
139
|
+
volumes: guard.volumes,
|
|
140
|
+
tag: guard.tag ?? `intentic-preupdate-${ctx.id}`,
|
|
141
|
+
recreate: () => bringUp(spec.images(parsed)),
|
|
142
|
+
stop: async () => {
|
|
143
|
+
await session.exec(`ids=$(docker ps -aq -f label=com.docker.compose.project=${spec.kind}); [ -n "$ids" ] && docker rm -f $ids || true`);
|
|
144
|
+
},
|
|
145
|
+
rollback: () => bringUp(oldImages),
|
|
146
|
+
log: ctx.log,
|
|
147
|
+
});
|
|
148
|
+
}
|
|
149
|
+
else {
|
|
150
|
+
await bringUp(spec.images(parsed));
|
|
113
151
|
}
|
|
114
|
-
ctx.log(`${spec.kind}: waiting for ${internalUrl(parsed)}${spec.healthPath} (up to ${readyTimeoutMs / 1000}s)`);
|
|
115
|
-
await waitHealthy(session, parsed);
|
|
116
152
|
await spec.seed?.(session, parsed, ctx.log);
|
|
117
153
|
return outputsFor(parsed);
|
|
118
154
|
}
|
|
@@ -130,7 +166,7 @@ export const createComposeServiceProvider = (spec, executor) => {
|
|
|
130
166
|
await session.dispose();
|
|
131
167
|
}
|
|
132
168
|
},
|
|
133
|
-
list: (sources, ctx) => listStampedContainers(executor, spec.kind, sources, ctx
|
|
169
|
+
list: (sources, ctx) => listStampedContainers(executor, spec.kind, sources, ctx),
|
|
134
170
|
};
|
|
135
171
|
};
|
|
136
172
|
//# sourceMappingURL=compose-service.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"compose-service.js","sourceRoot":"","sources":["../../src/services/compose-service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AACtD,OAAO,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AAEjD,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"compose-service.js","sourceRoot":"","sources":["../../src/services/compose-service.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
1
|
import type { Provider } from "@intentic/engine";
|
|
2
2
|
import type { SshExecutor } from "../core/ssh.js";
|
|
3
|
-
export declare const createInfisicalProvider: (executor
|
|
3
|
+
export declare const createInfisicalProvider: (executor: SshExecutor) => Provider;
|
|
4
4
|
//# sourceMappingURL=infisical.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"infisical.d.ts","sourceRoot":"","sources":["../../src/services/infisical.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAEjD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AA6DlD,eAAO,MAAM,uBAAuB,
|
|
1
|
+
{"version":3,"file":"infisical.d.ts","sourceRoot":"","sources":["../../src/services/infisical.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAEjD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AA6DlD,eAAO,MAAM,uBAAuB,aAAc,WAAW,KAAG,QA2B3D,CAAC"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { randomBytes } from "node:crypto";
|
|
2
2
|
import { z } from "zod";
|
|
3
|
-
import {
|
|
3
|
+
import { stampLabels } from "../core/stamp.js";
|
|
4
4
|
import { createComposeServiceProvider, SERVICE_LOGGING, serviceSchema } from "./compose-service.js";
|
|
5
5
|
const infisicalSchema = serviceSchema.extend({
|
|
6
6
|
adminUser: z.string(),
|
|
@@ -10,7 +10,7 @@ const infisicalSchema = serviceSchema.extend({
|
|
|
10
10
|
valkeyImage: z.string(),
|
|
11
11
|
});
|
|
12
12
|
const PORT = 8084;
|
|
13
|
-
const composeYaml = (parsed,
|
|
13
|
+
const composeYaml = (parsed, stamp) => [
|
|
14
14
|
"services:",
|
|
15
15
|
" postgres:",
|
|
16
16
|
` image: ${parsed.postgresImage}`,
|
|
@@ -45,16 +45,16 @@ const composeYaml = (parsed, id, hash) => [
|
|
|
45
45
|
" - REDIS_URL=redis://redis:6379",
|
|
46
46
|
` - SITE_URL=https://${parsed.domain}`,
|
|
47
47
|
" - TELEMETRY_ENABLED=false",
|
|
48
|
-
|
|
48
|
+
stampLabels("infisical", stamp),
|
|
49
49
|
"volumes: { pgdata: {} }",
|
|
50
50
|
"",
|
|
51
51
|
].join("\n");
|
|
52
|
-
export const createInfisicalProvider = (executor
|
|
52
|
+
export const createInfisicalProvider = (executor) => createComposeServiceProvider({
|
|
53
53
|
kind: "infisical",
|
|
54
54
|
schema: infisicalSchema,
|
|
55
55
|
port: PORT,
|
|
56
56
|
healthPath: "/api/status",
|
|
57
|
-
files: (parsed,
|
|
57
|
+
files: (parsed, stamp) => ({ "compose.yaml": composeYaml(parsed, stamp) }),
|
|
58
58
|
env: () => [
|
|
59
59
|
{ key: "ENCRYPTION_KEY", value: randomBytes(16).toString("hex") },
|
|
60
60
|
{ key: "AUTH_SECRET", value: randomBytes(32).toString("base64") },
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"infisical.js","sourceRoot":"","sources":["../../src/services/infisical.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAE1C,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,OAAO,
|
|
1
|
+
{"version":3,"file":"infisical.js","sourceRoot":"","sources":["../../src/services/infisical.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAE1C,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,OAAO,EAAuB,WAAW,EAAE,MAAM,kBAAkB,CAAC;AACpE,OAAO,EAAE,4BAA4B,EAAE,eAAe,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AAEpG,MAAM,eAAe,GAAG,aAAa,CAAC,MAAM,CAAC;IAEzC,SAAS,EAAE,CAAC,CAAC,MAAM,EAAE;IACrB,aAAa,EAAE,CAAC,CAAC,MAAM,EAAE;IACzB,cAAc,EAAE,CAAC,CAAC,MAAM,EAAE;IAC1B,aAAa,EAAE,CAAC,CAAC,MAAM,EAAE;IACzB,WAAW,EAAE,CAAC,CAAC,MAAM,EAAE;CAC1B,CAAC,CAAC;AAIH,MAAM,IAAI,GAAG,IAAI,CAAC;AAIlB,MAAM,WAAW,GAAG,CAAC,MAAuB,EAAE,KAAqB,EAAU,EAAE,CAC3E;IACI,WAAW;IACX,aAAa;IACb,cAAc,MAAM,CAAC,aAAa,EAAE;IACpC,6BAA6B;IAC7B,eAAe;IACf,kBAAkB;IAClB,iCAAiC;IACjC,gDAAgD;IAChD,+BAA+B;IAC/B,6CAA6C;IAC7C,kBAAkB;IAClB,sDAAsD;IACtD,qBAAqB;IACrB,mBAAmB;IACnB,kBAAkB;IAClB,UAAU;IACV,cAAc,MAAM,CAAC,WAAW,EAAE;IAClC,6BAA6B;IAC7B,eAAe;IACf,cAAc;IACd,cAAc,MAAM,CAAC,cAAc,EAAE;IACrC,6BAA6B;IAC7B,eAAe;IACf,iBAAiB;IACjB,gDAAgD;IAChD,6CAA6C;IAC7C,iBAAiB,IAAI,UAAU;IAC/B,kBAAkB;IAClB,0CAA0C;IAC1C,oCAAoC;IACpC,6FAA6F;IAC7F,sCAAsC;IACtC,4BAA4B,MAAM,CAAC,MAAM,EAAE;IAC3C,iCAAiC;IACjC,WAAW,CAAC,WAAW,EAAE,KAAK,CAAC;IAC/B,yBAAyB;IACzB,EAAE;CACL,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;AAGjB,MAAM,CAAC,MAAM,uBAAuB,GAAG,CAAC,QAAqB,EAAY,EAAE,CACvE,4BAA4B,CACxB;IACI,IAAI,EAAE,WAAW;IACjB,MAAM,EAAE,eAAe;IACvB,IAAI,EAAE,IAAI;IACV,UAAU,EAAE,aAAa;IACzB,KAAK,EAAE,CAAC,MAAM,EAAE,KAAK,EAAE,EAAE,CAAC,CAAC,EAAE,cAAc,EAAE,WAAW,CAAC,MAAM,EAAE,KAAK,CAAC,EAAE,CAAC;IAC1E,GAAG,EAAE,GAAG,EAAE,CAAC;QAEP,EAAE,GAAG,EAAE,gBAAgB,EAAE,KAAK,EAAE,WAAW,CAAC,EAAE,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE;QACjE,EAAE,GAAG,EAAE,aAAa,EAAE,KAAK,EAAE,WAAW,CAAC,EAAE,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE;QACjE,EAAE,GAAG,EAAE,mBAAmB,EAAE;KAC/B;IACD,MAAM,EAAE,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC,EAAE,QAAQ,EAAE,MAAM,CAAC,aAAa,EAAE,KAAK,EAAE,MAAM,CAAC,WAAW,EAAE,SAAS,EAAE,MAAM,CAAC,cAAc,EAAE,CAAC;IAErH,IAAI,EAAE,KAAK,EAAE,OAAO,EAAE,MAAM,EAAE,GAAG,EAAE,EAAE;QACjC,MAAM,IAAI,GAAG,IAAI,CAAC,SAAS,CAAC,EAAE,KAAK,EAAE,MAAM,CAAC,SAAS,EAAE,QAAQ,EAAE,MAAM,CAAC,aAAa,EAAE,YAAY,EAAE,UAAU,EAAE,CAAC,CAAC;QACnH,MAAM,MAAM,GAAG,MAAM,OAAO,CAAC,IAAI,CAC7B,yDAAyD,MAAM,CAAC,UAAU,IAAI,IAAI,mEAAmE,IAAI,GAAG,CAC/J,CAAC;QACF,IAAI,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,KAAK,KAAK,EAAE,CAAC;YACjC,GAAG,CAAC,iCAAiC,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,IAAI,WAAW,wCAAwC,CAAC,CAAC;QACtH,CAAC;IACL,CAAC;CACJ,EACD,QAAQ,CACX,CAAC"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
1
|
import type { Provider } from "@intentic/engine";
|
|
2
2
|
import type { SshExecutor } from "../core/ssh.js";
|
|
3
|
-
export declare const createInvoiceninjaProvider: (executor
|
|
3
|
+
export declare const createInvoiceninjaProvider: (executor: SshExecutor) => Provider;
|
|
4
4
|
//# sourceMappingURL=invoiceninja.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"invoiceninja.d.ts","sourceRoot":"","sources":["../../src/services/invoiceninja.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAEjD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAyGlD,eAAO,MAAM,0BAA0B,
|
|
1
|
+
{"version":3,"file":"invoiceninja.d.ts","sourceRoot":"","sources":["../../src/services/invoiceninja.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAEjD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAyGlD,eAAO,MAAM,0BAA0B,aAAc,WAAW,KAAG,QA0B9D,CAAC"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { randomBytes } from "node:crypto";
|
|
2
2
|
import { z } from "zod";
|
|
3
|
-
import {
|
|
3
|
+
import { stampLabels } from "../core/stamp.js";
|
|
4
4
|
import { createComposeServiceProvider, SERVICE_LOGGING, serviceSchema } from "./compose-service.js";
|
|
5
5
|
const invoiceninjaSchema = serviceSchema.extend({
|
|
6
6
|
adminUser: z.string(),
|
|
@@ -10,7 +10,7 @@ const invoiceninjaSchema = serviceSchema.extend({
|
|
|
10
10
|
valkeyImage: z.string(),
|
|
11
11
|
});
|
|
12
12
|
const PORT = 8083;
|
|
13
|
-
const composeYaml = (parsed,
|
|
13
|
+
const composeYaml = (parsed, stamp) => [
|
|
14
14
|
"x-env: &env",
|
|
15
15
|
` APP_URL: https://${parsed.domain}`,
|
|
16
16
|
" APP_ENV: production",
|
|
@@ -64,7 +64,7 @@ const composeYaml = (parsed, id, hash) => [
|
|
|
64
64
|
" <<: *env",
|
|
65
65
|
" LARAVEL_ROLE: app",
|
|
66
66
|
" volumes: [ appstorage:/app/storage ]",
|
|
67
|
-
|
|
67
|
+
stampLabels("invoiceninja", stamp),
|
|
68
68
|
" worker:",
|
|
69
69
|
` image: ${parsed.invoiceninjaImage}`,
|
|
70
70
|
" restart: unless-stopped",
|
|
@@ -92,13 +92,13 @@ const composeYaml = (parsed, id, hash) => [
|
|
|
92
92
|
"volumes: { mariadbdata: {}, appstorage: {} }",
|
|
93
93
|
"",
|
|
94
94
|
].join("\n");
|
|
95
|
-
export const createInvoiceninjaProvider = (executor
|
|
95
|
+
export const createInvoiceninjaProvider = (executor) => createComposeServiceProvider({
|
|
96
96
|
kind: "invoiceninja",
|
|
97
97
|
schema: invoiceninjaSchema,
|
|
98
98
|
port: PORT,
|
|
99
99
|
healthPath: "/health",
|
|
100
100
|
readyTimeoutMs: 600_000,
|
|
101
|
-
files: (parsed,
|
|
101
|
+
files: (parsed, stamp) => ({ "compose.yaml": composeYaml(parsed, stamp) }),
|
|
102
102
|
env: (parsed) => [
|
|
103
103
|
{ key: "APP_KEY", value: `base64:${randomBytes(32).toString("base64")}` },
|
|
104
104
|
{ key: "DB_PASSWORD" },
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"invoiceninja.js","sourceRoot":"","sources":["../../src/services/invoiceninja.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAE1C,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,OAAO,
|
|
1
|
+
{"version":3,"file":"invoiceninja.js","sourceRoot":"","sources":["../../src/services/invoiceninja.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
1
|
import type { Provider } from "@intentic/engine";
|
|
2
2
|
import type { SshExecutor } from "../core/ssh.js";
|
|
3
|
-
export declare const createOpenprojectProvider: (executor
|
|
3
|
+
export declare const createOpenprojectProvider: (executor: SshExecutor) => Provider;
|
|
4
4
|
//# sourceMappingURL=openproject.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"openproject.d.ts","sourceRoot":"","sources":["../../src/services/openproject.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAEjD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AA8ClD,eAAO,MAAM,yBAAyB,
|
|
1
|
+
{"version":3,"file":"openproject.d.ts","sourceRoot":"","sources":["../../src/services/openproject.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAEjD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AA8ClD,eAAO,MAAM,yBAAyB,aAAc,WAAW,KAAG,QAa7D,CAAC"}
|