@treeseed/sdk 0.6.3 → 0.6.4
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.
|
@@ -1444,9 +1444,17 @@ function resolveTreeseedLaunchEnvironment({
|
|
|
1444
1444
|
overrides = {}
|
|
1445
1445
|
}) {
|
|
1446
1446
|
warnDeprecatedTreeseedLocalEnvFiles(tenantRoot);
|
|
1447
|
+
let machineValues = {};
|
|
1448
|
+
try {
|
|
1449
|
+
machineValues = resolveTreeseedMachineEnvironmentValues(tenantRoot, scope);
|
|
1450
|
+
} catch (error) {
|
|
1451
|
+
if (!(error instanceof TreeseedKeyAgentError)) {
|
|
1452
|
+
throw error;
|
|
1453
|
+
}
|
|
1454
|
+
}
|
|
1455
|
+
const scopedValues = scope === "local" ? { ...baseEnv, ...machineValues } : { ...machineValues, ...baseEnv };
|
|
1447
1456
|
return {
|
|
1448
|
-
...
|
|
1449
|
-
...resolveTreeseedMachineEnvironmentValues(tenantRoot, scope),
|
|
1457
|
+
...scopedValues,
|
|
1450
1458
|
...overrides
|
|
1451
1459
|
};
|
|
1452
1460
|
}
|
|
@@ -1467,7 +1475,7 @@ function formatTreeseedConfigEnvironmentReport({ tenantRoot, scope, env = proces
|
|
|
1467
1475
|
function applyTreeseedEnvironmentToProcess({ tenantRoot, scope, override = false }) {
|
|
1468
1476
|
let resolvedValues = {};
|
|
1469
1477
|
try {
|
|
1470
|
-
resolvedValues = resolveTreeseedLaunchEnvironment({ tenantRoot, scope
|
|
1478
|
+
resolvedValues = resolveTreeseedLaunchEnvironment({ tenantRoot, scope });
|
|
1471
1479
|
} catch (error) {
|
|
1472
1480
|
if (!(error instanceof TreeseedKeyAgentError)) {
|
|
1473
1481
|
throw error;
|