Merge branch 'main' into devbox-manager

renovatebot · Jan 16, 2025 · 9adb832 · 9adb832
2 parents f200c96 + b3bd91b
commit 9adb832
Show file tree

Hide file tree

Showing 12 changed files with 259 additions and 132 deletions.
diff --git a/lib/modules/datasource/galaxy/index.ts b/lib/modules/datasource/galaxy/index.ts
@@ -63,9 +63,8 @@ export class GalaxyDatasource extends Datasource {
       }
     }
     if (body.results.length === 0) {
-      logger.info(
-        { dependency: packageName },
-        `Received no results from ${galaxyAPIUrl}`,
+      logger.debug(
+        `Received no results for ${packageName} from ${galaxyAPIUrl} `,
       );
       return null;
     }

diff --git a/lib/modules/datasource/maven/index.spec.ts b/lib/modules/datasource/maven/index.spec.ts
@@ -1,5 +1,6 @@
 import { HeadObjectCommand, S3Client } from '@aws-sdk/client-s3';
 import { mockClient } from 'aws-sdk-client-mock';
+import { codeBlock } from 'common-tags';
 import { GoogleAuth as _googleAuth } from 'google-auth-library';
 import { DateTime } from 'luxon';
 import type { Release, ReleaseResult } from '..';
@@ -315,6 +316,72 @@ describe('modules/datasource/maven/index', () => {
     expect(res?.sourceUrl).toBe('https://github.com/example/test');
   });
 
+  describe('supports relocation', () => {
+    it('with only groupId present', async () => {
+      const pom = codeBlock`
+        <project>
+          <distributionManagement>
+            <relocation>
+              <groupId>io.example</groupId>
+            </relocation>
+          </distributionManagement>
+        </project>
+      `;
+      mockGenericPackage({ pom });
+
+      const res = await get();
+
+      expect(res).toMatchObject({
+        replacementName: 'io.example:package',
+        replacementVersion: '2.0.0',
+      });
+    });
+
+    it('with only artifactId present', async () => {
+      const pom = codeBlock`
+        <project>
+          <distributionManagement>
+            <relocation>
+              <artifactId>foo</artifactId>
+            </relocation>
+          </distributionManagement>
+        </project>
+      `;
+      mockGenericPackage({ pom });
+
+      const res = await get();
+
+      expect(res).toMatchObject({
+        replacementName: 'org.example:foo',
+        replacementVersion: '2.0.0',
+      });
+    });
+
+    it('with all elments present', async () => {
+      const pom = codeBlock`
+        <project>
+          <distributionManagement>
+            <relocation>
+              <groupId>io.example</groupId>
+              <artifactId>foo</artifactId>
+              <version>1.2.3</version>
+              <message>test relocation</message>
+            </relocation>
+          </distributionManagement>
+        </project>
+      `;
+      mockGenericPackage({ pom });
+
+      const res = await get();
+
+      expect(res).toMatchObject({
+        replacementName: 'io.example:foo',
+        replacementVersion: '1.2.3',
+        deprecationMessage: 'test relocation',
+      });
+    });
+  });
+
   it('removes authentication header after redirect', async () => {
     const frontendHost = 'frontend_for_private_s3_repository';
     const frontendUrl = `https://${frontendHost}/maven2`;

diff --git a/lib/modules/datasource/maven/types.ts b/lib/modules/datasource/maven/types.ts
@@ -18,7 +18,12 @@ export type HttpResourceCheckResult = 'found' | 'not-found' | 'error' | Date;
 
 export type DependencyInfo = Pick<
   ReleaseResult,
-  'homepage' | 'sourceUrl' | 'packageScope'
+  | 'homepage'
+  | 'sourceUrl'
+  | 'packageScope'
+  | 'replacementName'
+  | 'replacementVersion'
+  | 'deprecationMessage'
 >;
 
 export interface MavenFetchSuccess<T = string> {

diff --git a/lib/modules/datasource/maven/util.ts b/lib/modules/datasource/maven/util.ts
@@ -543,6 +543,23 @@ export async function getDependencyInfo(
     }
   }
 
+  const relocation = pomContent.descendantWithPath(
+    'distributionManagement.relocation',
+  );
+  if (relocation) {
+    const relocationGroup =
+      relocation.valueWithPath('groupId') ?? dependency.group;
+    const relocationName =
+      relocation.valueWithPath('artifactId') ?? dependency.name;
+    result.replacementName = `${relocationGroup}:${relocationName}`;
+    const relocationVersion = relocation.valueWithPath('version');
+    result.replacementVersion = relocationVersion ?? version;
+    const relocationMessage = relocation.valueWithPath('message');
+    if (relocationMessage) {
+      result.deprecationMessage = relocationMessage;
+    }
+  }
+
   const groupId = pomContent.valueWithPath('groupId');
   if (groupId) {
     result.packageScope = groupId;

diff --git a/lib/modules/manager/git-submodules/artifacts.ts b/lib/modules/manager/git-submodules/artifacts.ts
@@ -7,7 +7,7 @@ export default function updateArtifacts({
   const res: UpdateArtifactsResult[] = [];
   updatedDeps.forEach((dep) => {
     // TODO: types (#22198)
-    logger.info(`Updating submodule ${dep.depName}`);
+    logger.debug(`Updating submodule ${dep.depName}`);
     res.push({
       file: { type: 'addition', path: dep.depName!, contents: '' },
     });

diff --git a/lib/modules/manager/npm/update/locked-dependency/package-lock/index.ts b/lib/modules/manager/npm/update/locked-dependency/package-lock/index.ts
@@ -48,7 +48,7 @@ export async function updateLockedDependency(
       currentVersion,
     );
     if (lockedDeps.some((dep) => dep.bundled)) {
-      logger.info(
+      logger.debug(
         `Package ${depName}@${currentVersion} is bundled and cannot be updated`,
       );
       return { status: 'update-failed' };

diff --git a/lib/modules/versioning/schema.ts b/lib/modules/versioning/schema.ts
@@ -12,8 +12,7 @@ export const Versioning = z
 
     let versioning = versionings.get(versioningName);
     if (!versioning) {
-      logger.info(
-        { versioning: versioningSpec },
+      logger.debug(
         `Versioning: '${versioningSpec}' not found, falling back to ${defaultVersioning.id}`,
       );
       return defaultVersioning.api;

diff --git a/lib/modules/versioning/ubuntu/common.ts b/lib/modules/versioning/ubuntu/common.ts
@@ -1,28 +1,40 @@
 import { regEx } from '../../../util/regex';
 
+const regex = regEx(/^(?<codename>\w+)-(?<date>\d{8})(?<suffix>\.\d{1,2})?$/);
+
 function isDatedCodeName(input: string): boolean {
-  return regEx(/^(?<codename>\w+)-(?<date>\d{8})$/).test(input);
+  return regex.test(input);
 }
 
 function getDatedContainerImageCodename(version: string): null | string {
-  const groups = regEx(/^(?<codename>\w+)-(?<date>\d{8})$/).exec(version);
+  const groups = regex.exec(version);
   if (!groups?.groups) {
     return null;
   }
   return groups.groups.codename;
 }
 
 function getDatedContainerImageVersion(version: string): null | number {
-  const groups = regEx(/^(?<codename>\w+)-(?<date>\d{8})$/).exec(version);
+  const groups = regex.exec(version);
   if (!groups?.groups) {
     return null;
   }
 
   return parseInt(groups.groups.date, 10);
 }
 
+function getDatedContainerImageSuffix(version: string): null | string {
+  const groups = regex.exec(version);
+  if (!groups?.groups?.suffix) {
+    return null;
+  }
+
+  return groups.groups.suffix;
+}
+
 export {
   isDatedCodeName,
   getDatedContainerImageCodename,
   getDatedContainerImageVersion,
+  getDatedContainerImageSuffix,
 };