renovate 41.0.0-next.21 → 41.0.0-next.23

package/dist/modules/platform/gitlab/code-owners.js

@@ -0,0 +1,38 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.extractRulesFromCodeOwnersLines = extractRulesFromCodeOwnersLines;
+const tslib_1 = require("tslib");
+const ignore_1 = tslib_1.__importDefault(require("ignore"));
+const regex_1 = require("../../../util/regex");
+function extractRulesFromCodeOwnersLines(cleanedLines) {
+    let currentSection = { name: '', defaultUsers: [] };
+    const internalRules = [];
+    for (const line of cleanedLines) {
+        if (isSectionHeader(line)) {
+            currentSection = changeCurrentSection(line);
+        }
+        else {
+            const rule = extractOwnersFromLine(line, currentSection.defaultUsers);
+            internalRules.push(rule);
+        }
+    }
+    return internalRules;
+}
+function changeCurrentSection(line) {
+    const [name, ...usernames] = line.split((0, regex_1.regEx)(/\s+/));
+    return { name, defaultUsers: usernames };
+}
+function extractOwnersFromLine(line, defaultUsernames) {
+    const [pattern, ...usernames] = line.split((0, regex_1.regEx)(/\s+/));
+    const matchPattern = (0, ignore_1.default)().add(pattern);
+    return {
+        usernames: usernames.length > 0 ? usernames : defaultUsernames,
+        pattern,
+        score: pattern.length,
+        match: (path) => matchPattern.ignores(path),
+    };
+}
+function isSectionHeader(line) {
+    return line.startsWith('[') || line.startsWith('^[');
+}
+//# sourceMappingURL=code-owners.js.map

package/dist/modules/platform/gitlab/code-owners.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"code-owners.js","sourceRoot":"","sources":["../../../../lib/modules/platform/gitlab/code-owners.ts"],"names":[],"mappings":";;AASA,0EAgBC;;AAzBD,4DAA4B;AAC5B,+CAA4C;AAQ5C,SAAgB,+BAA+B,CAC7C,YAAsB;IAEtB,IAAI,cAAc,GAAsB,EAAE,IAAI,EAAE,EAAE,EAAE,YAAY,EAAE,EAAE,EAAE,CAAC;IACvE,MAAM,aAAa,GAAG,EAAE,CAAC;IAEzB,KAAK,MAAM,IAAI,IAAI,YAAY,EAAE,CAAC;QAChC,IAAI,eAAe,CAAC,IAAI,CAAC,EAAE,CAAC;YAC1B,cAAc,GAAG,oBAAoB,CAAC,IAAI,CAAC,CAAC;QAC9C,CAAC;aAAM,CAAC;YACN,MAAM,IAAI,GAAG,qBAAqB,CAAC,IAAI,EAAE,cAAc,CAAC,YAAY,CAAC,CAAC;YACtE,aAAa,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAC3B,CAAC;IACH,CAAC;IAED,OAAO,aAAa,CAAC;AACvB,CAAC;AAED,SAAS,oBAAoB,CAAC,IAAY;IACxC,MAAM,CAAC,IAAI,EAAE,GAAG,SAAS,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,IAAA,aAAK,EAAC,KAAK,CAAC,CAAC,CAAC;IACtD,OAAO,EAAE,IAAI,EAAE,YAAY,EAAE,SAAS,EAAE,CAAC;AAC3C,CAAC;AAED,SAAS,qBAAqB,CAC5B,IAAY,EACZ,gBAA0B;IAE1B,MAAM,CAAC,OAAO,EAAE,GAAG,SAAS,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,IAAA,aAAK,EAAC,KAAK,CAAC,CAAC,CAAC;IACzD,MAAM,YAAY,GAAG,IAAA,gBAAM,GAAE,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;IAC3C,OAAO;QACL,SAAS,EAAE,SAAS,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,gBAAgB;QAC9D,OAAO;QACP,KAAK,EAAE,OAAO,CAAC,MAAM;QACrB,KAAK,EAAE,CAAC,IAAY,EAAE,EAAE,CAAC,YAAY,CAAC,OAAO,CAAC,IAAI,CAAC;KACpD,CAAC;AACJ,CAAC;AAED,SAAS,eAAe,CAAC,IAAY;IACnC,OAAO,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,IAAI,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;AACvD,CAAC","sourcesContent":["import ignore from 'ignore';\nimport { regEx } from '../../../util/regex';\nimport type { FileOwnerRule } from '../types';\n\ninterface CodeOwnersSection {\n  name: string;\n  defaultUsers: string[];\n}\n\nexport function extractRulesFromCodeOwnersLines(\n  cleanedLines: string[],\n): FileOwnerRule[] {\n  let currentSection: CodeOwnersSection = { name: '', defaultUsers: [] };\n  const internalRules = [];\n\n  for (const line of cleanedLines) {\n    if (isSectionHeader(line)) {\n      currentSection = changeCurrentSection(line);\n    } else {\n      const rule = extractOwnersFromLine(line, currentSection.defaultUsers);\n      internalRules.push(rule);\n    }\n  }\n\n  return internalRules;\n}\n\nfunction changeCurrentSection(line: string): CodeOwnersSection {\n  const [name, ...usernames] = line.split(regEx(/\\s+/));\n  return { name, defaultUsers: usernames };\n}\n\nfunction extractOwnersFromLine(\n  line: string,\n  defaultUsernames: string[],\n): FileOwnerRule {\n  const [pattern, ...usernames] = line.split(regEx(/\\s+/));\n  const matchPattern = ignore().add(pattern);\n  return {\n    usernames: usernames.length > 0 ? usernames : defaultUsernames,\n    pattern,\n    score: pattern.length,\n    match: (path: string) => matchPattern.ignores(path),\n  };\n}\n\nfunction isSectionHeader(line: string): boolean {\n  return line.startsWith('[') || line.startsWith('^[');\n}\n"]}

