Skip to content

Commit b477798

Browse files
feat: support version_expr_prefix
1 parent c897f6f commit b477798

File tree

2 files changed

+15
-14
lines changed

2 files changed

+15
-14
lines changed

pkg/config-reader/reader.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ func (r *ConfigReader) readPackage(logE *logrus.Entry, configFilePath string, pk
107107
"version_expr": pkg.VersionExpr,
108108
}))
109109
}
110-
pkg.Version = s
110+
pkg.Version = pkg.VersionExprPrefix + s
111111
return nil, nil
112112
}
113113
if pkg.Import == "" {

pkg/config/aqua/config.go

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -7,19 +7,20 @@ import (
77
)
88

99
type Package struct {
10-
Name string `validate:"required" json:"name,omitempty"`
11-
Registry string `validate:"required" yaml:",omitempty" json:"registry,omitempty" jsonschema:"description=Registry name,example=foo,example=local,default=standard"`
12-
Version string `validate:"required" yaml:",omitempty" json:"version,omitempty"`
13-
Import string `yaml:",omitempty" json:"import,omitempty"`
14-
Tags []string `yaml:",omitempty" json:"tags,omitempty"`
15-
Description string `yaml:",omitempty" json:"description,omitempty"`
16-
Link string `yaml:",omitempty" json:"link,omitempty"`
17-
Update *Update `yaml:",omitempty" json:"update,omitempty"`
18-
FilePath string `json:"-" yaml:"-"`
19-
GoVersionFile string `json:"go_version_file,omitempty" yaml:"go_version_file,omitempty"`
20-
VersionExpr string `json:"version_expr,omitempty" yaml:"version_expr,omitempty"`
21-
Vars map[string]any `json:"vars,omitempty" yaml:",omitempty"`
22-
CommandAliases []*CommandAlias `json:"command_aliases,omitempty" yaml:"command_aliases,omitempty"`
10+
Name string `validate:"required" json:"name,omitempty"`
11+
Registry string `validate:"required" yaml:",omitempty" json:"registry,omitempty" jsonschema:"description=Registry name,example=foo,example=local,default=standard"`
12+
Version string `validate:"required" yaml:",omitempty" json:"version,omitempty"`
13+
Import string `yaml:",omitempty" json:"import,omitempty"`
14+
Tags []string `yaml:",omitempty" json:"tags,omitempty"`
15+
Description string `yaml:",omitempty" json:"description,omitempty"`
16+
Link string `yaml:",omitempty" json:"link,omitempty"`
17+
Update *Update `yaml:",omitempty" json:"update,omitempty"`
18+
FilePath string `json:"-" yaml:"-"`
19+
GoVersionFile string `json:"go_version_file,omitempty" yaml:"go_version_file,omitempty"`
20+
VersionExpr string `json:"version_expr,omitempty" yaml:"version_expr,omitempty"`
21+
VersionExprPrefix string `json:"version_expr_prefix,omitempty" yaml:"version_expr_prefix,omitempty"`
22+
Vars map[string]any `json:"vars,omitempty" yaml:",omitempty"`
23+
CommandAliases []*CommandAlias `json:"command_aliases,omitempty" yaml:"command_aliases,omitempty"`
2324
}
2425

2526
type CommandAlias struct {

0 commit comments

Comments
 (0)