From 6f35533aa6151d3972c4787128db399950a6252a Mon Sep 17 00:00:00 2001 From: Shunsuke Suzuki Date: Mon, 8 May 2023 22:54:06 +0900 Subject: [PATCH] feat(generate-registry): enable deep by default --- pkg/cli/runner.go | 1 + pkg/config/package.go | 1 + pkg/controller/generate-registry/generate.go | 6 +++--- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/pkg/cli/runner.go b/pkg/cli/runner.go index ce3cda46f..f9d63c9eb 100644 --- a/pkg/cli/runner.go +++ b/pkg/cli/runner.go @@ -64,6 +64,7 @@ func (runner *Runner) setParam(c *cli.Context, commandName string, param *config param.MaxParallelism = config.GetMaxParallelism(os.Getenv("AQUA_MAX_PARALLELISM"), logE) param.GlobalConfigFilePaths = finder.ParseGlobalConfigFilePaths(os.Getenv("AQUA_GLOBAL_CONFIG")) param.Deep = c.Bool("deep") + param.DeepAuto = commandName == "generate-registry" && !c.IsSet("deep") param.Pin = c.Bool("pin") wd, err := os.Getwd() if err != nil { diff --git a/pkg/config/package.go b/pkg/config/package.go index a97d6bef9..e26f95edf 100644 --- a/pkg/config/package.go +++ b/pkg/config/package.go @@ -187,6 +187,7 @@ type Param struct { SelectVersion bool ProgressBar bool Deep bool + DeepAuto bool SkipLink bool Pin bool Prune bool diff --git a/pkg/controller/generate-registry/generate.go b/pkg/controller/generate-registry/generate.go index f90409546..a329ae0c2 100644 --- a/pkg/controller/generate-registry/generate.go +++ b/pkg/controller/generate-registry/generate.go @@ -52,7 +52,7 @@ func (ctrl *Controller) GenerateRegistry(ctx context.Context, param *config.Para } func (ctrl *Controller) genRegistry(ctx context.Context, param *config.Param, logE *logrus.Entry, pkgName string) error { - pkgInfo, versions := ctrl.getPackageInfo(ctx, logE, pkgName, param.Deep) + pkgInfo, versions := ctrl.getPackageInfo(ctx, logE, pkgName, param) if param.OutTestData != "" { if err := ctrl.testdataOutputter.Output(&output.Param{ List: listPkgsFromVersions(pkgName, versions), @@ -88,7 +88,7 @@ func (ctrl *Controller) getRelease(ctx context.Context, repoOwner, repoName, ver return release, err //nolint:wrapcheck } -func (ctrl *Controller) getPackageInfo(ctx context.Context, logE *logrus.Entry, arg string, deep bool) (*registry.PackageInfo, []string) { +func (ctrl *Controller) getPackageInfo(ctx context.Context, logE *logrus.Entry, arg string, param *config.Param) (*registry.PackageInfo, []string) { pkgName, version, _ := strings.Cut(arg, "@") splitPkgNames := strings.Split(pkgName, "/") pkgInfo := ®istry.PackageInfo{ @@ -112,7 +112,7 @@ func (ctrl *Controller) getPackageInfo(ctx context.Context, logE *logrus.Entry, } else { pkgInfo.Description = strings.TrimRight(strings.TrimSpace(gomoji.RemoveEmojis(repo.GetDescription())), ".!?") } - if deep && version == "" { + if param.Deep && version == "" { return ctrl.getPackageInfoWithVersionOverrides(ctx, logE, pkgName, pkgInfo) } release, err := ctrl.getRelease(ctx, pkgInfo.RepoOwner, pkgInfo.RepoName, version)