diff --git a/pkg/generate/generate.go b/pkg/generate/generate.go index 4080279..71e0e65 100644 --- a/pkg/generate/generate.go +++ b/pkg/generate/generate.go @@ -80,15 +80,13 @@ func autogenerateConfigs(opts Options) error { slog.Debug("unmarshaled json") var errGrp errgroup.Group - for kcDistro, f := range fullJson { + for distro, f := range fullJson { kernelEntries := f - dkDistro := root.ToDriverkitDistro(root.KernelCrawlerDistro(kcDistro)) - // Skip unneeded kernel entries // optimization for target-distro: skip entire key // instead of skipping objects one by one. - if !opts.DistroFilter(dkDistro.String()) { + if !opts.DistroFilter(distro) { continue } diff --git a/pkg/root/distro.go b/pkg/root/distro.go index 5a9a3b2..3335dec 100644 --- a/pkg/root/distro.go +++ b/pkg/root/distro.go @@ -20,30 +20,27 @@ import ( "github.com/falcosecurity/driverkit/pkg/driverbuilder/builder" ) -type KernelCrawlerDistro string - var ( SupportedDistroSlice []string // SupportedDistros keeps the list of distros supported by test-infra. // We don't want to generate configs for unsupported distros after all. - // Please add new supported build-new-drivers structures here, + // Please add new supported distros here, // so that the utility starts building configs for them. // Keys must have the same name used by driverkit targets. - // Values must have the same name used by kernel-crawler json keys. - SupportedDistros = map[builder.Type]KernelCrawlerDistro{ - builder.TargetTypeAlma: "AlmaLinux", - builder.TargetTypeAmazonLinux: "AmazonLinux", - builder.TargetTypeAmazonLinux2: "AmazonLinux2", - builder.TargetTypeAmazonLinux2022: "AmazonLinux2022", - builder.TargetTypeAmazonLinux2023: "AmazonLinux2023", - builder.TargetTypeBottlerocket: "BottleRocket", - builder.TargetTypeCentos: "CentOS", - builder.TargetTypeDebian: "Debian", - builder.TargetTypeFedora: "Fedora", - builder.TargetTypeMinikube: "Minikube", - builder.TargetTypePhoton: "PhotonOS", - builder.TargetTypeTalos: "Talos", - builder.TargetTypeUbuntu: "Ubuntu", + SupportedDistros = map[builder.Type]struct{}{ + builder.TargetTypeAlma: {}, + builder.TargetTypeAmazonLinux: {}, + builder.TargetTypeAmazonLinux2: {}, + builder.TargetTypeAmazonLinux2022: {}, + builder.TargetTypeAmazonLinux2023: {}, + builder.TargetTypeBottlerocket: {}, + builder.TargetTypeCentos: {}, + builder.TargetTypeDebian: {}, + builder.TargetTypeFedora: {}, + builder.TargetTypeMinikube: {}, + builder.TargetTypePhoton: {}, + builder.TargetTypeTalos: {}, + builder.TargetTypeUbuntu: {}, } ) @@ -54,12 +51,3 @@ func init() { } sort.Strings(SupportedDistroSlice) } - -func ToDriverkitDistro(distro KernelCrawlerDistro) builder.Type { - for key, val := range SupportedDistros { - if val == distro { - return key - } - } - return builder.Type("") -}