From 15030605d2dfb1120bac75e0b4b1b2117abe8da8 Mon Sep 17 00:00:00 2001
From: Rahul Gautam Singh <rahultesnik@gmail.com>
Date: Sun, 19 May 2024 23:29:03 +0545
Subject: [PATCH 1/2] fix failing test

---
 lib/config/presets/internal/replacements.ts | 4 ++--
 lib/config/presets/internal/workarounds.ts  | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/config/presets/internal/replacements.ts b/lib/config/presets/internal/replacements.ts
index 7e813c33802a45..bac082bc09e4a6 100644
--- a/lib/config/presets/internal/replacements.ts
+++ b/lib/config/presets/internal/replacements.ts
@@ -963,7 +963,7 @@ export const presets: Record<string, Preset> = {
           'The `zap-stable` image has moved to the `zaproxy` organization.',
         matchCurrentVersion: '>=2.0.0 <2.14.0',
         matchDatasources: ['docker'],
-        matchPackagePatterns: [
+        matchPackageNames: [
           '^(?:docker\\.io/)?owasp/zap2docker-stable$',
           '^(?:docker\\.io/)?softwaresecurityproject/zap-stable$',
         ],
@@ -975,7 +975,7 @@ export const presets: Record<string, Preset> = {
           'The `zap-bare` image has moved to the `zaproxy` organization.',
         matchCurrentVersion: '>=2.0.0 <2.14.0',
         matchDatasources: ['docker'],
-        matchPackagePatterns: [
+        matchPackageNames: [
           '^(?:docker\\.io/)?owasp/zap2docker-bare$',
           '^(?:docker\\.io/)?softwaresecurityproject/zap-bare$',
         ],
diff --git a/lib/config/presets/internal/workarounds.ts b/lib/config/presets/internal/workarounds.ts
index 8a6652b152fba0..240af4a39f3b51 100644
--- a/lib/config/presets/internal/workarounds.ts
+++ b/lib/config/presets/internal/workarounds.ts
@@ -32,7 +32,7 @@ export const presets: Record<string, Preset> = {
         matchCurrentValue:
           '/^(?<major>\\d+)(?:\\.(?<minor>\\d+)(?:\\.(?<patch>\\d+))?)?-(?<compatibility>.+)-(?<build>\\d+)(?:-r(?<revision>\\d+))?$/',
         matchDatasources: ['docker'],
-        matchPackagePrefixes: [
+        matchPackageNames: [
           'bitnami/',
           'docker.io/bitnami/',
           'gcr.io/bitnami-containers/',

From 6ac527e043dc97e699393525e4bed37ca019f8a1 Mon Sep 17 00:00:00 2001
From: Rahul Gautam Singh <rahultesnik@gmail.com>
Date: Mon, 20 May 2024 02:36:13 +0545
Subject: [PATCH 2/2] apply suggestion

---
 lib/config/presets/internal/replacements.ts | 8 ++++----
 lib/config/presets/internal/workarounds.ts  | 6 +++---
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/lib/config/presets/internal/replacements.ts b/lib/config/presets/internal/replacements.ts
index bac082bc09e4a6..cfce5aeb199cfe 100644
--- a/lib/config/presets/internal/replacements.ts
+++ b/lib/config/presets/internal/replacements.ts
@@ -964,8 +964,8 @@ export const presets: Record<string, Preset> = {
         matchCurrentVersion: '>=2.0.0 <2.14.0',
         matchDatasources: ['docker'],
         matchPackageNames: [
-          '^(?:docker\\.io/)?owasp/zap2docker-stable$',
-          '^(?:docker\\.io/)?softwaresecurityproject/zap-stable$',
+          '/^(?:docker\\.io/)?owasp/zap2docker-stable$/',
+          '/^(?:docker\\.io/)?softwaresecurityproject/zap-stable$/',
         ],
         replacementName: 'zaproxy/zap-stable',
         replacementVersion: '2.14.0',
@@ -976,8 +976,8 @@ export const presets: Record<string, Preset> = {
         matchCurrentVersion: '>=2.0.0 <2.14.0',
         matchDatasources: ['docker'],
         matchPackageNames: [
-          '^(?:docker\\.io/)?owasp/zap2docker-bare$',
-          '^(?:docker\\.io/)?softwaresecurityproject/zap-bare$',
+          '/^(?:docker\\.io/)?owasp/zap2docker-bare$/',
+          '/^(?:docker\\.io/)?softwaresecurityproject/zap-bare$/',
         ],
         replacementName: 'zaproxy/zap-bare',
         replacementVersion: '2.14.0',
diff --git a/lib/config/presets/internal/workarounds.ts b/lib/config/presets/internal/workarounds.ts
index 240af4a39f3b51..8c4441ecd3e2b9 100644
--- a/lib/config/presets/internal/workarounds.ts
+++ b/lib/config/presets/internal/workarounds.ts
@@ -33,9 +33,9 @@ export const presets: Record<string, Preset> = {
           '/^(?<major>\\d+)(?:\\.(?<minor>\\d+)(?:\\.(?<patch>\\d+))?)?-(?<compatibility>.+)-(?<build>\\d+)(?:-r(?<revision>\\d+))?$/',
         matchDatasources: ['docker'],
         matchPackageNames: [
-          'bitnami/',
-          'docker.io/bitnami/',
-          'gcr.io/bitnami-containers/',
+          'bitnami/**',
+          'docker.io/bitnami/**',
+          'gcr.io/bitnami-containers/**',
         ],
         versioning:
           'regex:^(?<major>\\d+)(?:\\.(?<minor>\\d+)(?:\\.(?<patch>\\d+))?)?(:?-(?<compatibility>.+)-(?<build>\\d+)(?:-r(?<revision>\\d+))?)?$',