Skip to content

Commit 7e887d5

Browse files
authored
Filter out "-env"-containing tags from CVE remediation (#251)
Signed-off-by: Antonio Gamez Diaz <antonio.gamez@suse.com>
1 parent 22b1619 commit 7e887d5

2 files changed

Lines changed: 6 additions & 6 deletions

File tree

.github/scripts/cve-scan-helper-remediation.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -187,8 +187,8 @@ find_compatible_upgrade() {
187187
continue
188188
fi
189189

190-
# Skip internal testing tags with -env suffix (e.g., "720-env")
191-
if [[ "$tag" =~ -env$ ]]; then
190+
# Skip internal testing tags containing -env as a segment (e.g., "720-env", "3501-env-prod")
191+
if [[ "$tag" =~ -env($|-) ]]; then
192192
continue
193193
fi
194194

.github/scripts/tests/cve-scan-helper-remediation.bats

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -240,8 +240,8 @@ setup() {
240240
@test "find_compatible_upgrade: skips internal -env tags" {
241241
# Current: 2.0.0
242242
# Available: internal -env tags, valid versions
243-
# Should return: 2.1.0 (skips 720-env, 718-env)
244-
local tags=("720-env" "2.1.0" "718-env" "2.0.0")
243+
# Should return: 2.1.0 (skips 720-env, 718-env, 3501-env-prod)
244+
local tags=("720-env" "2.1.0" "718-env" "3501-env-prod" "2.0.0")
245245
local result
246246
result=$(find_compatible_upgrade "2.0.0" "${tags[@]}")
247247

@@ -250,9 +250,9 @@ setup() {
250250

251251
@test "find_compatible_upgrade: returns empty when only -env tags are newer" {
252252
# Current: 2.0.0
253-
# Available: 720-env, 718-env (newer but -env), 2.0.0 (equal, not an upgrade)
253+
# Available: 720-env, 718-env, 3501-env-prod (all -env variants, filtered), 2.0.0 (equal, not an upgrade)
254254
# Should return: empty (-env tags must never be selected as upgrade target)
255-
local tags=("720-env" "718-env" "2.0.0")
255+
local tags=("720-env" "718-env" "3501-env-prod" "2.0.0")
256256
local result
257257
result=$(find_compatible_upgrade "2.0.0" "${tags[@]}")
258258

0 commit comments

Comments
 (0)