@zuplo/cli 1.118.0 → 1.120.0

package/dist/cmds/link.js

@@ -1,6 +1,7 @@
 
-!function(){try{var e="undefined"!=typeof window?window:"undefined"!=typeof global?global:"undefined"!=typeof self?self:{},n=(new Error).stack;n&&(e._sentryDebugIds=e._sentryDebugIds||{},e._sentryDebugIds[n]="c2365925-f632-55ec-9b9b-85ac10bfc5ab")}catch(e){}}();
+!function(){try{var e="undefined"!=typeof window?window:"undefined"!=typeof global?global:"undefined"!=typeof self?self:{},n=(new Error).stack;n&&(e._sentryDebugIds=e._sentryDebugIds||{},e._sentryDebugIds[n]="6247c8c4-d880-5d58-a70d-da8c9cd6a68a")}catch(e){}}();
 import { captureEvent } from "../common/analytics/lib.js";
+import { configure } from "../common/middleware/user-configuration.js";
 import { identify } from "../common/middleware/user-identification.js";
 import setBlocking from "../common/output.js";
 import { validLinkDirectoryValidator } from "../common/validators/file-system-validator.js";
@@ -18,7 +19,25 @@ export default {
             normalize: true,
             hidden: true,
         })
-            .middleware([setBlocking, identify])
+            .option("api-key", {
+            type: "string",
+            describe: "The API Key from Zuplo",
+            envVar: "API_KEY",
+        })
+            .option("account", {
+            type: "string",
+            describe: "The account name",
+        })
+            .option("project", {
+            type: "string",
+            describe: "The project name",
+        })
+            .option("environment", {
+            type: "string",
+            describe: "The environment name",
+        })
+            .demandOption(["api-key"])
+            .middleware([setBlocking, configure, identify])
             .check(async (argv) => {
             return await new YargsChecker(validLinkDirectoryValidator).check(argv);
         });
@@ -29,4 +48,4 @@ export default {
     },
 };
 //# sourceMappingURL=link.js.map
-//# debugId=c2365925-f632-55ec-9b9b-85ac10bfc5ab
+//# debugId=6247c8c4-d880-5d58-a70d-da8c9cd6a68a

package/dist/common/api/lib.js

@@ -1,5 +1,5 @@
 
-!function(){try{var e="undefined"!=typeof window?window:"undefined"!=typeof global?global:"undefined"!=typeof self?self:{},n=(new Error).stack;n&&(e._sentryDebugIds=e._sentryDebugIds||{},e._sentryDebugIds[n]="51fa863f-e84d-5faa-922f-e762f03ef49f")}catch(e){}}();
+!function(){try{var e="undefined"!=typeof window?window:"undefined"!=typeof global?global:"undefined"!=typeof self?self:{},n=(new Error).stack;n&&(e._sentryDebugIds=e._sentryDebugIds||{},e._sentryDebugIds[n]="be0ac435-2dd7-5dd2-8b70-531169e83b20")}catch(e){}}();
 export {};
 //# sourceMappingURL=lib.js.map
-//# debugId=51fa863f-e84d-5faa-922f-e762f03ef49f
+//# debugId=be0ac435-2dd7-5dd2-8b70-531169e83b20

package/dist/common/validators/file-system-validator.js

@@ -1,12 +1,12 @@
 
-!function(){try{var e="undefined"!=typeof window?window:"undefined"!=typeof global?global:"undefined"!=typeof self?self:{},n=(new Error).stack;n&&(e._sentryDebugIds=e._sentryDebugIds||{},e._sentryDebugIds[n]="5d556b94-af4a-5b17-96b6-e1bca9a4704a")}catch(e){}}();
+!function(){try{var e="undefined"!=typeof window?window:"undefined"!=typeof global?global:"undefined"!=typeof self?self:{},n=(new Error).stack;n&&(e._sentryDebugIds=e._sentryDebugIds||{},e._sentryDebugIds[n]="ec896cd1-5086-5370-b8b3-2b5276946dee")}catch(e){}}();
 import fg from "fast-glob";
 import { existsSync, readdirSync } from "node:fs";
 import { join } from "node:path";
 import { simpleGit } from "simple-git";
 import { TEST_IN_FOLDER } from "../constants.js";
 import { CompositeValidator } from "./lib.js";
