@intentic/providers 1.125.0 → 1.126.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.
Files changed (202) hide show
  1. package/dist/auth/authentik-api.d.ts.map +1 -1
  2. package/dist/auth/authentik-api.js +1 -0
  3. package/dist/auth/authentik-api.js.map +1 -1
  4. package/dist/auth/authentik.d.ts.map +1 -1
  5. package/dist/auth/authentik.js +22 -11
  6. package/dist/auth/authentik.js.map +1 -1
  7. package/dist/backings/garage-bucket.d.ts.map +1 -0
  8. package/dist/backings/garage-bucket.js.map +1 -0
  9. package/dist/backings/garage.d.ts.map +1 -0
  10. package/dist/{data → backings}/garage.js +21 -10
  11. package/dist/backings/garage.js.map +1 -0
  12. package/dist/backings/postgres-database.d.ts.map +1 -0
  13. package/dist/{data → backings}/postgres-database.js +4 -1
  14. package/dist/backings/postgres-database.js.map +1 -0
  15. package/dist/backings/postgres.d.ts.map +1 -0
  16. package/dist/{data → backings}/postgres.js +21 -10
  17. package/dist/backings/postgres.js.map +1 -0
  18. package/dist/backings/valkey-namespace.d.ts.map +1 -0
  19. package/dist/{data → backings}/valkey-namespace.js +4 -1
  20. package/dist/backings/valkey-namespace.js.map +1 -0
  21. package/dist/backings/valkey.d.ts.map +1 -0
  22. package/dist/{data → backings}/valkey.js +21 -10
  23. package/dist/backings/valkey.js.map +1 -0
  24. package/dist/backup/backup.d.ts.map +1 -1
  25. package/dist/backup/backup.js +6 -5
  26. package/dist/backup/backup.js.map +1 -1
  27. package/dist/core/backing-ssh.d.ts +1 -0
  28. package/dist/core/backing-ssh.d.ts.map +1 -1
  29. package/dist/core/backing-ssh.js +10 -1
  30. package/dist/core/backing-ssh.js.map +1 -1
  31. package/dist/core/inputs.d.ts +1 -0
  32. package/dist/core/inputs.d.ts.map +1 -1
  33. package/dist/core/inputs.js +1 -0
  34. package/dist/core/inputs.js.map +1 -1
  35. package/dist/core/list-stamped.d.ts +4 -0
  36. package/dist/core/list-stamped.d.ts.map +1 -0
  37. package/dist/core/list-stamped.js +54 -0
  38. package/dist/core/list-stamped.js.map +1 -0
  39. package/dist/core/over-ssh.d.ts +5 -0
  40. package/dist/core/over-ssh.d.ts.map +1 -0
  41. package/dist/core/over-ssh.js +20 -0
  42. package/dist/core/over-ssh.js.map +1 -0
  43. package/dist/core/response-detail.d.ts +2 -0
  44. package/dist/core/response-detail.d.ts.map +1 -0
  45. package/dist/core/response-detail.js +20 -0
  46. package/dist/core/response-detail.js.map +1 -0
  47. package/dist/core/ssh-diagnostics.d.ts +6 -0
  48. package/dist/core/ssh-diagnostics.d.ts.map +1 -0
  49. package/dist/core/ssh-diagnostics.js +46 -0
  50. package/dist/core/ssh-diagnostics.js.map +1 -0
  51. package/dist/core/ssh.d.ts +9 -0
  52. package/dist/core/ssh.d.ts.map +1 -1
  53. package/dist/core/ssh.js +102 -8
  54. package/dist/core/ssh.js.map +1 -1
  55. package/dist/forgejo/ci.d.ts +2 -1
  56. package/dist/forgejo/ci.d.ts.map +1 -1
  57. package/dist/forgejo/ci.js +57 -52
  58. package/dist/forgejo/ci.js.map +1 -1
  59. package/dist/forgejo/forgejo-api.d.ts.map +1 -1
  60. package/dist/forgejo/forgejo-api.js +3 -1
  61. package/dist/forgejo/forgejo-api.js.map +1 -1
  62. package/dist/forgejo/forgejo-notify.d.ts +2 -1
  63. package/dist/forgejo/forgejo-notify.d.ts.map +1 -1
  64. package/dist/forgejo/forgejo-notify.js +64 -59
  65. package/dist/forgejo/forgejo-notify.js.map +1 -1
  66. package/dist/forgejo/forgejo-org.d.ts +2 -1
  67. package/dist/forgejo/forgejo-org.d.ts.map +1 -1
  68. package/dist/forgejo/forgejo-org.js +18 -18
  69. package/dist/forgejo/forgejo-org.js.map +1 -1
  70. package/dist/forgejo/forgejo-runner.d.ts.map +1 -1
  71. package/dist/forgejo/forgejo-runner.js +15 -5
  72. package/dist/forgejo/forgejo-runner.js.map +1 -1
  73. package/dist/forgejo/forgejo-team.d.ts +2 -1
  74. package/dist/forgejo/forgejo-team.d.ts.map +1 -1
  75. package/dist/forgejo/forgejo-team.js +35 -33
  76. package/dist/forgejo/forgejo-team.js.map +1 -1
  77. package/dist/forgejo/forgejo-user.d.ts +2 -1
  78. package/dist/forgejo/forgejo-user.d.ts.map +1 -1
  79. package/dist/forgejo/forgejo-user.js +22 -22
  80. package/dist/forgejo/forgejo-user.js.map +1 -1
  81. package/dist/forgejo/forgejo.d.ts +1 -0
  82. package/dist/forgejo/forgejo.d.ts.map +1 -1
  83. package/dist/forgejo/forgejo.js +20 -9
  84. package/dist/forgejo/forgejo.js.map +1 -1
  85. package/dist/forgejo/repo.d.ts +2 -1
  86. package/dist/forgejo/repo.d.ts.map +1 -1
  87. package/dist/forgejo/repo.js +38 -38
  88. package/dist/forgejo/repo.js.map +1 -1
  89. package/dist/github/gh-ci.d.ts.map +1 -1
  90. package/dist/github/gh-ci.js +19 -35
  91. package/dist/github/gh-ci.js.map +1 -1
  92. package/dist/github/github-api.d.ts.map +1 -1
  93. package/dist/github/github-api.js +12 -4
  94. package/dist/github/github-api.js.map +1 -1
  95. package/dist/gitlab/gitlab-api.d.ts.map +1 -1
  96. package/dist/gitlab/gitlab-api.js +14 -5
  97. package/dist/gitlab/gitlab-api.js.map +1 -1
  98. package/dist/gitlab/gl-ci.d.ts.map +1 -1
  99. package/dist/gitlab/gl-ci.js +22 -34
  100. package/dist/gitlab/gl-ci.js.map +1 -1
  101. package/dist/host/host.d.ts.map +1 -1
  102. package/dist/host/host.js +4 -2
  103. package/dist/host/host.js.map +1 -1
  104. package/dist/host/workspace.d.ts.map +1 -1
  105. package/dist/host/workspace.js +15 -9
  106. package/dist/host/workspace.js.map +1 -1
  107. package/dist/index.d.ts +6 -6
  108. package/dist/index.d.ts.map +1 -1
  109. package/dist/index.js +6 -6
  110. package/dist/index.js.map +1 -1
  111. package/dist/integrations/discord-api.d.ts.map +1 -1
  112. package/dist/integrations/discord-api.js +4 -3
  113. package/dist/integrations/discord-api.js.map +1 -1
  114. package/dist/integrations/stripe-api.d.ts.map +1 -1
  115. package/dist/integrations/stripe-api.js +1 -1
  116. package/dist/integrations/stripe-api.js.map +1 -1
  117. package/dist/komodo/deployment.d.ts +2 -1
  118. package/dist/komodo/deployment.d.ts.map +1 -1
  119. package/dist/komodo/deployment.js +36 -30
  120. package/dist/komodo/deployment.js.map +1 -1
  121. package/dist/komodo/komodo-api.d.ts.map +1 -1
  122. package/dist/komodo/komodo-api.js +5 -2
  123. package/dist/komodo/komodo-api.js.map +1 -1
  124. package/dist/komodo/komodo-notify.d.ts +2 -1
  125. package/dist/komodo/komodo-notify.d.ts.map +1 -1
  126. package/dist/komodo/komodo-notify.js +35 -30
  127. package/dist/komodo/komodo-notify.js.map +1 -1
  128. package/dist/komodo/komodo-periphery.d.ts.map +1 -1
  129. package/dist/komodo/komodo-periphery.js +5 -1
  130. package/dist/komodo/komodo-periphery.js.map +1 -1
  131. package/dist/komodo/komodo-server.d.ts +2 -1
  132. package/dist/komodo/komodo-server.d.ts.map +1 -1
  133. package/dist/komodo/komodo-server.js +30 -26
  134. package/dist/komodo/komodo-server.js.map +1 -1
  135. package/dist/komodo/komodo-user.d.ts +2 -1
  136. package/dist/komodo/komodo-user.d.ts.map +1 -1
  137. package/dist/komodo/komodo-user.js +36 -34
  138. package/dist/komodo/komodo-user.js.map +1 -1
  139. package/dist/komodo/komodo.d.ts +1 -0
  140. package/dist/komodo/komodo.d.ts.map +1 -1
  141. package/dist/komodo/komodo.js +38 -34
  142. package/dist/komodo/komodo.js.map +1 -1
  143. package/dist/network/cf-route.d.ts.map +1 -1
  144. package/dist/network/cf-route.js +30 -4
  145. package/dist/network/cf-route.js.map +1 -1
  146. package/dist/network/cloudflare-api.d.ts +13 -0
  147. package/dist/network/cloudflare-api.d.ts.map +1 -1
  148. package/dist/network/cloudflare-api.js +25 -7
  149. package/dist/network/cloudflare-api.js.map +1 -1
  150. package/dist/network/tunnel.d.ts.map +1 -1
  151. package/dist/network/tunnel.js +34 -9
  152. package/dist/network/tunnel.js.map +1 -1
  153. package/dist/observability/signoz.d.ts.map +1 -1
  154. package/dist/observability/signoz.js +22 -15
  155. package/dist/observability/signoz.js.map +1 -1
  156. package/dist/providers.d.ts.map +1 -1
  157. package/dist/providers.js +16 -20
  158. package/dist/providers.js.map +1 -1
  159. package/dist/services/compose-service.d.ts +1 -1
  160. package/dist/services/compose-service.d.ts.map +1 -1
  161. package/dist/services/compose-service.js +22 -15
  162. package/dist/services/compose-service.js.map +1 -1
  163. package/dist/services/infisical.js +3 -3
  164. package/dist/services/infisical.js.map +1 -1
  165. package/dist/services/invoiceninja.js +3 -3
  166. package/dist/services/invoiceninja.js.map +1 -1
  167. package/dist/services/openproject.d.ts.map +1 -1
  168. package/dist/services/openproject.js +4 -7
  169. package/dist/services/openproject.js.map +1 -1
  170. package/dist/services/outline.d.ts.map +1 -1
  171. package/dist/services/outline.js +13 -13
  172. package/dist/services/outline.js.map +1 -1
  173. package/dist/services/paperless.js +3 -3
  174. package/dist/services/paperless.js.map +1 -1
  175. package/package.json +7 -7
  176. package/dist/data/garage-bucket.d.ts.map +0 -1
  177. package/dist/data/garage-bucket.js.map +0 -1
  178. package/dist/data/garage.d.ts.map +0 -1
  179. package/dist/data/garage.js.map +0 -1
  180. package/dist/data/postgres-database.d.ts.map +0 -1
  181. package/dist/data/postgres-database.js.map +0 -1
  182. package/dist/data/postgres.d.ts.map +0 -1
  183. package/dist/data/postgres.js.map +0 -1
  184. package/dist/data/valkey-namespace.d.ts.map +0 -1
  185. package/dist/data/valkey-namespace.js.map +0 -1
  186. package/dist/data/valkey.d.ts.map +0 -1
  187. package/dist/data/valkey.js.map +0 -1
  188. package/dist/github/gh-deployment.d.ts +0 -4
  189. package/dist/github/gh-deployment.d.ts.map +0 -1
  190. package/dist/github/gh-deployment.js +0 -92
  191. package/dist/github/gh-deployment.js.map +0 -1
  192. package/dist/gitlab/gl-deployment.d.ts +0 -4
  193. package/dist/gitlab/gl-deployment.d.ts.map +0 -1
  194. package/dist/gitlab/gl-deployment.js +0 -93
  195. package/dist/gitlab/gl-deployment.js.map +0 -1
  196. /package/dist/{data → backings}/garage-bucket.d.ts +0 -0
  197. /package/dist/{data → backings}/garage-bucket.js +0 -0
  198. /package/dist/{data → backings}/garage.d.ts +0 -0
  199. /package/dist/{data → backings}/postgres-database.d.ts +0 -0
  200. /package/dist/{data → backings}/postgres.d.ts +0 -0
  201. /package/dist/{data → backings}/valkey-namespace.d.ts +0 -0
  202. /package/dist/{data → backings}/valkey.d.ts +0 -0
