github/kubescape
1
0
Fork 0
mirror of https://github.com/kubescape/kubescape.git synced 2026-02-14 09:59:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1941 from kubescape/semver

Browse Source 
fix isRuleKubescapeVersionCompatible bug with version 4.0.0
This commit is contained in:
Matthias Bertschy
2026-02-12 15:14:45 +00:00
committed by GitHub
parent cfe022ff1d 9b29321a53
commit b167435c4d
3 changed files with 27 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
build/goreleaser-post-e2e.sh
View File

@@ -128,7 +128,7 @@ gha_group_start "Smoke tests"
log "Running smoke tests with $PYTHON $SMOKE_RUNNER \"$ART_PATH\"" log "Running smoke tests with $PYTHON $SMOKE_RUNNER \"$ART_PATH\""
# Run the test runner, propagate exit code # Run the test runner, propagate exit code
set +e set +e
"$PYTHON" "$SMOKE_RUNNER" "$ART_PATH" RELEASE="${RELEASE:-}" "$PYTHON" "$SMOKE_RUNNER" "$ART_PATH"
rc=$? rc=$?
set -e set -e

11
core/cautils/datastructuresmethods.go
View File

@@ -76,14 +76,18 @@ func ShouldSkipRule(control reporthandling.Control, rule reporthandling.PolicyRu
// In local build (BuildNumber = ""): // In local build (BuildNumber = ""):
// returns true only if rule doesn't have the "until" attribute // returns true only if rule doesn't have the "until" attribute
func isRuleKubescapeVersionCompatible(attributes map[string]interface{}, version string) bool { func isRuleKubescapeVersionCompatible(attributes map[string]interface{}, version string) bool {
normalizedVersion := version
if version != "" && !semver.IsValid(version) {
normalizedVersion = "v" + version
}
if from, ok := attributes["useFromKubescapeVersion"]; ok && from != nil { if from, ok := attributes["useFromKubescapeVersion"]; ok && from != nil {
switch sfrom := from.(type) { switch sfrom := from.(type) {
case string: case string:
if version != "" && semver.Compare(version, sfrom) == -1 { if normalizedVersion != "" && semver.IsValid(normalizedVersion) && semver.Compare(normalizedVersion, sfrom) == -1 {
return false return false
} }
default: default:
// Handle case where useFromKubescapeVersion is not a string
return false return false
} }
} }
@@ -91,11 +95,10 @@ func isRuleKubescapeVersionCompatible(attributes map[string]interface{}, version
if until, ok := attributes["useUntilKubescapeVersion"]; ok && until != nil { if until, ok := attributes["useUntilKubescapeVersion"]; ok && until != nil {
switch suntil := until.(type) { switch suntil := until.(type) {
case string: case string:
if version == "" || semver.Compare(version, suntil) >= 0 { if normalizedVersion == "" || (semver.IsValid(normalizedVersion) && semver.Compare(normalizedVersion, suntil) >= 0) {
return false return false
} }
default: default:
// Handle case where useUntilKubescapeVersion is not a string
return false return false
} }
} }

21
smoke_testing/test_version.py
View File

@@ -1,7 +1,9 @@
import os import os
import smoke_utils import re
import sys import sys
import smoke_utils
def run(kubescape_exec: str): def run(kubescape_exec: str):
print("Testing version") print("Testing version")
@@ -10,7 +12,22 @@ def run(kubescape_exec: str):
msg = smoke_utils.run_command(command=[kubescape_exec, "version"]) msg = smoke_utils.run_command(command=[kubescape_exec, "version"])
if isinstance(msg, bytes): if isinstance(msg, bytes):
msg = msg.decode('utf-8') msg = msg.decode('utf-8')
assert (ver and ver in msg) or (ver and ver.lstrip('v') in msg), f"expected version: {ver}, found: {msg}"
# Extract version from output
version_match = re.search(r'Your current version is: ([^\s\n]+)', msg)
if version_match:
output_version = version_match.group(1)
print(f"Found version in output: {output_version}")
# If RELEASE is set, verify it matches the output
if ver:
# Check if RELEASE (with or without 'v' prefix) is in the output
assert (ver in msg) or (ver.lstrip('v') in msg), f"expected version: {ver}, found: {output_version}"
else:
# If RELEASE is not set, just verify that a version was found
assert output_version, f"no version found in output: {msg}"
else:
raise AssertionError(f"no version found in output: {msg}")
print("Done testing version") print("Done testing version")