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 #1922 from kubescape/copilot/fix-kubescape-report-discrepancy

Browse Source 
Fix workload scan to include allcontrols framework
This commit is contained in:
Matthias Bertschy
2026-01-16 15:18:11 +00:00
committed by GitHub
parent aa62fbea68 7ca609d39f
commit 4d3b3efb9a
3 changed files with 17 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/scan/workload.go
View File

@@ -95,7 +95,7 @@ func setWorkloadScanInfo(scanInfo *cautils.ScanInfo, kind string, name string) {
scanInfo.ScanObject.SetKind(kind) scanInfo.ScanObject.SetKind(kind)
scanInfo.ScanObject.SetName(name) scanInfo.ScanObject.SetName(name)
scanInfo.SetPolicyIdentifiers([]string{"workloadscan"}, v1.KindFramework) scanInfo.SetPolicyIdentifiers([]string{"workloadscan", "allcontrols"}, v1.KindFramework)
if scanInfo.FilePath != "" { if scanInfo.FilePath != "" {
scanInfo.InputPatterns = []string{scanInfo.FilePath} scanInfo.InputPatterns = []string{scanInfo.FilePath}

19
cmd/scan/workload_test.go
View File

@@ -28,6 +28,10 @@ func TestSetWorkloadScanInfo(t *testing.T) {
Identifier: "workloadscan", Identifier: "workloadscan",
Kind: v1.KindFramework, Kind: v1.KindFramework,
}, },
{
Identifier: "allcontrols",
Kind: v1.KindFramework,
},
}, },
ScanType: cautils.ScanTypeWorkload, ScanType: cautils.ScanTypeWorkload,
ScanObject: &objectsenvelopes.ScanObject{ ScanObject: &objectsenvelopes.ScanObject{
@@ -59,12 +63,19 @@ func TestSetWorkloadScanInfo(t *testing.T) {
t.Errorf("got: %v, want: %v", scanInfo.ScanObject.Metadata.Name, tc.want.ScanObject.Metadata.Name) t.Errorf("got: %v, want: %v", scanInfo.ScanObject.Metadata.Name, tc.want.ScanObject.Metadata.Name)
} }
if len(scanInfo.PolicyIdentifier) != 1 { if len(scanInfo.PolicyIdentifier) != len(tc.want.PolicyIdentifier) {
t.Errorf("got: %v, want: %v", len(scanInfo.PolicyIdentifier), 1) t.Errorf("got: %v policy identifiers, want: %v", len(scanInfo.PolicyIdentifier), len(tc.want.PolicyIdentifier))
} }
if scanInfo.PolicyIdentifier[0].Identifier != tc.want.PolicyIdentifier[0].Identifier { for i, wantPolicy := range tc.want.PolicyIdentifier {
t.Errorf("got: %v, want: %v", scanInfo.PolicyIdentifier[0].Identifier, tc.want.PolicyIdentifier[0].Identifier) if i < len(scanInfo.PolicyIdentifier) {
if scanInfo.PolicyIdentifier[i].Identifier != wantPolicy.Identifier {
t.Errorf("got: %v, want: %v", scanInfo.PolicyIdentifier[i].Identifier, wantPolicy.Identifier)
}
if scanInfo.PolicyIdentifier[i].Kind != wantPolicy.Kind {
t.Errorf("got: %v, want: %v", scanInfo.PolicyIdentifier[i].Kind, wantPolicy.Kind)
}
}
} }
}, },
) )

2
go.mod
View File

@@ -56,7 +56,6 @@ require (
go.opentelemetry.io/otel v1.39.0 go.opentelemetry.io/otel v1.39.0
go.opentelemetry.io/otel/metric v1.39.0 go.opentelemetry.io/otel/metric v1.39.0
golang.org/x/mod v0.31.0 golang.org/x/mod v0.31.0
golang.org/x/sync v0.19.0
golang.org/x/term v0.38.0 golang.org/x/term v0.38.0
gopkg.in/op/go-logging.v1 v1.0.0-20160211212156-b2cb9fa56473 gopkg.in/op/go-logging.v1 v1.0.0-20160211212156-b2cb9fa56473
gopkg.in/yaml.v3 v3.0.1 gopkg.in/yaml.v3 v3.0.1
@@ -557,6 +556,7 @@ require (
golang.org/x/image v0.25.0 // indirect golang.org/x/image v0.25.0 // indirect
golang.org/x/net v0.48.0 // indirect golang.org/x/net v0.48.0 // indirect
golang.org/x/oauth2 v0.34.0 // indirect golang.org/x/oauth2 v0.34.0 // indirect
golang.org/x/sync v0.19.0 // indirect
golang.org/x/sys v0.39.0 // indirect golang.org/x/sys v0.39.0 // indirect
golang.org/x/text v0.32.0 // indirect golang.org/x/text v0.32.0 // indirect
golang.org/x/time v0.14.0 // indirect golang.org/x/time v0.14.0 // indirect