@geekmidas/cli 10.0.0-alpha.137 → 10.0.0-alpha.138
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/dist/{GoDaddyProvider-BcP8dWX-.cjs → GoDaddyProvider-DA0rzRQt.cjs} +2 -2
- package/dist/{GoDaddyProvider-BcP8dWX-.cjs.map → GoDaddyProvider-DA0rzRQt.cjs.map} +1 -1
- package/dist/{GoDaddyProvider-D8KVrUYm.mjs → GoDaddyProvider-baMIwhIy.mjs} +2 -2
- package/dist/{GoDaddyProvider-D8KVrUYm.mjs.map → GoDaddyProvider-baMIwhIy.mjs.map} +1 -1
- package/dist/{LegacyStateStore-63cJw4AV.mjs → LegacyStateStore-BSrw1yNS.mjs} +3 -3
- package/dist/{LegacyStateStore-63cJw4AV.mjs.map → LegacyStateStore-BSrw1yNS.mjs.map} +1 -1
- package/dist/{LegacyStateStore-De4hd05H.cjs → LegacyStateStore-h1u5xlpb.cjs} +3 -3
- package/dist/{LegacyStateStore-De4hd05H.cjs.map → LegacyStateStore-h1u5xlpb.cjs.map} +1 -1
- package/dist/{LocalStateStore-jDPIJHLS.mjs → LocalStateStore-BlH6Eanc.mjs} +2 -2
- package/dist/{LocalStateStore-jDPIJHLS.mjs.map → LocalStateStore-BlH6Eanc.mjs.map} +1 -1
- package/dist/{LocalStateStore-SiFl-guR.cjs → LocalStateStore-HmKqUWkF.cjs} +2 -2
- package/dist/{LocalStateStore-SiFl-guR.cjs.map → LocalStateStore-HmKqUWkF.cjs.map} +1 -1
- package/dist/{S3StateStore-UvVhNR69.cjs → S3StateStore-Ccz7J7Cf.cjs} +2 -2
- package/dist/{S3StateStore-UvVhNR69.cjs.map → S3StateStore-Ccz7J7Cf.cjs.map} +1 -1
- package/dist/{S3StateStore-CudutATE.mjs → S3StateStore-CwVWjNXJ.mjs} +2 -2
- package/dist/{S3StateStore-CudutATE.mjs.map → S3StateStore-CwVWjNXJ.mjs.map} +1 -1
- package/dist/{SSMStateStore-kpFFubgP.mjs → SSMStateStore-CASt-lob.mjs} +2 -2
- package/dist/{SSMStateStore-kpFFubgP.mjs.map → SSMStateStore-CASt-lob.mjs.map} +1 -1
- package/dist/{SSMStateStore-BpZqNwDW.cjs → SSMStateStore-CAxcx0U2.cjs} +2 -2
- package/dist/{SSMStateStore-BpZqNwDW.cjs.map → SSMStateStore-CAxcx0U2.cjs.map} +1 -1
- package/dist/{add-D1cRGiH4.mjs → add-6tyL4tWq.mjs} +3 -3
- package/dist/{add-D1cRGiH4.mjs.map → add-6tyL4tWq.mjs.map} +1 -1
- package/dist/{add-BDCl-l_l.cjs → add-Cq7B_VSJ.cjs} +3 -3
- package/dist/{add-BDCl-l_l.cjs.map → add-Cq7B_VSJ.cjs.map} +1 -1
- package/dist/{bundler-BKE3xo6D.mjs → bundler-CXuVyqXY.mjs} +5 -5
- package/dist/{bundler-BKE3xo6D.mjs.map → bundler-CXuVyqXY.mjs.map} +1 -1
- package/dist/{bundler-p1JT47FO.cjs → bundler-DRmdcbXx.cjs} +5 -5
- package/dist/{bundler-p1JT47FO.cjs.map → bundler-DRmdcbXx.cjs.map} +1 -1
- package/dist/{cli-BxWKJRgE.cjs → cli-DYru-gjk.cjs} +2 -2
- package/dist/{cli-BxWKJRgE.cjs.map → cli-DYru-gjk.cjs.map} +1 -1
- package/dist/{cli-CaqHWpud.mjs → cli-DxtrQdRa.mjs} +2 -2
- package/dist/{cli-CaqHWpud.mjs.map → cli-DxtrQdRa.mjs.map} +1 -1
- package/dist/{compose-BAT7wsdE.mjs → compose-Bdx2rqtO.mjs} +49 -18
- package/dist/compose-Bdx2rqtO.mjs.map +1 -0
- package/dist/{compose-DKddjrXC.cjs → compose-DJMHSSDI.cjs} +49 -18
- package/dist/compose-DJMHSSDI.cjs.map +1 -0
- package/dist/deploy/public.cjs +6 -6
- package/dist/deploy/public.mjs +6 -6
- package/dist/{deploy-CwlYj_tU.cjs → deploy-88E_1bHW.cjs} +5 -5
- package/dist/{deploy-CwlYj_tU.cjs.map → deploy-88E_1bHW.cjs.map} +1 -1
- package/dist/{deploy-C5UDDUU7.mjs → deploy-o5n6l4MO.mjs} +5 -5
- package/dist/{deploy-C5UDDUU7.mjs.map → deploy-o5n6l4MO.mjs.map} +1 -1
- package/dist/{dokploy-BaGPz931.mjs → dokploy-C1QCPJ1t.mjs} +2 -2
- package/dist/{dokploy-BaGPz931.mjs.map → dokploy-C1QCPJ1t.mjs.map} +1 -1
- package/dist/{dokploy-D8JRpnNM.cjs → dokploy-al6V2P9s.cjs} +2 -2
- package/dist/{dokploy-D8JRpnNM.cjs.map → dokploy-al6V2P9s.cjs.map} +1 -1
- package/dist/{eas-_k4YqH8L.mjs → eas-D0jmXv7F.mjs} +2 -2
- package/dist/{eas-_k4YqH8L.mjs.map → eas-D0jmXv7F.mjs.map} +1 -1
- package/dist/{eas-m37zU75L.cjs → eas-DAsdU35R.cjs} +2 -2
- package/dist/{eas-m37zU75L.cjs.map → eas-DAsdU35R.cjs.map} +1 -1
- package/dist/{encryption-CKt33qlB.cjs → encryption-C5c50qvt.cjs} +2 -2
- package/dist/{encryption-CKt33qlB.cjs.map → encryption-C5c50qvt.cjs.map} +1 -1
- package/dist/{encryption-B1wVX-iK.mjs → encryption-G8Ouiy55.mjs} +2 -2
- package/dist/{encryption-B1wVX-iK.mjs.map → encryption-G8Ouiy55.mjs.map} +1 -1
- package/dist/{engine-CazVehBM.cjs → engine-9C68_A78.cjs} +3 -3
- package/dist/{engine-CazVehBM.cjs.map → engine-9C68_A78.cjs.map} +1 -1
- package/dist/{engine-B66avdZg.mjs → engine-bEuItjJN.mjs} +3 -3
- package/dist/{engine-B66avdZg.mjs.map → engine-bEuItjJN.mjs.map} +1 -1
- package/dist/{github-DJS6FXj4.mjs → github-Buh2ldNN.mjs} +4 -4
- package/dist/{github-DJS6FXj4.mjs.map → github-Buh2ldNN.mjs.map} +1 -1
- package/dist/{github-DvoKzLo9.cjs → github-R-Pot7QV.cjs} +4 -4
- package/dist/{github-DvoKzLo9.cjs.map → github-R-Pot7QV.cjs.map} +1 -1
- package/dist/{googlePlay-B_5CB5YP.mjs → googlePlay-B_X_DJp0.mjs} +3 -3
- package/dist/{googlePlay-B_5CB5YP.mjs.map → googlePlay-B_X_DJp0.mjs.map} +1 -1
- package/dist/{googlePlay-BRAykqXD.cjs → googlePlay-Bi5qneXA.cjs} +3 -3
- package/dist/{googlePlay-BRAykqXD.cjs.map → googlePlay-Bi5qneXA.cjs.map} +1 -1
- package/dist/index.cjs +53 -56
- package/dist/index.cjs.map +1 -1
- package/dist/index.mjs +53 -56
- package/dist/index.mjs.map +1 -1
- package/dist/{migrate-DgBQ5hMl.cjs → migrate-Bv4AqxYP.cjs} +4 -6
- package/dist/migrate-Bv4AqxYP.cjs.map +1 -0
- package/dist/{migrate-wns_j863.mjs → migrate-C9abovJK.mjs} +2 -2
- package/dist/{migrate-wns_j863.mjs.map → migrate-C9abovJK.mjs.map} +1 -1
- package/dist/{migrate-Vz5SqDC9.cjs → migrate-DjCvZL4P.cjs} +2 -2
- package/dist/{migrate-Vz5SqDC9.cjs.map → migrate-DjCvZL4P.cjs.map} +1 -1
- package/dist/{migrate-CUXjEMyM.mjs → migrate-WkC0pay4.mjs} +4 -6
- package/dist/migrate-WkC0pay4.mjs.map +1 -0
- package/dist/{publish-BZ4WnlQF.mjs → publish-BVsLFs-n.mjs} +2 -2
- package/dist/{publish-BZ4WnlQF.mjs.map → publish-BVsLFs-n.mjs.map} +1 -1
- package/dist/{publish-C1WzNW-y.cjs → publish-BbJ7Ols2.cjs} +2 -2
- package/dist/{publish-C1WzNW-y.cjs.map → publish-BbJ7Ols2.cjs.map} +1 -1
- package/dist/{resolve-DBXRljeQ.cjs → resolve-CBEFNYca.cjs} +3 -3
- package/dist/{resolve-DBXRljeQ.cjs.map → resolve-CBEFNYca.cjs.map} +1 -1
- package/dist/{resolve-D42nz9oe.mjs → resolve-CTYtfl0x.mjs} +3 -3
- package/dist/{resolve-D42nz9oe.mjs.map → resolve-CTYtfl0x.mjs.map} +1 -1
- package/dist/{rollback-DKWjVtwa.mjs → rollback-BT6oPcnZ.mjs} +4 -4
- package/dist/{rollback-DKWjVtwa.mjs.map → rollback-BT6oPcnZ.mjs.map} +1 -1
- package/dist/{rollback-s8OXlOCr.cjs → rollback-RzUJ728z.cjs} +4 -4
- package/dist/{rollback-s8OXlOCr.cjs.map → rollback-RzUJ728z.cjs.map} +1 -1
- package/dist/{seeds-WyxyXjxu.mjs → seeds-CSNYLc4p.mjs} +26 -4
- package/dist/seeds-CSNYLc4p.mjs.map +1 -0
- package/dist/{seeds-D70hodXu.cjs → seeds-CcK_C30B.cjs} +31 -3
- package/dist/seeds-CcK_C30B.cjs.map +1 -0
- package/dist/{serverSetup-3kQPTiSi.cjs → serverSetup-C2U4-2i0.cjs} +5 -5
- package/dist/{serverSetup-3kQPTiSi.cjs.map → serverSetup-C2U4-2i0.cjs.map} +1 -1
- package/dist/{serverSetup-D2CKwf96.mjs → serverSetup-DiJPhPOz.mjs} +5 -5
- package/dist/{serverSetup-D2CKwf96.mjs.map → serverSetup-DiJPhPOz.mjs.map} +1 -1
- package/dist/{sniffer-BXvUF1hF.cjs → sniffer-B1iineXX.cjs} +6 -6
- package/dist/{sniffer-BXvUF1hF.cjs.map → sniffer-B1iineXX.cjs.map} +1 -1
- package/dist/{sniffer-C7Y1pnTH.mjs → sniffer-z-p2lTtc.mjs} +6 -6
- package/dist/{sniffer-C7Y1pnTH.mjs.map → sniffer-z-p2lTtc.mjs.map} +1 -1
- package/dist/{snsSubscriptions-DNVQKnuw.cjs → snsSubscriptions-C7wClS6U.cjs} +2 -2
- package/dist/{snsSubscriptions-DNVQKnuw.cjs.map → snsSubscriptions-C7wClS6U.cjs.map} +1 -1
- package/dist/{snsSubscriptions-DS6047gE.mjs → snsSubscriptions-CYy7Faid.mjs} +2 -2
- package/dist/{snsSubscriptions-DS6047gE.mjs.map → snsSubscriptions-CYy7Faid.mjs.map} +1 -1
- package/dist/{stage-BBre_tHU.cjs → stage-Cn3EEIB9.cjs} +4 -4
- package/dist/{stage-BBre_tHU.cjs.map → stage-Cn3EEIB9.cjs.map} +1 -1
- package/dist/{stage-_YcfLSj-.mjs → stage-Cx1KKX_o.mjs} +4 -4
- package/dist/{stage-_YcfLSj-.mjs.map → stage-Cx1KKX_o.mjs.map} +1 -1
- package/dist/target/public.cjs +1 -1
- package/dist/target/public.mjs +1 -1
- package/package.json +15 -15
- package/dist/compose-BAT7wsdE.mjs.map +0 -1
- package/dist/compose-DKddjrXC.cjs.map +0 -1
- package/dist/migrate-CUXjEMyM.mjs.map +0 -1
- package/dist/migrate-DgBQ5hMl.cjs.map +0 -1
- package/dist/seeds-D70hodXu.cjs.map +0 -1
- package/dist/seeds-WyxyXjxu.mjs.map +0 -1
|
@@ -2,9 +2,9 @@ const require_rolldown_runtime = require("./rolldown-runtime-C0BPl7ul.cjs");
|
|
|
2
2
|
const require_errors = require("./errors-DMC4Umsb.cjs");
|
|
3
3
|
const require_credentials = require("./credentials-D7XJypNd.cjs");
|
|
4
4
|
const require_workspace = require("./workspace-secxwA6K.cjs");
|
|
5
|
-
const require_snsSubscriptions = require("./snsSubscriptions-
|
|
5
|
+
const require_snsSubscriptions = require("./snsSubscriptions-C7wClS6U.cjs");
|
|
6
6
|
const require_define = require("./define-crmMcXFS.cjs");
|
|
7
|
-
const require_seeds = require("./seeds-
|
|
7
|
+
const require_seeds = require("./seeds-CcK_C30B.cjs");
|
|
8
8
|
const require_derive = require("./derive-CgZfoBU2.cjs");
|
|
9
9
|
const require_drivers = require("./drivers-C47nm-wB.cjs");
|
|
10
10
|
const require_identity = require("./identity-CbLfgQNT.cjs");
|
|
@@ -1363,6 +1363,16 @@ function withCaddyConfigs(compose, files) {
|
|
|
1363
1363
|
}
|
|
1364
1364
|
};
|
|
1365
1365
|
}
|
|
1366
|
+
/**
|
|
1367
|
+
* The services a stack publishes on its engine's loopback, and the port each
|
|
1368
|
+
* answers on inside — what gkm reaches from this machine to provision the
|
|
1369
|
+
* stack and run its migrations and seeds. Everything else is reached only on
|
|
1370
|
+
* the stack's network.
|
|
1371
|
+
*/
|
|
1372
|
+
const LOOPBACK_SERVICES = {
|
|
1373
|
+
postgres: 5432,
|
|
1374
|
+
minio: 9e3
|
|
1375
|
+
};
|
|
1366
1376
|
/** The local stage's stack, without the logins `gkm dev` generates. */
|
|
1367
1377
|
var LocalCredentialsMissing = class extends require_errors.GkmError {
|
|
1368
1378
|
stage;
|
|
@@ -1651,9 +1661,10 @@ function composeStack(input) {
|
|
|
1651
1661
|
...!local && domain ? { mailFrom: `noreply@${domain}` } : {},
|
|
1652
1662
|
relayedBuckets: [...require_seeds.watchedBuckets(manifest, input.subscribers ?? {}).keys()].filter((bucket) => services.minio.includes(bucket))
|
|
1653
1663
|
};
|
|
1664
|
+
const publicAddresses = Object.fromEntries(apps.map((app) => [app.id, app.url]));
|
|
1654
1665
|
const outside = require_seeds.networkEnv(plan, {
|
|
1655
1666
|
...derivation,
|
|
1656
|
-
addresses:
|
|
1667
|
+
addresses: publicAddresses
|
|
1657
1668
|
}, hostOf);
|
|
1658
1669
|
const inside = require_seeds.networkEnv(plan, {
|
|
1659
1670
|
...derivation,
|
|
@@ -2014,6 +2025,13 @@ function composeStack(input) {
|
|
|
2014
2025
|
dockerfiles,
|
|
2015
2026
|
plan,
|
|
2016
2027
|
credential,
|
|
2028
|
+
resolution: {
|
|
2029
|
+
...derivation,
|
|
2030
|
+
addresses: {
|
|
2031
|
+
...publicAddresses,
|
|
2032
|
+
...Object.fromEntries([...fileServers].map(([id, { url }]) => [id, url]))
|
|
2033
|
+
}
|
|
2034
|
+
},
|
|
2017
2035
|
...storage ? { storage } : {},
|
|
2018
2036
|
devServices: local ? [] : require_seeds.devServicesUsed(services),
|
|
2019
2037
|
...logs ? { logs } : {},
|
|
@@ -2300,7 +2318,7 @@ function stackFile(options) {
|
|
|
2300
2318
|
};
|
|
2301
2319
|
}
|
|
2302
2320
|
const postgres = services.postgres;
|
|
2303
|
-
if (postgres) postgres.ports = [
|
|
2321
|
+
if (postgres) postgres.ports = [`127.0.0.1::${LOOPBACK_SERVICES.postgres}`];
|
|
2304
2322
|
const minio = services.minio;
|
|
2305
2323
|
if (minio && options.storage) {
|
|
2306
2324
|
minio.environment = {
|
|
@@ -2309,7 +2327,7 @@ function stackFile(options) {
|
|
|
2309
2327
|
MINIO_ROOT_PASSWORD: options.storage.password,
|
|
2310
2328
|
...require_seeds.minioWebhookEnv(options.storage.webhooks)
|
|
2311
2329
|
};
|
|
2312
|
-
minio.ports = [
|
|
2330
|
+
minio.ports = [`127.0.0.1::${LOOPBACK_SERVICES.minio}`];
|
|
2313
2331
|
}
|
|
2314
2332
|
if (services["redis"] && options.redis) services[require_seeds.REDIS_SERVICE] = require_seeds.redisService(options.redis);
|
|
2315
2333
|
if (options.logs) services[require_seeds.LOGS_SERVICE] = require_seeds.logsService(options.logs);
|
|
@@ -3575,8 +3593,8 @@ async function provisionCompose(ctx, run, deps) {
|
|
|
3575
3593
|
via: Object.keys(run.previous).length > 0 ? "recorded" : "created"
|
|
3576
3594
|
});
|
|
3577
3595
|
}
|
|
3578
|
-
if (stack.infra.includes("postgres")) await prepareDatabases(ctx, run, deps);
|
|
3579
3596
|
if (stack.storage && stack.infra.includes("minio")) await prepareBuckets(ctx, run, deps);
|
|
3597
|
+
if (stack.infra.includes("postgres")) await prepareDatabases(ctx, run, deps);
|
|
3580
3598
|
}
|
|
3581
3599
|
/**
|
|
3582
3600
|
* Subscribe each topic subscriber SNS pushes to — for a topic the stage set
|
|
@@ -3616,7 +3634,7 @@ async function subscribeTopics(ctx, run, deps) {
|
|
|
3616
3634
|
async function prepareBuckets(ctx, run, deps) {
|
|
3617
3635
|
const storage = run.stack.storage;
|
|
3618
3636
|
if (storage.buckets.length === 0) return;
|
|
3619
|
-
const tunnel = await reach(run, deps, "minio",
|
|
3637
|
+
const tunnel = await reach(run, deps, "minio", LOOPBACK_SERVICES.minio);
|
|
3620
3638
|
let done;
|
|
3621
3639
|
try {
|
|
3622
3640
|
const client = deps.buckets(tunnel.port, storage);
|
|
@@ -3635,13 +3653,24 @@ async function prepareBuckets(ctx, run, deps) {
|
|
|
3635
3653
|
/**
|
|
3636
3654
|
* Create what the plan names in the stack's Postgres, migrate it, then run
|
|
3637
3655
|
* its seeds — every one, every time, as each construct's owner.
|
|
3656
|
+
*
|
|
3657
|
+
* Every service the stack publishes on its loopback is reached, not only
|
|
3658
|
+
* Postgres: a seed runs project code, and project code that uploads a file
|
|
3659
|
+
* reaches the stack's MinIO as well.
|
|
3638
3660
|
*/
|
|
3639
3661
|
async function prepareDatabases(ctx, run, deps) {
|
|
3640
|
-
const
|
|
3662
|
+
const tunnels = [];
|
|
3641
3663
|
try {
|
|
3642
|
-
|
|
3664
|
+
const ports = {};
|
|
3665
|
+
for (const [service, inside] of Object.entries(LOOPBACK_SERVICES)) {
|
|
3666
|
+
if (!run.stack.infra.includes(service)) continue;
|
|
3667
|
+
const tunnel = await reach(run, deps, service, inside);
|
|
3668
|
+
tunnels.push(tunnel);
|
|
3669
|
+
ports[require_seeds.primaryPortKey(service)] = tunnel.port;
|
|
3670
|
+
}
|
|
3671
|
+
await migrateAndSeed(ctx, run, deps, ports);
|
|
3643
3672
|
} finally {
|
|
3644
|
-
await tunnel.close();
|
|
3673
|
+
await Promise.all(tunnels.map((tunnel) => tunnel.close()));
|
|
3645
3674
|
}
|
|
3646
3675
|
}
|
|
3647
3676
|
/**
|
|
@@ -3662,9 +3691,10 @@ async function reach(run, deps, service, inside) {
|
|
|
3662
3691
|
};
|
|
3663
3692
|
return deps.server.tunnel(run.server, published);
|
|
3664
3693
|
}
|
|
3665
|
-
async function migrateAndSeed(ctx, run, deps,
|
|
3694
|
+
async function migrateAndSeed(ctx, run, deps, ports) {
|
|
3666
3695
|
const { stack } = run;
|
|
3667
3696
|
const workspace = ctx.workspace;
|
|
3697
|
+
const port = ports[require_seeds.primaryPortKey("postgres")];
|
|
3668
3698
|
const superuser = stack.credential.containers.postgres;
|
|
3669
3699
|
const login = await deps.logins({
|
|
3670
3700
|
port,
|
|
@@ -3686,15 +3716,16 @@ async function migrateAndSeed(ctx, run, deps, port) {
|
|
|
3686
3716
|
cwd: workspace.root,
|
|
3687
3717
|
sources
|
|
3688
3718
|
});
|
|
3689
|
-
const
|
|
3690
|
-
|
|
3691
|
-
|
|
3719
|
+
const custom = run.secrets?.custom ?? {};
|
|
3720
|
+
const resolved = require_seeds.envFor(stack.plan, {
|
|
3721
|
+
...stack.resolution,
|
|
3722
|
+
ports,
|
|
3692
3723
|
credentials: {
|
|
3693
|
-
...stack.
|
|
3724
|
+
...stack.resolution.credentials,
|
|
3694
3725
|
postgres: login.login
|
|
3695
|
-
}
|
|
3696
|
-
seed: stack.credential.seed
|
|
3726
|
+
}
|
|
3697
3727
|
});
|
|
3728
|
+
const env = require_seeds.stageEnv(run.secrets ? require_seeds.toEmbeddableSecrets(run.secrets) : {}, Object.fromEntries(Object.entries(resolved).filter(([key]) => custom[key] === void 0)));
|
|
3698
3729
|
const options = {
|
|
3699
3730
|
root: workspace.root,
|
|
3700
3731
|
manifest,
|
|
@@ -4360,4 +4391,4 @@ Object.defineProperty(exports, "stackPlan", {
|
|
|
4360
4391
|
}
|
|
4361
4392
|
});
|
|
4362
4393
|
|
|
4363
|
-
//# sourceMappingURL=compose-
|
|
4394
|
+
//# sourceMappingURL=compose-DJMHSSDI.cjs.map
|