From 25ca6ec1f17d823373d9f5c448170feb3c97e1fa Mon Sep 17 00:00:00 2001 From: Lorenzo Susini Date: Thu, 2 Nov 2023 14:19:53 +0000 Subject: [PATCH] update(build): introduce the new engine_version_semver key for plugins rule artifacts Signed-off-by: Lorenzo Susini --- build/registry/pkg/common/consts.go | 2 +- build/registry/pkg/oci/requirements.go | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/build/registry/pkg/common/consts.go b/build/registry/pkg/common/consts.go index 6034b1dd..3441c619 100644 --- a/build/registry/pkg/common/consts.go +++ b/build/registry/pkg/common/consts.go @@ -21,7 +21,7 @@ const ( RulesArtifactSuffix = "-rules" // EngineVersionKey is the name given to all the engine requirements. // The same name used by Falco when outputting the engine version. - EngineVersionKey = "engine_version" + EngineVersionKey = "engine_version_semver" // PluginAPIVersion is the name givet to the plugin api version requirements. // The same name used by Falco when outputting the plugin api version PluginAPIVersion = "plugin_api_version" diff --git a/build/registry/pkg/oci/requirements.go b/build/registry/pkg/oci/requirements.go index b605ef43..bb61c4a0 100644 --- a/build/registry/pkg/oci/requirements.go +++ b/build/registry/pkg/oci/requirements.go @@ -22,7 +22,6 @@ import ( "errors" "fmt" "os" - "strconv" "strings" "github.com/blang/semver" @@ -66,14 +65,14 @@ func rulesfileRequirement(filePath string) (*oci.ArtifactRequirement, error) { // Split the requirement and parse the version to semVer. tokens := strings.Split(fileScanner.Text(), ":") - reqVer, err := semver.ParseTolerant(tokens[1]) + reqVer, err := semver.Parse(tokens[1]) if err != nil { return nil, fmt.Errorf("unable to parse to semVer the version requirement %q", tokens[1]) } return &oci.ArtifactRequirement{ Name: common.EngineVersionKey, - Version: strconv.FormatUint(reqVer.Major, 10), + Version: reqVer.String(), }, nil }