From 548e8dce8466e048df6dc169f62888c28e6ced1b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kacper=20Ma=C5=82achowski?= <38684517+KacperMalachowski@users.noreply.github.com> Date: Wed, 5 Feb 2025 17:28:25 +0100 Subject: [PATCH 1/3] Rename security-scanners-cfg-fields --- sec-scanners-config.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sec-scanners-config.yaml b/sec-scanners-config.yaml index 0a1612ba2..99dae7327 100644 --- a/sec-scanners-config.yaml +++ b/sec-scanners-config.yaml @@ -1,12 +1,12 @@ module-name: telemetry kind: kyma -protecode: +bdba: - europe-docker.pkg.dev/kyma-project/prod/telemetry-manager:main - europe-docker.pkg.dev/kyma-project/prod/directory-size-exporter:v20241212-e4adf27f - europe-docker.pkg.dev/kyma-project/prod/external/fluent/fluent-bit:3.2.4 - europe-docker.pkg.dev/kyma-project/prod/kyma-otel-collector:0.118.0-main - europe-docker.pkg.dev/kyma-project/prod/tpi/telemetry-self-monitor:3.1.0-98bf175 -whitesource: +mend: language: golang-mod exclude: - '**/mocks/**' From 2356b4fbd8766289dc8f7fbb9dfce486568539d2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kacper=20Ma=C5=82achowski?= <38684517+KacperMalachowski@users.noreply.github.com> Date: Wed, 5 Feb 2025 17:29:27 +0100 Subject: [PATCH 2/3] Update main.go --- internal/tools/populateimages/main.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/internal/tools/populateimages/main.go b/internal/tools/populateimages/main.go index a76947984..5c3b45c28 100644 --- a/internal/tools/populateimages/main.go +++ b/internal/tools/populateimages/main.go @@ -16,8 +16,8 @@ import ( type secScanConfig struct { ModuleName string `yaml:"module-name"` Kind string `yaml:"kind"` - Protecode []string `yaml:"protecode"` - WhiteSource whiteSource `yaml:"whitesource"` + Protecode []string `yaml:"bdba"` + WhiteSource whiteSource `yaml:"mend"` CheckmarxOne checkmarxOne `yaml:"checkmarx-one"` } From e03dbddd41b359d4b170b4844b9e01c42398fb95 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kacper=20Ma=C5=82achowski?= <38684517+KacperMalachowski@users.noreply.github.com> Date: Thu, 6 Feb 2025 09:30:26 +0100 Subject: [PATCH 3/3] Update main.go --- internal/tools/populateimages/main.go | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/internal/tools/populateimages/main.go b/internal/tools/populateimages/main.go index 5c3b45c28..048dfb15e 100644 --- a/internal/tools/populateimages/main.go +++ b/internal/tools/populateimages/main.go @@ -16,12 +16,12 @@ import ( type secScanConfig struct { ModuleName string `yaml:"module-name"` Kind string `yaml:"kind"` - Protecode []string `yaml:"bdba"` - WhiteSource whiteSource `yaml:"mend"` + BDBA []string `yaml:"bdba"` + Mend mend `yaml:"mend"` CheckmarxOne checkmarxOne `yaml:"checkmarx-one"` } -type whiteSource struct { +type mend struct { Language string `yaml:"language"` Exclude []string `yaml:"exclude"` } @@ -183,8 +183,8 @@ func generateSecScanConfig(data map[string]string) error { secScanCfg := secScanConfig{ ModuleName: "telemetry", Kind: "kyma", - Protecode: imgs, - WhiteSource: whiteSource{ + BDBA: imgs, + Mend: mend{ Language: "golang-mod", Exclude: []string{"**/mocks/**", "**/stubs/**", "**/test/**", "**/*_test.go"}, },