package/dist/modules/platform/gitlab/index.d.ts

@@ -1,9 +1,10 @@
 import type { BranchStatus } from '../../../types';
 import type { AutodiscoverConfig, BranchStatusConfig, CreatePRConfig, EnsureCommentConfig, EnsureCommentRemovalConfig, EnsureIssueConfig, FindPRConfig, Issue, MergePRConfig, PlatformParams, PlatformResult, Pr, ReattemptPlatformAutomergeConfig, RepoParams, RepoResult, UpdatePrConfig } from '../types';
 import type { GitlabIssue, GitlabPr } from './types';
+export { extractRulesFromCodeOwnersLines } from './code-owners';
 export declare function resetPlatform(): void;
 export declare const id = "gitlab";
-export declare function initPlatform({ endpoint, token, gitAuthor, }: PlatformParams): Promise<PlatformResult>;
+export declare function initPlatform({ endpoint, username, token, gitAuthor, }: PlatformParams): Promise<PlatformResult>;
 export declare function getRepos(config?: AutodiscoverConfig): Promise<string[]>;
 export declare function getRawFile(fileName: string, repoName?: string, branchOrTag?: string): Promise<string | null>;
 export declare function getJsonFile(fileName: string, repoName?: string, branchOrTag?: string): Promise<any>;

package/dist/modules/platform/gitlab/index.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.id = void 0;
+exports.id = exports.extractRulesFromCodeOwnersLines = void 0;
 exports.resetPlatform = resetPlatform;
 exports.initPlatform = initPlatform;
 exports.getRepos = getRepos;
@@ -44,6 +44,7 @@ const error_messages_1 = require("../../../constants/error-messages");
 const logger_1 = require("../../../logger");
 const array_1 = require("../../../util/array");
 const common_1 = require("../../../util/common");
+const env_1 = require("../../../util/env");
 const git = tslib_1.__importStar(require("../../../util/git"));
 const hostRules = tslib_1.__importStar(require("../../../util/host-rules"));
 const memory_http_cache_provider_1 = require("../../../util/http/cache/memory-http-cache-provider");
@@ -57,8 +58,11 @@ const util_1 = require("../util");
 const pr_body_1 = require("../utils/pr-body");
 const http_1 = require("./http");
 const merge_request_1 = require("./merge-request");
+const pr_cache_1 = require("./pr-cache");
 const schema_1 = require("./schema");
 const utils_1 = require("./utils");
