From 9b1e0551be3b3cb2e4d053e78c4d4878fac8bd52 Mon Sep 17 00:00:00 2001
From: Shunsuke Suzuki <suzuki-shunsuke@users.noreply.github.com>
Date: Mon, 17 Feb 2025 07:37:29 +0900
Subject: [PATCH] fix(generate-registry): rename version to version_filter
 (#3568)

* fix(generate-registry): rename version to version_filter

* [autofix.ci] apply automated fixes

* fix(generate-registry): rename package to name

* fix(generate-registry): rename asset to all_assets_filter

---------

Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
---
 json-schema/aqua-generate-registry.json       |  8 +++----
 pkg/controller/generate-registry/confg.go     | 24 +++++++++----------
 pkg/controller/generate-registry/init.go      |  6 ++---
 .../generate-registry/version_overrides.go    |  8 +++----
 tests/gr-config/aqua-generate-registry.yaml   |  6 ++---
 5 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/json-schema/aqua-generate-registry.json b/json-schema/aqua-generate-registry.json
index 5b105ee80..086b732ed 100644
--- a/json-schema/aqua-generate-registry.json
+++ b/json-schema/aqua-generate-registry.json
@@ -5,20 +5,20 @@
   "$defs": {
     "RawConfig": {
       "properties": {
-        "version": {
+        "version_filter": {
           "type": "string"
         },
-        "asset": {
+        "all_assets_filter": {
           "type": "string"
         },
-        "package": {
+        "name": {
           "type": "string"
         }
       },
       "additionalProperties": false,
       "type": "object",
       "required": [
-        "package"
+        "name"
       ]
     }
   }
diff --git a/pkg/controller/generate-registry/confg.go b/pkg/controller/generate-registry/confg.go
index ea44ca57f..e8043372a 100644
--- a/pkg/controller/generate-registry/confg.go
+++ b/pkg/controller/generate-registry/confg.go
@@ -10,15 +10,15 @@ import (
 )
 
 type Config struct {
-	Version *vm.Program
-	Asset   *vm.Program
-	Package string
+	VersionFilter   *vm.Program
+	AllAssetsFilter *vm.Program
+	Package         string
 }
 
 type RawConfig struct {
-	Version string `json:"version,omitempty"`
-	Asset   string `json:"asset,omitempty"`
-	Package string `json:"package"`
+	VersionFilter   string `json:"version_filter,omitempty"`
+	AllAssetsFilter string `json:"all_assets_filter,omitempty" yaml:"all_assets_filter"`
+	Package         string `json:"name" yaml:"name"`
 }
 
 func (c *Config) FromRaw(raw *RawConfig) error {
@@ -28,20 +28,20 @@ func (c *Config) FromRaw(raw *RawConfig) error {
 
 	c.Package = raw.Package
 
-	if raw.Version != "" {
-		r, err := expr.CompileVersionFilter(raw.Version)
+	if raw.VersionFilter != "" {
+		r, err := expr.CompileVersionFilter(raw.VersionFilter)
 		if err != nil {
 			return fmt.Errorf("compile a version expression: %w", err)
 		}
-		c.Version = r
+		c.VersionFilter = r
 	}
 
-	if raw.Asset != "" {
-		a, err := expr.CompileAssetFilter(raw.Asset)
+	if raw.AllAssetsFilter != "" {
+		a, err := expr.CompileAssetFilter(raw.AllAssetsFilter)
 		if err != nil {
 			return fmt.Errorf("compile an asset expression: %w", err)
 		}
-		c.Asset = a
+		c.AllAssetsFilter = a
 	}
 
 	return nil
diff --git a/pkg/controller/generate-registry/init.go b/pkg/controller/generate-registry/init.go
index 5f2d48564..9e195fc79 100644
--- a/pkg/controller/generate-registry/init.go
+++ b/pkg/controller/generate-registry/init.go
@@ -13,9 +13,9 @@ const template = `---
 # yaml-language-server: $schema=https://raw.githubusercontent.com/aquaproj/aqua/main/json-schema/aqua-generate-registry.json
 # aqua - Declarative CLI Version Manager
 # https://aquaproj.github.io/
-package: %%PACKAGE%%
-version: not (Version matches "-rc$")
-asset: not (Asset matches "-cli")
+name: %%PACKAGE%%
+version_filter: not (Version matches "-rc$")
+all_assets_filter: not (Asset matches "-cli")
 `
 
 func (c *Controller) initConfig(args ...string) error {
diff --git a/pkg/controller/generate-registry/version_overrides.go b/pkg/controller/generate-registry/version_overrides.go
index ce96b0a12..0d4fb285e 100644
--- a/pkg/controller/generate-registry/version_overrides.go
+++ b/pkg/controller/generate-registry/version_overrides.go
@@ -48,10 +48,10 @@ func listPkgsFromVersions(pkgName string, versions []string) []*aqua.Package {
 }
 
 func excludeVersion(logE *logrus.Entry, tag string, cfg *Config) bool {
-	if cfg.Version == nil {
+	if cfg.VersionFilter == nil {
 		return false
 	}
-	f, err := expr.EvaluateVersionFilter(cfg.Version, tag)
+	f, err := expr.EvaluateVersionFilter(cfg.VersionFilter, tag)
 	if err != nil {
 		logerr.WithError(logE, err).WithField("tag_name", tag).Warn("evaluate a version filter")
 		return false
@@ -60,10 +60,10 @@ func excludeVersion(logE *logrus.Entry, tag string, cfg *Config) bool {
 }
 
 func excludeAsset(logE *logrus.Entry, asset string, cfg *Config) bool {
-	if cfg.Asset == nil {
+	if cfg.AllAssetsFilter == nil {
 		return false
 	}
-	f, err := expr.EvaluateAssetFilter(cfg.Asset, asset)
+	f, err := expr.EvaluateAssetFilter(cfg.AllAssetsFilter, asset)
 	if err != nil {
 		logerr.WithError(logE, err).WithField("asset", asset).Warn("evaluate an asset filter")
 		return false
diff --git a/tests/gr-config/aqua-generate-registry.yaml b/tests/gr-config/aqua-generate-registry.yaml
index f6870e65f..2c05b2613 100644
--- a/tests/gr-config/aqua-generate-registry.yaml
+++ b/tests/gr-config/aqua-generate-registry.yaml
@@ -1,6 +1,6 @@
 ---
 # aqua - Declarative CLI Version Manager
 # https://aquaproj.github.io/
-package: fission/fission
-version: Version matches "^v?\\d"
-asset: not ((Asset matches "\\.json$") or (Asset matches "\\.yaml$"))
+name: fission/fission
+version_filter: Version matches "^v?\\d"
+all_assets_filter: not ((Asset matches "\\.json$") or (Asset matches "\\.yaml$"))