technofab/jsonnet-bundler
1
0
Fork 0
mirror of https://github.com/TECHNOFAB11/jsonnet-bundler.git synced 2025-12-11 23:50:05 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

refactor: use a map instead of a slice

Browse source 
Packages are unique anyways so it makes sense to use a map to avoid having
duplicates.

For compatibility reasons custom json (un)marshallers hide this change from the
end user
This commit is contained in:
sh0rez 2019-10-16 17:36:25 +02:00
parent 4b6e2d89e9
commit 6e3e7b2fdd
No known key found for this signature in database
GPG key ID: 87C71DF9F8181FF1
4 changed files with 52 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

21
pkg/packages.go
View file

@ -33,14 +33,15 @@ var (
VersionMismatch = errors.New("multiple colliding versions specified")
)
func Ensure(want spec.JsonnetFile, vendorDir string, locks map[string]spec.Dependency) ([]spec.Dependency, error) {
var list []spec.Dependency
func Ensure(want spec.JsonnetFile, vendorDir string, locks map[string]spec.Dependency) (map[string]spec.Dependency, error) {
deps := make(map[string]spec.Dependency)
for _, d := range want.Dependencies {
l, present := locks[d.Name]
// already locked and the integrity is intact
if present && check(l, vendorDir) {
list = append(list, l)
deps[d.Name] = l
continue
}
expectedSum := d.Sum
@ -54,12 +55,12 @@ func Ensure(want spec.JsonnetFile, vendorDir string, locks map[string]spec.Depen
return nil, errors.Wrap(err, "downloading")
}
if expectedSum != "" && d.Sum != expectedSum {
return fmt.Errorf("checksum mismatch for %s. Expected %s but got %s", d.Name, expectedSum, d.Sum)
return nil, fmt.Errorf("checksum mismatch for %s. Expected %s but got %s", d.Name, expectedSum, d.Sum)
}
list = append(list, *locked)
deps[d.Name] = *locked
}
for _, d := range list {
for _, d := range deps {
f, err := jsonnetfile.Load(filepath.Join(vendorDir, d.Name, jsonnetfile.File))
if err != nil {
if os.IsNotExist(err) {
@ -73,10 +74,14 @@ func Ensure(want spec.JsonnetFile, vendorDir string, locks map[string]spec.Depen
return nil, err
}
list = append(list, nested...)
for _, d := range nested {
if _, ok := deps[d.Name]; !ok {
deps[d.Name] = d
}
}
}
return list, nil
return deps, nil
}
func download(d spec.Dependency, vendorDir string) (*spec.Dependency, error) {