From 6d5ef206c3808fa0398597b0593aa6b892e9b685 Mon Sep 17 00:00:00 2001 From: Luca Guerra Date: Thu, 18 Jan 2024 16:15:37 +0000 Subject: [PATCH] Revert "update(build): create new engine_version_semver string for new plugin rulesfiles artifact configs" This reverts commit eaa8fb10b94c62b86b96f71eb3555b6d3d2f24cf. --- build/registry/pkg/common/consts.go | 2 +- build/registry/pkg/oci/requirements.go | 17 ++++------------- 2 files changed, 5 insertions(+), 14 deletions(-) diff --git a/build/registry/pkg/common/consts.go b/build/registry/pkg/common/consts.go index 3441c619..6034b1dd 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_semver" + EngineVersionKey = "engine_version" // 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 f1925060..b605ef43 100644 --- a/build/registry/pkg/oci/requirements.go +++ b/build/registry/pkg/oci/requirements.go @@ -22,6 +22,7 @@ import ( "errors" "fmt" "os" + "strconv" "strings" "github.com/blang/semver" @@ -64,25 +65,15 @@ func rulesfileRequirement(filePath string) (*oci.ArtifactRequirement, error) { } // Split the requirement and parse the version to semVer. - // In case the requirement was expressed as a numeric value, - // we convert it to semver and treat it as minor version. tokens := strings.Split(fileScanner.Text(), ":") - reqVer, err := semver.Parse(tokens[1]) + reqVer, err := semver.ParseTolerant(tokens[1]) if err != nil { - reqVer, err = semver.ParseTolerant(tokens[1]) - if err != nil { - return nil, fmt.Errorf("unable to parse requirement %q: expected a numeric value or a valid semver string", tokens[1]) - } - reqVer = semver.Version{ - Major: 0, - Minor: reqVer.Major, - Patch: 0, - } + return nil, fmt.Errorf("unable to parse to semVer the version requirement %q", tokens[1]) } return &oci.ArtifactRequirement{ Name: common.EngineVersionKey, - Version: reqVer.String(), + Version: strconv.FormatUint(reqVer.Major, 10), }, nil }