-import { UserIsLoggedInValidator } from "./login-state-validator.js";
+import { IsZupLinkInvocableValidator } from "./login-state-validator.js";
 import { ProjectIsSetValidator } from "./project-name-validator.js";
 export class NotAGitRepoError extends Error {
     constructor() {
@@ -161,6 +161,6 @@ export class ZuploProjectHasTestsValidator {
 }
 export const validDeployDirectoryValidator = new CompositeValidator(new ZuploProjectValidator(), new GitVersionControlValidator(), new GitCommitValidator(), new GitBranchValidator(), new GitRemoteValidator(), new ProjectIsSetValidator());
 export const validTestDirectoryValidator = new CompositeValidator(new ZuploProjectValidator(), new ZuploProjectHasTestsValidator());
-export const validLinkDirectoryValidator = new CompositeValidator(new ZuploProjectValidator(), new UserIsLoggedInValidator());
+export const validLinkDirectoryValidator = new CompositeValidator(new ZuploProjectValidator(), new IsZupLinkInvocableValidator());
 //# sourceMappingURL=file-system-validator.js.map
-//# debugId=5d556b94-af4a-5b17-96b6-e1bca9a4704a
+//# debugId=ec896cd1-5086-5370-b8b3-2b5276946dee

package/dist/common/validators/login-state-validator.js

@@ -1,5 +1,5 @@
 
-!function(){try{var e="undefined"!=typeof window?window:"undefined"!=typeof global?global:"undefined"!=typeof self?self:{},n=(new Error).stack;n&&(e._sentryDebugIds=e._sentryDebugIds||{},e._sentryDebugIds[n]="ad5e9c30-9045-5fa4-b776-601c8f4c0a0a")}catch(e){}}();
+!function(){try{var e="undefined"!=typeof window?window:"undefined"!=typeof global?global:"undefined"!=typeof self?self:{},n=(new Error).stack;n&&(e._sentryDebugIds=e._sentryDebugIds||{},e._sentryDebugIds[n]="b9d015db-7e92-5ad9-a0e8-514350db203a")}catch(e){}}();
 import { existsSync } from "node:fs";
 import { readFile } from "node:fs/promises";
 import { join } from "node:path";
@@ -7,16 +7,19 @@ import { ZUPLO_AUTH_FILE_NAME } from "../constants.js";
 import { logger } from "../logger.js";
 import settings from "../settings.js";
 import { ZUPLO_XDG_STATE_HOME } from "../xdg/lib.js";
-export class UserIsNotLoggedIn extends Error {
+export class CannotInvokeZupLink extends Error {
     constructor() {
         super(`You are not logged in (or your credentials have expired). Please run \`zup login\` to log in.`);
-        Object.setPrototypeOf(this, UserIsNotLoggedIn.prototype);
+        Object.setPrototypeOf(this, CannotInvokeZupLink.prototype);
     }
 }
-export class UserIsLoggedInValidator {
-    async validate(_options) {
+export class IsZupLinkInvocableValidator {
+    async validate(options) {
+        if (options.environment) {
+            return { ok: true };
+        }
         if (!existsSync(join(ZUPLO_XDG_STATE_HOME, ZUPLO_AUTH_FILE_NAME))) {
-            return { ok: false, error: new UserIsNotLoggedIn() };
+            return { ok: false, error: new CannotInvokeZupLink() };
         }
         const rawAuth = await readFile(join(ZUPLO_XDG_STATE_HOME, ZUPLO_AUTH_FILE_NAME), "utf-8");
         const authJson = JSON.parse(rawAuth);
@@ -30,10 +33,10 @@ export class UserIsLoggedInValidator {
                 status: accountResponse.status,
                 statusText: accountResponse.statusText,
             }, "Failed to connect to Zuplo API during verification. Assuming user is not logged in.");
-            return { ok: false, error: new UserIsNotLoggedIn() };
+            return { ok: false, error: new CannotInvokeZupLink() };
         }
         return { ok: true };
     }
 }
 //# sourceMappingURL=login-state-validator.js.map
-//# debugId=ad5e9c30-9045-5fa4-b776-601c8f4c0a0a
+//# debugId=b9d015db-7e92-5ad9-a0e8-514350db203a

package/dist/compile/handler.js

@@ -1,6 +1,7 @@
 
-!function(){try{var e="undefined"!=typeof window?window:"undefined"!=typeof global?global:"undefined"!=typeof self?self:{},n=(new Error).stack;n&&(e._sentryDebugIds=e._sentryDebugIds||{},e._sentryDebugIds[n]="e900a4a1-10a3-56de-9a5a-905c90d64f03")}catch(e){}}();
-import { cpSync, existsSync } from "node:fs";
+!function(){try{var e="undefined"!=typeof window?window:"undefined"!=typeof global?global:"undefined"!=typeof self?self:{},n=(new Error).stack;n&&(e._sentryDebugIds=e._sentryDebugIds||{},e._sentryDebugIds[n]="925b9d73-a4de-58c0-8f9c-d757c8155db7")}catch(e){}}();
+import dotenv from "dotenv";
+import { cpSync, existsSync, readFileSync } from "node:fs";
 import { join, relative, resolve } from "node:path";
 import { fileURLToPath, pathToFileURL } from "node:url";
 import { printDiagnosticsToConsole } from "../common/output.js";
@@ -14,14 +15,11 @@ export async function compile(argv) {
         });
     }
     process.env.GLOBAL_MODULE_LOCATION = fileURLToPath(new URL("../../node_modules", import.meta.url));
-    const loadedEnvFiles = [];
-    const envFile = join(sourceDirectory, ".env");
-    if (existsSync(envFile)) {
-        loadedEnvFiles.push(".env");
-    }
+    let envZuplo = {};
     const envZuploFile = join(sourceDirectory, ".env.zuplo");
     if (existsSync(envZuploFile)) {
-        loadedEnvFiles.push(".env.zuplo");
+        const contents = readFileSync(envZuploFile);
+        envZuplo = dotenv.parse(contents);
     }
     const config = {
         build_assets_url: pathToFileURL(sourceDirectory),
@@ -33,10 +31,17 @@ export async function compile(argv) {
         sourceDirectory,
         port: zupPort,
         binaryName: argv["binary-name"],
-        generateSourceMaps: true,
+        publicZuploEnvironmentVariables: envZuplo
+            ? {
+                ZUPLO_ACCOUNT_NAME: envZuplo.ZUPLO_ACCOUNT_NAME,
+                ZUPLO_PROJECT_NAME: envZuplo.ZUPLO_PROJECT_NAME,
+                ZUPLO_ENVIRONMENT_TYPE: envZuplo.ZUPLO_ENVIRONMENT_TYPE,
+            }
+            :
+                undefined,
     });
     printDiagnosticsToConsole("📦 Compiled a self-contained zup binary");
     printDiagnosticsToConsole(`The binary is available at ${sourceDirectory}/dist/${argv["binary-name"]}`);
 }
 //# sourceMappingURL=handler.js.map
