From b8823e3debe08a02b627f835a1f9a209547b5927 Mon Sep 17 00:00:00 2001
From: Marcowindt <9336858+marcowindt@users.noreply.github.com>
Date: Sat, 26 Aug 2023 07:11:24 +0200
Subject: [PATCH] fix(mix): remove global flag in regex to match multiple
organizations (#24091)
---
lib/modules/manager/mix/artifacts.spec.ts | 5 +++++
lib/modules/manager/mix/artifacts.ts | 3 +--
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/lib/modules/manager/mix/artifacts.spec.ts b/lib/modules/manager/mix/artifacts.spec.ts
index 08f526a17e..0f1b12dd4f 100644
--- a/lib/modules/manager/mix/artifacts.spec.ts
+++ b/lib/modules/manager/mix/artifacts.spec.ts
@@ -238,12 +238,14 @@ describe('modules/manager/mix/artifacts', () => {
hostRules.getAll.mockReturnValueOnce([
{ matchHost: 'https://hex.pm/api/repos/an_organization/' },
{ matchHost: 'https://hex.pm/api/repos/unauthorized_organization/' },
+ { matchHost: 'https://hex.pm/api/repos/other_organization/' },
{ matchHost: 'https://hex.pm/api/repos/does_not_match_org/packages/' },
{ matchHost: 'https://example.com/api/repos/also_does_not_match_org/' },
{ matchHost: 'hex.pm' },
]);
hostRules.find.mockReturnValueOnce({ token: 'an_organization_token' });
hostRules.find.mockReturnValueOnce({}); // unauthorized_organization token missing
+ hostRules.find.mockReturnValueOnce({ token: 'other_org_token' });
hostRules.find.mockReturnValueOnce({ token: 'does_not_match_org_token' });
// erlang
@@ -283,6 +285,9 @@ describe('modules/manager/mix/artifacts', () => {
{
cmd: 'mix hex.organization auth an_organization --key an_organization_token',
},
+ {
+ cmd: 'mix hex.organization auth other_organization --key other_org_token',
+ },
{ cmd: 'mix deps.update some_package' },
]);
});
diff --git a/lib/modules/manager/mix/artifacts.ts b/lib/modules/manager/mix/artifacts.ts
index 78dd290b4f..6d53495aac 100644
--- a/lib/modules/manager/mix/artifacts.ts
+++ b/lib/modules/manager/mix/artifacts.ts
@@ -16,8 +16,7 @@ import type { UpdateArtifact, UpdateArtifactsResult } from '../types';
const hexRepoUrl = 'https://hex.pm/';
const hexRepoOrgUrlRegex = regEx(
- `https://hex\\.pm/api/repos/(?<organization>[a-z0-9_]+)/$`,
- 'g'
+ `^https://hex\\.pm/api/repos/(?<organization>[a-z0-9_]+)/$`
);
export async function updateArtifacts({
--
GitLab