github/kubescape
1
0
Fork 0
mirror of https://github.com/kubescape/kubescape.git synced 2026-04-15 06:58:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1896 from kubescape/summaries

Browse Source 
always save WorkloadConfigurationScanResultSummaries
This commit is contained in:
Matthias Bertschy
2025-12-01 08:05:57 +01:00
committed by GitHub
parent 440f39ba3e 8deff34d12
commit a46098c034
3 changed files with 37 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
httphandler/handlerequests/v1/requestshandlerutils.go
+4 -3
View File
@@ -86,11 +86,12 @@ func scan(ctx context.Context, scanInfo *cautils.ScanInfo, scanID string) (*repo
if err := result.HandleResults(ctx, scanInfo); err != nil {
return nil, err
}
storage := storage.GetStorage()
if storage != nil {
store := storage.GetStorage()
// do not store results locally when we are sending them
if store != nil && config.GetAccount() == "" {
pr := result.GetResults()
if err := storage.StorePostureReportResults(ctx, pr); err != nil {
if err := store.StorePostureReportResults(ctx, pr); err != nil {
return nil, err
}
} else {
httphandler/main.go
+1 -5
View File
@@ -61,10 +61,6 @@ func main() {
}
func initializeStorage(clusterName string, cfg config.Config) {
if !cfg.ContinuousPostureScan {
logger.L().Debug("continuous posture scan - skipping storage initialization")
return
}
namespace := getNamespace(cfg)
logger.L().Debug("initializing storage", helpers.String("namespace", namespace))
@@ -74,7 +70,7 @@ func initializeStorage(clusterName string, cfg config.Config) {
logger.L().Fatal("storage initialization error", helpers.Error(err))
}
s, err := storage.NewAPIServerStorage(clusterName, namespace, ksClient)
s, err := storage.NewAPIServerStorage(clusterName, namespace, ksClient, cfg.ContinuousPostureScan)
if err != nil {
logger.L().Fatal("storage initialization error", helpers.Error(err))
}
httphandler/storage/apiserver.go
+32 -14
View File
@@ -30,15 +30,17 @@ var storageInstance *APIServerStore
type PostureRepository interface {
GetWorkloadConfigurationScanResult(ctx context.Context, name, namespace string) (*v1beta1.WorkloadConfigurationScan, error)
StoreWorkloadConfigurationScanResult(ctx context.Context, report *v2.PostureReport, result *resourcesresults.Result) (*v1beta1.WorkloadConfigurationScan, error)
BuildWorkloadConfigurationScan(ctx context.Context, report *v2.PostureReport, result *resourcesresults.Result) (*v1beta1.WorkloadConfigurationScan, error)
StoreWorkloadConfigurationScanResult(ctx context.Context, manifest *v1beta1.WorkloadConfigurationScan) error
StoreWorkloadConfigurationScanResultSummary(ctx context.Context, workloadScan *v1beta1.WorkloadConfigurationScan) (*v1beta1.WorkloadConfigurationScanSummary, error)
}
// APIServerStore implements both PostureRepository with in-cluster storage (apiserver) to be used for production
type APIServerStore struct {
StorageClient spdxv1beta1.SpdxV1beta1Interface
clusterName string
namespace string
StorageClient spdxv1beta1.SpdxV1beta1Interface
clusterName string
namespace string
continuousPostureScan bool
}
var _ PostureRepository = (*APIServerStore)(nil)
@@ -52,22 +54,31 @@ func GetStorage() *APIServerStore {
}
// NewAPIServerStorage initializes the APIServerStore struct
func NewAPIServerStorage(clusterName string, namespace string, ksClient spdxv1beta1.SpdxV1beta1Interface) (*APIServerStore, error) {
func NewAPIServerStorage(clusterName string, namespace string, ksClient spdxv1beta1.SpdxV1beta1Interface, continuousPostureScan bool) (*APIServerStore, error) {
return &APIServerStore{
StorageClient: ksClient,
clusterName: clusterName,
namespace: namespace,
StorageClient: ksClient,
clusterName: clusterName,
namespace: namespace,
continuousPostureScan: continuousPostureScan,
}, nil
}
func (a *APIServerStore) StorePostureReportResults(ctx context.Context, pr *v2.PostureReport) error {
for i := range pr.Results {
detailedObj, err := a.StoreWorkloadConfigurationScanResult(ctx, pr, &pr.Results[i])
workloadScan, err := a.BuildWorkloadConfigurationScan(ctx, pr, &pr.Results[i])
if err != nil {
return err
}
if _, err := a.StoreWorkloadConfigurationScanResultSummary(ctx, detailedObj); err != nil {
// Only store full WorkloadConfigurationScan when continuousPostureScan is enabled
if a.continuousPostureScan {
if err := a.StoreWorkloadConfigurationScanResult(ctx, workloadScan); err != nil {
return err
}
}
// Always store summaries for headlamp plugin
if _, err := a.StoreWorkloadConfigurationScanResultSummary(ctx, workloadScan); err != nil {
return err
}
@@ -135,7 +146,8 @@ func (a *APIServerStore) getResourceNamespace(resource workloadinterface.IMetada
return resource.GetNamespace()
}
func (a *APIServerStore) StoreWorkloadConfigurationScanResult(ctx context.Context, report *v2.PostureReport, result *resourcesresults.Result) (*v1beta1.WorkloadConfigurationScan, error) {
// BuildWorkloadConfigurationScan builds a WorkloadConfigurationScan manifest without storing it
func (a *APIServerStore) BuildWorkloadConfigurationScan(ctx context.Context, report *v2.PostureReport, result *resourcesresults.Result) (*v1beta1.WorkloadConfigurationScan, error) {
resource, err := findResourceInReport(result.ResourceID, report)
if err != nil {
return nil, err
@@ -166,7 +178,13 @@ func (a *APIServerStore) StoreWorkloadConfigurationScanResult(ctx context.Contex
},
}
_, err = a.StorageClient.WorkloadConfigurationScans(namespace).Create(context.Background(), &manifest, metav1.CreateOptions{})
return &manifest, nil
}
// StoreWorkloadConfigurationScanResult stores a WorkloadConfigurationScan manifest
func (a *APIServerStore) StoreWorkloadConfigurationScanResult(ctx context.Context, manifest *v1beta1.WorkloadConfigurationScan) error {
namespace := manifest.GetNamespace()
_, err := a.StorageClient.WorkloadConfigurationScans(namespace).Create(context.Background(), manifest, metav1.CreateOptions{})
switch {
case errors.IsAlreadyExists(err):
retryErr := retry.RetryOnConflict(retry.DefaultRetry, func() error {
@@ -192,11 +210,11 @@ func (a *APIServerStore) StoreWorkloadConfigurationScanResult(ctx context.Contex
}
case err != nil:
logger.L().Ctx(ctx).Warning("failed to store WorkloadConfigurationScan manifest in storage", helpers.Error(err), helpers.String("name", manifest.Name))
return nil, err
return err
default:
logger.L().Debug("stored WorkloadConfigurationScan manifest in storage", helpers.String("name", manifest.Name))
}
return &manifest, nil
return nil
}
func mergeWorkloadConfigurationScanSpec(existingSpec v1beta1.WorkloadConfigurationScanSpec, newSpec v1beta1.WorkloadConfigurationScanSpec) v1beta1.WorkloadConfigurationScanSpec {