gitea-mirror/trivy
1
0
Fork 0
mirror of https://github.com/aquasecurity/trivy.git synced 2025-12-22 23:26:39 -08:00
Code Issues Packages Projects Releases Wiki Activity

refactor: replace zap with slog (#6466)

Browse Source 
Signed-off-by: knqyf263 <knqyf263@gmail.com>
Co-authored-by: Nikita Pivkin <nikita.pivkin@smartforce.io>
Co-authored-by: simar7 <1254783+simar7@users.noreply.github.com>
This commit is contained in:
Teppei Fukuda
2024-04-11 22:59:09 +04:00
committed by GitHub
parent 336c47ecc3
commit 94d6e8ced6
164 changed files with 1664 additions and 891 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
pkg/plugin/plugin.go
View File

@@ -136,7 +136,8 @@ func (p Plugin) selectPlatform() (Platform, error) {
selector := platform.Selector
if (selector.OS == "" || p.GOOS == selector.OS) &&
(selector.Arch == "" || p.GOARCH == selector.Arch) {
log.Logger.Debugf("Platform found, os: %s, arch: %s", selector.OS, selector.Arch)
log.Debug("Platform found",
log.String("os", selector.OS), log.String("arch", selector.Arch))
return platform, nil
}
}
@@ -144,13 +145,13 @@ func (p Plugin) selectPlatform() (Platform, error) {
}
func (p Plugin) install(ctx context.Context, dst, pwd string) error {
log.Logger.Debugf("Installing the plugin to %s...", dst)
log.Debug("Installing the plugin...", log.String("path", dst))
platform, err := p.selectPlatform()
if err != nil {
return xerrors.Errorf("platform selection error: %w", err)
}
log.Logger.Debugf("Downloading the execution file from %s...", platform.URI)
log.Debug("Downloading the execution file...", log.String("uri", platform.URI))
if err = downloader.Download(ctx, platform.URI, dst, pwd); err != nil {
return xerrors.Errorf("unable to download the execution file (%s): %w", platform.URI, err)
}
@@ -181,14 +182,14 @@ func Install(ctx context.Context, url string, force bool) (Plugin, error) {
}
}
log.Logger.Infof("Installing the plugin from %s...", url)
log.Info("Installing the plugin...", log.String("url", url))
tempDir, err := downloader.DownloadToTempDir(ctx, url)
if err != nil {
return Plugin{}, xerrors.Errorf("download failed: %w", err)
}
defer os.RemoveAll(tempDir)
log.Logger.Info("Loading the plugin metadata...")
log.Info("Loading the plugin metadata...")
plugin, err := loadMetadata(tempDir)
if err != nil {
return Plugin{}, xerrors.Errorf("failed to load the plugin metadata: %w", err)
@@ -259,16 +260,18 @@ func Update(name string) error {
return xerrors.Errorf("plugin load error: %w", err)
}
log.Logger.Infof("Updating plugin '%s'", name)
logger := log.With("name", name)
logger.Info("Updating plugin...")
updated, err := Install(nil, plugin.Repository, true)
if err != nil {
return xerrors.Errorf("unable to perform an update installation: %w", err)
}
if plugin.Version == updated.Version {
log.Logger.Infof("The %s plugin is the latest version. [%s]", name, plugin.Version)
logger.Info("The plugin is up-to-date", log.String("version", plugin.Version))
} else {
log.Logger.Infof("Updated '%s' from %s to %s", name, plugin.Version, updated.Version)
logger.Info("Plugin updated",
log.String("from", plugin.Version), log.String("to", updated.Version))
}
return nil
}
@@ -288,7 +291,7 @@ func LoadAll() ([]Plugin, error) {
}
plugin, err := loadMetadata(filepath.Join(pluginsDir, d.Name()))
if err != nil {
log.Logger.Warnf("plugin load error: %s", err)
log.Warn("Plugin load error", log.Err(err))
continue
}
plugins = append(plugins, plugin)