@catladder/cli 0.0.0-refactor-untangle-gitlab-api-requests-from-vorpal-57cf3cf2 → 0.0.0-reference-database-url-1befbbee

package/dist/bundles/cli/index.js

@@ -1451,7 +1451,6 @@ Object.defineProperty(exports, "__esModule", ({ value: true }));
 const child_process_promise_1 = __nccwpck_require__(75763);
 const lodash_1 = __nccwpck_require__(23255);
 const open_1 = __importDefault(__nccwpck_require__(14247));
-const gitlab_without_vorpal_1 = __nccwpck_require__(84346);
 const gitlab_1 = __nccwpck_require__(12927);
 const statusEmojiMap = {
     failed: "🙀",
@@ -1471,14 +1470,8 @@ const getCurrentCommit = async () => {
     return result.stdout && result.stdout.replace(/\n$/, "");
 };
 const delay = async (ms) => new Promise((resolve) => setTimeout(resolve, ms));
-const promptJob = async (vorpal, projectId, ctx, existing = {}) => {
-    const { host, path, token: inputToken, } = await (0, gitlab_without_vorpal_1.getGitLabHostPathToken)(existing, vorpal);
-    const token = inputToken || (await (0, gitlab_1.getGitlabToken)(vorpal, host));
-    const jobs = await (0, gitlab_1.doGitlabRequest)(vorpal, {
-        path: `projects/${projectId}/jobs`,
-        host,
-        token,
-    });
+const promptJob = async (vorpal, projectId, ctx) => {
+    const jobs = await (0, gitlab_1.doGitlabRequest)(vorpal, `projects/${projectId}/jobs`);
     const commitId = await getCurrentCommit();
     const jobsToName = (jo) => jo.map((j) => `${j.ref}-${j.name}-${j.user.username}-${j.status}-${j.id}`);
     const preferredJobs = jobs.filter((j) => j.commit.id === commitId);
@@ -1499,30 +1492,21 @@ const promptJob = async (vorpal, projectId, ctx, existing = {}) => {
     const jobId = Number((0, lodash_1.last)(jobName.split("-")));
     return jobs.find((j) => j.id === jobId);
 };
-const commandGitlabCi = async (vorpal, { projectId, ...existing } = {}) => {
+exports["default"] = async (vorpal) => {
     vorpal.command("project-ci-job-open", "Open a Job").action(async function () {
-        const { host, path, token: inputToken, } = await (0, gitlab_without_vorpal_1.getGitLabHostPathToken)(existing, vorpal);
-        const token = inputToken || (await (0, gitlab_1.getGitlabToken)(this, host));
-        const id = projectId || (await (0, gitlab_without_vorpal_1.getGitLabProjectId)({ host, path, token }, vorpal));
-        const job = await promptJob(this, id, this, { host, path, token });
+        const { id: projectId } = await (0, gitlab_1.getProjectInfo)(this);
+        const job = await promptJob(this, projectId, this);
         (0, open_1.default)(job.web_url);
     });
     vorpal
         .command("project-ci-job-log", "Show a job's log")
         .action(async function () {
-        const { host, path, token: inputToken, } = await (0, gitlab_without_vorpal_1.getGitLabHostPathToken)(existing, vorpal);
-        const token = inputToken || (await (0, gitlab_1.getGitlabToken)(this, host));
-        const apiData = { host, path, token };
-        const pId = projectId || (await (0, gitlab_without_vorpal_1.getGitLabProjectId)({ host, path, token }, vorpal));
-        const { id } = await promptJob(this, pId, this, apiData);
+        const { id: projectId } = await (0, gitlab_1.getProjectInfo)(this);
+        const { id } = await promptJob(this, projectId, this);
         let finished = false;
         while (!finished) {
-            const trace = await (0, child_process_promise_1.exec)(`curl -s --header "PRIVATE-TOKEN: ${token}" "https://git.panter.ch/api/v4/projects/${pId}/jobs/${id}/trace"`);
-            const job = await (0, gitlab_1.doGitlabRequest)(this, {
-                path: `projects/${pId}/jobs/${id}`,
-                host,
-                token,
-            });
+            const trace = await (0, child_process_promise_1.exec)(`curl -s --header "PRIVATE-TOKEN: ${await (0, gitlab_1.getGitlabToken)(this)}" "https://git.panter.ch/api/v4/projects/${projectId}/jobs/${id}/trace"`);
+            const job = await (0, gitlab_1.doGitlabRequest)(this, `projects/${projectId}/jobs/${id}`);
             if (trace.stdout) {
                 vorpal.ui.redraw(`${trace.stdout}`);
             }
@@ -1544,7 +1528,6 @@ const commandGitlabCi = async (vorpal, { projectId, ...existing } = {}) => {
         }
     });
 };
-exports["default"] = commandGitlabCi;
 //# sourceMappingURL=commandGitlabCi.js.map
 
 /***/ }),
@@ -1859,10 +1842,12 @@ exports["default"] = async (vorpal) => {
 
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 const setup_1 = __nccwpck_require__(33309);
+const autocompletions_1 = __nccwpck_require__(39855);
 exports["default"] = async (vorpal) => vorpal
-    .command("project-setup", "Initializes all environments and creates requires resources, service accounts, etc.")
-    .action(async function () {
-    await (0, setup_1.setupProject)(this);
+    .command("project-setup [component]", "Initializes all environments and creates requires resources, service accounts, etc.")
+    .autocomplete(await (0, autocompletions_1.allComponents)())
+    .action(async function ({ component }) {
+    await (0, setup_1.setupProject)(this, component);
 });
 //# sourceMappingURL=commandSetup.js.map
 
@@ -1996,32 +1981,21 @@ exports["default"] = async (vorpal) => {
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.setupProject = void 0;
 const getProjectConfig_1 = __nccwpck_require__(12145);
-const commandConfigSecrets_1 = __nccwpck_require__(23410);
 const setupAccessTokens_1 = __nccwpck_require__(84195);
 const setupContext_1 = __nccwpck_require__(44310);
 const setupTopic_1 = __nccwpck_require__(84290);
-const setupProject = async (instance) => {
-    const allContext = await (0, getProjectConfig_1.getAllPipelineContexts)();
+const setupProject = async (instance, onlyComponents) => {
+    const allContext = await (0, getProjectConfig_1.getAllPipelineContexts)(onlyComponents);
+    instance.log("will setup those contexts:");
+    allContext.forEach((context) => {
+        instance.log(` - ${context.name}:${context.env}`);
+    });
     for (const context of allContext) {
         await (0, setupContext_1.setupContext)(instance, context);
     }
     await (0, setupAccessTokens_1.setupAccessTokens)(instance);
     await (0, setupTopic_1.setupTopic)(instance);
     instance.log("");
-    const { configSecrets } = await instance.prompt({
-        default: true,
-        message: "Before deployments work, you need to config secrets. Do it now?",
-        name: "configSecrets",
-        type: "confirm",
-    });
-    instance.log("");
-    if (configSecrets) {
-        await (0, commandConfigSecrets_1.projectConfigSecrets)(instance);
-    }
-    else {
-        instance.log("👆 don't forget to config secret using `project-config-secrets`");
-    }
-    instance.log("");
     instance.log("gitlab is ready! 🥂");
     instance.log("\n");
     instance.log("do not forget to make sure that:");
@@ -2048,49 +2022,37 @@ exports.setupProject = setupProject;
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.setupAccessTokens = void 0;
 const date_fns_1 = __nccwpck_require__(44438);
-const gitlab_without_vorpal_1 = __nccwpck_require__(84346);
 const gitlab_1 = __nccwpck_require__(12927);
 const TOKEN_NAME = "semantic-release";
-const setupAccessTokens = async (vorpal, { projectId, ...existing } = {}) => {
-    const { host, path, token: inputToken, } = await (0, gitlab_without_vorpal_1.getGitLabHostPathToken)(existing, vorpal);
-    const token = inputToken || (await (0, gitlab_1.getGitlabToken)(vorpal, host));
-    const id = projectId || (await (0, gitlab_without_vorpal_1.getGitLabProjectId)({ host, path, token }, vorpal));
-    const projectTokens = await gitlab_without_vorpal_1.gitLabProjectAccessToken.getList({ projectId: id, token, host }, vorpal);
-    const accessToken = projectTokens.find((t) => t.name === TOKEN_NAME && t.active === true);
-    const expires_at = (0, date_fns_1.add)(new Date(), { years: 1, days: -1 });
-    const newToken = accessToken
-        ? await gitlab_without_vorpal_1.gitLabProjectAccessToken.rotate({
-            projectId: id,
-            tokenId: accessToken.id,
-            token,
-            host,
-            data: { expires_at },
-        }, vorpal)
-        : await gitlab_without_vorpal_1.gitLabProjectAccessToken.create({
-            projectId: id,
-            token,
-            host,
-            data: {
-                expires_at,
-                name: TOKEN_NAME,
-                scopes: ["api", "read_repository"],
-                access_level: 40, // Maintainer
-            },
-        }, vorpal);
-    const fetchCommon = { key: "GL_TOKEN", projectId: id, host, token };
+const setupAccessTokens = async (instance) => {
+    const { id: projectId } = await (0, gitlab_1.getProjectInfo)(instance);
+    const projectTokens = await (0, gitlab_1.doGitlabRequest)(instance, `projects/${projectId}/access_tokens`);
+    const token = projectTokens.find((t) => t.name === TOKEN_NAME && t.active === true);
+    const expires_at = (0, date_fns_1.format)((0, date_fns_1.add)(new Date(), { years: 1, days: -1 }), "yyyy-MM-dd");
+    const newToken = token
+        ? await (0, gitlab_1.doGitlabRequest)(instance, `projects/${projectId}/access_tokens/${token.id}/rotate`, { expires_at }, "POST")
+        : await (0, gitlab_1.doGitlabRequest)(instance, `projects/${projectId}/access_tokens`, {
+            name: TOKEN_NAME,
+            scopes: ["api", "read_repository"],
+            access_level: 40, // Maintainer
+            expires_at,
+        }, "POST");
     try {
-        await gitlab_without_vorpal_1.gitLabVariable.get(fetchCommon, vorpal);
-        await gitlab_without_vorpal_1.gitLabVariable.update({ ...fetchCommon, value: newToken.token }, vorpal);
+        await (0, gitlab_1.doGitlabRequest)(instance, `projects/${projectId}/variables/GL_TOKEN`);
+        await (0, gitlab_1.doGitlabRequest)(instance, `projects/${projectId}/variables/GL_TOKEN`, { value: newToken.token }, "PUT");
     }
     catch (e) {
-        if (!(e instanceof gitlab_without_vorpal_1.FetchGitLabError))
-            throw e;
-        if (e.status !== 404)
+        if (e.message !== "not found") {
             throw e;
+        }
         // not found
-        await gitlab_without_vorpal_1.gitLabVariable.create({ ...fetchCommon, value: newToken.token, masked: true }, vorpal);
+        await (0, gitlab_1.doGitlabRequest)(instance, `projects/${projectId}/variables`, {
+            key: "GL_TOKEN",
+            value: newToken.token,
+            masked: true,
+        }, "POST");
     }
-    vorpal.log("Token configured for semantic release. Renew me again in a year!");
+    instance.log("Token configured for semantic release. Renew me again in a year!");
 };
 exports.setupAccessTokens = setupAccessTokens;
 //# sourceMappingURL=setupAccessTokens.js.map
@@ -2203,53 +2165,39 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.setupKubernetes = void 0;
-const child_process_promise_1 = __nccwpck_require__(75763);
 const pipeline_1 = __nccwpck_require__(10603);
-const ensureNamespace_1 = __importDefault(__nccwpck_require__(81349));
-const gitlab_without_vorpal_1 = __nccwpck_require__(84346);
-const gitlab_1 = __nccwpck_require__(12927);
+const child_process_promise_1 = __nccwpck_require__(75763);
 const cluster_1 = __nccwpck_require__(62774);
-const setupKubernetes = async (vorpal, context, { projectId, ...existing } = {}) => {
+const gitlab_1 = __nccwpck_require__(12927);
+const ensureNamespace_1 = __importDefault(__nccwpck_require__(81349));
+const setupKubernetes = async (instance, context) => {
     var _a;
     const deployConfig = (_a = context.deploy) === null || _a === void 0 ? void 0 : _a.config;
     if (!(0, pipeline_1.isOfDeployType)(deployConfig, "kubernetes")) {
         throw new Error("cannot run setupKubernetes on non-kubernetes deployments");
     }
-    const { host, path, token: inputToken, } = await (0, gitlab_without_vorpal_1.getGitLabHostPathToken)(existing, vorpal);
-    const token = inputToken || (await (0, gitlab_1.getGitlabToken)(vorpal, host));
-    const id = projectId || (await (0, gitlab_without_vorpal_1.getGitLabProjectId)({ host, path, token }, vorpal));
-    const requestInfo = { host, path, token, projectId: id };
-    const deploy_tokens = await (0, gitlab_1.doGitlabRequest)(vorpal, {
-        path: `projects/${id}/deploy_tokens`,
-        host,
-        token,
-    });
+    const { id: projectId } = await (0, gitlab_1.getProjectInfo)(instance);
+    const deploy_tokens = await (0, gitlab_1.doGitlabRequest)(instance, `projects/${projectId}/deploy_tokens`);
     if (!deploy_tokens.find((v) => v.name === "gitlab-deploy-token")) {
-        vorpal.log("I will setup the 'GitLab Deploy Token', so Kubernetes can pull images from this project.");
-        await (0, gitlab_1.doGitlabRequest)(vorpal, {
-            path: `projects/${id}/deploy_tokens`,
-            data: {
-                id,
-                name: "gitlab-deploy-token",
-                scopes: ["read_registry"],
-            },
-            method: "POST",
-            host,
-            token,
-        });
+        instance.log("I will setup the 'GitLab Deploy Token', so Kubernetes can pull images from this project.");
+        await (0, gitlab_1.doGitlabRequest)(instance, `projects/${projectId}/deploy_tokens`, {
+            id: projectId,
+            name: "gitlab-deploy-token",
+            scopes: ["read_registry"],
+        }, "POST");
     }
     const fullName = (0, pipeline_1.getFullKubernetesClusterName)(deployConfig.cluster);
-    vorpal.log(`cluster: ${fullName}`);
+    instance.log(`cluster: ${fullName}`);
     await (0, cluster_1.connectToCluster)(fullName);
-    vorpal.log("");
-    vorpal.log("ensuring namespace ...");
+    instance.log("");
+    instance.log("ensuring namespace ...");
     const namespace = await (0, ensureNamespace_1.default)(context);
-    vorpal.log("Namespace " + namespace + " created / updated!");
-    vorpal.log("");
+    instance.log("Namespace " + namespace + " created / updated!");
+    instance.log("");
     //$.verbose = true;
     // we name the service account and the role and the role binding with the same name
     // we currently create one per component to better separate them
-    vorpal.log("ensuring service accounts...");
+    instance.log("ensuring service accounts...");
     const serviceAccountName = `cl-${context.name}-deploy`;
     const KUBE_URL = await (0, child_process_promise_1.exec)(`TERM=dumb kubectl cluster-info | grep -E 'Kubernetes master|Kubernetes control plane' | awk '/http/ {print $NF}'`).then((s) => s.stdout.trim());
     // first upsert service acount in the ns
@@ -2318,12 +2266,11 @@ EOF
             fullName +
             "'");
     }
-    vorpal.log("service accounts created / updated!");
-    vorpal.log("");
-    vorpal.log("pusing secrets to gitlab...");
-    await (0, gitlab_1.upsertAllVariables)(vorpal, vars, context.env, context.name, false, // no backup
-    undefined, requestInfo);
-    vorpal.log("done!");
+    instance.log("service accounts created / updated!");
+    instance.log("");
+    instance.log("pusing secrets to gitlab...");
+    await (0, gitlab_1.upsertAllVariables)(instance, vars, context.env, context.name, false);
+    instance.log("done!");
 };
 exports.setupKubernetes = setupKubernetes;
 //# sourceMappingURL=setupKubernetes.js.map
@@ -2337,13 +2284,12 @@ exports.setupKubernetes = setupKubernetes;
 
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.setupTopic = void 0;
-const gitlab_without_vorpal_1 = __nccwpck_require__(84346);
 const gitlab_1 = __nccwpck_require__(12927);
 const catladderTopic = "catladder";
-const setupTopic = async (vorpal, existing = {}) => {
-    const { host, path, token: inputToken, } = await (0, gitlab_without_vorpal_1.getGitLabHostPathToken)(existing, vorpal);
-    const token = inputToken || (await (0, gitlab_1.getGitlabToken)(vorpal, host));
-    return (0, gitlab_without_vorpal_1.insertProjectTopics)({ topics: [catladderTopic], token, host }, vorpal);
+const setupTopic = async (instance) => {
+    const { id: projectId } = await (0, gitlab_1.getProjectInfo)(instance);
+    const { topics } = await (0, gitlab_1.doGitlabRequest)(instance, `projects/${projectId}`);
+    await (0, gitlab_1.doGitlabRequest)(instance, `projects/${projectId}`, { topics: [catladderTopic, ...topics] }, "PUT");
 };
 exports.setupTopic = setupTopic;
 //# sourceMappingURL=setupTopic.js.map
@@ -2356,7 +2302,7 @@ exports.setupTopic = setupTopic;
 "use strict";
 
 Object.defineProperty(exports, "__esModule", ({ value: true }));
-exports.allEnvsAndAllComponents = exports.envAndComponents = exports.allEnvs = void 0;
+exports.allEnvsAndAllComponents = exports.envAndComponents = exports.allComponents = exports.allEnvs = void 0;
 const pipeline_1 = __nccwpck_require__(10603);
 const getProjectConfig_1 = __nccwpck_require__(12145);
 const allEnvs = async () => {
@@ -2367,6 +2313,14 @@ const allEnvs = async () => {
     return (0, pipeline_1.getAllEnvsInAllComponents)(config);
 };
 exports.allEnvs = allEnvs;
+const allComponents = async () => {
+    const config = await (0, getProjectConfig_1.getProjectConfig)();
+    if (!config) {
+        return [];
+    }
+    return Object.keys(config.components);
+};
+exports.allComponents = allComponents;
 const envAndComponents = async () => {
     const allEnvAndcomponents = await (0, getProjectConfig_1.getAllComponentsWithAllEnvsFlat)();
     return allEnvAndcomponents.reduce((acc, { env, componentName }) => [...acc, env + ":" + componentName], []);
@@ -2536,29 +2490,20 @@ exports["default"] = async (vorpal) => {
 
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.getGoogleAuthUserNumber = void 0;
-const log_1 = __nccwpck_require__(66921);
-const preferences_1 = __nccwpck_require__(62636);
+const preferences_1 = __nccwpck_require__(13511);
+const KEY = "googleAuthUserNumber";
 const getGoogleAuthUserNumber = async function () {
-    const preferences = await (0, preferences_1.getPreferences)(this);
-    if (typeof preferences.googleAuthUserNumber === "number" ||
-        typeof preferences.googleAuthUserNumber === "string") {
-        return preferences.googleAuthUserNumber;
-    }
-    (0, log_1.logLines)(this, "Please type in your google auth user number (0 if you have only one google account or maybe 1 if you have multiple)");
-    const { authUserNumber: googleAuthUserNumber } = await this.prompt({
-        type: "number",
-        name: "authUserNumber",
-        default: "0",
-        message: "Auth user ",
-    });
-    if (typeof googleAuthUserNumber === "number" ||
-        (typeof googleAuthUserNumber === "string" &&
-            googleAuthUserNumber.length > 0)) {
-        await (0, preferences_1.upsertPreferences)({ googleAuthUserNumber }, this);
-        return googleAuthUserNumber;
+    if (!(await (0, preferences_1.hasPreference)(KEY))) {
+        this.log("Please type in your google auth user number (0 if you have only one google account or maybe 1 if you have multiple)");
+        const { authUserNumber } = await this.prompt({
+            type: "number",
+            name: "authUserNumber",
+            default: "0",
+            message: "Auth user ",
+        });
+        await (0, preferences_1.setPreference)(KEY, authUserNumber);
     }
-    (0, log_1.logError)(this, "google auth user number input missing!");
-    process.exit(1);
+    return (0, preferences_1.getPreference)(KEY);
 };
 exports.getGoogleAuthUserNumber = getGoogleAuthUserNumber;
 //# sourceMappingURL=getGoogleAuthUserNumber.js.map
@@ -2573,31 +2518,14 @@ exports.getGoogleAuthUserNumber = getGoogleAuthUserNumber;
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.verify = void 0;
 const gitlab_1 = __nccwpck_require__(12927);
-const preferences_1 = __nccwpck_require__(62636);
-const git_1 = __nccwpck_require__(85096);
 const verify = async (vorpal) => {
-    var _a, _b;
-    const [preferences, { gitRemoteHost }] = await Promise.all([
-        (0, preferences_1.getPreferences)(vorpal),
-        (0, git_1.getGitRemoteHostAndPath)(),
-    ]);
     // check if has all settings
-    if ((_a = preferences.gitlabTokens[gitRemoteHost]) === null || _a === void 0 ? void 0 : _a.length) {
-        return;
-    }
-    if ((_b = preferences["gitlab-personal-access-token"]) === null || _b === void 0 ? void 0 : _b.length) {
-        // Add the token to the hostname based preferences
-        await (0, preferences_1.upsertPreferences)({
-            gitlabTokens: {
-                [gitRemoteHost]: preferences["gitlab-personal-access-token"],
-            },
-        }, vorpal);
-        return;
+    if (!(await (0, gitlab_1.hasGitlabToken)())) {
+        vorpal.command("setup-gitlab-token").action(async function () {
+            await (0, gitlab_1.setupGitlabToken)(this);
+        });
+        vorpal.exec("setup-gitlab-token");
     }
-    vorpal.command("setup-gitlab-token").action(async function () {
-        await (0, gitlab_1.setupGitlabToken)(this, gitRemoteHost);
-    });
-    vorpal.exec("setup-gitlab-token");
 };
 exports.verify = verify;
 //# sourceMappingURL=index.js.map
@@ -2626,11 +2554,10 @@ const cli_1 = __importDefault(__nccwpck_require__(12200));
 
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.getJobOnlyEnvVarsResolved = exports.getEnvVarsResolved = exports.getGitlabVar = exports.getEnvironment = exports.getAllPipelineContexts = exports.getAllComponentsWithAllEnvsHierarchical = exports.getAllComponentsWithAllEnvsFlat = exports.getPipelineContextByChoice = exports.getProjectComponents = exports.getProjectConfig = exports.parseChoice = void 0;
-const fs_1 = __nccwpck_require__(57147);
 const pipeline_1 = __nccwpck_require__(10603);
 const gitlab_1 = __nccwpck_require__(12927);
 const projects_1 = __nccwpck_require__(79011);
-const gitlab_without_vorpal_1 = __nccwpck_require__(84346);
+const fs_1 = __nccwpck_require__(57147);
 var parseChoice_1 = __nccwpck_require__(83941);
 Object.defineProperty(exports, "parseChoice", ({ enumerable: true, get: function () { return parseChoice_1.parseChoice; } }));
 let currentConfig = null;
@@ -2695,9 +2622,15 @@ const getAllComponentsWithAllEnvsHierarchical = async () => {
     ]));
 };
 exports.getAllComponentsWithAllEnvsHierarchical = getAllComponentsWithAllEnvsHierarchical;
-const getAllPipelineContexts = async () => {
+const getAllPipelineContexts = async (onlyComponent) => {
+    const onlyComponentsArray = onlyComponent
+        ? Array.isArray(onlyComponent)
+            ? onlyComponent
+            : [onlyComponent]
+        : null;
     return Promise.all((await (0, exports.getAllComponentsWithAllEnvsFlat)())
         .filter((c) => c.env !== "local")
+        .filter((c) => !onlyComponentsArray || onlyComponentsArray.includes(c.componentName))
         .map(({ env, componentName }) => (0, exports.getPipelineContextByChoice)(env, componentName)));
 };
 exports.getAllPipelineContexts = getAllPipelineContexts;
@@ -2711,15 +2644,8 @@ const getGitlabVar = async (vorpal, env, componentName, variableName) => {
     return await (0, gitlab_1.getVariableValueByRawName)(vorpal, rawVariableName);
 };
 exports.getGitlabVar = getGitlabVar;
-const resolveSecrets = async (vorpal, varSets, existing = {}) => {
-    const { host, path, token: inputToken, } = await (0, gitlab_without_vorpal_1.getGitLabHostPathToken)(existing, vorpal);
-    const token = inputToken || (await (0, gitlab_1.getGitlabToken)(vorpal, host));
-    const allVariablesInGitlab = await gitlab_without_vorpal_1.gitLabVariable.getAll({
-        logger: vorpal,
-        token,
-        host,
-        path,
-    });
+const resolveSecrets = async (vorpal, varSets) => {
+    const allVariablesInGitlab = await (0, gitlab_1.getAllVariables)(vorpal);
     return Object.fromEntries(varSets.flatMap(({ envVars, secretEnvVarKeys }) => Object.entries(envVars)
         .filter(([key, value]) => {
         var _a;
@@ -3093,7 +3019,7 @@ exports.gitConfigSet = gitConfigSet;
 "use strict";
 
 Object.defineProperty(exports, "__esModule", ({ value: true }));
-exports.getGitRemotePath = exports.getGitRemoteHost = exports.gitProjectInformation = exports.getGitRemoteHostAndPath = exports.getProjectRootPath = void 0;
+exports.gitProjectInformation = exports.getGitRemoteHostAndPath = exports.getProjectRootPath = void 0;
 const gitConfig_1 = __nccwpck_require__(72745);
 const child_process_promise_1 = __nccwpck_require__(75763);
 /**
@@ -3107,11 +3033,8 @@ exports.getProjectRootPath = getProjectRootPath;
 /**
  * Get the git remote hostname and project path from the git config.
  */
-const getGitRemoteHostAndPath = async ({ host, path, } = {}) => {
+const getGitRemoteHostAndPath = async () => {
     var _a;
-    if ((host === null || host === void 0 ? void 0 : host.length) && (path === null || path === void 0 ? void 0 : path.length)) {
-        return { gitRemoteHost: host, gitRemotePath: path };
-    }
     const remoteUrl = await (0, gitConfig_1.gitConfigGet)("remote.origin.url");
     const remoteReg = /(https:\/\/|git@)([^:/]+)[:/]([^.]*)(\.git)?/;
     const match = (_a = remoteUrl.match(remoteReg)) !== null && _a !== void 0 ? _a : [];
@@ -3131,60 +3054,10 @@ const gitProjectInformation = async () => {
     };
 };
 exports.gitProjectInformation = gitProjectInformation;
-/**
- * Get the git remote hostname.
- * Will only run a shell execution when hostnamePresent is nil or empty.
- */
-const getGitRemoteHost = async (hostnamePresent) => {
-    if (hostnamePresent === null || hostnamePresent === void 0 ? void 0 : hostnamePresent.length) {
-        return hostnamePresent;
-    }
-    const { gitRemoteHost } = await (0, exports.getGitRemoteHostAndPath)();
-    return gitRemoteHost;
-};
-exports.getGitRemoteHost = getGitRemoteHost;
-/**
- * Get the git remote path.
- * Will only run a shell execution when pathPresent is nil or empty.
- */
-const getGitRemotePath = async (pathPresent) => {
-    if (pathPresent === null || pathPresent === void 0 ? void 0 : pathPresent.length) {
-        return pathPresent;
-    }
-    const { gitRemotePath } = await (0, exports.getGitRemoteHostAndPath)();
-    return gitRemotePath;
-};
-exports.getGitRemotePath = getGitRemotePath;
 //# sourceMappingURL=gitProjectInformation.js.map
 
 /***/ }),
 
-/***/ 85096:
-/***/ (function(__unused_webpack_module, exports, __nccwpck_require__) {
-
-"use strict";
-
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __exportStar = (this && this.__exportStar) || function(m, exports) {
-    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
-};
-Object.defineProperty(exports, "__esModule", ({ value: true }));
-__exportStar(__nccwpck_require__(72745), exports);
-__exportStar(__nccwpck_require__(78329), exports);
-//# sourceMappingURL=index.js.map
-
-/***/ }),
-
 /***/ 79672:
 /***/ ((__unused_webpack_module, exports, __nccwpck_require__) => {
 
@@ -3469,85 +3342,7 @@ exports["default"] = async () => {
 
 /***/ }),
 
-/***/ 35438:
-/***/ ((__unused_webpack_module, exports) => {
-
-"use strict";
-
-Object.defineProperty(exports, "__esModule", ({ value: true }));
-exports.FetchGitLabError = void 0;
-class FetchGitLabError extends Error {
-    constructor(response, { resourcePath, data, method, cause, } = {}, extraMessage = "") {
-        const status = response === null || response === void 0 ? void 0 : response.status;
-        const statusMsg = status ? ` ${status}` : "";
-        const methodPath = [method, resourcePath].filter(Boolean).join(" ");
-        const customMsg = (extraMessage === null || extraMessage === void 0 ? void 0 : extraMessage.length) ? `: ${extraMessage}` : "";
-        super(`GitLab API Error${statusMsg}${(methodPath === null || methodPath === void 0 ? void 0 : methodPath.length) ? ` ${methodPath}` : ""}${customMsg}`, {
-            cause: Object.entries({ resourcePath, data, method, cause }).reduce((acc, [k, v]) => {
-                if (v) {
-                    acc[k] = v;
-                }
-                return acc;
-            }, {}),
-        });
-        this.response = response;
-        this.name = "FetchGitLabError";
-        this.cause = cause;
-        this.resourcePath = resourcePath;
-        this.data = data;
-        this.method = method;
-        if (response) {
-            this.status = status;
-            this.contentType = response.headers.get("content-type");
-            this.statusText = response.statusText;
-        }
-    }
-}
-exports.FetchGitLabError = FetchGitLabError;
-//# sourceMappingURL=FetchGitLabError.js.map
-
-/***/ }),
-
-/***/ 64361:
-/***/ ((__unused_webpack_module, exports) => {
-
-"use strict";
-
-Object.defineProperty(exports, "__esModule", ({ value: true }));
-//# sourceMappingURL=FetchMethod.js.map
-
-/***/ }),
-
-/***/ 971:
-/***/ ((__unused_webpack_module, exports) => {
-
-"use strict";
-
-Object.defineProperty(exports, "__esModule", ({ value: true }));
-//# sourceMappingURL=GitLabApiDataOptional.js.map
-
-/***/ }),
-
-/***/ 47231:
-/***/ ((__unused_webpack_module, exports) => {
-
-"use strict";
-
-Object.defineProperty(exports, "__esModule", ({ value: true }));
-exports.GitLabTokenMissingError = void 0;
-class GitLabTokenMissingError extends Error {
-    constructor(message = "", additional = {}) {
-        const notice = `GitLab token is missing${(message === null || message === void 0 ? void 0 : message.length) ? `: ${message}` : ""}`;
-        super(notice, additional);
-        this.name = "GitLabTokenMissingError";
-    }
-}
-exports.GitLabTokenMissingError = GitLabTokenMissingError;
-//# sourceMappingURL=GitLabTokenMissingError.js.map
-
-/***/ }),
-
-/***/ 48585:
+/***/ 12927:
 /***/ (function(__unused_webpack_module, exports, __nccwpck_require__) {
 
 "use strict";
@@ -3556,575 +3351,210 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", ({ value: true }));
-exports.fetchGitLabApi = void 0;
+exports.upsertAllVariables = exports.clearBackups = exports.getVariableValueByRawName = exports.getAllVariables = exports.getProjectInfo = exports.doGitlabRequest = exports.getGitlabToken = exports.setupGitlabToken = exports.hasGitlabToken = void 0;
+const pipeline_1 = __nccwpck_require__(10603);
+const lodash_1 = __nccwpck_require__(23255);
+const memoizee_1 = __importDefault(__nccwpck_require__(85839));
 const node_fetch_1 = __importDefault(__nccwpck_require__(26372));
-const FetchGitLabError_1 = __nccwpck_require__(35438);
-const GitLabTokenMissingError_1 = __nccwpck_require__(47231);
-const loadGitLabToken_1 = __nccwpck_require__(32643);
-const git_1 = __nccwpck_require__(85096);
-const fetchGitLabApi = async ({ resourcePath, data, method = "GET", host, token, }, logger = console) => {
-    const gitRemoteHost = await (0, git_1.getGitRemoteHost)(host);
-    const gitlabToken = token || (await (0, loadGitLabToken_1.loadGitLabToken)(gitRemoteHost, logger));
-    if (!(gitlabToken === null || gitlabToken === void 0 ? void 0 : gitlabToken.length)) {
-        throw new GitLabTokenMissingError_1.GitLabTokenMissingError();
-    }
-    try {
-        const result = await (0, node_fetch_1.default)(`https://${gitRemoteHost}/api/v4/${resourcePath}`, {
-            method,
-            headers: {
-                "Content-Type": "application/json",
-                "Private-Token": gitlabToken,
-            },
-            body: data ? JSON.stringify(data) : undefined,
-        });
-        const status = result.status;
-        if (status >= 200 && status < 400) {
-            if (result.headers.get("content-type") === "application/json") {
-                return result.json();
-            }
-            return null;
-        }
-        if (status === 404) {
-            throw new FetchGitLabError_1.FetchGitLabError(result, { resourcePath, data, method }, "not found");
-        }
-        throw new FetchGitLabError_1.FetchGitLabError(result, { resourcePath, data, method }, `Could not send request to gitlab api ${resourcePath}: ${status} "${result.statusText}".\nResponse: ${JSON.stringify(await result.json(), null, 2)}`);
+const open_1 = __importDefault(__nccwpck_require__(14247));
+const preferences_1 = __nccwpck_require__(13511);
+const gitProjectInformation_1 = __nccwpck_require__(78329);
+const TOKEN_KEY = "gitlab-personal-access-token";
+const hasGitlabToken = async () => await (0, preferences_1.hasPreference)(TOKEN_KEY);
+exports.hasGitlabToken = hasGitlabToken;
+const setupGitlabToken = async (vorpal) => {
+    vorpal.log("");
+    vorpal.log("☝ in order to access the api, we need a personal access token");
+    vorpal.log("Its best to create one specifically for catladder");
+    vorpal.log("Scopes needed: api");
+    vorpal.log("");
+    vorpal.log("☝ we open up the settings page for you!");
+    vorpal.log("");
+    const [{ shouldContinue }, { gitRemoteHost }] = await Promise.all([
+        vorpal.prompt({
+            default: true,
+            message: "Ok",
+            name: "shouldContinue",
+            type: "prompt",
+        }),
+        (0, gitProjectInformation_1.getGitRemoteHostAndPath)(),
+    ]);
+    (0, open_1.default)(`https://${gitRemoteHost}/-/user_settings/personal_access_tokens`);
+    vorpal.log("Please type in gitlab's personal access token");
+    const { personalToken } = await vorpal.prompt({
+        type: "string",
+        name: "personalToken",
+        default: "",
+        message: "Your personal access token ",
+    });
+    if (personalToken) {
+        await (0, preferences_1.setPreference)(TOKEN_KEY, personalToken);
     }
-    catch (error) {
-        if (error instanceof FetchGitLabError_1.FetchGitLabError) {
-            throw error;
+};
+exports.setupGitlabToken = setupGitlabToken;
+const getGitlabToken = async (vorpal) => {
+    if (!(await (0, exports.hasGitlabToken)())) {
+        if (!vorpal) {
+            console.error("⚠️ gitlab token missing, please run catladder to set it up");
+            process.exit(1);
         }
-        throw new FetchGitLabError_1.FetchGitLabError(undefined, { resourcePath, data, method, cause: error }, `Unknown error ${error}`);
+        await (0, exports.setupGitlabToken)(vorpal);
     }
+    return (0, preferences_1.getPreference)(TOKEN_KEY);
 };
-exports.fetchGitLabApi = fetchGitLabApi;
-//# sourceMappingURL=fetchGitLabApi.js.map
-
-/***/ }),
-
-/***/ 82250:
-/***/ ((__unused_webpack_module, exports, __nccwpck_require__) => {
-
-"use strict";
-
-Object.defineProperty(exports, "__esModule", ({ value: true }));
-exports.getGitLabHostPathToken = void 0;
-const loadGitLabToken_1 = __nccwpck_require__(32643);
-const git_1 = __nccwpck_require__(85096);
-/**
- * Lazy gather the GitLab api request data
- */
-const getGitLabHostPathToken = async ({ token: inputToken, ...existing } = {}, logger = console) => {
-    const { gitRemotePath: path, gitRemoteHost: host } = await (0, git_1.getGitRemoteHostAndPath)(existing);
-    const token = inputToken || (await (0, loadGitLabToken_1.loadGitLabToken)(host, logger));
-    return { host, path, token: token || undefined };
-};
-exports.getGitLabHostPathToken = getGitLabHostPathToken;
-//# sourceMappingURL=getGitlabHostPathToken.js.map
-
-/***/ }),
-
-/***/ 12113:
-/***/ ((__unused_webpack_module, exports, __nccwpck_require__) => {
-
-"use strict";
-
-Object.defineProperty(exports, "__esModule", ({ value: true }));
-exports.getGitLabProjectId = exports.gitLabProjectByGitPath = void 0;
-const preferences_1 = __nccwpck_require__(62636);
-const fetchGitLabApi_1 = __nccwpck_require__(48585);
-const getGitlabHostPathToken_1 = __nccwpck_require__(82250);
-const gitLabProjectByGitPath = async (existing = {}, logger = console) => {
-    const { host, path, token } = await (0, getGitlabHostPathToken_1.getGitLabHostPathToken)(existing, logger);
-    return (0, fetchGitLabApi_1.fetchGitLabApi)({
-        resourcePath: `projects/${encodeURIComponent(path)}`,
-        host,
-        token,
-    }, logger);
-};
-exports.gitLabProjectByGitPath = gitLabProjectByGitPath;
-const getGitLabProjectId = async (existing = {}, logger = console) => {
-    const [preferences, { host, path, token }] = await Promise.all([
-        (0, preferences_1.getPreferences)(logger),
-        (0, getGitlabHostPathToken_1.getGitLabHostPathToken)(existing, logger),
+exports.getGitlabToken = getGitlabToken;
+const doGitlabRequest = async (vorpal, path, data = undefined, method = "GET") => {
+    const [rootToken, { gitRemoteHost }] = await Promise.all([
+        (0, exports.getGitlabToken)(vorpal),
+        (0, gitProjectInformation_1.getGitRemoteHostAndPath)(),
     ]);
-    const hostPathKey = `${host}/${path}`;
-    if (preferences.gitLabProjectIds[hostPathKey]) {
-        return preferences.gitLabProjectIds[hostPathKey];
+    //const method = data ? (update ? "PUT" : "POST") : "GET";
+    const result = await (0, node_fetch_1.default)(`https://${gitRemoteHost}/api/v4/${path}`, {
+        method,
+        headers: {
+            "Content-Type": "application/json",
+            "Private-Token": rootToken,
+        },
+        body: data ? JSON.stringify(data) : undefined,
+    });
+    if (result.status >= 200 && result.status < 400) {
+        if (result.headers.get("content-type") === "application/json") {
+            return result.json();
+        }
+        return null;
     }
-    const project = await (0, exports.gitLabProjectByGitPath)({ token, host, path }, logger);
-    await (0, preferences_1.upsertPreferences)({ gitLabProjectIds: { [hostPathKey]: project.id } });
-    return project.id;
-};
-exports.getGitLabProjectId = getGitLabProjectId;
-//# sourceMappingURL=gitLabProjectByGitPath.js.map
-
-/***/ }),
-
-/***/ 55854:
-/***/ (function(__unused_webpack_module, exports, __nccwpck_require__) {
-
-"use strict";
-
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
+    if (result.status === 404) {
+        throw new Error("not found");
+    }
+    throw new Error(`Could not send request to gitlab api ${path}: ${result.status} "${result.statusText}".\nResponse: ${JSON.stringify(await result.json(), null, 2)}`);
 };
-Object.defineProperty(exports, "__esModule", ({ value: true }));
-exports.gitLabVariable = void 0;
-const memoizee_1 = __importDefault(__nccwpck_require__(85839));
-const lodash_1 = __nccwpck_require__(23255);
-const fetchGitLabApi_1 = __nccwpck_require__(48585);
-const getGitlabHostPathToken_1 = __nccwpck_require__(82250);
-const gitLabProjectByGitPath_1 = __nccwpck_require__(12113);
-const GitLabTokenMissingError_1 = __nccwpck_require__(47231);
-/**
- * @see {@link https://gitlab.com/gitlab-org/gitlab-foss/-/blob/master/spec/frontend/ci_variable_list/components/ci_variable_modal_spec.js#L20}
- */
-const maskableRegex = new RegExp("^[a-zA-Z0-9_+=/@:.~-]{8,}$");
-/**
- * @see {@link https://gitlab.com/gitlab-org/gitlab-foss/-/blob/master/spec/frontend/ci_variable_list/components/ci_variable_modal_spec.js#L20}
- */
-const isMaskable = (value) => maskableRegex.test(value);
-const getGitLabVariable = async ({ projectId, key, host, token, }, logger = console) => (0, fetchGitLabApi_1.fetchGitLabApi)({
-    resourcePath: `projects/${projectId}/variables/${key}`,
-    host,
-    token,
-}, logger);
-const createGitLabVariable = async ({ projectId, key, value, masked = true, scope = "*", host, token, }, logger = console) => (0, fetchGitLabApi_1.fetchGitLabApi)({
-    resourcePath: `projects/${projectId}/variables`,
-    method: "POST",
-    data: {
-        key,
-        value,
-        masked: masked && isMaskable(value),
-        environment_scope: scope,
-    },
-    host,
-    token,
-}, logger);
-const updateGitLabVariable = async ({ projectId, key, value, masked = true, host, token, }, logger = console) => (0, fetchGitLabApi_1.fetchGitLabApi)({
-    resourcePath: `projects/${projectId}/variables/${key}`,
-    method: "PUT",
-    data: {
-        value,
-        masked: masked && isMaskable(value),
-    },
-    host,
-    token,
-}, logger);
-const deleteGitLabVariable = async ({ projectId, key, host, token, }, logger = console) => (0, fetchGitLabApi_1.fetchGitLabApi)({
-    resourcePath: `projects/${projectId}/variables/${key}`,
-    method: "DELETE",
-    host,
-    token,
-}, logger);
-const getGitlabVariablesPage = async ({ projectId, page = 1, perPage = 100, host, token, }, logger = console) => (0, fetchGitLabApi_1.fetchGitLabApi)({
-    resourcePath: `projects/${projectId}/variables?per_page=${perPage}&page=${page}`,
-    host,
-    token,
-}, logger);
-const getAllVariables = (0, memoizee_1.default)(async ({ logger = console, parallelRequests = 5, projectId, ...existing } = {}) => {
-    const { host, path, token } = await (0, getGitlabHostPathToken_1.getGitLabHostPathToken)(existing, logger);
-    if (!(token === null || token === void 0 ? void 0 : token.length)) {
-        throw new GitLabTokenMissingError_1.GitLabTokenMissingError();
-    }
-    const id = projectId || (await (0, gitLabProjectByGitPath_1.getGitLabProjectId)({ host, path, token }, logger));
+exports.doGitlabRequest = doGitlabRequest;
+const getProjectInfo = async (vorpal) => {
+    const { gitRemotePath } = await (0, gitProjectInformation_1.getGitRemoteHostAndPath)();
+    const project = await (0, exports.doGitlabRequest)(vorpal, `projects/${encodeURIComponent(gitRemotePath)}`);
+    return project;
+};
+exports.getProjectInfo = getProjectInfo;
+exports.getAllVariables = (0, memoizee_1.default)(async (vorpal, n = 5) => {
+    const { id } = await (0, exports.getProjectInfo)(vorpal);
     let all = [];
     let result = [];
     let page = 1;
     do {
-        // Create an array of promises for parallelRequests pages - Wait for all promises to resolve
-        result = await Promise.all((0, lodash_1.times)(parallelRequests, (i) => i + 1).map((parallelPage) => getGitlabVariablesPage({ projectId: id, page: parallelPage, host, token }, logger)));
-        // Increment the page by parallelRequests
-        page += parallelRequests;
+        // Create an array of promises for N pages
+        const promises = Array.from({ length: n }, (_, i) => {
+            return (0, exports.doGitlabRequest)(vorpal, `projects/${id}/variables?per_page=100&page=${page + i}`);
+        });
+        // Wait for all promises to resolve
+        result = await Promise.all(promises);
+        // Increment the page by N
+        page += n;
         // Flatten the result array and add it to 'all'
-        all = all.concat(result.flat());
+        all = [...all, ...result.flat()];
         // Continue only if the last page had results
-    } while (result.length > 0 && result.slice(-1)[0].length > 0);
+    } while (result.length > 0 && result[result.length - 1].length > 0);
     return all;
 }, { promise: true });
-const getAllCatladderEnvVars = async ({ logger = console, projectId, ...existing } = {}) => {
-    const { host, path, token } = await (0, getGitlabHostPathToken_1.getGitLabHostPathToken)(existing, logger);
-    if (!(token === null || token === void 0 ? void 0 : token.length)) {
-        throw new GitLabTokenMissingError_1.GitLabTokenMissingError();
-    }
-    const id = projectId || (await (0, gitLabProjectByGitPath_1.getGitLabProjectId)({ host, path, token }, logger));
-    const fetchResults = await exports.gitLabVariable.getAll({
-        projectId: id,
-        host,
-        path,
-        token,
-        logger,
-    });
-    const catladderPrefixed = fetchResults.filter(({ key }) => key.startsWith("CL_"));
-    const allVariables = catladderPrefixed.reduce((acc, { key, value, ...rest }) => {
+const getVariableValueByRawName = async (vorpal, rawName) => {
+    var _a;
+    const allVariables = await (0, exports.getAllVariables)(vorpal);
+    return (_a = allVariables.find((v) => v.key === rawName)) === null || _a === void 0 ? void 0 : _a.value;
+};
+exports.getVariableValueByRawName = getVariableValueByRawName;
+const maskableRegex = new RegExp("^[a-zA-Z0-9_+=/@:.~-]{8,}$"); // SEE https://gitlab.com/gitlab-org/gitlab-foss/-/blob/master/spec/frontend/ci_variable_list/components/ci_variable_modal_spec.js#L20
+const isMaskable = (value) => maskableRegex.test(value);
+const createVariable = async (vorpal, projectId, key, value, masked = true, environment_scope = "*") => {
+    return await (0, exports.doGitlabRequest)(vorpal, `projects/${projectId}/variables`, {
+        key,
+        value,
+        masked: masked && isMaskable(value),
+        environment_scope,
+    }, "POST");
+};
+const updateVariable = async (vorpal, projectId, key, value, masked = true) => {
+    return await (0, exports.doGitlabRequest)(vorpal, `projects/${projectId}/variables/${key}`, {
+        value,
+        masked: masked && isMaskable(value),
+    }, "PUT");
+};
+const deleteVariable = async (vorpal, projectId, key) => {
+    return await (0, exports.doGitlabRequest)(vorpal, `projects/${projectId}/variables/${key}`, undefined, "DELETE");
+};
+const getAllCatladderEnvVarsInGitlab = async (vorpal) => {
+    const allVariables = await (0, exports.getAllVariables)(vorpal).then((v) => v.reduce((acc, variable) => {
         var _a, _b, _c, _d;
-        const matchBackup = key.match(/(CL_.*)_backup_([0-9]+)/);
-        if (matchBackup) {
-            const key = matchBackup[1];
-            const timestamp = Number(matchBackup[2]);
-            const backups = [...((_b = (_a = acc[key]) === null || _a === void 0 ? void 0 : _a.backups) !== null && _b !== void 0 ? _b : []), timestamp];
+        const { key } = variable;
+        if (key.startsWith("CL_")) {
+            const matchBackup = key.match(/(CL_.*)_backup_([0-9]+)/);
+            if (matchBackup) {
+                const key = matchBackup[1];
+                const timestamp = Number(matchBackup[2]);
+                const backups = [...((_b = (_a = acc[key]) === null || _a === void 0 ? void 0 : _a.backups) !== null && _b !== void 0 ? _b : []), timestamp];
+                return {
+                    ...acc,
+                    [key]: {
+                        ...((_c = acc[key]) !== null && _c !== void 0 ? _c : {}), // add value
+                        backups,
+                    },
+                };
+            }
             return {
                 ...acc,
                 [key]: {
-                    ...((_c = acc[key]) !== null && _c !== void 0 ? _c : {}), // add value
-                    backups,
+                    backups: [],
+                    ...((_d = acc[key]) !== null && _d !== void 0 ? _d : {}), // may add backups
+                    value: variable.value,
                 },
             };
         }
-        return {
-            ...acc,
-            [key]: {
-                backups: [],
-                ...((_d = acc[key]) !== null && _d !== void 0 ? _d : {}), // may add backups
-                value,
-                ...rest,
-            },
-        };
-    }, {});
+        return acc;
+    }, {}));
     return allVariables;
 };
-exports.gitLabVariable = {
-    get: getGitLabVariable,
-    create: createGitLabVariable,
-    update: updateGitLabVariable,
-    delete: deleteGitLabVariable,
-    getPage: getGitlabVariablesPage,
-    getAll: getAllVariables,
-    getAllCatladder: getAllCatladderEnvVars,
-};
-//# sourceMappingURL=gitLabVariables.js.map
-
-/***/ }),
-
-/***/ 84346:
-/***/ (function(__unused_webpack_module, exports, __nccwpck_require__) {
-
-"use strict";
-
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __exportStar = (this && this.__exportStar) || function(m, exports) {
-    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
-};
-Object.defineProperty(exports, "__esModule", ({ value: true }));
-__exportStar(__nccwpck_require__(35438), exports);
-__exportStar(__nccwpck_require__(64361), exports);
-__exportStar(__nccwpck_require__(971), exports);
-__exportStar(__nccwpck_require__(47231), exports);
-__exportStar(__nccwpck_require__(48585), exports);
-__exportStar(__nccwpck_require__(82250), exports);
-__exportStar(__nccwpck_require__(12113), exports);
-__exportStar(__nccwpck_require__(55854), exports);
-__exportStar(__nccwpck_require__(53699), exports);
-__exportStar(__nccwpck_require__(32643), exports);
-__exportStar(__nccwpck_require__(5638), exports);
-__exportStar(__nccwpck_require__(11166), exports);
-//# sourceMappingURL=index.js.map
-
-/***/ }),
-
-/***/ 53699:
-/***/ ((__unused_webpack_module, exports, __nccwpck_require__) => {
-
-"use strict";
-
-Object.defineProperty(exports, "__esModule", ({ value: true }));
-exports.insertProjectTopics = void 0;
-const fetchGitLabApi_1 = __nccwpck_require__(48585);
-const getGitlabHostPathToken_1 = __nccwpck_require__(82250);
-const gitLabProjectByGitPath_1 = __nccwpck_require__(12113);
-const GitLabTokenMissingError_1 = __nccwpck_require__(47231);
-const insertProjectTopics = async ({ topics: insertTopics, ...existing }, logger = console) => {
-    const { host, path, token } = await (0, getGitlabHostPathToken_1.getGitLabHostPathToken)(existing, logger);
-    if (!(token === null || token === void 0 ? void 0 : token.length)) {
-        throw new GitLabTokenMissingError_1.GitLabTokenMissingError();
-    }
-    const { id, topics } = await (0, gitLabProjectByGitPath_1.gitLabProjectByGitPath)({ path, host, token }, logger);
-    await (0, fetchGitLabApi_1.fetchGitLabApi)({
-        resourcePath: `projects/${id}`,
-        data: { topics: [...insertTopics, ...topics] },
-        method: "PUT",
-        host,
-        token,
-    }, logger);
-};
-exports.insertProjectTopics = insertProjectTopics;
-//# sourceMappingURL=insertProjectTopics.js.map
-
-/***/ }),
-
-/***/ 32643:
-/***/ ((__unused_webpack_module, exports, __nccwpck_require__) => {
-
-"use strict";
-
-Object.defineProperty(exports, "__esModule", ({ value: true }));
-exports.loadGitLabToken = void 0;
-const GitLabTokenMissingError_1 = __nccwpck_require__(47231);
-const storeGitLabToken_1 = __nccwpck_require__(11166);
-const preferences_1 = __nccwpck_require__(62636);
-const git_1 = __nccwpck_require__(85096);
-const loadGitLabToken = async (gitlabHost, logger = console) => {
-    var _a, _b;
-    const [preferences, host] = await Promise.all([
-        (0, preferences_1.getPreferences)(logger),
-        (0, git_1.getGitRemoteHost)(gitlabHost),
-    ]);
-    if ((_a = preferences.gitlabTokens[host]) === null || _a === void 0 ? void 0 : _a.length) {
-        return preferences.gitlabTokens[host];
-    }
-    if ((_b = preferences["gitlab-personal-access-token"]) === null || _b === void 0 ? void 0 : _b.length) {
-        // Add the token to the hostname based preferences
-        return (0, storeGitLabToken_1.storeGitLabToken)({
-            token: preferences["gitlab-personal-access-token"],
-            host,
-        }, logger);
-    }
-    throw new GitLabTokenMissingError_1.GitLabTokenMissingError();
-};
-exports.loadGitLabToken = loadGitLabToken;
-//# sourceMappingURL=loadGitLabToken.js.map
-
-/***/ }),
-
-/***/ 5638:
-/***/ ((__unused_webpack_module, exports, __nccwpck_require__) => {
-
-"use strict";
-
-Object.defineProperty(exports, "__esModule", ({ value: true }));
-exports.gitLabProjectAccessToken = void 0;
-const date_fns_1 = __nccwpck_require__(44438);
-const fetchGitLabApi_1 = __nccwpck_require__(48585);
-const getProjectAccessTokens = async ({ projectId, path, ...existing }, logger = console) => (0, fetchGitLabApi_1.fetchGitLabApi)({ resourcePath: `projects/${projectId}/access_tokens`, ...existing }, logger);
-const rotate = async ({ projectId, tokenId, data: { expires_at }, path, ...existing }, logger = console) => (0, fetchGitLabApi_1.fetchGitLabApi)({
-    resourcePath: `projects/${projectId}/access_tokens/${tokenId}/rotate`,
-    data: { expires_at: (0, date_fns_1.format)(expires_at, "yyyy-MM-dd") },
-    method: "POST",
-    ...existing,
-}, logger);
-const create = async ({ projectId, path, data: { expires_at, ...data }, ...existing }, logger = console) => (0, fetchGitLabApi_1.fetchGitLabApi)({
-    resourcePath: `projects/${projectId}/access_tokens`,
-    data: { expires_at: (0, date_fns_1.format)(expires_at, "yyyy-MM-dd"), ...data },
-    method: "POST",
-    ...existing,
-}, logger);
-exports.gitLabProjectAccessToken = {
-    getList: getProjectAccessTokens,
-    rotate,
-    create,
-};
-//# sourceMappingURL=projectAccessToken.js.map
-
-/***/ }),
-
-/***/ 11166:
-/***/ ((__unused_webpack_module, exports, __nccwpck_require__) => {
-
-"use strict";
-
-Object.defineProperty(exports, "__esModule", ({ value: true }));
-exports.storeGitLabToken = void 0;
-const preferences_1 = __nccwpck_require__(62636);
-const GitLabTokenMissingError_1 = __nccwpck_require__(47231);
-const git_1 = __nccwpck_require__(85096);
-const storeGitLabToken = async ({ token, host }, logger = console) => {
-    if (typeof token !== "string" || !token.length) {
-        throw new GitLabTokenMissingError_1.GitLabTokenMissingError();
-    }
-    const gitRemoteHost = await (0, git_1.getGitRemoteHost)(host);
-    await (0, preferences_1.upsertPreferences)({
-        "gitlab-personal-access-token": token,
-        gitlabTokens: { [gitRemoteHost]: token },
-    }, logger);
-    return token;
-};
-exports.storeGitLabToken = storeGitLabToken;
-//# sourceMappingURL=storeGitLabToken.js.map
-
-/***/ }),
-
-/***/ 12927:
-/***/ (function(__unused_webpack_module, exports, __nccwpck_require__) {
-
-"use strict";
-
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", ({ value: true }));
-exports.upsertAllVariables = exports.clearBackups = exports.getVariableValueByRawName = exports.doGitlabRequest = exports.getGitlabToken = exports.setupGitlabToken = void 0;
-const lodash_1 = __nccwpck_require__(23255);
-const open_1 = __importDefault(__nccwpck_require__(14247));
-const pipeline_1 = __nccwpck_require__(10603);
-const gitProjectInformation_1 = __nccwpck_require__(78329);
-const log_1 = __nccwpck_require__(66921);
-const gitlab_without_vorpal_1 = __nccwpck_require__(84346);
-const setupGitlabToken = async (vorpal, host) => {
-    (0, log_1.logNotice)(vorpal, "In order to access the API, you need your personal access token.", "It's best to create a specific token for CatLadder.");
-    const gitRemoteHost = await (0, gitProjectInformation_1.getGitRemoteHost)(host);
-    const accessTokenSettingsUrl = `https://${gitRemoteHost}/-/user_settings/personal_access_tokens`;
-    (0, log_1.logNotice)(vorpal, "We'll open up the GitLab settings page in your browser for you!", accessTokenSettingsUrl);
-    const { shouldContinue } = await vorpal.prompt({
-        default: true,
-        message: "Ok",
-        name: "shouldContinue",
-        type: "prompt",
-    });
-    (0, open_1.default)(accessTokenSettingsUrl);
-    (0, log_1.logLines)(vorpal, "Please enter GitLab's personal access token.");
-    const { personalToken: token } = await vorpal.prompt({
-        type: "string",
-        name: "personalToken",
-        default: "",
-        message: "Your personal access token ",
-    });
-    try {
-        return (0, gitlab_without_vorpal_1.storeGitLabToken)({ token, host }, vorpal);
-    }
-    catch (error) {
-        if (error instanceof gitlab_without_vorpal_1.GitLabTokenMissingError) {
-            (0, log_1.logError)(vorpal, "Token missing", "Please run catladder again");
-            process.exit(1);
-        }
-        else {
-            throw error;
-        }
-    }
-};
-exports.setupGitlabToken = setupGitlabToken;
-const getGitlabToken = async (vorpal, host) => {
-    const gitRemoteHost = await (0, gitProjectInformation_1.getGitRemoteHost)(host);
-    try {
-        return (0, gitlab_without_vorpal_1.loadGitLabToken)(gitRemoteHost, vorpal);
-    }
-    catch (error) {
-        if (!(error instanceof gitlab_without_vorpal_1.GitLabTokenMissingError))
-            throw error;
-        if (vorpal) {
-            return (0, exports.setupGitlabToken)(vorpal, gitRemoteHost);
-        }
-        (0, log_1.logError)(console, "GitLab token missing!", "Please run catladder to set it up");
-        process.exit(1);
-    }
-};
-exports.getGitlabToken = getGitlabToken;
-const doGitlabRequest = async (vorpal, { path: resourcePath, ...args }) => (0, gitlab_without_vorpal_1.fetchGitLabApi)({ resourcePath, ...args }, vorpal);
-exports.doGitlabRequest = doGitlabRequest;
-const getVariableValueByRawName = async (vorpal, rawName, { projectId, ...existing } = {}) => {
-    var _a;
-    const { host, path, token: inputToken, } = await (0, gitlab_without_vorpal_1.getGitLabHostPathToken)(existing, vorpal);
-    const token = inputToken || (await (0, exports.getGitlabToken)(vorpal, host));
-    const id = projectId || (await (0, gitlab_without_vorpal_1.getGitLabProjectId)({ host, path, token }, vorpal));
-    const allVariables = await gitlab_without_vorpal_1.gitLabVariable.getAll({
-        logger: vorpal,
-        host,
-        path,
-        token,
-        projectId: id,
-    });
-    return (_a = allVariables.find((v) => v.key === rawName)) === null || _a === void 0 ? void 0 : _a.value;
-};
-exports.getVariableValueByRawName = getVariableValueByRawName;
-const getAllCatladderEnvVarsInGitlab = async (vorpal, { projectId, ...existing } = {}) => {
-    const { host, path, token: inputToken, } = await (0, gitlab_without_vorpal_1.getGitLabHostPathToken)(existing, vorpal);
-    const token = inputToken || (await (0, exports.getGitlabToken)(vorpal, host));
-    const id = projectId || (await (0, gitlab_without_vorpal_1.getGitLabProjectId)({ host, path, token }, vorpal));
-    return gitlab_without_vorpal_1.gitLabVariable.getAllCatladder({
-        logger: vorpal,
-        host,
-        path,
-        token,
-        projectId: id,
-    });
-};
 const getBackupKey = (fullKey, timestamp) => `${fullKey}_backup_${timestamp}`;
-const clearBackups = async (vorpal, keep, existing = {}) => {
-    const { host, path, token: inputToken, } = await (0, gitlab_without_vorpal_1.getGitLabHostPathToken)(existing, vorpal);
-    const token = inputToken || (await (0, exports.getGitlabToken)(vorpal, host));
-    const id = await (0, gitlab_without_vorpal_1.getGitLabProjectId)({ host, path, token }, vorpal);
-    const existingVariables = await getAllCatladderEnvVarsInGitlab(vorpal, {
-        projectId: id,
-        host,
-        path,
-        token,
-    });
+const clearBackups = async (vorpal, keep) => {
+    const existingVariables = await getAllCatladderEnvVarsInGitlab(vorpal);
+    const { id } = await (0, exports.getProjectInfo)(vorpal);
     for (const [key, { backups }] of Object.entries(existingVariables)) {
         const backupsSorted = backups.sort((a, b) => b - a);
         //const toKeep = backupsSorted.slice(0, keep);
         const toDelete = backupsSorted.slice(keep);
         for (const timestamp of toDelete) {
-            await gitlab_without_vorpal_1.gitLabVariable.delete({ projectId: id, key: getBackupKey(key, timestamp), token, host }, vorpal);
+            await deleteVariable(vorpal, id, getBackupKey(key, timestamp));
         }
     }
 };
 exports.clearBackups = clearBackups;
-const upsertAllVariables = async (vorpal, variables, env, componentName, backup = true, masked = true, // FIXME: would be better to have this per variable
-{ projectId, ...existing } = {}) => {
+const upsertAllVariables = async (vorpal, variables, env, componentName, backup = true, masked = true) => {
     var _a;
-    const { host, path, token: inputToken, } = await (0, gitlab_without_vorpal_1.getGitLabHostPathToken)(existing, vorpal);
-    const token = inputToken || (await (0, exports.getGitlabToken)(vorpal, host));
-    const id = projectId || (await (0, gitlab_without_vorpal_1.getGitLabProjectId)({ host, path, token }, vorpal));
+    const { id } = await (0, exports.getProjectInfo)(vorpal);
     // we list all existing variables. We also gather backup versions, but its currently unused
-    const existingVariables = await getAllCatladderEnvVarsInGitlab(vorpal, {
-        projectId: id,
-        host,
-        path,
-        token,
-    });
+    const existingVariables = await getAllCatladderEnvVarsInGitlab(vorpal);
     for (const [key, value] of Object.entries(variables !== null && variables !== void 0 ? variables : {})) {
         const fullKey = (0, pipeline_1.getSecretVarName)(env, componentName, key);
         const valueSanitized = (0, lodash_1.isObject)(value) ? JSON.stringify(value) : `${value}`;
         const exists = (0, lodash_1.has)(existingVariables, fullKey);
         const oldValue = (_a = existingVariables[fullKey]) === null || _a === void 0 ? void 0 : _a.value;
         const changed = oldValue !== valueSanitized;
-        if (!changed) {
-            vorpal.log(`skip   : ${key}`);
-            continue;
+        if (changed) {
+            if (exists) {
+                vorpal.log(`changed: ${key}`);
+                await updateVariable(vorpal, id, fullKey, valueSanitized, masked);
+                // write backup
+                if (backup) {
+                    await createVariable(vorpal, id, getBackupKey(fullKey, new Date().getTime()), oldValue, masked, "_backup");
+                }
+            }
+            else {
+                vorpal.log(`new    : ${key}`);
+                await createVariable(vorpal, id, fullKey, valueSanitized, masked);
+            }
         }
-        if (!exists) {
-            vorpal.log(`new    : ${key}`);
-            await gitlab_without_vorpal_1.gitLabVariable.create({
-                projectId: id,
-                key: fullKey,
-                value: valueSanitized,
-                masked,
-                host,
-                token,
-            }, vorpal);
-            continue;
+        else {
+            vorpal.log(`skip   : ${key}`);
         }
-        vorpal.log(`changed: ${key}`);
-        await gitlab_without_vorpal_1.gitLabVariable.update({
-            projectId: id,
-            key: fullKey,
-            value: valueSanitized,
-            masked,
-            host,
-            token,
-        }, vorpal);
-        // write backup
-        if (backup) {
-            await gitlab_without_vorpal_1.gitLabVariable.create({
-                projectId: id,
-                key: getBackupKey(fullKey, new Date().getTime()),
-                value: oldValue,
-                masked,
-                host,
-                token,
-            }, vorpal);
-        }
-    }
-    gitlab_without_vorpal_1.gitLabVariable.getAll.clear();
+    }
+    exports.getAllVariables.clear();
 };
 exports.upsertAllVariables = upsertAllVariables;
 //# sourceMappingURL=gitlab.js.map
@@ -4137,7 +3567,7 @@ exports.upsertAllVariables = upsertAllVariables;
 "use strict";
 
 Object.defineProperty(exports, "__esModule", ({ value: true }));
-exports.logNotice = exports.logWarning = exports.logError = exports.logLines = void 0;
+exports.logWarning = exports.logError = exports.logLines = void 0;
 /**
  * Logs multiple lines using the log method of the provided {@link LoggerCmdInstance}.
  *
@@ -4202,28 +3632,6 @@ const logWarning = (cmd = console, message, ...additionalMessages) => {
     logLines(cmd, "");
 };
 exports.logWarning = logWarning;
-/**
- * Logs a notification message using the log method of the provided {@link LoggerCmdInstance}.
- *
- * Line items that are `null` or `undefined` are logged as empty lines.
- *
- * @example
- * ```ts
- * logNotice(cmd, "Message");
- * logNotice(cmd, "Message", "Additional message");
- * logNotice(cmd, "Message", "Additional message", "Another additional message line");
- * logNotice(cmd, "Message", ...additionalMessages); // arrays can be spread into the function
- * logNotice(cmd, "Message", additionalMessages); // but it will flatten the plain array for convenience
- * ```
- */
-const logNotice = (cmd = console, message, ...additionalMessages) => {
-    logLines(cmd, "", `[NOTICE] ☝ : ${message}`);
-    if (additionalMessages === null || additionalMessages === void 0 ? void 0 : additionalMessages.length) {
-        logLines(cmd, ...additionalMessages.flat());
-    }
-    logLines(cmd, "");
-};
-exports.logNotice = logNotice;
 //# sourceMappingURL=log.js.map
 
 /***/ }),
@@ -4283,130 +3691,68 @@ exports.stopAllPortForwards = stopAllPortForwards;
 
 /***/ }),
 
-/***/ 58302:
-/***/ ((__unused_webpack_module, exports) => {
-
-"use strict";
-
-Object.defineProperty(exports, "__esModule", ({ value: true }));
-exports.mergeWithFallback = void 0;
-const gitlabPersonalAccessToken = "gitlab-personal-access-token";
-const googleAuthUserNumber = "googleAuthUserNumber";
-const gitlabTokens = "gitlabTokens";
-const gitLabProjectIds = "gitLabProjectIds";
-const preferenceKeys = [
-    gitlabPersonalAccessToken,
-    googleAuthUserNumber,
-    gitlabTokens,
-    gitLabProjectIds,
-];
-const perfFallback = {
-    [gitlabPersonalAccessToken]: undefined,
-    [googleAuthUserNumber]: undefined,
-    [gitlabTokens]: {},
-    [gitLabProjectIds]: {},
-};
-/**
- * Merges a partial configuration object with a fallback configuration object.
- * @param config - A partial configuration object of type `Partial<CatladderPreferences>`.
- * @param fallback - The fallback can be passed, in order to use this function for upserting as well.
- */
-const mergeWithFallback = (config = {}, fallback = perfFallback) => preferenceKeys.reduce((acc, key) => {
-    var _a, _b;
-    return Object.assign(acc, {
-        [key]: typeof fallback[key] === "object"
-            ? Object.assign(fallback[key], (_a = config[key]) !== null && _a !== void 0 ? _a : {})
-            : ((_b = config[key]) !== null && _b !== void 0 ? _b : fallback[key]),
-    });
-}, {});
-exports.mergeWithFallback = mergeWithFallback;
-//# sourceMappingURL=CatladderPreferences.js.map
-
-/***/ }),
-
-/***/ 62636:
+/***/ 13511:
 /***/ ((__unused_webpack_module, exports, __nccwpck_require__) => {
 
 "use strict";
 
 Object.defineProperty(exports, "__esModule", ({ value: true }));
-exports.upsertPreferences = exports.getPreferences = void 0;
-const fs_1 = __nccwpck_require__(57147);
+exports.setPreference = exports.getPreference = exports.hasPreference = exports.getPreferences = void 0;
 const promises_1 = __nccwpck_require__(73292);
+const fs_1 = __nccwpck_require__(57147);
+const path_1 = __nccwpck_require__(71017);
 const os_1 = __nccwpck_require__(22037);
-const posix_1 = __nccwpck_require__(58034);
 const yaml_1 = __nccwpck_require__(68033);
-const CatladderPreferences_1 = __nccwpck_require__(58302);
-const log_1 = __nccwpck_require__(66921);
-const legacyDir = (0, posix_1.join)((0, os_1.homedir)(), ".catladder");
-const legacyPath = (0, posix_1.join)(legacyDir, "preferences.yml");
-const configDir = (0, posix_1.join)((0, os_1.homedir)(), ".config/catladder");
-const configPath = (0, posix_1.join)(configDir, "preferences.yml");
-const legacyBackupPath = (0, posix_1.join)(configDir, "old_preferences_backup.yml");
-const encoding = "utf-8";
-const mode = 0o600;
-const readPerfString = () => (0, promises_1.readFile)(configPath, { encoding });
-const writePerfString = (str) => (0, promises_1.writeFile)(configPath, str, { encoding, mode });
-const isConfigPath = () => (0, fs_1.existsSync)(configPath);
-const isLegacyPath = () => (0, fs_1.existsSync)(legacyPath);
-const createDir = () => (0, promises_1.mkdir)(configDir, { recursive: true, mode: 0o700 });
-const copyLegacyConfig = async (target = configPath) => {
-    await (0, promises_1.cp)(legacyPath, target);
-    return (0, promises_1.chmod)(target, mode);
-};
-const parseConfigString = (yamlString, logger = console) => {
-    var _a;
-    try {
-        return (0, CatladderPreferences_1.mergeWithFallback)((_a = (0, yaml_1.parse)(yamlString)) !== null && _a !== void 0 ? _a : {});
-    }
-    catch (error) {
-        (0, log_1.logError)(logger, "Error when trying to parse preferences", `${error}`);
-        throw error;
-    }
-};
-const readPreferences = async (logger = console) => {
-    const yamlContent = await readPerfString();
-    return parseConfigString(yamlContent, logger);
-};
-const stringifyConfig = (config = {}, logger = console) => {
-    try {
-        const preferences = (0, CatladderPreferences_1.mergeWithFallback)(config);
-        return (0, yaml_1.stringify)(preferences);
-    }
-    catch (error) {
-        (0, log_1.logError)(logger, "Error when trying to stringify preferences", `${error}`);
-        throw error;
-    }
-};
-const writePreferences = async (preferences = {}, logger = console) => writePerfString(stringifyConfig(preferences, logger));
-const ensureConfigFile = async () => {
-    if (isConfigPath()) {
+const legacyPreferencesPath = (0, path_1.join)((0, os_1.homedir)(), ".catladder/preferences.yml");
+const preferencesPath = (0, path_1.join)((0, os_1.homedir)(), ".config/catladder/preferences.yml");
+const ensurePreferencesFile = async () => {
+    if ((0, fs_1.existsSync)(preferencesPath)) {
         return;
     }
-    await createDir();
-    if (!isLegacyPath()) {
-        return writePreferences();
+    await (0, promises_1.mkdir)((0, path_1.dirname)(preferencesPath), { recursive: true, mode: 0o700 });
+    if (!(0, fs_1.existsSync)(legacyPreferencesPath)) {
+        return (0, promises_1.writeFile)(preferencesPath, "---\n{}", {
+            encoding: "utf-8",
+            mode: 0o600,
+        });
     }
-    await copyLegacyConfig();
-    return copyLegacyConfig(legacyBackupPath);
+    await (0, promises_1.cp)(legacyPreferencesPath, preferencesPath);
+    await (0, promises_1.chmod)(preferencesPath, 0o600);
+    await (0, promises_1.cp)(preferencesPath, (0, path_1.join)((0, path_1.dirname)(preferencesPath), "old_preferences_backup.yml"));
 };
-/**
- * Load preferences from ~/.config/catladder/preferences.yml
- */
-const getPreferences = async (logger = console) => {
-    await ensureConfigFile();
-    return readPreferences(logger);
+const loadPreferences = async () => {
+    await ensurePreferencesFile();
+    return (0, promises_1.readFile)(preferencesPath, { encoding: "utf-8" });
+};
+const getPreferences = async () => {
+    var _a;
+    const yamlContent = await loadPreferences();
+    return ((_a = (0, yaml_1.parse)(yamlContent)) !== null && _a !== void 0 ? _a : {});
 };
 exports.getPreferences = getPreferences;
-/**
- * Add or update preference values in ~/.config/catladder/preferences.yml
- */
-const upsertPreferences = async (preferences = {}, logger = console) => {
-    const current = await (0, exports.getPreferences)(logger);
-    return writePreferences((0, CatladderPreferences_1.mergeWithFallback)(preferences, current), logger);
+const hasPreference = async (key) => {
+    const preferences = await (0, exports.getPreferences)();
+    return key in preferences;
+};
+exports.hasPreference = hasPreference;
+const getPreference = async (key) => {
+    const preferences = await (0, exports.getPreferences)();
+    return preferences[key];
+};
+exports.getPreference = getPreference;
+const setPreference = async (key, value) => {
+    const preferences = await (0, exports.getPreferences)();
+    const newPreferences = {
+        ...preferences,
+        [key]: value,
+    };
+    await (0, promises_1.writeFile)(preferencesPath, (0, yaml_1.stringify)(newPreferences), {
+        encoding: "utf-8",
+        mode: 0o600,
+    });
 };
-exports.upsertPreferences = upsertPreferences;
-//# sourceMappingURL=index.js.map
+exports.setPreference = setPreference;
+//# sourceMappingURL=preferences.js.map
 
 /***/ }),
 
@@ -4905,7 +4251,9 @@ exports.createBuildJobArtifacts = createBuildJobArtifacts;
 const getArtifactsPathForComponent = (c, additionalPaths) => {
     var _a, _b;
     return (_b = [
-        ...((_a = c.build.config.artifactsPaths) !== null && _a !== void 0 ? _a : []),
+        ...(c.build.type !== "disabled"
+            ? ((_a = c.build.config.artifactsPaths) !== null && _a !== void 0 ? _a : [])
+            : []),
         ...(additionalPaths !== null && additionalPaths !== void 0 ? additionalPaths : []),
     ]) === null || _b === void 0 ? void 0 : _b.flatMap((artifact) => c.build
         // in theory, we only need "direct",
@@ -5281,10 +4629,12 @@ const getAllCacheConfigsFromConfig = (context, configWithCache) => {
                 // we would probably need to introduce a path to the right config property (build-->test or so)
                 context.components.flatMap((componentContext) => {
                     var _a;
-                    return (_a = (0, index_1.ensureArray)(componentContext.build.config.cache).map((c) => ({
-                        ...c,
-                        baseDir: componentContext.build.dir,
-                    }))) !== null && _a !== void 0 ? _a : [];
+                    return componentContext.build.type !== "disabled"
+                        ? ((_a = (0, index_1.ensureArray)(componentContext.build.config.cache).map((c) => ({
+                            ...c,
+                            baseDir: componentContext.build.dir,
+                        }))) !== null && _a !== void 0 ? _a : [])
+                        : [];
                 })
             : []),
     ];
@@ -5499,7 +4849,7 @@ const requiresDockerBuild = (context) => {
 exports.requiresDockerBuild = requiresDockerBuild;
 // those need to be runner variables
 const getDockerBuildRunnerVariables = () => ({
-    DOCKER_HOST: "tcp://0.0.0.0:2375",
+    DOCKER_HOST: "tcp://docker:2375",
     DOCKER_TLS_CERTDIR: "",
     DOCKER_DRIVER: "overlay2",
     DOCKER_BUILDKIT: "1", // see https://docs.docker.com/develop/develop-images/build_enhancements/
@@ -5675,10 +5025,9 @@ exports.BUILD_TYPES = {
     rails: {
         jobs: rails_1.createRailsJobs,
         defaults: () => ({
-            startCommand: "/cnb/process/web",
             cnbBuilder: {
-                image: "heroku/builder:22",
-                packVersion: "0.32.1",
+                image: "heroku/builder:24",
+                packVersion: "0.36.4",
             },
         }),
     },
@@ -6052,7 +5401,9 @@ const ensureNodeVersion = (context) => (0, gitlab_1.collapseableSection)("nodein
 ]);
 exports.ensureNodeVersion = ensureNodeVersion;
 const getYarnInstall = (context, options) => {
-    const postInstall = context.type !== "workspace" && "postInstall" in context.build.config
+    const postInstall = context.type !== "workspace" &&
+        context.build.type !== "disabled" &&
+        "postInstall" in context.build.config
         ? context.build.config.postInstall
         : null;
     return [
@@ -6138,7 +5489,6 @@ const createRailsBuildJobs = (context) => {
             script: [
                 ...(0, docker_1.gitlabDockerLogin)(context),
                 `cd ${context.build.dir}`,
-                `docker pull $DOCKER_CACHE_IMAGE || true`,
                 `wget --output-document=- https://github.com/buildpacks/pack/releases/download/v${cnbConf === null || cnbConf === void 0 ? void 0 : cnbConf.packVersion}/pack-v${cnbConf === null || cnbConf === void 0 ? void 0 : cnbConf.packVersion}-linux.tgz | tar -zx --directory /usr/local/bin pack`,
                 `chmod +x /usr/local/bin/pack`,
                 //  replace private git ssh gem sources with https to make bundler with credentials via env var work
@@ -6180,7 +5530,7 @@ exports.createRailsTestJobs = void 0;
 const __1 = __nccwpck_require__(10603);
 const utils_1 = __nccwpck_require__(32497);
 const createRailsTestJobs = (context) => {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s;
     // don't run tests after release
     // TODO: this will be replaced by using rules
     if (context.trigger === "taggedRelease") {
@@ -6253,9 +5603,26 @@ const createRailsTestJobs = (context) => {
                 `cd ${context.build.dir}`,
                 ...bundlerInstall,
                 ...((_q = (0, utils_1.ensureArrayOrNull)((_p = buildConfig.test) === null || _p === void 0 ? void 0 : _p.command)) !== null && _q !== void 0 ? _q : [
+                    "bundle exec rake db:test:prepare",
+                    "bundle exec rake assets:precompile assets:clean",
                     "bundle exec rspec",
                 ]),
             ],
+            runnerVariables: {
+                RAILS_ENV: "test",
+                DATABASE_URL: "postgresql://postgres@database",
+            },
+            services: [
+                {
+                    name: buildConfig.test && "databaseImage" in buildConfig.test
+                        ? ((_s = (_r = buildConfig === null || buildConfig === void 0 ? void 0 : buildConfig.test) === null || _r === void 0 ? void 0 : _r.databaseImage) !== null && _s !== void 0 ? _s : "docker.io/postgres:latest")
+                        : "docker.io/postgres:latest",
+                    alias: "database",
+                    variables: {
+                        POSTGRES_HOST_AUTH_METHOD: "trust",
+                    },
+                },
+            ],
         }
         : null;
     return [auditJob, lintJob, testJob].filter(utils_1.notNil);
@@ -6279,7 +5646,10 @@ exports.SBOM_FILE = "__sbom.json";
 const createSbomBuildJob = (context) => {
     var _a, _b, _c, _d;
     const buildConfig = context.build.config;
-    const defaultImage = "aquasec/trivy:0.38.3";
+    const defaultImage = {
+        name: "aquasec/trivy:0.58.2",
+        entrypoint: [""],
+    };
     const defaultScript = [
         `trivy fs --quiet --format cyclonedx --output "${exports.SBOM_FILE}" ${context.packageManagerInfo.componentIsInWorkspace
             ? "."
@@ -6510,19 +5880,23 @@ const createComponentContext = async (ctx) => {
     const packageManagerInfo = await (0, packageManager_1.getPackageManagerInfoForComponent)(ctx.config, ctx.componentName);
     const envContext = (0, getEnvironmentContext_1.getEnvironmentContext)(ctx);
     const componentConfigWithoutDefaults = envContext.envConfigRaw;
-    const resolvedBuildType = (0, build_1.isStandaloneBuildConfig)(componentConfigWithoutDefaults.build)
-        ? componentConfigWithoutDefaults.build.type
-        : (_a = ctx.config.builds) === null || _a === void 0 ? void 0 : _a[componentConfigWithoutDefaults.build.from].type;
-    if (!resolvedBuildType) {
+    const resolvedBuildType = componentConfigWithoutDefaults.build === false
+        ? false
+        : (0, build_1.isStandaloneBuildConfig)(componentConfigWithoutDefaults.build)
+            ? componentConfigWithoutDefaults.build.type
+            : (_a = ctx.config.builds) === null || _a === void 0 ? void 0 : _a[componentConfigWithoutDefaults.build.from].type;
+    if (resolvedBuildType === undefined) {
         throw new Error("build type not found, is the build config correct?");
     }
     const defaults = componentConfigWithoutDefaults.deploy
         ? {
-            build: build_1.BUILD_TYPES[resolvedBuildType].defaults(envContext),
+            build: resolvedBuildType &&
+                build_1.BUILD_TYPES[resolvedBuildType].defaults(envContext),
             deploy: deploy_1.DEPLOY_TYPES[componentConfigWithoutDefaults.deploy.type].defaults(envContext),
         }
         : {
-            build: build_1.BUILD_TYPES[resolvedBuildType].defaults(envContext),
+            build: resolvedBuildType &&
+                build_1.BUILD_TYPES[resolvedBuildType].defaults(envContext),
             deploy: {},
         };
     const componentConfig = (0, utils_1.mergeWithMergingArrays)(defaults, componentConfigWithoutDefaults);
@@ -6540,6 +5914,13 @@ const createComponentContext = async (ctx) => {
     };
     const _getBuildContext = () => {
         var _a;
+        if (build === false) {
+            return {
+                type: "disabled",
+                getComponentDirs,
+                dir,
+            };
+        }
         if ((0, build_1.isStandaloneBuildConfig)(build)) {
             return {
                 dir: dir,
@@ -6956,7 +6337,9 @@ const getLabels = (context) => {
         "app-name": sanitize(context.fullConfig.appName),
         "env-type": sanitize(context.environment.envType),
         "env-name": sanitize(context.env),
-        "build-type": sanitize(context.build.buildType),
+        "build-type": context.build.type === "disabled"
+            ? "disabled"
+            : sanitize(context.build.buildType),
         ...((_b = (_a = context.fullConfig.meta) === null || _a === void 0 ? void 0 : _a.labels) !== null && _b !== void 0 ? _b : {}),
     };
     return labels;
@@ -7550,7 +6933,7 @@ const jobName_1 = __nccwpck_require__(9626);
 const common_1 = __nccwpck_require__(73325);
 const constants_1 = __nccwpck_require__(38865);
 const volumes_1 = __nccwpck_require__(60847);
-const onDeploy_1 = __nccwpck_require__(2358);
+const getJobOrServiceArgs_1 = __nccwpck_require__(61741);
 const getDeleteJobsScripts = (context) => {
     const commonArgs = (0, common_1.getCommonCloudRunArgs)(context);
     const commonArgsString = (0, createArgsString_1.createArgsString)(commonArgs);
@@ -7570,7 +6953,7 @@ const getJobCreateScripts = (context) => (0, exports.getCloudRunJobsWithNames)(c
     const { image: commonImage, project, region, ...deployArgs } = (0, common_1.getCommonDeployArgs)(context);
     const commonDeployArgsString = (0, createArgsString_1.createArgsString)({
         command: `"${commandArray.join(",")}"`,
-        args: (0, onDeploy_1.getCloudRunJobArgsArg)(job.args),
+        args: (0, getJobOrServiceArgs_1.getCloudRunServiceOrJobArgsArg)(job.args),
         labels: `"${(0, common_1.makeLabelString)((0, getLabels_1.getLabels)(context))},cloud-run-job-name=$current_job_name"`,
         image: `"${(_a = job.image) !== null && _a !== void 0 ? _a : commonImage}"`,
         project,
@@ -7630,17 +7013,21 @@ Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.getServiceDeleteScript = exports.getServiceDeployScript = void 0;
 const getLabels_1 = __nccwpck_require__(30920);
 const createArgsString_1 = __nccwpck_require__(49598);
+const getJobOrServiceArgs_1 = __nccwpck_require__(61741);
 const getServiceName_1 = __nccwpck_require__(38128);
 const common_1 = __nccwpck_require__(73325);
 const constants_1 = __nccwpck_require__(38865);
+const healthCheck_1 = __nccwpck_require__(30193);
 const volumes_1 = __nccwpck_require__(60847);
 const getServiceDeployScript = (context, service, nameSuffix) => {
-    var _a, _b, _c, _d, _e;
+    var _a, _b, _c, _d, _e, _f;
     const commonDeployArgs = (0, common_1.getCommonDeployArgs)(context);
     const serviceName = (0, getServiceName_1.getServiceName)(context);
     const customConfig = service !== true ? service : undefined;
     const command = service !== true
-        ? ((_a = service === null || service === void 0 ? void 0 : service.command) !== null && _a !== void 0 ? _a : context.build.config.startCommand)
+        ? ((_a = service === null || service === void 0 ? void 0 : service.command) !== null && _a !== void 0 ? _a : (context.build.type !== "disabled"
+            ? context.build.config.startCommand
+            : undefined))
         : undefined;
     const commandArray = command
         ? Array.isArray(command)
@@ -7651,14 +7038,16 @@ const getServiceDeployScript = (context, service, nameSuffix) => {
     const argsString = (0, createArgsString_1.createArgsString)({
         // command as empty string resets it to default (uses the image's entrypoint)
         command: commandArray ? '"' + commandArray.join(",") + '"' : '""',
+        args: (0, getJobOrServiceArgs_1.getCloudRunServiceOrJobArgsArg)(customConfig === null || customConfig === void 0 ? void 0 : customConfig.args),
         ...commonDeployArgs,
+        image: (_b = customConfig === null || customConfig === void 0 ? void 0 : customConfig.image) !== null && _b !== void 0 ? _b : commonDeployArgs.image,
         labels: (0, common_1.makeLabelString)({
             ...(0, getLabels_1.getLabels)(context),
             "cloud-run-service-name": fullServiceName,
         }),
         "env-vars-file": constants_1.ENV_VARS_FILENAME,
-        "min-instances": (_b = customConfig === null || customConfig === void 0 ? void 0 : customConfig.minInstances) !== null && _b !== void 0 ? _b : 0,
-        "max-instances": (_c = customConfig === null || customConfig === void 0 ? void 0 : customConfig.maxInstances) !== null && _c !== void 0 ? _c : 100,
+        "min-instances": (_c = customConfig === null || customConfig === void 0 ? void 0 : customConfig.minInstances) !== null && _c !== void 0 ? _c : 0,
+        "max-instances": (_d = customConfig === null || customConfig === void 0 ? void 0 : customConfig.maxInstances) !== null && _d !== void 0 ? _d : 100,
         "cpu-throttling": (customConfig === null || customConfig === void 0 ? void 0 : customConfig.noCpuThrottling) !== true,
         cpu: customConfig === null || customConfig === void 0 ? void 0 : customConfig.cpu,
         memory: customConfig === null || customConfig === void 0 ? void 0 : customConfig.memory,
@@ -7668,12 +7057,16 @@ const getServiceDeployScript = (context, service, nameSuffix) => {
         network: customConfig === null || customConfig === void 0 ? void 0 : customConfig.network,
         subnet: customConfig === null || customConfig === void 0 ? void 0 : customConfig.subnet,
         "use-http2": customConfig === null || customConfig === void 0 ? void 0 : customConfig.http2,
-        "allow-unauthenticated": (_d = customConfig === null || customConfig === void 0 ? void 0 : customConfig.allowUnauthenticated) !== null && _d !== void 0 ? _d : true,
-        ingress: (_e = customConfig === null || customConfig === void 0 ? void 0 : customConfig.ingress) !== null && _e !== void 0 ? _e : "all",
+        "allow-unauthenticated": (_e = customConfig === null || customConfig === void 0 ? void 0 : customConfig.allowUnauthenticated) !== null && _e !== void 0 ? _e : true,
+        ingress: (_f = customConfig === null || customConfig === void 0 ? void 0 : customConfig.ingress) !== null && _f !== void 0 ? _f : "all",
         "cpu-boost": true,
         "execution-environment": customConfig === null || customConfig === void 0 ? void 0 : customConfig.executionEnvironment,
+        gpu: customConfig === null || customConfig === void 0 ? void 0 : customConfig.gpu,
+        "gpu-type": customConfig === null || customConfig === void 0 ? void 0 : customConfig.gpuType,
+        ...(0, healthCheck_1.healthCheckCliArgs)(customConfig === null || customConfig === void 0 ? void 0 : customConfig.healthCheck),
     }, ...(0, volumes_1.createVolumeConfig)(customConfig === null || customConfig === void 0 ? void 0 : customConfig.volumes, "service"));
-    return `${(0, common_1.gcloudRunCmd)()} deploy ${fullServiceName} ${argsString}`;
+    const version = requiresBeta(customConfig) ? "beta" : undefined;
+    return `${(0, common_1.gcloudRunCmd)(version)} deploy ${fullServiceName} ${argsString}`;
 };
 exports.getServiceDeployScript = getServiceDeployScript;
 const getServiceDeleteScript = (context, serviceSuffix) => {
@@ -7688,6 +7081,21 @@ const getServiceDeleteScript = (context, serviceSuffix) => {
     ];
 };
 exports.getServiceDeleteScript = getServiceDeleteScript;
+const requiresBeta = (config) => {
+    if (!config) {
+        return false;
+    }
+    if (config.gpuType) {
+        return true;
+    }
+    if (config.gpu && config.gpu > 0) {
+        return true;
+    }
+    if (config.healthCheck !== undefined) {
+        return true;
+    }
+    return false;
+};
 //# sourceMappingURL=cloudRunServices.js.map
 
 /***/ }),
@@ -7774,8 +7182,9 @@ exports.ENV_VARS_FILENAME = "____envvars.yaml";
 "use strict";
 
 Object.defineProperty(exports, "__esModule", ({ value: true }));
-exports.getCloudRunJobArgsArg = exports.getOnDeployExecuteScript = void 0;
+exports.getOnDeployExecuteScript = void 0;
 const createArgsString_1 = __nccwpck_require__(49598);
+const getJobOrServiceArgs_1 = __nccwpck_require__(61741);
 const jobName_1 = __nccwpck_require__(9626);
 const cloudRunJobs_1 = __nccwpck_require__(61224);
 const common_1 = __nccwpck_require__(73325);
@@ -7843,19 +7252,11 @@ const getJobRunScriptForExecute = (context, { jobName, config }) => {
     const argString = (0, createArgsString_1.createArgsString)({
         ...commonArgs,
         wait: waitForCompletion === true ? true : undefined,
-        args: (0, exports.getCloudRunJobArgsArg)(config.args),
+        args: (0, getJobOrServiceArgs_1.getCloudRunServiceOrJobArgsArg)(config.args),
     });
     const fullJobName = (0, jobName_1.getFullJobName)(context, jobName);
     return `${(0, common_1.gcloudRunCmd)()} jobs execute ${fullJobName.toString()} ${argString}`;
 };
-const getCloudRunJobArgsArg = (args) => {
-    return args !== undefined
-        ? args.length > 0
-            ? args === null || args === void 0 ? void 0 : args.map((arg) => `"${arg}"`).join(",")
-            : ""
-        : undefined;
-};
-exports.getCloudRunJobArgsArg = getCloudRunJobArgsArg;
 //# sourceMappingURL=onDeploy.js.map
 
 /***/ }),
@@ -8095,6 +7496,64 @@ exports.getCloudRunStopScripts = getCloudRunStopScripts;
 
 /***/ }),
 
+/***/ 30193:
+/***/ ((__unused_webpack_module, exports, __nccwpck_require__) => {
+
+"use strict";
+
+Object.defineProperty(exports, "__esModule", ({ value: true }));
+exports.healthCheckCliArgs = void 0;
+const types_1 = __nccwpck_require__(75781);
+const PORT = 8080;
+function healthCheckCliArgs(healthCheck) {
+    const shouldNotSetHealthCheck = healthCheck === undefined;
+    if (shouldNotSetHealthCheck) {
+        return undefined;
+    }
+    const shouldUseDefaultProbe = healthCheck === true;
+    if (shouldUseDefaultProbe) {
+        return {
+            "startup-probe": toArgValue(probeToKeyValuePairs(types_1.defaultStartupProbe)),
+            "liveness-probe": toArgValue(probeToKeyValuePairs(types_1.defaultLivenessProbe)),
+        };
+    }
+    return {
+        "startup-probe": toArgValue(probeToKeyValuePairs(healthCheck.startupProbe)),
+        "liveness-probe": healthCheck.livenessProbe
+            ? toArgValue(probeToKeyValuePairs(healthCheck.livenessProbe))
+            : "", // NOTE: empty string ("") removes liveness probe
+    };
+}
+exports.healthCheckCliArgs = healthCheckCliArgs;
+function probeToKeyValuePairs(probe) {
+    const sharedArgs = Object.entries({
+        initialDelaySeconds: probe.initialDelaySeconds,
+        timeoutSeconds: probe.timeoutSeconds,
+        periodSeconds: probe.periodSeconds,
+        failureThreshold: probe.failureThreshold,
+    });
+    switch (probe.type) {
+        case "tcp":
+            return [...sharedArgs, ["tcpSocket.port", PORT]];
+        case "http1":
+            return [
+                ...sharedArgs,
+                ["httpGet.port", PORT],
+                ["httpGet.path", probe.path],
+                // NOTE: headers are not supported by "gcloud beta" at the moment
+            ];
+        default:
+            probe;
+            return [];
+    }
+}
+function toArgValue(keyValues) {
+    return keyValues.map(([key, value]) => `${key}=${value}`).join(",");
+}
+//# sourceMappingURL=healthCheck.js.map
+
+/***/ }),
+
 /***/ 34069:
 /***/ ((__unused_webpack_module, exports, __nccwpck_require__) => {
 
@@ -8192,19 +7651,22 @@ exports.GCLOUD_DEPLOY_CREDENTIALS_KEY = "GCLOUD_DEPLOY_credentialsKey";
 // FIXME: rename to internalHostSuffix, but this means that project-setup needs to be rerun, so its kindof a breaking change
 exports.GCLOUD_RUN_CANONICAL_HOST_SUFFIX = "GCLOUD_RUN_canonicalHostSuffix";
 const getCloudSqlVariables = ({ deployConfigRaw, environmentSlugPrefix, env, componentName, fullConfig, }) => {
-    var _a, _b;
+    var _a, _b, _c;
     if (deployConfigRaw && deployConfigRaw.cloudSql) {
         const DB_NAME = (0, utils_1.getFullDbName)(deployConfigRaw.cloudSql, fullConfig, environmentSlugPrefix, componentName);
         const additionalQueryParamsString = Object.entries((_a = deployConfigRaw.cloudSql.dbAdditionalQueryParams) !== null && _a !== void 0 ? _a : {})
             .map(([key, value]) => `&${key}=${value}`)
             .join("");
-        return {
+        const dbVars = {
             CLOUD_SQL_INSTANCE_CONNECTION_NAME: deployConfigRaw.cloudSql.instanceConnectionName,
             DB_NAME: DB_NAME,
             DB_USER: (_b = deployConfigRaw.cloudSql.dbUser) !== null && _b !== void 0 ? _b : "postgres",
             DB_PASSWORD: "$" + (0, context_1.getSecretVarName)(env, componentName, "DB_PASSWORD"),
-            DATABASE_URL: `${(0, database_1.getDatabaseConnectionString)(deployConfigRaw.cloudSql)}${additionalQueryParamsString}`,
-            DATABASE_JDBC_URL: database_1.DATABASE_JDBC_URL,
+        };
+        return {
+            ...dbVars,
+            DATABASE_URL: (0, database_1.getDatabaseConnectionString)(deployConfigRaw.cloudSql, dbVars).concat(additionalQueryParamsString),
+            DATABASE_JDBC_URL: (0, database_1.getDatabaseJdbcUrl)(dbVars, (_c = deployConfigRaw.cloudSql.dbConnectionStringVariablesMode) !== null && _c !== void 0 ? _c : database_1.DEFAULT_DB_VARIABLES_MODE),
         };
     }
     return {};
@@ -8328,7 +7790,8 @@ exports.createArgsString = createArgsString;
 "use strict";
 
 Object.defineProperty(exports, "__esModule", ({ value: true }));
-exports.getDatabaseConnectionString = exports.DATABASE_JDBC_URL = exports.getDatabaseCreateScript = exports.getDatabaseDeleteScript = void 0;
+exports.getDatabaseConnectionString = exports.getPrismaDatabaseConnectionString = exports.getRailsDatabaseConnectionString = exports.getDatabaseJdbcUrl = exports.DEFAULT_DB_VARIABLES_MODE = exports.getDatabaseCreateScript = exports.getDatabaseDeleteScript = void 0;
+const bash_1 = __nccwpck_require__(22990);
 const gitlab_1 = __nccwpck_require__(38490);
 const getDatabaseDeleteScript = (context, deployConfig) => {
     if (!deployConfig.cloudSql || !deployConfig.cloudSql.deleteDatabaseOnStop) {
@@ -8366,16 +7829,64 @@ const getDatabaseCreateScript = (context, deployConfig) => {
     ]);
 };
 exports.getDatabaseCreateScript = getDatabaseCreateScript;
-exports.DATABASE_JDBC_URL = "jdbc:postgresql:///$DB_NAME?cloudSqlInstance=$CLOUD_SQL_INSTANCE_CONNECTION_NAME&socketFactory=com.google.cloud.sql.postgres.SocketFactory&user=$DB_USER&password=$DB_PASSWORD";
-const getDatabaseConnectionString = (config) => {
+exports.DEFAULT_DB_VARIABLES_MODE = "legacy";
+const getVariableOrValue = (key, variables, mode) => {
+    return mode === "legacy" ? `$${key}` : variables[key];
+};
+const getDatabaseJdbcUrl = (variables, mode) => {
+    const parts = [
+        "jdbc:postgresql:///",
+        getVariableOrValue("DB_NAME", variables, mode),
+        "?cloudSqlInstance=",
+        getVariableOrValue("CLOUD_SQL_INSTANCE_CONNECTION_NAME", variables, mode),
+        "&socketFactory=com.google.cloud.sql.postgres.SocketFactory&user=",
+        getVariableOrValue("DB_USER", variables, mode),
+        "&password=",
+        getVariableOrValue("DB_PASSWORD", variables, mode),
+    ];
+    return (0, bash_1.joinBashExpressions)(parts);
+};
+exports.getDatabaseJdbcUrl = getDatabaseJdbcUrl;
+const getRailsDatabaseConnectionString = (variables, mode) => {
+    const parts = [
+        "postgresql://",
+        getVariableOrValue("DB_USER", variables, mode),
+        ":",
+        getVariableOrValue("DB_PASSWORD", variables, mode),
+        "@",
+        encodeURIComponent(`/cloudsql/${variables.CLOUD_SQL_INSTANCE_CONNECTION_NAME}`),
+        "/",
+        getVariableOrValue("DB_NAME", variables, mode),
+        "?",
+    ];
+    return (0, bash_1.joinBashExpressions)(parts);
+};
+exports.getRailsDatabaseConnectionString = getRailsDatabaseConnectionString;
+const getPrismaDatabaseConnectionString = (variables, mode) => {
+    const parts = [
+        "postgresql://",
+        getVariableOrValue("DB_USER", variables, mode),
+        ":",
+        getVariableOrValue("DB_PASSWORD", variables, mode),
+        "@localhost/",
+        getVariableOrValue("DB_NAME", variables, mode),
+        "?host=/cloudsql/",
+        getVariableOrValue("CLOUD_SQL_INSTANCE_CONNECTION_NAME", variables, mode),
+    ];
+    return (0, bash_1.joinBashExpressions)(parts);
+};
+exports.getPrismaDatabaseConnectionString = getPrismaDatabaseConnectionString;
+const getDatabaseConnectionString = (config, variables) => {
+    var _a;
+    const mode = (_a = config.dbConnectionStringVariablesMode) !== null && _a !== void 0 ? _a : exports.DEFAULT_DB_VARIABLES_MODE;
     switch (config.dbConnectionStringFormat) {
         case "jdbc":
-            return exports.DATABASE_JDBC_URL;
+            return (0, exports.getDatabaseJdbcUrl)(variables, mode);
         case "rails":
-            return `postgresql://$DB_USER:$DB_PASSWORD@${encodeURIComponent(`/cloudsql/${config.instanceConnectionName}`)}/$DB_NAME?`;
+            return (0, exports.getRailsDatabaseConnectionString)(variables, mode);
         default:
             // prisma
-            return "postgresql://$DB_USER:$DB_PASSWORD@localhost/$DB_NAME?host=/cloudsql/$CLOUD_SQL_INSTANCE_CONNECTION_NAME";
+            return (0, exports.getPrismaDatabaseConnectionString)(variables, mode);
     }
 };
 exports.getDatabaseConnectionString = getDatabaseConnectionString;
@@ -8400,6 +7911,25 @@ exports.gcloudServiceAccountLoginCommands = gcloudServiceAccountLoginCommands;
 
 /***/ }),
 
+/***/ 61741:
+/***/ ((__unused_webpack_module, exports) => {
+
+"use strict";
+
+Object.defineProperty(exports, "__esModule", ({ value: true }));
+exports.getCloudRunServiceOrJobArgsArg = void 0;
+const getCloudRunServiceOrJobArgsArg = (args) => {
+    return args !== undefined
+        ? args.length > 0
+            ? args === null || args === void 0 ? void 0 : args.map((arg) => `"${arg}"`).join(",")
+            : ""
+        : undefined;
+};
+exports.getCloudRunServiceOrJobArgsArg = getCloudRunServiceOrJobArgsArg;
+//# sourceMappingURL=getJobOrServiceArgs.js.map
+
+/***/ }),
+
 /***/ 38128:
 /***/ ((__unused_webpack_module, exports) => {
 
@@ -8942,7 +8472,9 @@ const createAppConfig = (context, application) => {
     const { healthRoute, command, ...rest } = application !== null && application !== void 0 ? application : {};
     return (0, utils_1.mergeWithMergingArrays)({
         host: context.environment.envVars.HOSTNAME,
-        command: command !== null && command !== void 0 ? command : context.build.config.startCommand,
+        command: command !== null && command !== void 0 ? command : (context.build.type !== "disabled"
+            ? context.build.config.startCommand
+            : undefined),
         livenessProbe: {
             httpGet: {
                 path: healthRoute !== null && healthRoute !== void 0 ? healthRoute : "__health",
@@ -9122,9 +8654,10 @@ exports.getDependencyTrackDeleteScript = exports.getDependencyTrackUploadScript
 const BashExpression_1 = __nccwpck_require__(42376);
 const sbom_1 = __nccwpck_require__(37038);
 const context_1 = __nccwpck_require__(61724);
-const sbomDeactivated = (context) => (0, context_1.componentContextIsStandaloneBuild)(context) &&
-    context.build.config.type === "custom" &&
-    context.build.config.sbom === false;
+const sbomDeactivated = (context) => context.build.type === "disabled" ||
+    ((0, context_1.componentContextIsStandaloneBuild)(context) &&
+        context.build.config.type === "custom" &&
+        context.build.config.sbom === false);
 exports.sbomDeactivated = sbomDeactivated;
 const getDependencyTrackUploadScript = (context) => {
     return (0, exports.sbomDeactivated)(context)
@@ -9174,6 +8707,22 @@ Object.defineProperty(exports, "__esModule", ({ value: true }));
 "use strict";
 
 Object.defineProperty(exports, "__esModule", ({ value: true }));
+exports.defaultLivenessProbe = exports.defaultStartupProbe = void 0;
+exports.defaultStartupProbe = {
+    type: "http1",
+    path: "/__health",
+    initialDelaySeconds: 5,
+    timeoutSeconds: 1,
+    periodSeconds: 30,
+    failureThreshold: 3,
+};
+exports.defaultLivenessProbe = {
+    ...exports.defaultStartupProbe,
+    initialDelaySeconds: 0,
+    timeoutSeconds: 10,
+    periodSeconds: 30,
+    failureThreshold: 3,
+};
 //# sourceMappingURL=googleCloudRun.js.map
 
 /***/ }),
@@ -9417,7 +8966,9 @@ const getCustomJobs = (context) => {
     return injectDefaultVarsInCustomJobs(context, rawJobs);
 };
 const createJobsForComponentContext = (context) => {
-    const buildJobs = build_1.BUILD_TYPES[context.build.buildType].jobs(context);
+    const buildJobs = context.build.type !== "disabled"
+        ? build_1.BUILD_TYPES[context.build.buildType].jobs(context)
+        : [];
     const deployJobs = context.componentConfig.deploy !== false
         ? deploy_1.DEPLOY_TYPES[context.componentConfig.deploy.type].jobs(context)
         : [];
@@ -300553,14 +300104,6 @@ module.exports = require("path");
 
 /***/ }),
 
-/***/ 58034:
-/***/ ((module) => {
-
-"use strict";
-module.exports = require("path/posix");
-
-/***/ }),
-
 /***/ 85477:
 /***/ ((module) => {