@@ -1,22 +1,23 @@
1
1
  import { z } from "zod";
2
- import { parseInputs } from "../core/inputs.js";
2
+ import { parseInputs, sshSchema } from "../core/inputs.js";
3
+ import { overSsh } from "../core/over-ssh.js";
4
+ import { sshExecutor } from "../core/ssh.js";
3
5
  import { forgejoApi } from "./forgejo-api.js";
4
- const forgejoOrgSchema = z.object({
5
- forgejoUrl: z.string(),
6
+ import { FORGEJO_HTTP_PORT } from "./forgejo.js";
7
+ const forgejoOrgSchema = sshSchema.extend({
6
8
  adminUser: z.string(),
7
9
  adminPassword: z.string(),
8
10
  org: z.string(),
9
11
  });
10
12
  const parse = (inputs) => parseInputs(forgejoOrgSchema, inputs, "forgejo-org");
11
- export const createForgejoOrgProvider = (api = forgejoApi) => ({
13
+ export const createForgejoOrgProvider = (api = forgejoApi, executor = sshExecutor) => ({
12
14
  read: async (inputs, ctx) => {
13
- if (typeof inputs["forgejoUrl"] !== "string") {
14
- return undefined;
15
- }
16
15
  const parsed = parse(inputs);
17
16
  try {
18
- const exists = await api.findOrg({ baseUrl: parsed.forgejoUrl, user: parsed.adminUser, password: parsed.adminPassword, org: parsed.org });
19
- return exists ? { outputs: {} } : undefined;
17
+ return await overSsh(executor, parsed, FORGEJO_HTTP_PORT, async (baseUrl) => {
18
+ const exists = await api.findOrg({ baseUrl, user: parsed.adminUser, password: parsed.adminPassword, org: parsed.org });
19
+ return exists ? { outputs: {} } : undefined;
20
+ });
20
21
  }
21
22
  catch (error) {
22
23
  ctx.log(`forgejo-org "${ctx.id}": forgejo not reachable yet, treating as not-yet-created: ${String(error)}`);
@@ -26,18 +27,17 @@ export const createForgejoOrgProvider = (api = forgejoApi) => ({
26
27
  diff: () => ({ action: "noop" }),
27
28
  apply: async (inputs) => {
28
29
  const parsed = parse(inputs);
29
- const auth = { baseUrl: parsed.forgejoUrl, user: parsed.adminUser, password: parsed.adminPassword };
30
- if (!(await api.findOrg({ ...auth, org: parsed.org }))) {
31
- await api.createOrg({ ...auth, org: parsed.org });
32
- }
33
- return {};
30
+ return overSsh(executor, parsed, FORGEJO_HTTP_PORT, async (baseUrl) => {
31
+ const auth = { baseUrl, user: parsed.adminUser, password: parsed.adminPassword };
32
+ if (!(await api.findOrg({ ...auth, org: parsed.org }))) {
33
+ await api.createOrg({ ...auth, org: parsed.org });
34
+ }
35
+ return {};
36
+ });
34
37
  },
35
38
  delete: async (inputs) => {
36
- if (typeof inputs["forgejoUrl"] !== "string") {
37
- return;
38
- }
39
39
  const parsed = parse(inputs);
40
- await api.deleteOrg({ baseUrl: parsed.forgejoUrl, user: parsed.adminUser, password: parsed.adminPassword, org: parsed.org });
40
+ await overSsh(executor, parsed, FORGEJO_HTTP_PORT, (baseUrl) => api.deleteOrg({ baseUrl, user: parsed.adminUser, password: parsed.adminPassword, org: parsed.org }));
41
41
  },
42
42
  });
43
43
  //# sourceMappingURL=forgejo-org.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"forgejo-org.js","sourceRoot":"","sources":["../../src/forgejo/forgejo-org.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AACxB,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAEhD,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAE9C,MAAM,gBAAgB,GAAG,CAAC,CAAC,MAAM,CAAC;IAC9B,UAAU,EAAE,CAAC,CAAC,MAAM,EAAE;IACtB,SAAS,EAAE,CAAC,CAAC,MAAM,EAAE;IACrB,aAAa,EAAE,CAAC,CAAC,MAAM,EAAE;IACzB,GAAG,EAAE,CAAC,CAAC,MAAM,EAAE;CAClB,CAAC,CAAC;AAEH,MAAM,KAAK,GAAG,CAAC,MAAsB,EAAoB,EAAE,CAAC,WAAW,CAAC,gBAAgB,EAAE,MAAM,EAAE,aAAa,CAAC,CAAC;AAKjH,MAAM,CAAC,MAAM,wBAAwB,GAAG,CAAC,MAAkB,UAAU,EAAY,EAAE,CAAC,CAAC;IACjF,IAAI,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,EAAE,EAAE;QACxB,IAAI,OAAO,MAAM,CAAC,YAAY,CAAC,KAAK,QAAQ,EAAE,CAAC;YAC3C,OAAO,SAAS,CAAC;QACrB,CAAC;QACD,MAAM,MAAM,GAAG,KAAK,CAAC,MAAM,CAAC,CAAC;QAC7B,IAAI,CAAC;YACD,MAAM,MAAM,GAAG,MAAM,GAAG,CAAC,OAAO,CAAC,EAAE,OAAO,EAAE,MAAM,CAAC,UAAU,EAAE,IAAI,EAAE,MAAM,CAAC,SAAS,EAAE,QAAQ,EAAE,MAAM,CAAC,aAAa,EAAE,GAAG,EAAE,MAAM,CAAC,GAAG,EAAE,CAAC,CAAC;YAC1I,OAAO,MAAM,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,EAAE,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC;QAChD,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACb,GAAG,CAAC,GAAG,CAAC,gBAAgB,GAAG,CAAC,EAAE,8DAA8D,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;YAC7G,OAAO,SAAS,CAAC;QACrB,CAAC;IACL,CAAC;IACD,IAAI,EAAE,GAAG,EAAE,CAAC,CAAC,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC;IAChC,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,EAAE;QACpB,MAAM,MAAM,GAAG,KAAK,CAAC,MAAM,CAAC,CAAC;QAC7B,MAAM,IAAI,GAAG,EAAE,OAAO,EAAE,MAAM,CAAC,UAAU,EAAE,IAAI,EAAE,MAAM,CAAC,SAAS,EAAE,QAAQ,EAAE,MAAM,CAAC,aAAa,EAAE,CAAC;QACpG,IAAI,CAAC,CAAC,MAAM,GAAG,CAAC,OAAO,CAAC,EAAE,GAAG,IAAI,EAAE,GAAG,EAAE,MAAM,CAAC,GAAG,EAAE,CAAC,CAAC,EAAE,CAAC;YACrD,MAAM,GAAG,CAAC,SAAS,CAAC,EAAE,GAAG,IAAI,EAAE,GAAG,EAAE,MAAM,CAAC,GAAG,EAAE,CAAC,CAAC;QACtD,CAAC;QACD,OAAO,EAAE,CAAC;IACd,CAAC;IACD,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,EAAE;QACrB,IAAI,OAAO,MAAM,CAAC,YAAY,CAAC,KAAK,QAAQ,EAAE,CAAC;YAC3C,OAAO;QACX,CAAC;QACD,MAAM,MAAM,GAAG,KAAK,CAAC,MAAM,CAAC,CAAC;QAC7B,MAAM,GAAG,CAAC,SAAS,CAAC,EAAE,OAAO,EAAE,MAAM,CAAC,UAAU,EAAE,IAAI,EAAE,MAAM,CAAC,SAAS,EAAE,QAAQ,EAAE,MAAM,CAAC,aAAa,EAAE,GAAG,EAAE,MAAM,CAAC,GAAG,EAAE,CAAC,CAAC;IACjI,CAAC;CACJ,CAAC,CAAC"}
1
+ {"version":3,"file":"forgejo-org.js","sourceRoot":"","sources":["../../src/forgejo/forgejo-org.ts"],"names":[],"mappings":"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"}
@@ -1 +1 @@
1
- {"version":3,"file":"forgejo-runner.d.ts","sourceRoot":"","sources":["../../src/forgejo/forgejo-runner.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAkB,MAAM,kBAAkB,CAAC;AAGjE,OAAO,KAAK,EAAE,WAAW,EAAc,MAAM,gBAAgB,CAAC;AA8D9D,eAAO,MAAM,2BAA2B,GAAI,WAAU,WAAyB,KAAG,QAmFhF,CAAC"}
1
+ {"version":3,"file":"forgejo-runner.d.ts","sourceRoot":"","sources":["../../src/forgejo/forgejo-runner.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAkB,MAAM,kBAAkB,CAAC;AAKjE,OAAO,KAAK,EAAE,WAAW,EAAc,MAAM,gBAAgB,CAAC;AA8D9D,eAAO,MAAM,2BAA2B,GAAI,WAAU,WAAyB,KAAG,QA8FhF,CAAC"}
@@ -1,5 +1,7 @@
1
+ import { HASH_KEY } from "@intentic/graph";
1
2
  import { z } from "zod";
2
- import { parseInputs, sshSchema, sshTarget } from "../core/inputs.js";
3
+ import { hasPendingRef, parseInputs, sshSchema, sshTarget } from "../core/inputs.js";
4
+ import { listStampedContainers } from "../core/list-stamped.js";
3
5
  import { sshExecutor } from "../core/ssh.js";
4
6
  const runnerSchema = sshSchema.extend({ instanceUrl: z.string(), token: z.string(), image: z.string(), jobImage: z.string() });
5
7
  const parse = (inputs) => parseInputs(runnerSchema, inputs, "forgejo-runner");
@@ -36,6 +38,9 @@ const configuredJobImage = async (session) => {
36
38
  };
37
39
  export const createForgejoRunnerProvider = (executor = sshExecutor) => ({
38
40
  read: async (inputs, ctx) => {
41
+ if (hasPendingRef(inputs, "instanceUrl", "token")) {
42
+ return undefined;
43
+ }
39
44
  const parsed = parse(inputs);
40
45
  let session;
41
46
  try {
@@ -49,7 +54,12 @@ export const createForgejoRunnerProvider = (executor = sshExecutor) => ({
49
54
  if (!(await running(session)) || !(await registeredTo(session, parsed.instanceUrl))) {
50
55
  return undefined;
51
56
  }
52
- return { outputs: {}, detail: { image: await runningImage(session), jobImage: await configuredJobImage(session) } };
57
+ const stampHash = (await session.exec(`docker inspect --format '{{index .Config.Labels "${HASH_KEY}"}}' ${CONTAINER}`)).stdout.trim();
58
+ return {
59
+ outputs: {},
60
+ detail: { image: await runningImage(session), jobImage: await configuredJobImage(session) },
61
+ ...(stampHash === "" ? {} : { stampHash }),
62
+ };
53
63
  }
54
64
  finally {
55
65
  await session.dispose();
@@ -83,7 +93,7 @@ export const createForgejoRunnerProvider = (executor = sshExecutor) => ({
83
93
  await session.exec(`mkdir -p ${CONFIG_DIR}`);
84
94
  await session.exec(`cat > ${CONFIG_DIR}/config.yaml <<'CFG'\n${runnerConfig(dockerBin, buildxPlugin, parsed.jobImage)}CFG`);
85
95
  await session.exec(`docker rm -f ${CONTAINER} 2>/dev/null || true`);
86
- const run = await session.exec(`docker run -d --restart unless-stopped --network host --user root --name ${CONTAINER} --label intentic.id=${ctx.id} ` +
96
+ const run = await session.exec(`docker run -d --restart unless-stopped --network host --user root --name ${CONTAINER} --label intentic.id=${ctx.id} --label intentic.type=forgejo-runner --label intentic.hash=${ctx.inputsHash ?? ""} ` +
87
97
  `-v ${CONTAINER}-data:/data -v /var/run/docker.sock:/var/run/docker.sock -v ${CONFIG_DIR}/config.yaml:/config.yaml:ro ${parsed.image} ` +
88
98
  `sh -c "forgejo-runner register --no-interactive --config /config.yaml --instance ${parsed.instanceUrl} --token ${parsed.token} && forgejo-runner daemon --config /config.yaml"`);
89
99
  if (run.code !== 0) {
@@ -96,8 +106,7 @@ export const createForgejoRunnerProvider = (executor = sshExecutor) => ({
96
106
  }
97
107
  },
98
108
  delete: async (inputs) => {
99
- const parsed = parse(inputs);
100
- const session = await executor.connect(sshTarget(parsed));
109
+ const session = await executor.connect(sshTarget(parseInputs(sshSchema, inputs, "forgejo-runner")));
101
110
  try {
102
111
  await session.exec(`docker rm -f ${CONTAINER} 2>/dev/null || true`);
103
112
  await session.exec(`docker volume rm ${CONTAINER}-data 2>/dev/null || true`);
@@ -107,5 +116,6 @@ export const createForgejoRunnerProvider = (executor = sshExecutor) => ({
107
116
  await session.dispose();
108
117
  }
109
118
  },
119
+ list: (sources, ctx) => listStampedContainers(executor, "forgejo-runner", sources, ctx.log),
110
120
  });
111
121
  //# sourceMappingURL=forgejo-runner.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"forgejo-runner.js","sourceRoot":"","sources":["../../src/forgejo/forgejo-runner.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"forgejo-runner.js","sourceRoot":"","sources":["../../src/forgejo/forgejo-runner.ts"],"names":[],"mappings":"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"}
@@ -1,4 +1,5 @@
1
1
  import type { Provider } from "@intentic/engine";
2
+ import type { SshExecutor } from "../core/ssh.js";
2
3
  import type { ForgejoApi } from "./forgejo-api.js";
3
- export declare const createForgejoTeamProvider: (api?: ForgejoApi) => Provider;
4
+ export declare const createForgejoTeamProvider: (api?: ForgejoApi, executor?: SshExecutor) => Provider;
4
5
  //# sourceMappingURL=forgejo-team.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"forgejo-team.d.ts","sourceRoot":"","sources":["../../src/forgejo/forgejo-team.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAkB,MAAM,kBAAkB,CAAC;AAGjE,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAuBnD,eAAO,MAAM,yBAAyB,GAAI,MAAK,UAAuB,KAAG,QAmDvE,CAAC"}
1
+ {"version":3,"file":"forgejo-team.d.ts","sourceRoot":"","sources":["../../src/forgejo/forgejo-team.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAkB,MAAM,kBAAkB,CAAC;AAIjE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAElD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAwBnD,eAAO,MAAM,yBAAyB,GAAI,MAAK,UAAuB,EAAE,WAAU,WAAyB,KAAG,QAmD5G,CAAC"}
@@ -1,8 +1,10 @@
1
1
  import { z } from "zod";
2
- import { parseInputs } from "../core/inputs.js";
2
+ import { parseInputs, sshSchema } from "../core/inputs.js";
3
+ import { overSsh } from "../core/over-ssh.js";
4
+ import { sshExecutor } from "../core/ssh.js";
3
5
  import { forgejoApi } from "./forgejo-api.js";
4
- const forgejoTeamSchema = z.object({
5
- forgejoUrl: z.string(),
6
+ import { FORGEJO_HTTP_PORT } from "./forgejo.js";
7
+ const forgejoTeamSchema = sshSchema.extend({
6
8
  adminUser: z.string(),
7
9
  adminPassword: z.string(),
8
10
  org: z.string(),
@@ -12,21 +14,20 @@ const forgejoTeamSchema = z.object({
12
14
  repos: z.array(z.object({ owner: z.string(), name: z.string() })),
13
15
  });
14
16
  const parse = (inputs) => parseInputs(forgejoTeamSchema, inputs, "forgejo-team");
15
- export const createForgejoTeamProvider = (api = forgejoApi) => ({
17
+ export const createForgejoTeamProvider = (api = forgejoApi, executor = sshExecutor) => ({
16
18
  read: async (inputs, ctx) => {
17
- if (typeof inputs["forgejoUrl"] !== "string") {
18
- return undefined;
19
- }
20
19
  const parsed = parse(inputs);
21
20
  try {
22
- const team = await api.findTeam({
23
- baseUrl: parsed.forgejoUrl,
24
- user: parsed.adminUser,
25
- password: parsed.adminPassword,
26
- org: parsed.org,
27
- name: parsed.name,
21
+ return await overSsh(executor, parsed, FORGEJO_HTTP_PORT, async (baseUrl) => {
22
+ const team = await api.findTeam({
23
+ baseUrl,
24
+ user: parsed.adminUser,
25
+ password: parsed.adminPassword,
26
+ org: parsed.org,
27
+ name: parsed.name,
28
+ });
29
+ return team === undefined ? undefined : { outputs: {}, detail: { permission: team.permission } };
28
30
  });
29
- return team === undefined ? undefined : { outputs: {}, detail: { permission: team.permission } };
30
31
  }
31
32
  catch (error) {
32
33
  ctx.log(`forgejo-team "${ctx.id}": forgejo not reachable yet, treating as not-yet-created: ${String(error)}`);
@@ -41,28 +42,29 @@ export const createForgejoTeamProvider = (api = forgejoApi) => ({
41
42
  },
42
43
  apply: async (inputs) => {
43
44
  const parsed = parse(inputs);
44
- const auth = { baseUrl: parsed.forgejoUrl, user: parsed.adminUser, password: parsed.adminPassword };
45
- const existing = await api.findTeam({ ...auth, org: parsed.org, name: parsed.name });
46
- const teamId = existing?.id ?? (await api.createTeam({ ...auth, org: parsed.org, name: parsed.name, permission: parsed.permission })).id;
47
- for (const username of parsed.members) {
48
- await api.addTeamMember({ ...auth, teamId, username });
49
- }
50
- for (const repo of parsed.repos) {
51
- await api.addTeamRepo({ ...auth, teamId, org: repo.owner, name: repo.name });
52
- }
53
- return {};
45
+ return overSsh(executor, parsed, FORGEJO_HTTP_PORT, async (baseUrl) => {
46
+ const auth = { baseUrl, user: parsed.adminUser, password: parsed.adminPassword };
47
+ const existing = await api.findTeam({ ...auth, org: parsed.org, name: parsed.name });
48
+ const teamId = existing?.id ?? (await api.createTeam({ ...auth, org: parsed.org, name: parsed.name, permission: parsed.permission })).id;
49
+ for (const username of parsed.members) {
50
+ await api.addTeamMember({ ...auth, teamId, username });
51
+ }
52
+ for (const repo of parsed.repos) {
53
+ await api.addTeamRepo({ ...auth, teamId, org: repo.owner, name: repo.name });
54
+ }
55
+ return {};
56
+ });
54
57
  },
55
58
  delete: async (inputs) => {
56
- if (typeof inputs["forgejoUrl"] !== "string") {
57
- return;
58
- }
59
59
  const parsed = parse(inputs);
60
- const auth = { baseUrl: parsed.forgejoUrl, user: parsed.adminUser, password: parsed.adminPassword };
61
- const existing = await api.findTeam({ ...auth, org: parsed.org, name: parsed.name });
62
- if (existing === undefined) {
63
- return;
64
- }
65
- await api.deleteTeam({ ...auth, teamId: existing.id });
60
+ await overSsh(executor, parsed, FORGEJO_HTTP_PORT, async (baseUrl) => {
61
+ const auth = { baseUrl, user: parsed.adminUser, password: parsed.adminPassword };
62
+ const existing = await api.findTeam({ ...auth, org: parsed.org, name: parsed.name });
63
+ if (existing === undefined) {
64
+ return;
65
+ }
66
+ await api.deleteTeam({ ...auth, teamId: existing.id });
67
+ });
66
68
  },
67
69
  });
68
70
  //# sourceMappingURL=forgejo-team.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"forgejo-team.js","sourceRoot":"","sources":["../../src/forgejo/forgejo-team.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"forgejo-team.js","sourceRoot":"","sources":["../../src/forgejo/forgejo-team.ts"],"names":[],"mappings":"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"}
@@ -1,4 +1,5 @@
1
1
  import type { Provider } from "@intentic/engine";
2
+ import type { SshExecutor } from "../core/ssh.js";
2
3
  import type { ForgejoApi } from "./forgejo-api.js";
3
- export declare const createForgejoUserProvider: (api?: ForgejoApi) => Provider;
4
+ export declare const createForgejoUserProvider: (api?: ForgejoApi, executor?: SshExecutor) => Provider;
4
5
  //# sourceMappingURL=forgejo-user.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"forgejo-user.d.ts","sourceRoot":"","sources":["../../src/forgejo/forgejo-user.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAkB,MAAM,kBAAkB,CAAC;AAGjE,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAmBnD,eAAO,MAAM,yBAAyB,GAAI,MAAK,UAAuB,KAAG,QAmCvE,CAAC"}
1
+ {"version":3,"file":"forgejo-user.d.ts","sourceRoot":"","sources":["../../src/forgejo/forgejo-user.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAkB,MAAM,kBAAkB,CAAC;AAIjE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAElD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAoBnD,eAAO,MAAM,yBAAyB,GAAI,MAAK,UAAuB,EAAE,WAAU,WAAyB,KAAG,QAmC5G,CAAC"}
@@ -1,8 +1,10 @@
1
1
  import { z } from "zod";
2
- import { parseInputs } from "../core/inputs.js";
2
+ import { parseInputs, sshSchema } from "../core/inputs.js";
3
+ import { overSsh } from "../core/over-ssh.js";
4
+ import { sshExecutor } from "../core/ssh.js";
3
5
  import { forgejoApi } from "./forgejo-api.js";
4
- const forgejoUserSchema = z.object({
5
- forgejoUrl: z.string(),
6
+ import { FORGEJO_HTTP_PORT } from "./forgejo.js";
7
+ const forgejoUserSchema = sshSchema.extend({
6
8
  adminUser: z.string(),
7
9
  adminPassword: z.string(),
8
10
  username: z.string(),
@@ -10,20 +12,19 @@ const forgejoUserSchema = z.object({
10
12
  accountPassword: z.string(),
11
13
  });
12
14
  const parse = (inputs) => parseInputs(forgejoUserSchema, inputs, "forgejo-user");
13
- export const createForgejoUserProvider = (api = forgejoApi) => ({
15
+ export const createForgejoUserProvider = (api = forgejoApi, executor = sshExecutor) => ({
14
16
  read: async (inputs, ctx) => {
15
- if (typeof inputs["forgejoUrl"] !== "string") {
16
- return undefined;
17
- }
18
17
  const parsed = parse(inputs);
19
18
  try {
20
- const exists = await api.findUser({
21
- baseUrl: parsed.forgejoUrl,
22
- user: parsed.adminUser,
23
- password: parsed.adminPassword,
24
- username: parsed.username,
19
+ return await overSsh(executor, parsed, FORGEJO_HTTP_PORT, async (baseUrl) => {
20
+ const exists = await api.findUser({
21
+ baseUrl,
22
+ user: parsed.adminUser,
23
+ password: parsed.adminPassword,
24
+ username: parsed.username,
25
+ });
26
+ return exists ? { outputs: {} } : undefined;
25
27
  });
26
- return exists ? { outputs: {} } : undefined;
27
28
  }
28
29
  catch (error) {
29
30
  ctx.log(`forgejo-user "${ctx.id}": forgejo not reachable yet, treating as not-yet-created: ${String(error)}`);
@@ -33,18 +34,17 @@ export const createForgejoUserProvider = (api = forgejoApi) => ({
33
34
  diff: () => ({ action: "noop" }),
34
35
  apply: async (inputs) => {
35
36
  const parsed = parse(inputs);
36
- const auth = { baseUrl: parsed.forgejoUrl, user: parsed.adminUser, password: parsed.adminPassword };
37
- if (!(await api.findUser({ ...auth, username: parsed.username }))) {
38
- await api.createUser({ ...auth, username: parsed.username, email: parsed.email, accountPassword: parsed.accountPassword });
39
- }
40
- return {};
37
+ return overSsh(executor, parsed, FORGEJO_HTTP_PORT, async (baseUrl) => {
38
+ const auth = { baseUrl, user: parsed.adminUser, password: parsed.adminPassword };
39
+ if (!(await api.findUser({ ...auth, username: parsed.username }))) {
40
+ await api.createUser({ ...auth, username: parsed.username, email: parsed.email, accountPassword: parsed.accountPassword });
41
+ }
42
+ return {};
43
+ });
41
44
  },
42
45
  delete: async (inputs) => {
43
- if (typeof inputs["forgejoUrl"] !== "string") {
44
- return;
45
- }
46
46
  const parsed = parse(inputs);
47
- await api.deleteUser({ baseUrl: parsed.forgejoUrl, user: parsed.adminUser, password: parsed.adminPassword, username: parsed.username });
47
+ await overSsh(executor, parsed, FORGEJO_HTTP_PORT, (baseUrl) => api.deleteUser({ baseUrl, user: parsed.adminUser, password: parsed.adminPassword, username: parsed.username }));
48
48
  },
49
49
  });
50
50
  //# sourceMappingURL=forgejo-user.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"forgejo-user.js","sourceRoot":"","sources":["../../src/forgejo/forgejo-user.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AACxB,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAEhD,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAE9C,MAAM,iBAAiB,GAAG,CAAC,CAAC,MAAM,CAAC;IAC/B,UAAU,EAAE,CAAC,CAAC,MAAM,EAAE;IACtB,SAAS,EAAE,CAAC,CAAC,MAAM,EAAE;IACrB,aAAa,EAAE,CAAC,CAAC,MAAM,EAAE;IACzB,QAAQ,EAAE,CAAC,CAAC,MAAM,EAAE;IACpB,KAAK,EAAE,CAAC,CAAC,MAAM,EAAE;IAEjB,eAAe,EAAE,CAAC,CAAC,MAAM,EAAE;CAC9B,CAAC,CAAC;AAEH,MAAM,KAAK,GAAG,CAAC,MAAsB,EAAqB,EAAE,CAAC,WAAW,CAAC,iBAAiB,EAAE,MAAM,EAAE,cAAc,CAAC,CAAC;AAMpH,MAAM,CAAC,MAAM,yBAAyB,GAAG,CAAC,MAAkB,UAAU,EAAY,EAAE,CAAC,CAAC;IAClF,IAAI,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,EAAE,EAAE;QACxB,IAAI,OAAO,MAAM,CAAC,YAAY,CAAC,KAAK,QAAQ,EAAE,CAAC;YAC3C,OAAO,SAAS,CAAC;QACrB,CAAC;QACD,MAAM,MAAM,GAAG,KAAK,CAAC,MAAM,CAAC,CAAC;QAC7B,IAAI,CAAC;YACD,MAAM,MAAM,GAAG,MAAM,GAAG,CAAC,QAAQ,CAAC;gBAC9B,OAAO,EAAE,MAAM,CAAC,UAAU;gBAC1B,IAAI,EAAE,MAAM,CAAC,SAAS;gBACtB,QAAQ,EAAE,MAAM,CAAC,aAAa;gBAC9B,QAAQ,EAAE,MAAM,CAAC,QAAQ;aAC5B,CAAC,CAAC;YACH,OAAO,MAAM,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,EAAE,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC;QAChD,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACb,GAAG,CAAC,GAAG,CAAC,iBAAiB,GAAG,CAAC,EAAE,8DAA8D,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;YAC9G,OAAO,SAAS,CAAC;QACrB,CAAC;IACL,CAAC;IACD,IAAI,EAAE,GAAG,EAAE,CAAC,CAAC,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC;IAChC,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,EAAE;QACpB,MAAM,MAAM,GAAG,KAAK,CAAC,MAAM,CAAC,CAAC;QAC7B,MAAM,IAAI,GAAG,EAAE,OAAO,EAAE,MAAM,CAAC,UAAU,EAAE,IAAI,EAAE,MAAM,CAAC,SAAS,EAAE,QAAQ,EAAE,MAAM,CAAC,aAAa,EAAE,CAAC;QACpG,IAAI,CAAC,CAAC,MAAM,GAAG,CAAC,QAAQ,CAAC,EAAE,GAAG,IAAI,EAAE,QAAQ,EAAE,MAAM,CAAC,QAAQ,EAAE,CAAC,CAAC,EAAE,CAAC;YAChE,MAAM,GAAG,CAAC,UAAU,CAAC,EAAE,GAAG,IAAI,EAAE,QAAQ,EAAE,MAAM,CAAC,QAAQ,EAAE,KAAK,EAAE,MAAM,CAAC,KAAK,EAAE,eAAe,EAAE,MAAM,CAAC,eAAe,EAAE,CAAC,CAAC;QAC/H,CAAC;QACD,OAAO,EAAE,CAAC;IACd,CAAC;IACD,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,EAAE;QACrB,IAAI,OAAO,MAAM,CAAC,YAAY,CAAC,KAAK,QAAQ,EAAE,CAAC;YAC3C,OAAO;QACX,CAAC;QACD,MAAM,MAAM,GAAG,KAAK,CAAC,MAAM,CAAC,CAAC;QAC7B,MAAM,GAAG,CAAC,UAAU,CAAC,EAAE,OAAO,EAAE,MAAM,CAAC,UAAU,EAAE,IAAI,EAAE,MAAM,CAAC,SAAS,EAAE,QAAQ,EAAE,MAAM,CAAC,aAAa,EAAE,QAAQ,EAAE,MAAM,CAAC,QAAQ,EAAE,CAAC,CAAC;IAC5I,CAAC;CACJ,CAAC,CAAC"}
1
+ {"version":3,"file":"forgejo-user.js","sourceRoot":"","sources":["../../src/forgejo/forgejo-user.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AACxB,OAAO,EAAE,WAAW,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;AAC3D,OAAO,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AAE9C,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAE7C,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAC9C,OAAO,EAAE,iBAAiB,EAAE,MAAM,cAAc,CAAC;AAGjD,MAAM,iBAAiB,GAAG,SAAS,CAAC,MAAM,CAAC;IACvC,SAAS,EAAE,CAAC,CAAC,MAAM,EAAE;IACrB,aAAa,EAAE,CAAC,CAAC,MAAM,EAAE;IACzB,QAAQ,EAAE,CAAC,CAAC,MAAM,EAAE;IACpB,KAAK,EAAE,CAAC,CAAC,MAAM,EAAE;IAEjB,eAAe,EAAE,CAAC,CAAC,MAAM,EAAE;CAC9B,CAAC,CAAC;AAEH,MAAM,KAAK,GAAG,CAAC,MAAsB,EAAqB,EAAE,CAAC,WAAW,CAAC,iBAAiB,EAAE,MAAM,EAAE,cAAc,CAAC,CAAC;AAMpH,MAAM,CAAC,MAAM,yBAAyB,GAAG,CAAC,MAAkB,UAAU,EAAE,WAAwB,WAAW,EAAY,EAAE,CAAC,CAAC;IACvH,IAAI,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,EAAE,EAAE;QACxB,MAAM,MAAM,GAAG,KAAK,CAAC,MAAM,CAAC,CAAC;QAC7B,IAAI,CAAC;YACD,OAAO,MAAM,OAAO,CAAC,QAAQ,EAAE,MAAM,EAAE,iBAAiB,EAAE,KAAK,EAAE,OAAO,EAAE,EAAE;gBACxE,MAAM,MAAM,GAAG,MAAM,GAAG,CAAC,QAAQ,CAAC;oBAC9B,OAAO;oBACP,IAAI,EAAE,MAAM,CAAC,SAAS;oBACtB,QAAQ,EAAE,MAAM,CAAC,aAAa;oBAC9B,QAAQ,EAAE,MAAM,CAAC,QAAQ;iBAC5B,CAAC,CAAC;gBACH,OAAO,MAAM,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,EAAE,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC;YAChD,CAAC,CAAC,CAAC;QACP,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACb,GAAG,CAAC,GAAG,CAAC,iBAAiB,GAAG,CAAC,EAAE,8DAA8D,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;YAC9G,OAAO,SAAS,CAAC;QACrB,CAAC;IACL,CAAC;IACD,IAAI,EAAE,GAAG,EAAE,CAAC,CAAC,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC;IAChC,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,EAAE;QACpB,MAAM,MAAM,GAAG,KAAK,CAAC,MAAM,CAAC,CAAC;QAC7B,OAAO,OAAO,CAAC,QAAQ,EAAE,MAAM,EAAE,iBAAiB,EAAE,KAAK,EAAE,OAAO,EAAE,EAAE;YAClE,MAAM,IAAI,GAAG,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,CAAC,SAAS,EAAE,QAAQ,EAAE,MAAM,CAAC,aAAa,EAAE,CAAC;YACjF,IAAI,CAAC,CAAC,MAAM,GAAG,CAAC,QAAQ,CAAC,EAAE,GAAG,IAAI,EAAE,QAAQ,EAAE,MAAM,CAAC,QAAQ,EAAE,CAAC,CAAC,EAAE,CAAC;gBAChE,MAAM,GAAG,CAAC,UAAU,CAAC,EAAE,GAAG,IAAI,EAAE,QAAQ,EAAE,MAAM,CAAC,QAAQ,EAAE,KAAK,EAAE,MAAM,CAAC,KAAK,EAAE,eAAe,EAAE,MAAM,CAAC,eAAe,EAAE,CAAC,CAAC;YAC/H,CAAC;YACD,OAAO,EAAE,CAAC;QACd,CAAC,CAAC,CAAC;IACP,CAAC;IACD,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,EAAE;QACrB,MAAM,MAAM,GAAG,KAAK,CAAC,MAAM,CAAC,CAAC;QAC7B,MAAM,OAAO,CAAC,QAAQ,EAAE,MAAM,EAAE,iBAAiB,EAAE,CAAC,OAAO,EAAE,EAAE,CAC3D,GAAG,CAAC,UAAU,CAAC,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,CAAC,SAAS,EAAE,QAAQ,EAAE,MAAM,CAAC,aAAa,EAAE,QAAQ,EAAE,MAAM,CAAC,QAAQ,EAAE,CAAC,CACjH,CAAC;IACN,CAAC;CACJ,CAAC,CAAC"}
@@ -1,4 +1,5 @@
1
1
  import type { Provider } from "@intentic/engine";
2
2
  import type { SshExecutor } from "../core/ssh.js";
3
+ export declare const FORGEJO_HTTP_PORT = 3000;
3
4
  export declare const createForgejoProvider: (executor?: SshExecutor) => Provider;
4
5
  //# sourceMappingURL=forgejo.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"forgejo.d.ts","sourceRoot":"","sources":["../../src/forgejo/forgejo.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAkB,MAAM,kBAAkB,CAAC;AAIjE,OAAO,KAAK,EAAE,WAAW,EAAc,MAAM,gBAAgB,CAAC;AAkF9D,eAAO,MAAM,qBAAqB,GAAI,WAAU,WAAyB,KAAG,QAyH1E,CAAC"}
1
+ {"version":3,"file":"forgejo.d.ts","sourceRoot":"","sources":["../../src/forgejo/forgejo.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,QAAQ,EAAkB,MAAM,kBAAkB,CAAC;AAMjE,OAAO,KAAK,EAAE,WAAW,EAAc,MAAM,gBAAgB,CAAC;AAsB9D,eAAO,MAAM,iBAAiB,OAAO,CAAC;AA6DtC,eAAO,MAAM,qBAAqB,GAAI,WAAU,WAAyB,KAAG,QAoI1E,CAAC"}
@@ -1,6 +1,9 @@
1
+ import { setTimeout as sleep } from "node:timers/promises";
2
+ import { HASH_KEY } from "@intentic/graph";
1
3
  import { z } from "zod";
2
4
  import { guardedUpdate } from "../core/guarded-update.js";
3
- import { parseInputs, sshSchema, sshTarget } from "../core/inputs.js";
5
+ import { hasPendingRef, parseInputs, sshSchema, sshTarget } from "../core/inputs.js";
6
+ import { listStampedContainers } from "../core/list-stamped.js";
4
7
  import { sshExecutor } from "../core/ssh.js";
5
8
  const forgejoSchema = sshSchema.extend({
6
9
  internalIp: z.string(),
@@ -13,14 +16,14 @@ const forgejoSchema = sshSchema.extend({
13
16
  });
14
17
  const parse = (inputs) => parseInputs(forgejoSchema, inputs, "forgejo");
15
18
  const CONTAINER = "intentic-forgejo";
16
- const HTTP_PORT = 3000;
19
+ export const FORGEJO_HTTP_PORT = 3000;
17
20
  const STATE_DIR = "/opt/intentic/forgejo";
18
21
  const TOKEN_FILE = `${STATE_DIR}/runner-token`;
19
22
  const GIT_TOKEN_FILE = `${STATE_DIR}/git-token`;
20
23
  const PKG_TOKEN_FILE = `${STATE_DIR}/packages-token`;
21
24
  const READY_TIMEOUT_MS = 120_000;
22
25
  const READY_INTERVAL_MS = 3_000;
23
- const internalUrl = (parsed) => `http://${parsed.internalIp}:${HTTP_PORT}`;
26
+ const internalUrl = (parsed) => `http://${parsed.internalIp}:${FORGEJO_HTTP_PORT}`;
24
27
  const outputsFor = (parsed, runnerToken, gitToken, packagesToken) => ({
25
28
  url: `https://${parsed.domain}`,
26
29
  internalUrl: internalUrl(parsed),
@@ -37,7 +40,7 @@ const runningImage = async (session) => {
37
40
  return result.stdout.trim();
38
41
  };
39
42
  const healthy = async (session) => {
40
- const result = await session.exec(`docker exec ${CONTAINER} wget -q --spider http://localhost:${HTTP_PORT}/api/healthz`);
43
+ const result = await session.exec(`docker exec ${CONTAINER} wget -q -T 10 --spider http://localhost:${FORGEJO_HTTP_PORT}/api/healthz`);
41
44
  return result.code === 0;
42
45
  };
43
46
  const persisted = async (session, file) => {
@@ -53,11 +56,14 @@ const waitHealthy = async (session) => {
53
56
  if (Date.now() >= deadline) {
54
57
  throw new Error(`forgejo did not become healthy within ${READY_TIMEOUT_MS}ms`);
55
58
  }
56
- await new Promise((resolve) => setTimeout(resolve, READY_INTERVAL_MS));
59
+ await sleep(READY_INTERVAL_MS);
57
60
  }
58
61
  };
59
62
  export const createForgejoProvider = (executor = sshExecutor) => ({
60
63
  read: async (inputs, ctx) => {
64
+ if (hasPendingRef(inputs, "internalIp")) {
65
+ return undefined;
66
+ }
61
67
  const parsed = parse(inputs);
62
68
  let session;
63
69
  try {
@@ -77,7 +83,12 @@ export const createForgejoProvider = (executor = sshExecutor) => ({
77
83
  if (runnerToken === "" || gitToken === "" || packagesToken === "") {
78
84
  return undefined;
79
85
  }
80
- return { outputs: outputsFor(parsed, runnerToken, gitToken, packagesToken), detail: { image: await runningImage(session) } };
86
+ const stampHash = (await session.exec(`docker inspect --format '{{index .Config.Labels "${HASH_KEY}"}}' ${CONTAINER}`)).stdout.trim();
87
+ return {
88
+ outputs: outputsFor(parsed, runnerToken, gitToken, packagesToken),
89
+ detail: { image: await runningImage(session) },
90
+ ...(stampHash === "" ? {} : { stampHash }),
91
+ };
81
92
  }
82
93
  finally {
83
94
  await session.dispose();
@@ -97,7 +108,7 @@ export const createForgejoProvider = (executor = sshExecutor) => ({
97
108
  await session.exec(`mkdir -p ${STATE_DIR}`);
98
109
  const bringUp = async (image) => {
99
110
  await session.exec(`docker rm -f ${CONTAINER} 2>/dev/null || true`);
100
- const run = await session.exec(`docker run -d --restart unless-stopped --network host --name ${CONTAINER} --label intentic.id=${ctx.id} ` +
111
+ const run = await session.exec(`docker run -d --restart unless-stopped --network host --name ${CONTAINER} --label intentic.id=${ctx.id} --label intentic.type=forgejo --label intentic.hash=${ctx.inputsHash ?? ""} ` +
101
112
  `-v ${CONTAINER}-data:/data ` +
102
113
  `-e FORGEJO__security__INSTALL_LOCK=true -e FORGEJO__database__DB_TYPE=sqlite3 ` +
103
114
  `-e FORGEJO__server__ROOT_URL=https://${parsed.domain} -e FORGEJO__server__DOMAIN=${parsed.domain} ${image}`);
@@ -154,8 +165,7 @@ export const createForgejoProvider = (executor = sshExecutor) => ({
154
165
  }
155
166
  },
156
167
  delete: async (inputs) => {
157
- const parsed = parse(inputs);
158
- const session = await executor.connect(sshTarget(parsed));
168
+ const session = await executor.connect(sshTarget(parseInputs(sshSchema, inputs, "forgejo")));
159
169
  try {
160
170
  await session.exec(`docker rm -f ${CONTAINER} 2>/dev/null || true`);
161
171
  await session.exec(`docker volume rm ${CONTAINER}-data 2>/dev/null || true`);
@@ -165,5 +175,6 @@ export const createForgejoProvider = (executor = sshExecutor) => ({
165
175
  await session.dispose();
166
176
  }
167
177
  },
178
+ list: (sources, ctx) => listStampedContainers(executor, "forgejo", sources, ctx.log),
168
179
  });
169
180
  //# sourceMappingURL=forgejo.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"forgejo.js","sourceRoot":"","sources":["../../src/forgejo/forgejo.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"forgejo.js","sourceRoot":"","sources":["../../src/forgejo/forgejo.ts"],"names":[],"mappings":"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"}
@@ -1,4 +1,5 @@
1
1
  import type { Provider } from "@intentic/engine";
2
+ import type { SshExecutor } from "../core/ssh.js";
2
3
  import type { ForgejoApi } from "./forgejo-api.js";
3
- export declare const createRepoProvider: (api?: ForgejoApi) => Provider;
4
+ export declare const createRepoProvider: (api?: ForgejoApi, executor?: SshExecutor) => Provider;
4
5
  //# sourceMappingURL=repo.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"repo.d.ts","sourceRoot":"","sources":["../../src/forgejo/repo.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAkB,MAAM,kBAAkB,CAAC;AAGjE,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AA2BnD,eAAO,MAAM,kBAAkB,GAAI,MAAK,UAAuB,KAAG,QA4DhE,CAAC"}
1
+ {"version":3,"file":"repo.d.ts","sourceRoot":"","sources":["../../src/forgejo/repo.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAkB,MAAM,kBAAkB,CAAC;AAIjE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAElD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AA6BnD,eAAO,MAAM,kBAAkB,GAAI,MAAK,UAAuB,EAAE,WAAU,WAAyB,KAAG,QA4DrG,CAAC"}