-//# debugId=e900a4a1-10a3-56de-9a5a-905c90d64f03
+//# debugId=925b9d73-a4de-58c0-8f9c-d757c8155db7

package/dist/dev/handler.js

@@ -1,6 +1,7 @@
 
-!function(){try{var e="undefined"!=typeof window?window:"undefined"!=typeof global?global:"undefined"!=typeof self?self:{},n=(new Error).stack;n&&(e._sentryDebugIds=e._sentryDebugIds||{},e._sentryDebugIds[n]="bf35816c-e91e-5014-89aa-1472b78406e4")}catch(e){}}();
-import { cpSync, existsSync } from "node:fs";
+!function(){try{var e="undefined"!=typeof window?window:"undefined"!=typeof global?global:"undefined"!=typeof self?self:{},n=(new Error).stack;n&&(e._sentryDebugIds=e._sentryDebugIds||{},e._sentryDebugIds[n]="249e5ca0-cf2e-5cef-a5c8-0d053825f965")}catch(e){}}();
+import dotenv from "dotenv";
+import { cpSync, existsSync, readFileSync } from "node:fs";
 import { join, relative, resolve } from "node:path";
 import { fileURLToPath, pathToFileURL } from "node:url";
 import { logger } from "../common/logger.js";
@@ -22,14 +23,18 @@ export async function dev(argv) {
     if (existsSync(envFile)) {
         loadedEnvFiles.push(".env");
     }
+    let envZuplo;
     const envZuploFile = join(sourceDirectory, ".env.zuplo");
     if (existsSync(envZuploFile)) {
+        const contents = readFileSync(envZuploFile);
+        envZuplo = dotenv.parse(contents);
         loadedEnvFiles.push(".env.zuplo");
     }
     const config = {
         build_assets_url: pathToFileURL(sourceDirectory),
     };
     process.env.__ZUPLO_CONFIG = btoa(JSON.stringify(config));
+    process.env.ZUPLO_IS_LOCAL_DEVELOPMENT = "true";
     const core = await import("@zuplo/core");
     const zupPort = argv.port;
     const zupEditorPort = argv.editorPort;
@@ -52,12 +57,14 @@ export async function dev(argv) {
         sourceDirectory,
         port: zupPort,
         debugPort: argv.debugPort ?? undefined,
-        devServerPort: undefined,
-        generateSourceMaps: true,
-        flags: {
-            remoteModules: false,
-            disableIntegratedDevPortalBuild: false,
-        },
+        publicZuploEnvironmentVariables: envZuplo
+            ? {
+                ZUPLO_ACCOUNT_NAME: envZuplo.ZUPLO_ACCOUNT_NAME,
+                ZUPLO_PROJECT_NAME: envZuplo.ZUPLO_PROJECT_NAME,
+                ZUPLO_ENVIRONMENT_TYPE: envZuplo.ZUPLO_ENVIRONMENT_TYPE,
+            }
+            :
+                undefined,
     });
     let editor;
     if (argv["start-editor"]) {
@@ -95,4 +102,4 @@ export async function dev(argv) {
     });
 }
 //# sourceMappingURL=handler.js.map
