From 04f6e543ec6532f9bd1496863493e6db519b6486 Mon Sep 17 00:00:00 2001 From: Aldo Lacuku Date: Tue, 14 May 2024 16:45:00 +0200 Subject: [PATCH] fix(CI): use the repo URL as source of truth for plugin's owner Signed-off-by: Aldo Lacuku --- build/registry/cmd/validateRegistry/validateRegistryFile.go | 4 ++-- build/registry/pkg/oci/const.go | 1 + build/registry/pkg/oci/oci.go | 6 +++--- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/build/registry/cmd/validateRegistry/validateRegistryFile.go b/build/registry/cmd/validateRegistry/validateRegistryFile.go index 5cab107e..d2b950c4 100644 --- a/build/registry/cmd/validateRegistry/validateRegistryFile.go +++ b/build/registry/cmd/validateRegistry/validateRegistryFile.go @@ -3,13 +3,13 @@ package validateRegistry import ( "context" "fmt" - "github.com/falcosecurity/falcoctl/pkg/oci/authn" ocipuller "github.com/falcosecurity/falcoctl/pkg/oci/puller" "github.com/falcosecurity/plugins/build/registry/pkg/oci" "github.com/falcosecurity/plugins/build/registry/pkg/registry" "github.com/spf13/cobra" "k8s.io/klog/v2" + "strings" ) func NewValidateRegistry(ctx context.Context) *cobra.Command { @@ -38,7 +38,7 @@ func validateRegistry(ctx context.Context, registryFile string) error { // For each plugin in the registry index, look for new ones to be released, and publish them. for _, plugin := range reg.Plugins { // Filter out plugins that are not owned by falcosecurity. - if plugin.Authors != oci.FalcoAuthors { + if !strings.HasPrefix(plugin.URL, oci.PluginsRepo) { klog.V(2).Infof("skipping plugin %q with authors %q: it is not maintained by %q", plugin.Name, plugin.Authors, oci.FalcoAuthors) continue diff --git a/build/registry/pkg/oci/const.go b/build/registry/pkg/oci/const.go index e7554d3f..31734551 100644 --- a/build/registry/pkg/oci/const.go +++ b/build/registry/pkg/oci/const.go @@ -41,6 +41,7 @@ const ( RegistryOCI = "REGISTRY" RepoGithub = "REPO_GITHUB" FalcoAuthors = "The Falco Authors" + PluginsRepo = "https://github.com/falcosecurity/plugins" archiveSuffix = ".tar.gz" amd64Platform = "linux/amd64" arm64Platform = "linux/arm64" diff --git a/build/registry/pkg/oci/oci.go b/build/registry/pkg/oci/oci.go index 830155ba..09992add 100644 --- a/build/registry/pkg/oci/oci.go +++ b/build/registry/pkg/oci/oci.go @@ -165,10 +165,10 @@ func tagsFromVersion(version *semver.Version) []string { func handleArtifact(ctx context.Context, cfg *config, plugin *registry.Plugin, ociClient remote.Client, pluginsAMD64, pluginsARM64, rulesfiles, devTag string) ([]registry.ArtifactPushMetadata, []registry.ArtifactPushMetadata, error) { // Filter out plugins that are not owned by falcosecurity. - if plugin.Authors != FalcoAuthors { + if !strings.HasPrefix(plugin.URL, PluginsRepo) { sepString := strings.Repeat("#", 15) - klog.V(2).Info("%s %s %s", sepString, plugin.Name, sepString) - klog.V(2).Infof("skipping plugin %q with authors %q: it is not maintained by %q", + klog.Info("%s %s %s", sepString, plugin.Name, sepString) + klog.Infof("skipping plugin %q with authors %q: it is not maintained by %q", plugin.Name, plugin.Authors, FalcoAuthors) return nil, nil, nil }