+var code_owners_1 = require("./code-owners");
+Object.defineProperty(exports, "extractRulesFromCodeOwnersLines", { enumerable: true, get: function () { return code_owners_1.extractRulesFromCodeOwnersLines; } });
 let config = {};
 function resetPlatform() {
     config = {};
@@ -75,7 +79,8 @@ const defaults = {
 };
 exports.id = 'gitlab';
 let draftPrefix = utils_1.DRAFT_PREFIX;
-async function initPlatform({ endpoint, token, gitAuthor, }) {
+let botUserName;
+async function initPlatform({ endpoint, username, token, gitAuthor, }) {
     if (!token) {
         throw new Error('Init: You must configure a GitLab personal access token');
     }
@@ -94,10 +99,12 @@ async function initPlatform({ endpoint, token, gitAuthor, }) {
         if (!gitAuthor) {
             const user = (await http_1.gitlabApi.getJsonUnchecked(`user`, { token })).body;
             platformConfig.gitAuthor = `${user.name} <${user.commit_email ?? user.email}>`;
+            botUserName = user.name;
         }
+        const env = (0, env_1.getEnv)();
         /* v8 ignore start: experimental feature */
-        if (process.env.RENOVATE_X_PLATFORM_VERSION) {
-            gitlabVersion = process.env.RENOVATE_X_PLATFORM_VERSION;
+        if (env.RENOVATE_X_PLATFORM_VERSION) {
+            gitlabVersion = env.RENOVATE_X_PLATFORM_VERSION;
         } /* v8 ignore stop */
         else {
             const version = (await http_1.gitlabApi.getJsonUnchecked('version', {
@@ -117,6 +124,7 @@ async function initPlatform({ endpoint, token, gitAuthor, }) {
     draftPrefix = semver_1.default.lt(defaults.version, '13.2.0')
         ? utils_1.DRAFT_PREFIX_DEPRECATED
         : utils_1.DRAFT_PREFIX;
+    botUserName ??= username;
     return platformConfig;
 }
 // Get all repositories that the user has access to
@@ -188,13 +196,14 @@ function getRepoUrl(repository, gitUrl, res) {
         hostType: defaults.hostType,
         url: defaults.endpoint,
     });
+    const env = (0, env_1.getEnv)();
     if (gitUrl === 'endpoint' ||
-        is_1.default.nonEmptyString(process.env.GITLAB_IGNORE_REPO_URL) ||
+        is_1.default.nonEmptyString(env.GITLAB_IGNORE_REPO_URL) ||
         res.body.http_url_to_repo === null) {
         if (res.body.http_url_to_repo === null) {
             logger_1.logger.debug('no http_url_to_repo found. Falling back to old behavior.');
         }
-        if (process.env.GITLAB_IGNORE_REPO_URL) {
+        if (env.GITLAB_IGNORE_REPO_URL) {
             logger_1.logger.warn('GITLAB_IGNORE_REPO_URL environment variable is deprecated. Please use "gitUrl" option.');
         }
         // TODO: null check (#22198)
@@ -260,7 +269,6 @@ async function initRepo({ repository, cloneSubmodules, cloneSubmodulesFilter, ig
                     res.body.squash_option === 'default_on';
         }
         logger_1.logger.debug(`${repository} default branch = ${config.defaultBranch}`);
-        delete config.prList;
         logger_1.logger.debug('Enabling Git FS');
         const url = getRepoUrl(repository, gitUrl, res);
         await git.initRepo({
@@ -390,33 +398,8 @@ async function getBranchStatus(branchName, internalChecksAsSuccess) {
     return status;
 }
 // Pull Request
-async function fetchPrList() {
-    const searchParams = {
-        per_page: '100',
-    };
-    /* v8 ignore start */
-    if (!config.ignorePrAuthor) {
-        searchParams.scope = 'created_by_me';
-    } /* v8 ignore stop */
-    const query = (0, url_1.getQueryString)(searchParams);
-    const urlString = `projects/${config.repository}/merge_requests?${query}`;
-    try {
-        const res = await http_1.gitlabApi.getJsonUnchecked(urlString, {
-            paginate: true,
-        });
-        return res.body.map((pr) => (0, utils_1.prInfo)(pr));
-    }
-    catch (err) /* v8 ignore start */ {
-        logger_1.logger.debug({ err }, 'Error fetching PR list');
-        if (err.statusCode === 403) {
-            throw new Error(error_messages_1.PLATFORM_AUTHENTICATION_ERROR);
-        }
-        throw err;
-    } /* v8 ignore stop */
-}
 async function getPrList() {
-    config.prList ??= await fetchPrList();
-    return config.prList;
+    return await pr_cache_1.GitlabPrCache.getPrs(http_1.gitlabApi, config.repository, botUserName, !!config.ignorePrAuthor);
 }
 async function ignoreApprovals(pr) {
     try {
@@ -470,9 +453,10 @@ async function tryPrAutomerge(pr, platformPrOptions) {
                 'running', // pipeline is running, no need to wait for it
             ];
             const desiredStatus = 'can_be_merged';
+            const env = (0, env_1.getEnv)();
             // The default value of 5 attempts results in max. 13.75 seconds timeout if no pipeline created.
-            const retryTimes = (0, number_1.parseInteger)(process.env.RENOVATE_X_GITLAB_AUTO_MERGEABLE_CHECK_ATTEMPS, 5);
-            const mergeDelay = (0, number_1.parseInteger)(process.env.RENOVATE_X_GITLAB_MERGE_REQUEST_DELAY, 250);
+            const retryTimes = (0, number_1.parseInteger)(env.RENOVATE_X_GITLAB_AUTO_MERGEABLE_CHECK_ATTEMPS, 5);
+            const mergeDelay = (0, number_1.parseInteger)(env.RENOVATE_X_GITLAB_MERGE_REQUEST_DELAY, 250);
             // Check for correct merge request status before setting `merge_when_pipeline_succeeds` to  `true`.
             for (let attempt = 1; attempt <= retryTimes; attempt += 1) {
                 const { body } = await http_1.gitlabApi.getJsonUnchecked(`projects/${config.repository}/merge_requests/${pr}`, {
@@ -516,9 +500,10 @@ async function tryPrAutomerge(pr, platformPrOptions) {
         logger_1.logger.debug({ err }, 'Automerge on PR creation failed');
     } /* v8 ignore stop */
 }
-async function approvePr(pr) {
+async function approveMr(mrNumber) {
+    logger_1.logger.debug(`approveMr(${mrNumber})`);
     try {
-        await http_1.gitlabApi.postJson(`projects/${config.repository}/merge_requests/${pr}/approve`);
+        await http_1.gitlabApi.postJson(`projects/${config.repository}/merge_requests/${mrNumber}/approve`);
     }
     catch (err) {
         logger_1.logger.warn({ err }, 'GitLab: Error approving merge request');
@@ -543,12 +528,9 @@ async function createPr({ sourceBranch, targetBranch, prTitle, prBody: rawDescri
         },
     });
     const pr = (0, utils_1.prInfo)(res.body);
-    /* v8 ignore start */
-    if (config.prList) {
-        config.prList.push(pr);
-    } /* v8 ignore stop */
+    await pr_cache_1.GitlabPrCache.setPr(http_1.gitlabApi, config.repository, botUserName, pr, !!config.ignorePrAuthor);
     if (platformPrOptions?.autoApprove) {
-        await approvePr(pr.number);
+        await approveMr(pr.number);
     }
     await tryPrAutomerge(pr.number, platformPrOptions);
     return pr;
@@ -585,19 +567,9 @@ async function updatePr({ number: iid, prTitle, prBody: description, addLabels,
     }
     const updatedPrInfo = (await http_1.gitlabApi.putJson(`projects/${config.repository}/merge_requests/${iid}`, { body })).body;
     const updatedPr = (0, utils_1.prInfo)(updatedPrInfo);
-    if (config.prList) {
-        const existingIndex = config.prList.findIndex((pr) => pr.number === updatedPr.number);
-        /* v8 ignore start: should not happen */
-        if (existingIndex === -1) {
-            logger_1.logger.warn({ pr: updatedPr }, 'Possible error: Updated PR was not found in the PRs that were returned from getPrList().');
-            config.prList.push(updatedPr);
-        } /* v8 ignore stop */
-        else {
-            config.prList[existingIndex] = updatedPr;
-        }
-    }
+    await pr_cache_1.GitlabPrCache.setPr(http_1.gitlabApi, config.repository, botUserName, updatedPr, !!config.ignorePrAuthor);
     if (platformPrOptions?.autoApprove) {
-        await approvePr(iid);
+        await approveMr(iid);
     }
 }
 async function reattemptPlatformAutomerge({ number: iid, platformPrOptions, }) {
@@ -722,7 +694,8 @@ async function setBranchStatus({ branchName, context, description, state: renova
     if (targetUrl) {
         options.target_url = targetUrl;
     }
-    const retryTimes = (0, number_1.parseInteger)(process.env.RENOVATE_X_GITLAB_BRANCH_STATUS_CHECK_ATTEMPTS, 2);
+    const env = (0, env_1.getEnv)();
+    const retryTimes = (0, number_1.parseInteger)(env.RENOVATE_X_GITLAB_BRANCH_STATUS_CHECK_ATTEMPTS, 2);
     try {
         for (let attempt = 1; attempt <= retryTimes + 1; attempt += 1) {
             const commitUrl = `projects/${config.repository}/repository/commits/${branchSha}`;
@@ -741,7 +714,7 @@ async function setBranchStatus({ branchName, context, description, state: renova
                 logger_1.logger.debug(`Pipeline not yet created. Retrying ${attempt}`);
             }
             // give gitlab some time to create pipelines for the sha
-            await (0, promises_1.setTimeout)((0, number_1.parseInteger)(process.env.RENOVATE_X_GITLAB_BRANCH_STATUS_DELAY, 1000));
+            await (0, promises_1.setTimeout)((0, number_1.parseInteger)(env.RENOVATE_X_GITLAB_BRANCH_STATUS_DELAY, 1000));
         }
     }
     catch (err) {