npm - @catladder/cli - Versions diffs - 0.0.0-refactor-untangle-gitlab-api-requests-from-vorpal-c65e5318 → 0.0.0-refactor-untangle-gitlab-api-requests-from-vorpal-57cf3cf2 - Mend

@catladder/cli 0.0.0-refactor-untangle-gitlab-api-requests-from-vorpal-c65e5318 → 0.0.0-refactor-untangle-gitlab-api-requests-from-vorpal-57cf3cf2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (31) hide show

package/dist/bundles/catenv/index.js CHANGED Viewed

@@ -719,7 +719,8 @@ exports.getGitLabHostPathToken = getGitLabHostPathToken;
 "use strict";
 Object.defineProperty(exports, "__esModule", ({ value: true }));
-exports.gitLabProjectByGitPath = void 0;
+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) => {
@@ -731,6 +732,20 @@ const gitLabProjectByGitPath = async (existing = {}, logger = console) => {
     }, 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),
+    ]);
+    const hostPathKey = `${host}/${path}`;
+    if (preferences.gitLabProjectIds[hostPathKey]) {
+        return preferences.gitLabProjectIds[hostPathKey];
+    }
+    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
 /***/ }),
@@ -802,9 +817,7 @@ const getAllVariables = (0, memoizee_1.default)(async ({ logger = console, paral
     if (!(token === null || token === void 0 ? void 0 : token.length)) {
         throw new GitLabTokenMissingError_1.GitLabTokenMissingError();
     }
-    const { id } = projectId
-        ? { id: projectId }
-        : await (0, gitLabProjectByGitPath_1.gitLabProjectByGitPath)({ host, path, token }, logger);
+    const id = projectId || (await (0, gitLabProjectByGitPath_1.getGitLabProjectId)({ host, path, token }, logger));
     let all = [];
     let result = [];
     let page = 1;
@@ -824,9 +837,7 @@ const getAllCatladderEnvVars = async ({ logger = console, projectId, ...existing
     if (!(token === null || token === void 0 ? void 0 : token.length)) {
         throw new GitLabTokenMissingError_1.GitLabTokenMissingError();
     }
-    const { id } = projectId
-        ? { id: projectId }
-        : await (0, gitLabProjectByGitPath_1.gitLabProjectByGitPath)({ host, path, token }, logger);
+    const id = projectId || (await (0, gitLabProjectByGitPath_1.getGitLabProjectId)({ host, path, token }, logger));
     const fetchResults = await exports.gitLabVariable.getAll({
         projectId: id,
         host,
@@ -1041,7 +1052,7 @@ 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.getProjectInfo = exports.doGitlabRequest = exports.getGitlabToken = exports.setupGitlabToken = void 0;
+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);
@@ -1099,23 +1110,17 @@ const getGitlabToken = async (vorpal, host) => {
 exports.getGitlabToken = getGitlabToken;
 const doGitlabRequest = async (vorpal, { path: resourcePath, ...args }) => (0, gitlab_without_vorpal_1.fetchGitLabApi)({ resourcePath, ...args }, vorpal);
 exports.doGitlabRequest = doGitlabRequest;
-const getProjectInfo = async (vorpal, existing = {}) => {
-    const { host, path, token: inputToken, } = await (0, gitlab_without_vorpal_1.getGitLabHostPathToken)(existing, vorpal);
-    const token = inputToken || (await (0, exports.getGitlabToken)(vorpal, host));
-    return (0, gitlab_without_vorpal_1.gitLabProjectByGitPath)({ host, path, token }, vorpal);
-};
-exports.getProjectInfo = getProjectInfo;
-const getVariableValueByRawName = async (vorpal, rawName, existing = {}) => {
+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, exports.getProjectInfo)(vorpal, { host, path, token });
+    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,
+        projectId: id,
     });
     return (_a = allVariables.find((v) => v.key === rawName)) === null || _a === void 0 ? void 0 : _a.value;
 };
@@ -1123,19 +1128,20 @@ 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,
+        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, exports.getProjectInfo)(vorpal, { host, path, token });
+    const id = await (0, gitlab_without_vorpal_1.getGitLabProjectId)({ host, path, token }, vorpal);
     const existingVariables = await getAllCatladderEnvVarsInGitlab(vorpal, {
         projectId: id,
         host,
@@ -1153,11 +1159,11 @@ const clearBackups = async (vorpal, keep, existing = {}) => {
 };
 exports.clearBackups = clearBackups;
 const upsertAllVariables = async (vorpal, variables, env, componentName, backup = true, masked = true, // FIXME: would be better to have this per variable
-existing = {}) => {
+{ 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 } = await (0, exports.getProjectInfo)(vorpal, { host, path, token });
+    const id = projectId || (await (0, gitlab_without_vorpal_1.getGitLabProjectId)({ host, path, token }, vorpal));
     // we list all existing variables. We also gather backup versions, but its currently unused
     const existingVariables = await getAllCatladderEnvVarsInGitlab(vorpal, {
         projectId: id,
@@ -1322,15 +1328,18 @@ 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.

package/dist/bundles/cli/index.js CHANGED Viewed

@@ -1499,12 +1499,12 @@ 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, existing = {}) => {
+const commandGitlabCi = async (vorpal, { projectId, ...existing } = {}) => {
     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_1.getProjectInfo)(this, { host, path, token });
-        const job = await promptJob(this, projectId, this, { host, path, token });
+        const id = projectId || (await (0, gitlab_without_vorpal_1.getGitLabProjectId)({ host, path, token }, vorpal));
+        const job = await promptJob(this, id, this, { host, path, token });
         (0, open_1.default)(job.web_url);
     });
     vorpal
@@ -1513,13 +1513,13 @@ const commandGitlabCi = 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)(this, host));
         const apiData = { host, path, token };
-        const { id: projectId } = await (0, gitlab_1.getProjectInfo)(this, apiData);
-        const { id } = await promptJob(this, projectId, this, apiData);
+        const pId = projectId || (await (0, gitlab_without_vorpal_1.getGitLabProjectId)({ host, path, token }, vorpal));
+        const { id } = await promptJob(this, pId, this, apiData);
         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/${projectId}/jobs/${id}/trace"`);
+            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/${projectId}/jobs/${id}`,
+                path: `projects/${pId}/jobs/${id}`,
                 host,
                 token,
             });
@@ -2051,23 +2051,23 @@ 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, existing = {}) => {
+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_1.getProjectInfo)(vorpal, { host, path, token });
-    const projectTokens = await gitlab_without_vorpal_1.gitLabProjectAccessToken.getList({ projectId, token, host }, vorpal);
+    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,
+            projectId: id,
             tokenId: accessToken.id,
             token,
             host,
             data: { expires_at },
         }, vorpal)
         : await gitlab_without_vorpal_1.gitLabProjectAccessToken.create({
-            projectId,
+            projectId: id,
             token,
             host,
             data: {
@@ -2077,7 +2077,7 @@ const setupAccessTokens = async (vorpal, existing = {}) => {
                 access_level: 40, // Maintainer
             },
         }, vorpal);
-    const fetchCommon = { key: "GL_TOKEN", projectId, host, token };
+    const fetchCommon = { key: "GL_TOKEN", projectId: id, host, token };
     try {
         await gitlab_without_vorpal_1.gitLabVariable.get(fetchCommon, vorpal);
         await gitlab_without_vorpal_1.gitLabVariable.update({ ...fetchCommon, value: newToken.token }, vorpal);
@@ -2209,7 +2209,7 @@ const ensureNamespace_1 = __importDefault(__nccwpck_require__(81349));
 const gitlab_without_vorpal_1 = __nccwpck_require__(84346);
 const gitlab_1 = __nccwpck_require__(12927);
 const cluster_1 = __nccwpck_require__(62774);
-const setupKubernetes = async (vorpal, context, existing = {}) => {
+const setupKubernetes = async (vorpal, context, { projectId, ...existing } = {}) => {
     var _a;
     const deployConfig = (_a = context.deploy) === null || _a === void 0 ? void 0 : _a.config;
     if (!(0, pipeline_1.isOfDeployType)(deployConfig, "kubernetes")) {
@@ -2217,19 +2217,19 @@ const setupKubernetes = async (vorpal, context, 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 requestInfo = { host, path, token };
-    const { id: projectId } = await (0, gitlab_1.getProjectInfo)(vorpal, requestInfo);
+    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/${projectId}/deploy_tokens`,
+        path: `projects/${id}/deploy_tokens`,
         host,
         token,
     });
     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/${projectId}/deploy_tokens`,
+            path: `projects/${id}/deploy_tokens`,
             data: {
-                id: projectId,
+                id,
                 name: "gitlab-deploy-token",
                 scopes: ["read_registry"],
             },
@@ -3629,7 +3629,8 @@ exports.getGitLabHostPathToken = getGitLabHostPathToken;
 "use strict";
 Object.defineProperty(exports, "__esModule", ({ value: true }));
-exports.gitLabProjectByGitPath = void 0;
+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) => {
@@ -3641,6 +3642,20 @@ const gitLabProjectByGitPath = async (existing = {}, logger = console) => {
     }, 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),
+    ]);
+    const hostPathKey = `${host}/${path}`;
+    if (preferences.gitLabProjectIds[hostPathKey]) {
+        return preferences.gitLabProjectIds[hostPathKey];
+    }
+    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
 /***/ }),
@@ -3712,9 +3727,7 @@ const getAllVariables = (0, memoizee_1.default)(async ({ logger = console, paral
     if (!(token === null || token === void 0 ? void 0 : token.length)) {
         throw new GitLabTokenMissingError_1.GitLabTokenMissingError();
     }
-    const { id } = projectId
-        ? { id: projectId }
-        : await (0, gitLabProjectByGitPath_1.gitLabProjectByGitPath)({ host, path, token }, logger);
+    const id = projectId || (await (0, gitLabProjectByGitPath_1.getGitLabProjectId)({ host, path, token }, logger));
     let all = [];
     let result = [];
     let page = 1;
@@ -3734,9 +3747,7 @@ const getAllCatladderEnvVars = async ({ logger = console, projectId, ...existing
     if (!(token === null || token === void 0 ? void 0 : token.length)) {
         throw new GitLabTokenMissingError_1.GitLabTokenMissingError();
     }
-    const { id } = projectId
-        ? { id: projectId }
-        : await (0, gitLabProjectByGitPath_1.gitLabProjectByGitPath)({ host, path, token }, logger);
+    const id = projectId || (await (0, gitLabProjectByGitPath_1.getGitLabProjectId)({ host, path, token }, logger));
     const fetchResults = await exports.gitLabVariable.getAll({
         projectId: id,
         host,
@@ -3951,7 +3962,7 @@ 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.getProjectInfo = exports.doGitlabRequest = exports.getGitlabToken = exports.setupGitlabToken = void 0;
+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);
@@ -4009,23 +4020,17 @@ const getGitlabToken = async (vorpal, host) => {
 exports.getGitlabToken = getGitlabToken;
 const doGitlabRequest = async (vorpal, { path: resourcePath, ...args }) => (0, gitlab_without_vorpal_1.fetchGitLabApi)({ resourcePath, ...args }, vorpal);
 exports.doGitlabRequest = doGitlabRequest;
-const getProjectInfo = async (vorpal, existing = {}) => {
-    const { host, path, token: inputToken, } = await (0, gitlab_without_vorpal_1.getGitLabHostPathToken)(existing, vorpal);
-    const token = inputToken || (await (0, exports.getGitlabToken)(vorpal, host));
-    return (0, gitlab_without_vorpal_1.gitLabProjectByGitPath)({ host, path, token }, vorpal);
-};
-exports.getProjectInfo = getProjectInfo;
-const getVariableValueByRawName = async (vorpal, rawName, existing = {}) => {
+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, exports.getProjectInfo)(vorpal, { host, path, token });
+    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,
+        projectId: id,
     });
     return (_a = allVariables.find((v) => v.key === rawName)) === null || _a === void 0 ? void 0 : _a.value;
 };
@@ -4033,19 +4038,20 @@ 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,
+        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, exports.getProjectInfo)(vorpal, { host, path, token });
+    const id = await (0, gitlab_without_vorpal_1.getGitLabProjectId)({ host, path, token }, vorpal);
     const existingVariables = await getAllCatladderEnvVarsInGitlab(vorpal, {
         projectId: id,
         host,
@@ -4063,11 +4069,11 @@ const clearBackups = async (vorpal, keep, existing = {}) => {
 };
 exports.clearBackups = clearBackups;
 const upsertAllVariables = async (vorpal, variables, env, componentName, backup = true, masked = true, // FIXME: would be better to have this per variable
-existing = {}) => {
+{ 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 } = await (0, exports.getProjectInfo)(vorpal, { host, path, token });
+    const id = projectId || (await (0, gitlab_without_vorpal_1.getGitLabProjectId)({ host, path, token }, vorpal));
     // we list all existing variables. We also gather backup versions, but its currently unused
     const existingVariables = await getAllCatladderEnvVarsInGitlab(vorpal, {
         projectId: id,
@@ -4287,15 +4293,18 @@ 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.

package/dist/cli/src/apps/cli/commands/project/commandGitlabCi.d.ts CHANGED Viewed

@@ -1,4 +1,6 @@
 import type Vorpal from "vorpal";
 import type { GitLabApiDataOptional } from "../../../../utils/gitlab-without-vorpal";
-declare const commandGitlabCi: (vorpal: Vorpal, existing?: GitLabApiDataOptional) => Promise<void>;
+declare const commandGitlabCi: (vorpal: Vorpal, { projectId, ...existing }?: GitLabApiDataOptional & {
+    projectId?: number | string;
+}) => Promise<void>;
 export default commandGitlabCi;

package/dist/cli/src/apps/cli/commands/project/commandGitlabCi.js CHANGED Viewed

@@ -54,12 +54,12 @@ 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, existing = {}) => {
+const commandGitlabCi = async (vorpal, { projectId, ...existing } = {}) => {
     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_1.getProjectInfo)(this, { host, path, token });
-        const job = await promptJob(this, projectId, this, { host, path, token });
+        const id = projectId || (await (0, gitlab_without_vorpal_1.getGitLabProjectId)({ host, path, token }, vorpal));
+        const job = await promptJob(this, id, this, { host, path, token });
         (0, open_1.default)(job.web_url);
     });
     vorpal
@@ -68,13 +68,13 @@ const commandGitlabCi = 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)(this, host));
         const apiData = { host, path, token };
-        const { id: projectId } = await (0, gitlab_1.getProjectInfo)(this, apiData);
-        const { id } = await promptJob(this, projectId, this, apiData);
+        const pId = projectId || (await (0, gitlab_without_vorpal_1.getGitLabProjectId)({ host, path, token }, vorpal));
+        const { id } = await promptJob(this, pId, this, apiData);
         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/${projectId}/jobs/${id}/trace"`);
+            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/${projectId}/jobs/${id}`,
+                path: `projects/${pId}/jobs/${id}`,
                 host,
                 token,
             });

package/dist/cli/src/apps/cli/commands/project/commandGitlabCi.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"commandGitlabCi.js","sourceRoot":"","sources":["../../../../../../../src/apps/cli/commands/project/commandGitlabCi.ts"],"names":[],"mappings":";;;;;AAAA,iEAA6C;AAC7C,mCAA8B;AAC9B,gDAAwB;AAIxB,~~mFAAiF~~;~~AACjF~~,~~qDAIkC~~;~~AAElC~~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~~WAAkC~~,EAAE,~~EACpC~~,EAAE;IACF,MAAM,CAAC,OAAO,CAAC,qBAAqB,EAAE,YAAY,CAAC,CAAC,MAAM,CAAC,KAAK;QAC9D,MAAM,EACJ,IAAI,EACJ,IAAI,EACJ,KAAK,EAAE,UAAU,GAClB,GAAG,MAAM,IAAA,8CAAsB,EAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;QACnD,MAAM,KAAK,GAAG,UAAU,IAAI,CAAC,MAAM,IAAA,uBAAc,EAAC,IAAI,EAAE,IAAI,CAAC,CAAC,CAAC;QAC/D,MAAM,EAAE,~~EAAE~~,~~EAAE,~~SAAS,~~EAAE~~,~~GAAG~~,MAAM,IAAA,~~uBAAc~~,EAAC,~~IAAI,~~EAAE,~~EAAE,~~IAAI,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC,CAAC;~~QAE5E~~,MAAM,GAAG,GAAG,MAAM,SAAS,CAAC,IAAI,EAAE,~~SAAS~~,EAAE,IAAI,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC,CAAC;~~QAC1E~~,IAAA,cAAI,EAAC,GAAG,CAAC,OAAO,CAAC,CAAC;IACpB,CAAC,CAAC,CAAC;IAEH,MAAM;SACH,OAAO,CAAC,oBAAoB,EAAE,kBAAkB,CAAC;SACjD,MAAM,CAAC,KAAK;QACX,MAAM,EACJ,IAAI,EACJ,IAAI,EACJ,KAAK,EAAE,UAAU,GAClB,GAAG,MAAM,IAAA,8CAAsB,EAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;QACnD,MAAM,KAAK,GAAG,UAAU,IAAI,CAAC,MAAM,IAAA,uBAAc,EAAC,IAAI,EAAE,IAAI,CAAC,CAAC,CAAC;QAC/D,MAAM,OAAO,GAAG,EAAE,IAAI,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC;QACtC,MAAM,~~EAAE~~,~~EAAE~~,~~EAAE,~~SAAS,~~EAAE~~,~~GAAG~~,MAAM,IAAA,~~uBAAc~~,EAAC,IAAI,EAAE,~~OAAO~~,CAAC,CAAC;~~QAE9D~~,MAAM,EAAE,EAAE,EAAE,GAAG,MAAM,SAAS,CAAC,IAAI,EAAE,~~SAAS~~,EAAE,IAAI,EAAE,OAAO,CAAC,CAAC;~~QAE/D~~,IAAI,QAAQ,GAAG,KAAK,CAAC;QACrB,OAAO,CAAC,QAAQ,EAAE,CAAC;YACjB,MAAM,KAAK,GAAG,MAAM,IAAA,4BAAI,EACtB,oCAAoC,KAAK,4CAA4C,~~SAAS~~,SAAS,EAAE,SAAS,~~CACnH~~,CAAC;YAEF,MAAM,GAAG,GAAG,MAAM,IAAA,wBAAe,EAAC,IAAI,EAAE;gBACtC,IAAI,EAAE,YAAY,~~SAAS~~,SAAS,EAAE,EAAE;~~gBACxC~~,IAAI;gBACJ,KAAK;aACN,CAAC,CAAC;YAEH,IAAI,KAAK,CAAC,MAAM,EAAE,CAAC;gBACjB,MAAM,CAAC,EAAE,CAAC,MAAM,CAAC,GAAG,KAAK,CAAC,MAAM,EAAE,CAAC,CAAC;YACtC,CAAC;iBAAM,CAAC;gBACN,MAAM,CAAC,EAAE,CAAC,MAAM,CAAC;;YAEf,SAAS,CAAC,GAAG,CAAC,MAAM,CAAC;YACrB,GAAG,CAAC,OAAO;;WAEZ,CAAC,CAAC;YACL,CAAC;YAED,QAAQ,GAAG,CAAC,CAAC,GAAG,CAAC,WAAW,CAAC;YAC7B,IAAI,CAAC,QAAQ,EAAE,CAAC;gBACd,MAAM,KAAK,CAAC,IAAI,CAAC,CAAC;YACpB,CAAC;iBAAM,CAAC;gBACN,MAAM,CAAC,EAAE,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC;YAC1B,CAAC;QACH,CAAC;IACH,CAAC,CAAC,CAAC;AACP,CAAC,CAAC;AAEF,kBAAe,eAAe,CAAC"}
1	+ {"version":3,"file":"commandGitlabCi.js","sourceRoot":"","sources":["../../../../../../../src/apps/cli/commands/project/commandGitlabCi.ts"],"names":[],"mappings":"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"}

package/dist/cli/src/apps/cli/commands/project/setup/setupAccessTokens.d.ts CHANGED Viewed

@@ -1,3 +1,5 @@
 import type { CommandInstance } from "vorpal";
 import { type GitLabApiDataOptional } from "../../../../../utils/gitlab-without-vorpal";
-export declare const setupAccessTokens: (vorpal: CommandInstance, existing?: GitLabApiDataOptional) => Promise<void>;
+export declare const setupAccessTokens: (vorpal: CommandInstance, { projectId, ...existing }?: GitLabApiDataOptional & {
+    projectId?: number | string;
+}) => Promise<void>;

package/dist/cli/src/apps/cli/commands/project/setup/setupAccessTokens.js CHANGED Viewed

@@ -5,23 +5,23 @@ const date_fns_1 = require("date-fns");
 const gitlab_without_vorpal_1 = require("../../../../../utils/gitlab-without-vorpal");
 const gitlab_1 = require("../../../../../utils/gitlab");
 const TOKEN_NAME = "semantic-release";
-const setupAccessTokens = async (vorpal, existing = {}) => {
+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_1.getProjectInfo)(vorpal, { host, path, token });
-    const projectTokens = await gitlab_without_vorpal_1.gitLabProjectAccessToken.getList({ projectId, token, host }, vorpal);
+    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,
+            projectId: id,
             tokenId: accessToken.id,
             token,
             host,
             data: { expires_at },
         }, vorpal)
         : await gitlab_without_vorpal_1.gitLabProjectAccessToken.create({
-            projectId,
+            projectId: id,
             token,
             host,
             data: {
@@ -31,7 +31,7 @@ const setupAccessTokens = async (vorpal, existing = {}) => {
                 access_level: 40, // Maintainer
             },
         }, vorpal);
-    const fetchCommon = { key: "GL_TOKEN", projectId, host, token };
+    const fetchCommon = { key: "GL_TOKEN", projectId: id, host, token };
     try {
         await gitlab_without_vorpal_1.gitLabVariable.get(fetchCommon, vorpal);
         await gitlab_without_vorpal_1.gitLabVariable.update({ ...fetchCommon, value: newToken.token }, vorpal);

package/dist/cli/src/apps/cli/commands/project/setup/setupAccessTokens.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"setupAccessTokens.js","sourceRoot":"","sources":["../../../../../../../../src/apps/cli/commands/project/setup/setupAccessTokens.ts"],"names":[],"mappings":";;;AACA,uCAA+B;AAC/B,~~sFAMoD~~;AACpD,~~wDAA6E~~;~~AAE7E~~,MAAM,UAAU,GAAG,kBAAkB,CAAC;AAE/B,MAAM,iBAAiB,GAAG,KAAK,EACpC,MAAuB,EACvB,~~WAAkC~~,EAAE,~~EACpC~~,EAAE;IACF,MAAM,EACJ,IAAI,EACJ,IAAI,EACJ,KAAK,EAAE,UAAU,GAClB,GAAG,MAAM,IAAA,8CAAsB,EAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;IACnD,MAAM,KAAK,GAAG,UAAU,IAAI,CAAC,MAAM,IAAA,uBAAc,EAAC,MAAM,EAAE,IAAI,CAAC,CAAC,CAAC;IACjE,MAAM,EAAE,~~EAAE~~,~~EAAE,~~SAAS,~~EAAE~~,~~GAAG~~,MAAM,IAAA,~~uBAAc~~,EAAC,~~MAAM,~~EAAE,~~EAAE,~~IAAI,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC,CAAC;~~IAE9E~~,MAAM,aAAa,GAAG,MAAM,gDAAwB,CAAC,OAAO,CAC1D,EAAE,SAAS,EAAE,KAAK,EAAE,IAAI,EAAE,~~EAC1B~~,MAAM,CACP,CAAC;IACF,MAAM,WAAW,GAAG,aAAa,CAAC,IAAI,CACpC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,UAAU,IAAI,CAAC,CAAC,MAAM,KAAK,IAAI,CAClD,CAAC;IAEF,MAAM,UAAU,GAAG,IAAA,cAAG,EAAC,IAAI,IAAI,EAAE,EAAE,EAAE,KAAK,EAAE,CAAC,EAAE,IAAI,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC;IAE3D,MAAM,QAAQ,GAAG,WAAW;QAC1B,CAAC,CAAC,MAAM,gDAAwB,CAAC,MAAM,CACnC;YACE,SAAS;~~YACT~~,OAAO,EAAE,WAAW,CAAC,EAAE;YACvB,KAAK;YACL,IAAI;YACJ,IAAI,EAAE,EAAE,UAAU,EAAE;SACrB,EACD,MAAM,CACP;QACH,CAAC,CAAC,MAAM,gDAAwB,CAAC,MAAM,CACnC;YACE,SAAS;~~YACT~~,KAAK;YACL,IAAI;YACJ,IAAI,EAAE;gBACJ,UAAU;gBACV,IAAI,EAAE,UAAU;gBAChB,MAAM,EAAE,CAAC,KAAK,EAAE,iBAAiB,CAAC;gBAClC,YAAY,EAAE,EAAE,EAAE,aAAa;aAChC;SACF,EACD,MAAM,CACP,CAAC;IAEN,MAAM,WAAW,GAAG,EAAE,GAAG,EAAE,UAAU,EAAE,SAAS,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC;~~IAChE~~,IAAI,CAAC;QACH,MAAM,sCAAc,CAAC,GAAG,CAAC,WAAW,EAAE,MAAM,CAAC,CAAC;QAC9C,MAAM,sCAAc,CAAC,MAAM,CACzB,EAAE,GAAG,WAAW,EAAE,KAAK,EAAE,QAAQ,CAAC,KAAK,EAAE,EACzC,MAAM,CACP,CAAC;IACJ,CAAC;IAAC,OAAO,CAAC,EAAE,CAAC;QACX,IAAI,CAAC,CAAC,CAAC,YAAY,wCAAgB,CAAC;YAAE,MAAM,CAAC,CAAC;QAC9C,IAAI,CAAC,CAAC,MAAM,KAAK,GAAG;YAAE,MAAM,CAAC,CAAC;QAC9B,YAAY;QACZ,MAAM,sCAAc,CAAC,MAAM,CACzB,EAAE,GAAG,WAAW,EAAE,KAAK,EAAE,QAAQ,CAAC,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,EACvD,MAAM,CACP,CAAC;IACJ,CAAC;IAED,MAAM,CAAC,GAAG,CACR,kEAAkE,CACnE,CAAC;AACJ,CAAC,CAAC;~~AApEW~~,QAAA,iBAAiB,~~qBAoE5B~~"}
1	+ {"version":3,"file":"setupAccessTokens.js","sourceRoot":"","sources":["../../../../../../../../src/apps/cli/commands/project/setup/setupAccessTokens.ts"],"names":[],"mappings":";;;AACA,uCAA+B;AAC/B,sFAOoD;AACpD,wDAA6D;AAE7D,MAAM,UAAU,GAAG,kBAAkB,CAAC;AAE/B,MAAM,iBAAiB,GAAG,KAAK,EACpC,MAAuB,EACvB,EACE,SAAS,EACT,GAAG,QAAQ,KACgD,EAAE,EAC/D,EAAE;IACF,MAAM,EACJ,IAAI,EACJ,IAAI,EACJ,KAAK,EAAE,UAAU,GAClB,GAAG,MAAM,IAAA,8CAAsB,EAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;IACnD,MAAM,KAAK,GAAG,UAAU,IAAI,CAAC,MAAM,IAAA,uBAAc,EAAC,MAAM,EAAE,IAAI,CAAC,CAAC,CAAC;IACjE,MAAM,EAAE,GACN,SAAS,IAAI,CAAC,MAAM,IAAA,0CAAkB,EAAC,EAAE,IAAI,EAAE,IAAI,EAAE,KAAK,EAAE,EAAE,MAAM,CAAC,CAAC,CAAC;IAEzE,MAAM,aAAa,GAAG,MAAM,gDAAwB,CAAC,OAAO,CAC1D,EAAE,SAAS,EAAE,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,EAC9B,MAAM,CACP,CAAC;IACF,MAAM,WAAW,GAAG,aAAa,CAAC,IAAI,CACpC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,UAAU,IAAI,CAAC,CAAC,MAAM,KAAK,IAAI,CAClD,CAAC;IAEF,MAAM,UAAU,GAAG,IAAA,cAAG,EAAC,IAAI,IAAI,EAAE,EAAE,EAAE,KAAK,EAAE,CAAC,EAAE,IAAI,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC;IAE3D,MAAM,QAAQ,GAAG,WAAW;QAC1B,CAAC,CAAC,MAAM,gDAAwB,CAAC,MAAM,CACnC;YACE,SAAS,EAAE,EAAE;YACb,OAAO,EAAE,WAAW,CAAC,EAAE;YACvB,KAAK;YACL,IAAI;YACJ,IAAI,EAAE,EAAE,UAAU,EAAE;SACrB,EACD,MAAM,CACP;QACH,CAAC,CAAC,MAAM,gDAAwB,CAAC,MAAM,CACnC;YACE,SAAS,EAAE,EAAE;YACb,KAAK;YACL,IAAI;YACJ,IAAI,EAAE;gBACJ,UAAU;gBACV,IAAI,EAAE,UAAU;gBAChB,MAAM,EAAE,CAAC,KAAK,EAAE,iBAAiB,CAAC;gBAClC,YAAY,EAAE,EAAE,EAAE,aAAa;aAChC;SACF,EACD,MAAM,CACP,CAAC;IAEN,MAAM,WAAW,GAAG,EAAE,GAAG,EAAE,UAAU,EAAE,SAAS,EAAE,EAAE,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC;IACpE,IAAI,CAAC;QACH,MAAM,sCAAc,CAAC,GAAG,CAAC,WAAW,EAAE,MAAM,CAAC,CAAC;QAC9C,MAAM,sCAAc,CAAC,MAAM,CACzB,EAAE,GAAG,WAAW,EAAE,KAAK,EAAE,QAAQ,CAAC,KAAK,EAAE,EACzC,MAAM,CACP,CAAC;IACJ,CAAC;IAAC,OAAO,CAAC,EAAE,CAAC;QACX,IAAI,CAAC,CAAC,CAAC,YAAY,wCAAgB,CAAC;YAAE,MAAM,CAAC,CAAC;QAC9C,IAAI,CAAC,CAAC,MAAM,KAAK,GAAG;YAAE,MAAM,CAAC,CAAC;QAC9B,YAAY;QACZ,MAAM,sCAAc,CAAC,MAAM,CACzB,EAAE,GAAG,WAAW,EAAE,KAAK,EAAE,QAAQ,CAAC,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,EACvD,MAAM,CACP,CAAC;IACJ,CAAC;IAED,MAAM,CAAC,GAAG,CACR,kEAAkE,CACnE,CAAC;AACJ,CAAC,CAAC;AAxEW,QAAA,iBAAiB,qBAwE5B"}

package/dist/cli/src/apps/cli/commands/project/setup/setupKubernetes.d.ts CHANGED Viewed

@@ -1,4 +1,6 @@
 import type { CommandInstance } from "vorpal";
 import { type ComponentContext } from "../../../../../../../pipeline/src/index.js";
 import type { GitLabApiDataOptional } from "../../../../../utils/gitlab-without-vorpal";
-export declare const setupKubernetes: (vorpal: CommandInstance, context: ComponentContext, existing?: GitLabApiDataOptional) => Promise<void>;
+export declare const setupKubernetes: (vorpal: CommandInstance, context: ComponentContext, { projectId, ...existing }?: GitLabApiDataOptional & {
+    projectId?: number | string;
+}) => Promise<void>;

package/dist/cli/src/apps/cli/commands/project/setup/setupKubernetes.js CHANGED Viewed

@@ -10,7 +10,7 @@ const ensureNamespace_1 = __importDefault(require("../utils/ensureNamespace"));
 const gitlab_without_vorpal_1 = require("../../../../../utils/gitlab-without-vorpal");
 const gitlab_1 = require("../../../../../utils/gitlab");
 const cluster_1 = require("../../../../../utils/cluster");
-const setupKubernetes = async (vorpal, context, existing = {}) => {
+const setupKubernetes = async (vorpal, context, { projectId, ...existing } = {}) => {
     var _a;
     const deployConfig = (_a = context.deploy) === null || _a === void 0 ? void 0 : _a.config;
     if (!(0, pipeline_1.isOfDeployType)(deployConfig, "kubernetes")) {
@@ -18,19 +18,19 @@ const setupKubernetes = async (vorpal, context, 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 requestInfo = { host, path, token };
-    const { id: projectId } = await (0, gitlab_1.getProjectInfo)(vorpal, requestInfo);
+    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/${projectId}/deploy_tokens`,
+        path: `projects/${id}/deploy_tokens`,
         host,
         token,
     });
     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/${projectId}/deploy_tokens`,
+            path: `projects/${id}/deploy_tokens`,
             data: {
-                id: projectId,
+                id,
                 name: "gitlab-deploy-token",
                 scopes: ["read_registry"],
             },

package/dist/cli/src/apps/cli/commands/project/setup/setupKubernetes.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"setupKubernetes.js","sourceRoot":"","sources":["../../../../../../../../src/apps/cli/commands/project/setup/setupKubernetes.ts"],"names":[],"mappings":";;;;;;AAAA,iEAA6C;AAG7C,kDAI6B;AAC7B,+EAAuD;AAEvD,~~sFAAoF~~;~~AACpF~~,~~wDAKqC~~;AACrC,0DAAgE;AAEzD,MAAM,eAAe,GAAG,KAAK,EAClC,MAAuB,EACvB,OAAyB,EACzB,~~WAAkC~~,EAAE,~~EACpC~~,EAAE;;IACF,MAAM,YAAY,GAAG,MAAA,OAAO,CAAC,MAAM,0CAAE,MAAM,CAAC;IAC5C,IAAI,CAAC,IAAA,yBAAc,EAAC,YAAY,EAAE,YAAY,CAAC,EAAE,CAAC;QAChD,MAAM,IAAI,KAAK,CAAC,0DAA0D,CAAC,CAAC;IAC9E,CAAC;IACD,MAAM,EACJ,IAAI,EACJ,IAAI,EACJ,KAAK,EAAE,UAAU,GAClB,GAAG,MAAM,IAAA,8CAAsB,EAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;IACnD,MAAM,KAAK,GAAG,UAAU,IAAI,CAAC,MAAM,IAAA,uBAAc,EAAC,MAAM,EAAE,IAAI,CAAC,CAAC,CAAC;IACjE,MAAM,~~WAAW~~,~~GAAG~~,EAAE,IAAI,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC;~~IAE1C~~,MAAM,~~EAAE~~,~~EAAE~~,EAAE,~~SAAS~~,EAAE,~~GAAG~~,~~MAAM~~,~~IAAA~~,~~uBAAc~~,~~EAAC~~,~~MAAM~~,EAAE,~~WAAW~~,CAAC~~,CAAC~~;~~IACpE~~,MAAM,aAAa,GAAG,MAAM,IAAA,wBAAe,EAAC,MAAM,EAAE;QAClD,IAAI,EAAE,YAAY,~~SAAS~~,gBAAgB;~~QAC3C~~,IAAI;QACJ,KAAK;KACN,CAAC,CAAC;IAEH,IACE,CAAC,aAAa,CAAC,IAAI,CACjB,CAAC,CAAmB,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,qBAAqB,CAC1D,EACD,CAAC;QACD,MAAM,CAAC,GAAG,CACR,0FAA0F,CAC3F,CAAC;QAEF,MAAM,IAAA,wBAAe,EAAC,MAAM,EAAE;YAC5B,IAAI,EAAE,YAAY,~~SAAS~~,gBAAgB;~~YAC3C~~,IAAI,EAAE;gBACJ,EAAE~~,EAAE,SAAS~~;~~gBACb~~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~~AAvKW~~,QAAA,eAAe,~~mBAuK1B~~"}
1	+ {"version":3,"file":"setupKubernetes.js","sourceRoot":"","sources":["../../../../../../../../src/apps/cli/commands/project/setup/setupKubernetes.ts"],"names":[],"mappings":"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"}

package/dist/cli/src/utils/gitlab-without-vorpal/gitLabProjectByGitPath.d.ts CHANGED Viewed

@@ -20,3 +20,4 @@ export type GitLabProject = {
     topics: string[];
 };
 export declare const gitLabProjectByGitPath: (existing?: GitLabApiDataOptional, logger?: LoggerCmdInstance) => Promise<GitLabProject>;
+export declare const getGitLabProjectId: (existing?: GitLabApiDataOptional, logger?: LoggerCmdInstance) => Promise<number>;

package/dist/cli/src/utils/gitlab-without-vorpal/gitLabProjectByGitPath.js CHANGED Viewed

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.gitLabProjectByGitPath = void 0;
+exports.getGitLabProjectId = exports.gitLabProjectByGitPath = void 0;
+const preferences_1 = require("../preferences");
 const fetchGitLabApi_1 = require("./fetchGitLabApi");
 const getGitlabHostPathToken_1 = require("./getGitlabHostPathToken");
 const gitLabProjectByGitPath = async (existing = {}, logger = console) => {
@@ -12,4 +13,18 @@ const gitLabProjectByGitPath = async (existing = {}, logger = console) => {
     }, 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),
+    ]);
+    const hostPathKey = `${host}/${path}`;
+    if (preferences.gitLabProjectIds[hostPathKey]) {
+        return preferences.gitLabProjectIds[hostPathKey];
+    }
+    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