-//# debugId=bf35816c-e91e-5014-89aa-1472b78406e4
+//# debugId=249e5ca0-cf2e-5cef-a5c8-0d053825f965

package/dist/link/handler.js

@@ -1,5 +1,5 @@
 
-!function(){try{var e="undefined"!=typeof window?window:"undefined"!=typeof global?global:"undefined"!=typeof self?self:{},n=(new Error).stack;n&&(e._sentryDebugIds=e._sentryDebugIds||{},e._sentryDebugIds[n]="3c8e52ab-7b72-5f36-b4ad-e2ee1aaa743c")}catch(e){}}();
+!function(){try{var e="undefined"!=typeof window?window:"undefined"!=typeof global?global:"undefined"!=typeof self?self:{},n=(new Error).stack;n&&(e._sentryDebugIds=e._sentryDebugIds||{},e._sentryDebugIds[n]="90968db1-f5e4-5d8c-bbaa-d4b1a87e94fa")}catch(e){}}();
 import { select } from "@inquirer/prompts";
 import { readFile } from "node:fs/promises";
 import { join } from "node:path";
@@ -9,75 +9,138 @@ import { printCriticalFailureToConsoleAndExit, printResultToConsoleAndExitGracef
 import settings from "../common/settings.js";
 import { ZUPLO_XDG_STATE_HOME } from "../common/xdg/lib.js";
 import { pullSystemConfig, safeMergeConfig } from "./populate.js";
+function prettyPrintEnvironmentPrompt(env) {
+    const name = env.name;
+    let environmentType = env.environmentType.toLowerCase();
+    let branchName = env.branchName;
+    switch (environmentType) {
+        case "working-copy":
+        case "working_copy":
+            environmentType = "development";
+            branchName = "(via portal.zuplo.com)";
+            break;
+    }
+    return `${env.name} (${environmentType}, ${branchName})`;
+}
 export async function link(argv) {
     const rawAuth = await readFile(join(ZUPLO_XDG_STATE_HOME, ZUPLO_AUTH_FILE_NAME), "utf-8");
     const authJson = JSON.parse(rawAuth);
-    const accountResponse = await fetch(`${settings.ZUPLO_API_ENDPOINT}/v1/accounts`, {
-        headers: {
-            authorization: `Bearer ${authJson.access_token}`,
-        },
-    });
-    if (!accountResponse.ok) {
-        logger.error({
-            status: accountResponse.status,
-            statusText: accountResponse.statusText,
-            response: textOrJson(await accountResponse.text()),
-        }, "Failed to list accounts.");
-        await printCriticalFailureToConsoleAndExit("Error: Failed to list your accounts. Try again later.");
-    }
-    const accountJson = (await accountResponse.json());
-    let account;
-    if (accountJson.length === 1) {
-        account = accountJson[0].name;
-    }
-    else {
-        account = await select({
-            message: "Select the account to work with",
-            choices: accountJson.map((acc) => {
-                return {
-                    name: acc.name,
-                    value: acc.name,
-                };
-            }),
+    let environment = argv.environment;
+    let account = argv.account;
+    if (!environment && !account) {
+        const accountResponse = await fetch(`${settings.ZUPLO_API_ENDPOINT}/v1/accounts`, {
+            headers: {
+                authorization: `Bearer ${authJson.access_token}`,
+            },
         });
+        if (!accountResponse.ok) {
+            logger.error({
+                status: accountResponse.status,
+                statusText: accountResponse.statusText,
+                response: textOrJson(await accountResponse.text()),
+            }, "Failed to list accounts.");
+            await printCriticalFailureToConsoleAndExit("Error: Failed to list your accounts. Try again later.");
+        }
+        const accountJson = (await accountResponse.json());
+        if (accountJson.length === 1) {
+            account = accountJson[0].name;
+        }
+        else {
+            account = await select({
+                message: "Select the account to work with",
+                choices: accountJson.map((acc) => {
+                    return {
+                        name: acc.name,
+                        value: acc.name,
+                    };
+                }),
+            });
+        }
     }
-    const projectResponse = await fetch(`${settings.ZUPLO_API_ENDPOINT}/v1/accounts/${account}/projects`, {
-        headers: {
-            authorization: `Bearer ${authJson.access_token}`,
-        },
-    });
-    if (!projectResponse.ok) {
-        logger.error({
-            status: projectResponse.status,
-            statusText: projectResponse.statusText,
-            response: textOrJson(await projectResponse.text()),
-        }, "Failed to list projects.");
-        await printCriticalFailureToConsoleAndExit("Error: Failed to list your projects. Try again later.");
-    }
-    const projectJson = (await projectResponse.json());
-    let project;
-    if (projectJson.data.length === 1) {
-        project = projectJson.data[0].name;
+    let project = argv.project;
+    if (!environment && !project) {
+        const projectResponse = await fetch(`${settings.ZUPLO_API_ENDPOINT}/v1/accounts/${account}/projects`, {
+            headers: {
+                authorization: `Bearer ${authJson.access_token}`,
+            },
+        });
+        if (!projectResponse.ok) {
+            logger.error({
+                status: projectResponse.status,
+                statusText: projectResponse.statusText,
+                response: textOrJson(await projectResponse.text()),
+            }, "Failed to list projects.");
+            await printCriticalFailureToConsoleAndExit("Error: Failed to list your projects. Try again later.");
+        }
+        const projectJson = (await projectResponse.json());
+        if (projectJson.data.length === 1) {
+            project = projectJson.data[0].name;
+        }
+        else {
+            project = await select({
+                message: "Select the project to work with",
+                choices: projectJson.data.map((prj) => {
+                    return {
+                        name: prj.name,
+                        value: prj.name,
+                    };
+                }),
+            });
+        }
     }
-    else {
-        project = await select({
-            message: "Select the project to work with",
-            choices: projectJson.data.map((prj) => {
-                return {
-                    name: prj.name,
-                    value: prj.name,
-                };
-            }),
+    if (!environment) {
+        const environmentResponseFromZuploAPI = await fetch(`${settings.ZUPLO_API_ENDPOINT}/v1/accounts/${account}/projects/${project}/deployments`, {
+            headers: {
+                authorization: `Bearer ${authJson.access_token}`,
+            },
         });
+        const environmentJsonFromZuploAPI = (await environmentResponseFromZuploAPI.json());
+        const environmentResponseFromDeveloperAPI = await fetch(`${settings.ZUPLO_DEVELOPER_API_ENDPOINT}/v1/accounts/${account}/projects/${project}/deployments`, {
+            headers: {
+                authorization: `Bearer ${argv["api-key"]}`,
+            },
+        });
+        const environmentJsonFromDeveloperAPI = (await environmentResponseFromDeveloperAPI.json());
+        const environments = Object.assign({}, environmentJsonFromZuploAPI.data
+            .map((env) => {
+            return {
+                [prettyPrintEnvironmentPrompt(env)]: env.name,
+            };
+        })
+            .reduce((acc, curr) => {
+            return { ...acc, ...curr };
+        }), environmentJsonFromDeveloperAPI.data
+            .map((env) => {
+            return {
+                [prettyPrintEnvironmentPrompt(env)]: env.name,
+            };
+        })
+            .reduce((acc, curr) => {
+            return { ...acc, ...curr };
+        }));
+        if (Object.values(environments).length === 1) {
+            environment = Object.values(environments)[0];
+        }
+        else {
+            environment = await select({
+                message: "Select the environment to work with",
+                choices: Object.entries(environments).map(([key, value]) => {
+                    return {
+                        name: key,
+                        value,
+                    };
+                }),
+            });
+        }
+    }
+    argv.environment = environment;
+    if (project) {
+        await safeMergeConfig(argv.dir, project);
     }
-    await safeMergeConfig(argv.dir, { account, project });
-    await pullSystemConfig(argv.dir, {
-        account: accountJson.find((acc) => acc.name === account),
-        project: projectJson.data.find((prj) => prj.name === project),
-    });
+    await pullSystemConfig(argv);
     await printResultToConsoleAndExitGracefully(`
 Successfully linked your local directory to the ${project} project in the ${account} account.
 .env.zuplo and zuplo.jsonc have been updated with the new values.`);
 }
 //# sourceMappingURL=handler.js.map
-//# debugId=3c8e52ab-7b72-5f36-b4ad-e2ee1aaa743c
+//# debugId=90968db1-f5e4-5d8c-bbaa-d4b1a87e94fa

package/dist/link/populate.js

@@ -1,25 +1,22 @@
 
-!function(){try{var e="undefined"!=typeof window?window:"undefined"!=typeof global?global:"undefined"!=typeof self?self:{},n=(new Error).stack;n&&(e._sentryDebugIds=e._sentryDebugIds||{},e._sentryDebugIds[n]="b2394d6d-82d5-5876-b02e-aa6ebe0bf121")}catch(e){}}();
+!function(){try{var e="undefined"!=typeof window?window:"undefined"!=typeof global?global:"undefined"!=typeof self?self:{},n=(new Error).stack;n&&(e._sentryDebugIds=e._sentryDebugIds||{},e._sentryDebugIds[n]="6b8807e2-ae71-5c69-b1b0-2b87dae3cfdb")}catch(e){}}();
 import { applyEdits, modify } from "jsonc-parser";
 import { existsSync } from "node:fs";
 import { readFile, writeFile } from "node:fs/promises";
 import { join, relative } from "node:path";
 import prettier from "prettier";
 import { ZUPLO_FALLBACK_JSON_FILE, ZUPLO_PREFERRED_JSON_FILE, ZUPLO_SYSTEM_ENV_VAR, } from "../common/constants.js";
-export async function safeMergeConfig(dir, options) {
+import settings from "../common/settings.js";
+export async function safeMergeConfig(dir, project) {
     const normalizedDir = join(relative(process.cwd(), dir));
     const zuploPreferredConfigFile = join(normalizedDir, ZUPLO_PREFERRED_JSON_FILE);
     const zuploFallbackConfigFile = join(normalizedDir, ZUPLO_FALLBACK_JSON_FILE);
     if (existsSync(zuploPreferredConfigFile)) {
         const originalContents = await readFile(zuploPreferredConfigFile, "utf-8");
-        const modifyAccountEdit = modify(originalContents, ["account"], options.account, {
-            getInsertionIndex: () => 1,
-        });
-        const contentsPostAccount = applyEdits(originalContents, modifyAccountEdit);
-        const modifyProjectEdit = modify(contentsPostAccount, ["project"], options.project, {
+        const modifyProjectEdit = modify(originalContents, ["project"], project, {
             getInsertionIndex: () => 2,
         });
-        const contentsPostProject = applyEdits(contentsPostAccount, modifyProjectEdit);
+        const contentsPostProject = applyEdits(originalContents, modifyProjectEdit);
         const formatted = prettier.format(contentsPostProject, {
             parser: "json",
             quoteProps: "as-needed",
@@ -30,8 +27,7 @@ export async function safeMergeConfig(dir, options) {
         const config = JSON.parse(await readFile(zuploFallbackConfigFile, "utf-8"));
         const formatted = prettier.format(JSON.stringify({
             version: 1,
-            account: options.account,
-            project: options.project,
+            project: project,
             compatibilityDate: config.compatibilityDate,
         }), {
             parser: "json",
@@ -42,8 +38,7 @@ export async function safeMergeConfig(dir, options) {
     else {
         const formatted = prettier.format(JSON.stringify({
             version: 1,
-            account: options.account,
-            project: options.project,
+            project: project,
             compatibilityDate: "2023-03-14",
         }), {
             parser: "json",
@@ -52,18 +47,26 @@ export async function safeMergeConfig(dir, options) {
         await writeFile(zuploPreferredConfigFile, formatted);
     }
 }
-export async function pullSystemConfig(dir, options) {
-    const normalizedDir = join(relative(process.cwd(), dir));
+export async function pullSystemConfig(argv) {
+    const normalizedDir = join(relative(process.cwd(), argv.dir));
     const zuploPreferredConfigFile = join(normalizedDir, ZUPLO_SYSTEM_ENV_VAR);
+    const environmentResponseFromDeveloperAPI = await fetch(`${settings.ZUPLO_DEVELOPER_API_ENDPOINT}/v1/environments/${argv.environment}/configurations`, {
+        headers: {
+            authorization: `Bearer ${argv["api-key"]}`,
+        },
+    });
+    const payload = await environmentResponseFromDeveloperAPI.json();
     const content = `
-  # This file is auto-generated from zup link. Please do not edit it manually.
-  # It will be auto-generated afresh the next time you run zup link.
-  # If you wish to add your own environment variables, create a separate .env file.
-  
-  ZUPLO_API_KEY_SERVICE_BUCKET_NAME=z${options.project.id
-        .toLowerCase()
-        .replaceAll("_", "-")}-working-copy`;
+# This file is auto-generated from zup link. Please do not edit it manually.
+# It will be auto-generated afresh the next time you run zup link.
+# If you wish to add your own environment variables, create a separate .env file.
+
+ZUPLO_ACCOUNT_NAME=${payload.accountName}
+ZUPLO_PROJECT_NAME=${payload.projectName}
+ZUPLO_ENVIRONMENT_TYPE=${payload.environmentType}
+ZUPLO_SYSTEM_CONFIGURATIONS=${payload["systemConfigurations"]}
+`;
     await writeFile(zuploPreferredConfigFile, content);
 }
 //# sourceMappingURL=populate.js.map
-//# debugId=b2394d6d-82d5-5876-b02e-aa6ebe0bf121
+//# debugId=6b8807e2-ae71-5c69-b1b0-2b87dae3cfdb

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zuplo/cli",
-  "version": "1.118.0",
+  "version": "1.120.0",
   "type": "module",
   "repository": "https://github.com/zuplo/cli",
   "description": "The command-line interface for Zuplo",
@@ -64,10 +64,10 @@
     "@opentelemetry/api": "^1.8.0",
     "@sentry/node": "7.69.0",
     "@swc/core": "1.3.78",
-    "@zuplo/core": "5.2212.0",
+    "@zuplo/core": "5.2251.0",
     "@zuplo/deno-bin": "1.37.1",
     "@zuplo/pino-pretty-configurations": "^1.5.0",
-    "@zuplo/runtime": "5.2212.0",
+    "@zuplo/runtime": "5.2251.0",
     "chalk": "^5.1.2",
     "chokidar": "^3.5.3",
     "dotenv": "^16.3.1",