fix(update): update imported packages

aquaproj · Oct 14, 2023 · 6a18c71 · 6a18c71
1 parent ccdab87
commit 6a18c71
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 2 deletions.
diff --git a/pkg/config-reader/reader.go b/pkg/config-reader/reader.go
@@ -96,7 +96,10 @@ func (r *ConfigReaderImpl) readImports(configFilePath string, cfg *aqua.Config)
 			if err := r.Read(filePath, subCfg); err != nil {
 				return err
 			}
-			pkgs = append(pkgs, subCfg.Packages...)
+			for _, pkg := range subCfg.Packages {
+				pkg.FilePath = filePath
+				pkgs = append(pkgs, pkg)
+			}
 		}
 	}
 	cfg.Packages = pkgs

diff --git a/pkg/config/aqua/config.go b/pkg/config/aqua/config.go
@@ -14,6 +14,7 @@ type Package struct {
 	Tags        []string `yaml:",omitempty" json:"tags,omitempty"`
 	Description string   `yaml:",omitempty" json:"description,omitempty"`
 	Link        string   `yaml:",omitempty" json:"link,omitempty"`
+	FilePath    string   `json:"-" yaml:"-"`
 }
 
 func (p *Package) UnmarshalYAML(unmarshal func(interface{}) error) error {

diff --git a/pkg/controller/update/package.go b/pkg/controller/update/package.go
@@ -27,7 +27,11 @@ func (c *Controller) updatePackages(ctx context.Context, logE *logrus.Entry, par
 			newVersions[fmt.Sprintf("%s,%s", pkg.Package.Registry, pkg.PackageInfo.GetName())] = newVersion
 			newVersions[fmt.Sprintf("%s,%s", pkg.Package.Registry, pkg.Package.Name)] = newVersion
 		}
-		if err := c.updateFile(logE, cfgFilePath, newVersions); err != nil {
+		filePath := cfgFilePath
+		if pkg.Package.FilePath != "" {
+			filePath = pkg.Package.FilePath
+		}
+		if err := c.updateFile(logE, filePath, newVersions); err != nil {
 			return fmt.Errorf("update a package: %w", err)
 		}
 	}